Realize that there already a python2-port-for package.

2 files changed, 14 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2dc4340ef8d..5982bc621d06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 13 01:26:43 UTC 2016
+# Tue Dec 13 01:42:01 UTC 2016
 pkgbase = python-port-for
 	pkgdesc = Utility that helps with local TCP ports managment. It can find an unused TCP localhost port and remember the association.
 	pkgver = 0.3.1
@@ -8,13 +8,10 @@ pkgbase = python-port-for
 	arch = any
 	license = custom
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = port-for::git+https://github.com/kmike/port-for.git#tag=0.3.1
+	depends = python
+	conflicts = python2-port-for
+	source = python-port-for::git+https://github.com/kmike/port-for.git#tag=0.3.1
 	sha256sums = SKIP
 
 pkgname = python-port-for
-	depends = python
-
-pkgname = python2-port-for
-	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index d28338551347..d47e35463718 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,29 @@
 # Maintainer: Ben Wolsieffer <benwolsieffer@gmail.com>
-
-_py_pkgname=port-for
 _github_url=https://github.com/kmike/port-for
-pkgbase=python-${_py_pkgname}
-pkgname=(python-${_py_pkgname} python2-${_py_pkgname})
+pkgname=python-port-for
 pkgver=0.3.1
 pkgrel=2
 pkgdesc="Utility that helps with local TCP ports managment. It can find an unused TCP localhost port and remember the association."
 arch=('any')
 url="${_github_url}"
 license=('custom')
-depends=()
-makedepends=('python-setuptools' 'python2-setuptools')
-backup=()
-source=(${_py_pkgname}::git+${_github_url}.git#tag=$pkgver)
+depends=('python')
+makedepends=('python-setuptools')
+conflicts=('python2-port-for')
+source=(${pkgname}::git+${_github_url}.git#tag=$pkgver)
 sha256sums=('SKIP')
 
-prepare() {
-    cp -a "${srcdir}/${_py_pkgname}" "${srcdir}/python2-${_py_pkgname}"
-}
-
 build() {
-    cd "${srcdir}/${_py_pkgname}"
+    cd "${srcdir}/${pkgname}"
     python setup.py build
-    cd "${srcdir}/python2-${_py_pkgname}"
-    python2 setup.py build
 }
 
-# Automatically create package functions using Bash magic
-source /dev/stdin << EOF
-package_python-${_py_pkgname}() {
-    depends=('python')
-
-    cd "\${srcdir}/${_py_pkgname}"
-
-    python setup.py install --skip-build --root="\${pkgdir}" --optimize=1
-
-    install -Dm644 LICENSE.txt "\${pkgdir}/usr/share/licenses/\${pkgname}/LICENSE"
-}
-
-package_python2-${_py_pkgname}() {
-    depends=('python2')
-
-    cd "\${srcdir}/python2-${_py_pkgname}"
+package() {
+    cd "${srcdir}/${pkgname}"
 
-    python2 setup.py install --skip-build --root="\${pkgdir}" --optimize=1
+    python setup.py install --skip-build --root="${pkgdir}" --optimize=1
 
-    install -Dm644 LICENSE.txt "\${pkgdir}/usr/share/licenses/\${pkgname}/LICENSE"
-    
-    # Add suffix to command
-    mv "\${pkgdir}/usr/bin/${_py_pkgname}" "\${pkgdir}/usr/bin/${_py_pkgname}-python2"
+    install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-EOF
 
 # vim:set ts=4 sw=4 et: