git-imerge-git: use setuptools

2 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77a7fc3c6091..38df298a31a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = git-imerge-git
 	pkgdesc = Incremental merge for git
-	pkgver = 1.1.0.r2.g269969e
+	pkgver = 1.1.0.r20.g9d51192
 	pkgrel = 1
 	url = https://github.com/mhagger/git-imerge
 	changelog = git-imerge-git.changelog
 	arch = any
 	license = GPL2
-	makedepends = git
-	depends = python2
+	makedepends = python-setuptools
+	makedepends = bash-completion
+	depends = python
 	depends = git
 	source = git+https://github.com/mhagger/git-imerge.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2f97edd605b5..d6a92692afd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=git-imerge-git
 _pkgname=git-imerge
-pkgver=1.1.0.r2.g269969e
+pkgver=1.1.0.r20.g9d51192
 pkgrel=1
 pkgdesc='Incremental merge for git'
 arch=('any')
 url='https://github.com/mhagger/git-imerge'
 license=('GPL2')
-depends=('python2' 'git')
-makedepends=('git')
+depends=('python' 'git')
+makedepends=('python-setuptools' 'bash-completion')
 changelog=${pkgname}.changelog
 source=('git+https://github.com/mhagger/git-imerge.git')
 sha256sums=('SKIP')
@@ -20,9 +20,12 @@ pkgver() {
     git describe --long | sed -r 's/^v//; s/([^-]*-g)/r\1/; s/-/./g'
 }
 
-package () {
-    cd "${srcdir}"/${_pkgname}
-    install -D -m755 git-imerge "${pkgdir}"/usr/bin/git-imerge
-    install -D -m644 git-imerge.bashcomplete \
-            "${pkgdir}"/usr/share/bash-completion/completions/git-imerge
+build() {
+    cd "${srcdir}/${_pkgname}"
+    python setup.py build
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}"
+    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }