[arch-commits] Commit in python-hglib/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, November 9, 2019 @ 22:08:25
  Author: arojas
Revision: 524908

Drop python2

Modified:
  python-hglib/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-09 22:03:38 UTC (rev 524907)
+++ PKGBUILD	2019-11-09 22:08:25 UTC (rev 524908)
@@ -2,16 +2,16 @@
 # Contributor: Erik Johnson <palehose at gmail dot com>
 # Contributor: Jelle van der Waa <jelle at archlinux.org>
 
-pkgbase=python-hglib
-pkgname=('python2-hglib' 'python-hglib')
+pkgname=python-hglib
 pkgver=2.6.1
 pkgrel=3
 arch=('any')
 url="https://pypi.python.org/pypi/python-hglib"
 license=('MIT')
-makedepends=('python2' 'mercurial' 'python')
-checkdepends=('python-nose' 'python2-nose')
-source=(https://files.pythonhosted.org/packages/source/${pkgbase:0:1}/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc}
+pkgdesc="A library with a fast, convenient interface to Mercurial. It uses Mercurial's command server for communication with hg."
+depends=('python' 'mercurial')
+checkdepends=('python-nose')
+source=(https://files.pythonhosted.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
         hglib-fix-obsolete-markers.patch::https://www.mercurial-scm.org/repo/python-hglib/raw-rev/12e6aaef0f6e)
 validpgpkeys=('2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5') # Augie Fackler <raf at durin42.com> v2.5
 # v2.4 validpgpkeys=('FAD61395F642FC2B33C84B9A205781AC682A2D72') # Matthew Mackall <mpm at selenic.com>
@@ -20,34 +20,18 @@
             'ea0d32a061746ebe621e070ddb4653bbb4f755503ed63489c100870e82b7f553')
 
 prepare() {
-  cd "${pkgbase}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   # pass tests with recent mercurial versions
   patch -p1 -i ../hglib-fix-obsolete-markers.patch
-
-  cd ../
-  cp -rf "${pkgbase}-${pkgver}" "${pkgbase}-${pkgver}-2"
 }
 
 check() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python test.py
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-2"
-  python2 test.py
 }
 
-package_python2-hglib() {
-  pkgdesc="A library with a fast, convenient interface to Mercurial. It uses Mercurial's command server for communication with hg."
-  depends=('python2' 'mercurial')
-  cd "${srcdir}/${pkgbase}-${pkgver}-2"
-  python2 setup.py install --root=${pkgdir} --optimize=1
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python-hglib() {
-  pkgdesc="A library with a fast, convenient interface to Mercurial. It uses Mercurial's command server for communication with hg."
-  depends=('python' 'mercurial')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python setup.py install --root=${pkgdir} --optimize=1
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }