fix m2crypto compatinility

use python2-lxml package instead of bundled egg

2 files changed, 24 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26eb4957f272..36bce38966ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = acestream-engine
 	pkgdesc = ACE Stream engine
 	pkgver = 3.1.16
-	pkgrel = 1
+	pkgrel = 2
 	url = http://acestream.org/
 	install = acestream-engine.install
 	arch = x86_64
 	license = unknown
 	depends = python2-setuptools
 	depends = python2-xlib
-	depends = python2-m2crypto
 	depends = python2-apsw
+	depends = python2-lxml
 	optdepends = libappindicator-gtk2: GTK+ gui support
 	source = acestream-engine.service
 	source = http://dl.acestream.org/linux/acestream_3.1.16_ubuntu_16.04_x86_64.tar.gz
+	source = https://archive.archlinux.org/packages/p/python2-m2crypto/python2-m2crypto-0.23.0-2-x86_64.pkg.tar.xz
 	sha256sums = b9863a9dd3ee6d41d18475f5f539107fe81a573f45ca1cb98013441f955f1af0
 	sha256sums = 452bccb8ae8b5ff4497bbb796081dcf3fec2b699ba9ce704107556a3d6ad2ad7
+	sha256sums = a58bcd992b4823b8cf3c9d5794d0eb631438a63db8a03488fff571cfdc71a768
 
 pkgname = acestream-engine
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f45cebb4be4..77e9a3ad0a91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,33 @@
-# Maintainer: Jan Magnus Brevik <janmbrevik at gmail dot com>
+# Maintainer: Jonian Guveli <jonian@hardpixel.eu>
+# Contributor: Jan Magnus Brevik <janmbrevik@gmail.com>
 # Contributor: Rubén Fdes Moreira <tmp-meteque@openmailbox.com>
-# Contributor: Sigmund Vestergaard <sigmundv at gmail dot com>
-# Contributor: MacCyber <jonas.enge at gmail dot com>
-# Contributor: Doug Newgard <scimmia22 at outlook dot com>
+# Contributor: Sigmund Vestergaard <sigmundv@gmail.com>
+# Contributor: MacCyber <jonas.enge@gmail.com>
+# Contributor: Doug Newgard <scimmia22@outlook.com>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
-# Contributor: Antti Hautaniemi <an7oine at me com>
+# Contributor: Antti Hautaniemi <an7oine@me.com>
 
 pkgname=acestream-engine
 pkgver=3.1.16
-pkgrel=1
+pkgrel=2
 _ubuntuver=16.04
 pkgdesc="ACE Stream engine"
 arch=('x86_64')
 url="http://acestream.org/"
 license=('unknown')
-depends=('python2-setuptools' 'python2-xlib' 'python2-m2crypto' 'python2-apsw')
+depends=('python2-setuptools' 'python2-xlib' 'python2-apsw' 'python2-lxml')
 optdepends=('libappindicator-gtk2: GTK+ gui support')
 install='acestream-engine.install'
-
-source=("acestream-engine.service"
-        "http://dl.acestream.org/linux/acestream_${pkgver}_ubuntu_${_ubuntuver}_x86_64.tar.gz")
-sha256sums=('b9863a9dd3ee6d41d18475f5f539107fe81a573f45ca1cb98013441f955f1af0'
-            '452bccb8ae8b5ff4497bbb796081dcf3fec2b699ba9ce704107556a3d6ad2ad7')
+source=(
+  "acestream-engine.service"
+  "http://dl.acestream.org/linux/acestream_${pkgver}_ubuntu_${_ubuntuver}_x86_64.tar.gz"
+  "https://archive.archlinux.org/packages/p/python2-m2crypto/python2-m2crypto-0.23.0-2-x86_64.pkg.tar.xz"
+)
+sha256sums=(
+  'b9863a9dd3ee6d41d18475f5f539107fe81a573f45ca1cb98013441f955f1af0'
+  '452bccb8ae8b5ff4497bbb796081dcf3fec2b699ba9ce704107556a3d6ad2ad7'
+  'a58bcd992b4823b8cf3c9d5794d0eb631438a63db8a03488fff571cfdc71a768'
+)
 
 package() {
   cd "$srcdir/acestream_${pkgver}_ubuntu_${_ubuntuver}_$CARCH"
@@ -30,5 +36,7 @@ package() {
   install -Dm755 "start-engine" "$pkgdir/opt/acestream/start-engine"
   cp -a acestream.conf "$pkgdir/opt/acestream/acestream.conf"
   cp -a data lib "$pkgdir/opt/acestream/"
+  cp -a $srcdir/usr/lib/python2.7/site-packages/M2Crypto* "$pkgdir/opt/acestream/lib"
   install -Dm644 "$srcdir/acestream-engine.service" "$pkgdir/usr/lib/systemd/system/acestream-engine.service"
+  rm "$pkgdir/opt/acestream/lib/lxml-3.7.2-py2.7-linux-x86_64.egg"
 }