split package

2 files changed, 35 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d7c86c1a31c..7f1047738634 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,11 +5,14 @@ pkgbase = python-pyjnius
 	url = https://github.com/kivy/pyjnius
 	arch = any
 	license = LGPL3
-	makedepends = cython
-	depends = java-environment
-	depends = python
 	source = pyjnius-1.1.1.tar.gz::https://github.com/kivy/pyjnius/tarball/1.1.1
 	md5sums = 2d457e4761b27e6760cf54efb6201f17
 
+pkgname = python2-pyjnius
+	depends = java-environment
+	depends = python2
+
 pkgname = python-pyjnius
+	depends = java-environment
+	depends = python
 
diff --git a/PKGBUILD b/PKGBUILD
index 884fdfd2a13c..c7175461fcf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,46 @@
 _name=pyjnius
-pkgname=python-pyjnius
+pkgbase=python-$_name
+pkgname=(python2-$_name python-$_name)
 pkgver=1.1.1
 pkgrel=1
 pkgdesc='Python module to access Java class as Python class, using JNI.'
 arch=(any)
 url="https://github.com/kivy/$_name"
 license=(LGPL3)
-depends=(java-environment python)
-makedepends=(cython)
 source=("$_name-$pkgver.tar.gz::https://github.com/kivy/$_name/tarball/$pkgver")
 md5sums=(2d457e4761b27e6760cf54efb6201f17)
 
+prepare() {
+	[[ ! -d "python-$_name-$pkgver"  ]] && mv "kivy-$_name-"* "python-$_name-$pkgver" || true
+	[[ ! -d "python2-$_name-$pkgver" ]] && cp -r python{,2}-"$_name-$pkgver" || true
+}
+
 build() {
-	cd "kivy-$_name-"*
+	local python=${pkgname%%-*}
+	cd "$pkgname-$pkgver"
 	
-	python setup.py build_ext --inplace -f
-	python setup.py build
+	$python setup.py build_ext --inplace -f
+	$python setup.py build
+}
+
+package_python2-pyjnius() {
+	depends=(java-environment python2)
+	makedepends=(cython2)
+	package_ python2
+}
+
+package_python-pyjnius() {
+	depends=(java-environment python)
+	makedepends=(cython)
+	package_ python
 }
 
-package() {
-	export PYTHONPATH="$pkgdir/usr/lib/$(readlink /usr/bin/python3)/site-packages"
+package_() {
+	local python=$1
+	local pyver=$($python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
+	export PYTHONPATH="$pkgdir/usr/lib/python$pyver/site-packages"
 	mkdir -p "$PYTHONPATH"
 	
-	cd "$srcdir/kivy-$_name-"*
-	python setup.py install --prefix="$pkgdir/usr" --optimize=1
+	cd "$srcdir/$pkgname-$pkgver"
+	$python setup.py install --prefix="$pkgdir/usr" --optimize=1
 }