v1.4.1

2 files changed, 20 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3647cbb30361..d9dd65789bb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = python-pyjnius
 	pkgdesc = Python module to access Java class as Python class, using JNI.
-	pkgver = 1.2.0
+	pkgver = 1.4.1
 	pkgrel = 1
 	url = https://github.com/kivy/pyjnius
 	arch = any
 	license = MIT
 	makedepends = cython
 	makedepends = python-setuptools
-	makedepends = cython2
-	makedepends = python2-setuptools
-	source = https://files.pythonhosted.org/packages/source/p/pyjnius/pyjnius-1.2.0.tar.gz
-	sha256sums = 9ff35438d6f6774d7d6fb0632587e45d5dd3d4ecb1d3a3bef31a3e31de1709d0
-
-pkgname = python2-pyjnius
+	depends = python
+	depends = java-environment
+	depends = python-six
+	source = https://files.pythonhosted.org/packages/source/p/pyjnius/pyjnius-1.4.1.tar.gz
+	sha256sums = 8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce
 
 pkgname = python-pyjnius
-
diff --git a/PKGBUILD b/PKGBUILD
index 5edeb8cf7fe4..688c24248fcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,30 @@
 _name=pyjnius
-pkgbase=python-$_name
-pkgname=(python2-$_name python-$_name)
-pkgver=1.2.0
+pkgname=python-$_name
+pkgver=1.4.1
 pkgrel=1
 pkgdesc='Python module to access Java class as Python class, using JNI.'
 arch=(any)
 url="https://github.com/kivy/$_name"
 license=(MIT)
+depends=(python java-environment python-six)
+makedepends=(cython python-setuptools)
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz")
-sha256sums=('9ff35438d6f6774d7d6fb0632587e45d5dd3d4ecb1d3a3bef31a3e31de1709d0')
-makedepends=(
-    cython  python-setuptools
-    cython2 python2-setuptools
-)
+sha256sums=('8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce')
 
-prepare() {
-	rm -rf "$srcdir"/python{,2}-"$_name-$pkgver"
-	mv "$srcdir/$_name-$pkgver" "$srcdir/python-$_name-$pkgver"
-	cp -a "$srcdir"/python{,2}-"$_name-$pkgver"
-}
-
-build_() {
-	local python=$1
-	cd "$srcdir/$python-$_name-$pkgver"
-	
-	$python setup.py build_ext --inplace -f
-	$python setup.py build
-}
 build() {
-	build_ python
-	build_ python2
+	cd "$srcdir/$_name-$pkgver"
+	python setup.py build_ext --inplace -f
+	python setup.py build
 }
 
 
-check_() {
-	local python=$1
-	cd "$srcdir/$python-$_name-$pkgver"
-	$python setup.py test
-}
-check_python-pyjnius() {
-	check_ python
-}
-check_python2-pyjnius() {
-	check_ python2
+check() {
+	cd "$srcdir/$_name-$pkgver"
+	python setup.py test
 }
 
-package_() {
-	local python=$1
-	cd "$srcdir/$python-$_name-$pkgver"
-	
-	depends=($python 'java-environment')
-	$python setup.py install --root="$pkgdir" --skip-build
+package() {
+	cd "$srcdir/$_name-$pkgver"
+	python setup.py install --root="$pkgdir" --skip-build
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rst"
 }
-package_python-pyjnius() {
-	package_ python
-}
-package_python2-pyjnius() {
-	package_ python2
-}