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

[Jelle van der Waa]

    Date: Saturday, February 16, 2019 @ 20:50:49
  Author: jelle
Revision: 433827

Kill python2-cssutils from PKGBUILD

Modified:
  python-cssutils/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-16 20:47:19 UTC (rev 433826)
+++ PKGBUILD	2019-02-16 20:50:49 UTC (rev 433827)
@@ -4,8 +4,7 @@
 # Contributor: Rick W. Chena <stuffcorpse at archlinux.us>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
-pkgbase=python-cssutils
-pkgname=('python2-cssutils' 'python-cssutils')
+pkgname=python-cssutils
 pkgver=1.0.2
 pkgrel=2
 pkgdesc="A CSS Cascading Style Sheets library for Python"
@@ -12,48 +11,24 @@
 arch=('any')
 url="http://cthedot.de/cssutils/"
 license=('LGPL3')
-makedepends=('python2-setuptools' 'python-setuptools')
+depends=('python')
+makedepends=('python-setuptools')
 # We need to include mock as a check dependency due to the following pbr bug:
 # https://bugs.launchpad.net/pbr/+bug/1493735
-checkdepends=('python2-mock')
 source=("https://pypi.python.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec/cssutils-1.0.2.tar.gz")
 md5sums=('dc66d96c2d78f1687f59ac412fe9d318')
 
 build() {
-  cd "${srcdir}"
-
-  # Create python2 build dir
-  cp -a cssutils-${pkgver} cssutils-py2-${pkgver}
-
   # Use #!/usr/bin/python3 
   cd cssutils-${pkgver}/src
   find . -maxdepth 2 -mindepth 1 -type f -iname '*.py' -exec sed -i 's/env python/python3/' '{}' \;
-
-  cd "${srcdir}/cssutils-py2-${pkgver}"
-  find . -maxdepth 2 -mindepth 1 -type f -iname '*.py' -exec sed -i -e 's:#!/usr/bin/env python:#!/usr/bin/env python2:g' '{}' \;
 }
 
-package_python2-cssutils() {
-  depends=('python2')
+package() {
+  cd "cssutils-${pkgver}"
 
-  cd "${srcdir}/cssutils-py2-${pkgver}"
-
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-
-  # Don't install tests (FS#27567)
-  rm -rf "${pkgdir}/usr/lib/python2.7/site-packages/tests"
-}
-
-package_python-cssutils() {
-  depends=('python')
-
-  cd "${srcdir}/cssutils-${pkgver}"
-
   python3 setup.py install --root="${pkgdir}/" --optimize=1
 
-  # Avoid a conflict: only keep the Py2 executables.
-  rm -rf "${pkgdir}/usr/bin"
-
   # Don't install tests (FS#27567)
   rm -rf "${pkgdir}/usr/lib/python3.3/site-packages/tests"
 }
@@ -62,7 +37,4 @@
   cd "${srcdir}/cssutils-${pkgver}"
   2to3 --no-diffs -nw src
   python3 setup.py test
-
-  cd "${srcdir}/cssutils-py2-${pkgver}"
-  python2 setup.py test
 }