split pacakge for both python2 and 3

2 files changed, 26 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92a4fd2663d7..86f56d38c6a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
-# Generated by mksrcinfo v8
-# Wed May  8 01:48:13 UTC 2019
 pkgbase = pyutil
 	pkgdesc = general-purpose python library (used by tahoe-lafs)
-	pkgver = 3.2.0
+	pkgver = 3.3.0
 	pkgrel = 1
 	url = https://pypi.python.org/pypi/pyutil
 	arch = any
 	license = GPL2
-	checkdepends = python2-twisted
-	checkdepends = python2-mock
 	makedepends = python2-setuptools
-	depends = python2
+	makedepends = python-setuptools
+	source = https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-3.3.0.tar.gz
+	sha256sums = 8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848
+
+pkgname = python2-pyutil
 	depends = python2-simplejson
-	depends = zbase32
-	source = https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-3.2.0.tar.gz
-	sha256sums = 910b83e70d83a6d44d5c44613c524725faeb55d297aeb3bd7623a16743689d1c
+	depends = python2-zbase32
+	replaces = pyutil
 
-pkgname = pyutil
+pkgname = python-pyutil
+	depends = python-simplejson
+	depends = python-zbase32
 
diff --git a/PKGBUILD b/PKGBUILD
index 868ac2c2cce4..e231d4170112 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
 # Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
 # Contributor: Peter Simons <simons@cryp.to>
 
-pkgname=pyutil
-pkgver=3.2.0
+pkgbase=pyutil
+pkgname=('python2-pyutil' 'python-pyutil')
+pkgver=3.3.0
 pkgrel=1
 pkgdesc="general-purpose python library (used by tahoe-lafs)"
 arch=('any')
 url='https://pypi.python.org/pypi/pyutil'
 license=('GPL2')
-depends=('python2' 'python2-simplejson' 'zbase32')
-makedepends=('python2-setuptools')
-checkdepends=('python2-twisted' 'python2-mock')
+makedepends=('python2-setuptools' 'python-setuptools')
 source=("https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-${pkgver}.tar.gz")
-sha256sums=('910b83e70d83a6d44d5c44613c524725faeb55d297aeb3bd7623a16743689d1c')
+sha256sums=('8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848')
 
-build(){
-    cd "$srcdir/pyutil-$pkgver"
-    python2 setup.py build
-}
+package_python2-pyutil() {
+	depends=('python2-simplejson' 'python2-zbase32')
+	replaces=('pyutil')
+	cd "$srcdir/pyutil-$pkgver"
+    python2 setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1
+    rm -r "$pkgdir/usr/pyutil"
 
-BUILDENV+=(!check)
-check() {
-    cd "$srcdir/pyutil-$pkgver"
-    python2 setup.py test
 }
 
-package(){
-    cd "$srcdir/pyutil-$pkgver"
-    python2 setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1 --skip-build
+package_python-pyutil() {
+	depends=('python-simplejson' 'python-zbase32')
+	cd "$srcdir/pyutil-$pkgver"
+    python setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1
     rm -r "$pkgdir/usr/pyutil"
 }