Python 2 Removal - Round 1

dtc/PKGBUILD

@@ -2,13 +2,13 @@
 
 pkgname=dtc
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Device Tree Compiler"
 arch=('i686' 'x86_64')
 url="https://git.kernel.org/pub/scm/utils/dtc/dtc/git"
 license=('GPL2')
 groups=('base')
-makedepends=('python2' 'swig' 'libcrypt-devel')
+makedepends=('python' 'swig' 'libcrypt-devel')
 source=("https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${pkgname}-${pkgver}.tar.gz"
         01-correct-shared-library-extension.patch
         02-pyext-install.patch)
@@ -18,7 +18,7 @@ sha256sums=('45f9885f890c5feab8110a721410970deb8f83987d0125f1a2703bc8ec140e33'
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/python\b/python2/' tests/run_tests.sh
+  sed -i 's/python\b/python3/' tests/run_tests.sh
 
   # to make check work
   sed -i 's/__attribute__((weak))//' tests/testutils.c
@@ -40,7 +40,7 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
+  make -j1 PREFIX=/usr DESTDIR="${pkgdir}" install
 
   # license
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/README.license ${pkgdir}/usr/share/licenses/${pkgname}/README.license

gpgme/PKGBUILD

@@ -1,21 +1,22 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgbase=gpgme
-pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python2' 'libgpgme-python3')
+pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python')
 pkgver=1.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
 url="https://gnupg.org/related_software/gpgme/"
 license=('LGPL')
 depends=('libassuan' 'libgpg-error' 'gnupg')
-makedepends=('libassuan-devel' 'libgpg-error-devel' 'python2' 'python3' 'swig')
+makedepends=('libassuan-devel' 'libgpg-error-devel' 'python' 'swig' 'libcrypt-devel')
 options=('!libtool' '!emptydirs')
 source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         gpgme-1.4.2-msys2.patch)
 sha256sums=('c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46'
             'SKIP'
             '7e9157aaebdc04fbf02d2470fc25d730fc873ec402bfb9f7be18501264d076f7')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
 
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -73,20 +74,13 @@ package_libgpgme-devel() {
   cp -rf ${srcdir}/dest/usr/share/common-lisp ${pkgdir}/usr/share/
 }
 
-package_libgpgme-python2() {
-  pkgdesc="libgpgme bindings for Python2"
-  groups=('development')
-  depends=("libgpgme=${pkgver}" "python2")
-  options=('staticlibs')
-
-  mkdir -p ${pkgdir}/usr/lib
-  cp -rf ${srcdir}/dest/usr/lib/python2.7 ${pkgdir}/usr/lib/
-}
-
-package_libgpgme-python3() {
+package_libgpgme-python() {
   pkgdesc="libgpgme bindings for Python3"
   groups=('development')
   depends=("libgpgme=${pkgver}" "python3")
+  provides=("libgpgme-python3")
+  conflicts=("libgpgme-python3")
+  replaces=("libgpgme-python3")
   options=('staticlibs')
 
   mkdir -p ${pkgdir}/usr/lib

python-beaker/PKGBUILD

@@ -2,47 +2,33 @@
 
 _realname=beaker
 pkgbase="python-${_realname}"
-pkgname=("python3-${_realname}" "python2-${_realname}")
+pkgname=("python-${_realname}")
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://beaker.groovie.org/"
-depends=("python2-setuptools" "python3-setuptools")
+depends=("python" "python3-setuptools")
+provides=("python3-${_realname}")
+conflicts=("python3-${_realname}")
+replaces=("python3-${_realname}")
 source=("${_realname}-${pkgver}.tar.gz"::https://github.com/bbangert/beaker/archive/${pkgver}.tar.gz)
 sha256sums=('5298f2d3be7b3ad8f299c9cc69b57907613412f397feb8c322896dbc857f5218')
 
 prepare() {
-  cd "${srcdir}"
-
-  cp -a ${_realname}-${pkgver}{,-python2}
+  cd "${srcdir}/${_realname}-${pkgver}"
 }
 
 build() {
-  # Build python 3 module
-  cd "${srcdir}"/${_realname}-${pkgver}
-  sed -i "s#/usr/bin/python#/usr/bin/python3#" beaker/crypto/pbkdf2.py
-  python3 setup.py build
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  # Build python 2 module
-  cd ../${_realname}-${pkgver}-python2
-  sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
-  python2 setup.py build
+  /usr/bin/python setup.py build
 }
 
-package_python3-beaker() {
-  depends=('python>=3.3')
-
+package() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python3-beaker/LICENSE"
-}
-
-package_python2-beaker() {
-  depends=('python2>=2.7' 'python2-funcsigs')
 
-  cd "${srcdir}/${_realname}-${pkgver}-python2"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-beaker/LICENSE"
+  /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-beaker/LICENSE"
 }

python-colorama/PKGBUILD

@@ -5,53 +5,36 @@
 
 _pyname=colorama
 pkgbase="python-${_pyname}"
-pkgname=(python2-${_pyname} python3-${_pyname})
+pkgname=("python-${_pyname}")
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python API for cross-platform colored terminal text."
 arch=('any')
 url="https://pypi.python.org/pypi/colorama"
 license=('BSD')
-makedepends=('python2' 'python3' 'git')
-checkdepends=('python3-mock' 'python2-mock')
+provides=("python3-${_pyname}")
+conflicts=("python3-${_pyname}")
+replaces=("python3-${_pyname}")
+depends=('python')
+checkdepends=('python3-mock')
 source=(colorama-${pkgver}.tar.gz::https://github.com/tartley/colorama/archive/${pkgver}.tar.gz)
 sha256sums=('6b2e2bb7bd96813fcafe5598886ce4f9f741450677e1ee090a119c600f04de9c')
 
-
-prepare() {
-  for pver in {3,2}; do
-    rm -rf python${pver} || true
-    cp -r ${_pyname}-${pkgver} python${pver}
-  done
-}
-
 build() {
-  for pver in {3,2}; do
-    cd "$srcdir/python${pver}"
-    /usr/bin/python${pver} setup.py build
-  done
-}
+  cd "$srcdir/${_pyname}-${pkgver}"
 
-check() {
-  for pver in {3,2}; do
-    msg "Python ${pver} test"
-    cd "${srcdir}/python${pver}"
-    /usr/bin/python${pver}.exe -m unittest discover -p *_test.py || warning "test failed"
-  done
+  /usr/bin/python setup.py build
 }
 
-package_python2-colorama() {
-  depends=('python2')
+check() {
+  cd "$srcdir/${_pyname}-${pkgver}"
 
-  cd ${srcdir}/python2
-  /usr/bin/python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  /usr/bin/python.exe -m unittest discover -p *_test.py || warning "test failed"
 }
 
-package_python3-colorama() {
-  depends=('python3')
+package() {
+  cd "$srcdir/${_pyname}-${pkgver}"
 
-  cd ${srcdir}/python3
-  /usr/bin/python3 setup.py install --root="${pkgdir}" --optimize=1
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1
   install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }

python-mako/PKGBUILD

@@ -2,60 +2,40 @@
 
 _realname=mako
 pkgbase="python-${_realname}"
-pkgname=("python3-${_realname}" "python2-${_realname}")
+pkgname=("python-${_realname}")
 pkgver=1.0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages"
 arch=('i686' 'x86_64')
 url="https://pypi.python.org/pypi/Mako"
-makedepends=("python2-setuptools"
-             "python3-setuptools"
-             "python2-markupsafe"
-             "python3-markupsafe"
-             "python2-beaker"
-             "python3-beaker")
-checkdepends=("python2-nose"
-              "python3-nose")
+license=('MIT')
+depends=("python3-markupsafe"
+         "python3-beaker")
+makedepends=("python3-setuptools")
+checkdepends=("python3-nose")
+provides=("python3-${_realname}")
+conflicts=("python3-${_realname}")
+replaces=("python3-${_realname}")
 options=('staticlibs')
 source=("https://pypi.python.org/packages/source/M/Mako/Mako-${pkgver}.tar.gz")
 sha256sums=('f5a642d8c5699269ab62a68b296ff990767eb120f51e2e8f3d6afb16bdb57f4b')
 
 build() {
-cd "$srcdir"
-  rm -rf python{2,3}-build
-  for builddir in python{2,3}-build; do
-    cp -r Mako-$pkgver $builddir
-    pushd $builddir
-    /usr/bin/${builddir%-build} setup.py build
-    popd
-  done
-}
+  cd "$srcdir/Mako-$pkgver"
 
-check() {
-  cd "$srcdir"
-  for builddir in python{2,3}-build; do
-    pushd $builddir
-    /usr/bin/${builddir%-build} setup.py test
-    popd
-  done
+  /usr/bin/python setup.py build
 }
 
-package_python2-mako() {
-  depends=("python2-markupsafe" "python2-beaker")
-
-  cd "$srcdir/python2-build"
-  /usr/bin/python2 setup.py install --prefix=/usr --root="$pkgdir" -O1
-
-  mv ${pkgdir}/usr/bin/mako-render{,2}
+check() {
+  cd "$srcdir/Mako-$pkgver"
 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python2-${_realname}/COPYING"
+  /usr/bin/python setup.py test
 }
 
-package_python3-mako() {
-  depends=("python3-markupsafe" "python3-beaker")
+package() {
+  cd "$srcdir/Mako-$pkgver"
 
-  cd "$srcdir/python3-build"
-  /usr/bin/python3 setup.py install --prefix=/usr --root="$pkgdir" -O1
+  /usr/bin/python setup.py install --prefix=/usr --root="$pkgdir" -O1
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python3-${_realname}/COPYING"
 }