split package

Signed-off-by: Chris Warrick <kwpolska@gmail.com>

2 files changed, 47 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c61907add619..79579627afa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,32 @@
 pkgbase = python-doit-git
-	pkgdesc = Automation Tool (git version)
+	pkgdesc = doit automation tool (git version)
 	pkgver = 0.28.0.r1.gdcefd21
 	pkgrel = 1
 	url = http://pydoit.org/
 	arch = any
 	license = MIT
 	makedepends = git
+	makedepends = python
+	makedepends = python2
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	options = !emptydirs
+	source = git+https://github.com/pydoit/doit
+	md5sums = SKIP
+
+pkgname = python-doit-git
 	depends = python
 	depends = python-pyinotify
 	depends = python-six
 	depends = python-setuptools
-	options = !emptydirs
-	source = git://github.com/pydoit/doit.git
-	source = LICENSE
-	md5sums = SKIP
-	md5sums = 7d6fd7c8e022bae9010af272c31eb45f
+	provides = python-doit
+	conflicts = python-doit
 
-pkgname = python-doit-git
+pkgname = python2-doit-git
+	depends = python2
+	depends = python2-pyinotify
+	depends = python2-six
+	depends = python2-setuptools
+	provides = python2-doit
+	conflicts = python2-doit
 
diff --git a/PKGBUILD b/PKGBUILD
index b730f8bed1eb..6ea1b3cd59c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,46 @@
 # Maintainer: Chris Warrick <aur@chriswarrick.com>
-pkgname=python-doit-git
+pkgbase=python-doit-git
+pkgname=('python-doit-git' 'python2-doit-git')
 _pyname=doit
 _gitname=doit
 pkgver=0.28.0.r1.gdcefd21
 pkgrel=1
-pkgdesc='Automation Tool (git version)'
+pkgdesc='doit automation tool (git version)'
 arch=('any')
 url='http://pydoit.org/'
 license=('MIT')
-depends=('python' 'python-pyinotify' 'python-six' 'python-setuptools')
-makedepends=('git')
+makedepends=('git' 'python' 'python2' 'python-setuptools' 'python2-setuptools')
 options=(!emptydirs)
-source=("git://github.com/pydoit/${_gitname}.git"
-        "LICENSE")
-md5sums=('SKIP' '7d6fd7c8e022bae9010af272c31eb45f')
+source=("git+https://github.com/pydoit/${_gitname}")
+md5sums=('SKIP')
 
-package() {
+prepare() {
   cd "${srcdir}/${_gitname}"
-  python setup.py install --root="${pkgdir}/" --optimize=1
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cp -R "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-py2"
+}
+
+package_python-doit-git() {
+  depends=('python' 'python-pyinotify' 'python-six' 'python-setuptools')
+  provides=('python-doit')
+  conflicts=('python-doit')
+  cd "${srcdir}/${_gitname}"
+  python3 setup.py install --root="${pkgdir}/" --optimize=1
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+  ln -s ${_pyname} "${pkgdir}/usr/bin/${_pyname}3"
+}
+
+package_python2-doit-git() {
+  depends=('python2' 'python2-pyinotify' 'python2-six' 'python2-setuptools')
+  provides=('python2-doit')
+  conflicts=('python2-doit')
+  cd "${srcdir}/${_gitname}-py2"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+  mv "${pkgdir}/usr/bin/${_pyname}" "${pkgdir}/usr/bin/${_pyname}2"
 }
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
-  git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+  git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/^v//'
 }
 
 # vim:set ts=2 sw=2 et: