fix makedeps and split package

2 files changed, 34 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6baaf4106448..131d547eb469 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,23 @@
+# Generated by mksrcinfo v8
+# Sat Mar 12 00:58:28 UTC 2016
 pkgbase = funcparserlib
-	pkgdesc = Small and fast python (2&3) based parser. Inspired from EBNF and Haskell.
+	pkgdesc = Small and fast python based parser. Inspired from EBNF and Haskell.
 	pkgver = 0.3.6
 	pkgrel = 1
-	url = http://code.google.com/p/funcparserlib/
+	url = https://github.com/vlasovskikh/funcparserlib
 	arch = any
 	license = MIT
-	depends = python2
+	makedepends = python2
+	makedepends = python2-setuptools
+	makedepends = python-setuptools
 	depends = python
+	provides = funcparserlib
 	source = http://pypi.python.org/packages/source/f/funcparserlib/funcparserlib-0.3.6.tar.gz
 	md5sums = 3aba546bdad5d0826596910551ce37c0
 
-pkgname = funcparserlib
+pkgname = python-funcparserlib
+
+pkgname = python2-funcparserlib
+	depends = python2
+	provides = 
 
diff --git a/PKGBUILD b/PKGBUILD
index 7e0c54c5430a..42cc249d431f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,42 @@
 # Contributor: Kyle Keen <keenerd@gmail.com>
-pkgname=funcparserlib
+pkgbase=funcparserlib
+pkgname=('python-funcparserlib' 'python2-funcparserlib')
 pkgver=0.3.6
 pkgrel=1
-pkgdesc="Small and fast python (2&3) based parser.  Inspired from EBNF and Haskell."
-# really should be a split package
+pkgdesc="Small and fast python based parser.  Inspired from EBNF and Haskell."
 arch=('any')
-url="http://code.google.com/p/funcparserlib/"
+url="https://github.com/vlasovskikh/funcparserlib"
 license=('MIT')
-depends=('python2' 'python')
-source=(http://pypi.python.org/packages/source/f/$pkgname/$pkgname-$pkgver.tar.gz)
+depends=('python')
+provides=('funcparserlib')
+makedepends=('python2' 'python2-setuptools' 'python-setuptools')
+source=(http://pypi.python.org/packages/source/f/$pkgbase/$pkgbase-$pkgver.tar.gz)
 md5sums=('3aba546bdad5d0826596910551ce37c0')
 
 prepare() {
   cd "$srcdir"
-  mkdir "$pkgname-$pkgver-py3"
-  cp -r $pkgname-$pkgver/* "$pkgname-$pkgver-py3/"
+  mkdir -p "$pkgbase-$pkgver-py3"
+  cp -r $pkgbase-$pkgver/* "$pkgbase-$pkgver-py3/"
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
   find ./ -type f -name '*.py' | xargs -n 1 sed -i 's|/usr/bin/env python|/usr/bin/env python2|'
   python2 setup.py build
 
-  cd "$srcdir/$pkgname-$pkgver-py3"
+  cd "$srcdir/$pkgbase-$pkgver-py3"
   python3 setup.py build
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
-
-  cd "$srcdir/$pkgname-$pkgver-py3"
+package_python-funcparserlib() {
+  cd "$srcdir/$pkgbase-$pkgver-py3"
   python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
+package_python2-funcparserlib() {
+  depends=('python2')
+  provides=()
+  cd "$srcdir/$pkgbase-$pkgver"
+  python2 setup.py install --prefix=/usr --root="$pkgdir"
+}
+