[arch-commits] Commit in (4 files)

[Daniel M. Capella]

    Date: Sunday, October 31, 2021 @ 21:47:30
  Author: polyzen
Revision: 1035131

python2-docutils no longer needed

Added:
  python-docutils/
Modified:
  python-docutils/trunk/PKGBUILD
Deleted:
  docutils/
  python-docutils/trunk/python2-docutils.install

--------------------------+
 PKGBUILD                 |   60 +++++++++------------------------------------
 python2-docutils.install |    9 ------
 2 files changed, 13 insertions(+), 56 deletions(-)

Modified: python-docutils/trunk/PKGBUILD
===================================================================
--- docutils/trunk/PKGBUILD	2021-10-31 21:35:35 UTC (rev 1035130)
+++ python-docutils/trunk/PKGBUILD	2021-10-31 21:47:30 UTC (rev 1035131)
@@ -4,46 +4,34 @@
 # Contributor : Ionut Biru <ibiru at archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
-pkgbase=docutils
-pkgname=('python-docutils' 'python2-docutils')
+_name=docutils
+pkgname=python-docutils
 pkgver=0.17.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX'
 arch=('any')
 url='http://docutils.sourceforge.net'
 license=('custom')
-makedepends=('python-setuptools' 'python2-setuptools')
-source=("https://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz")
+depends=('python')
+makedepends=('python-setuptools')
+source=("https://downloads.sourceforge.net/$_name/$_name-$pkgver.tar.gz")
 sha512sums=('5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b')
 
 build() {
-  cd $pkgbase-$pkgver
-  echo 'Python3 build'
-  python3 setup.py build --build-lib=build/python
-  find build/python -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python3,' {} \;
-  echo 'Python2 build'
-  python2 setup.py build --build-lib=build/python2
-  find build/python2 -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+  cd $_name-$pkgver
+  python setup.py build
 }
 
 check() {
-  cd $pkgbase-$pkgver
+  cd $_name-$pkgver
   # we need utf locale to valid utf8 tests
   export LANG=en_US.UTF-8
-  echo 'Python3 checks'
-  PYTHONPATH="$PWD/build/python/" python3 test/alltests.py
-  echo 'Python2 checks'
-  PYTHONPATH="$PWD/build/python2/" python2 test/alltests.py
+  PYTHONPATH="$PWD/build/python/" python test/alltests.py
 }
 
-package_python-docutils() {
-  depends=('python')
-
-  cd $pkgbase-$pkgver
-  python setup.py build --build-lib=build/python \
-                  install --root="$pkgdir" --optimize=1
+package() {
+  cd $_name-$pkgver
+  python setup.py build install --root="$pkgdir" --optimize=1
   # symlink without .py
   for f in "$pkgdir"/usr/bin/*.py; do
       ln -s "$(basename $f)" "$pkgdir/usr/bin/$(basename $f .py)"
@@ -53,26 +41,4 @@
   install -D -m644 licenses/python* "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
-package_python2-docutils() {
-  depends=('python2')
-  provides=("docutils=$pkgver")
-  replaces=('docutils')
-  install=python2-docutils.install
-
-  cd $pkgbase-$pkgver
-  python2 setup.py build --build-lib=build/python2 \
-                   install --root="$pkgdir" --optimize=1
-  # fix python-docutils conflict
-  for _f in "$pkgdir"/usr/bin/*.py; do
-      mv -v "$_f" "${_f%.py}2.py"
-  done
-  # symlink without .py
-  for _f in "$pkgdir"/usr/bin/*.py; do
-      ln -s "$(basename $_f)" "$pkgdir/usr/bin/$(basename $_f .py)"
-  done
-  # setup license
-  install -D -m644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt"
-  install -D -m644 licenses/python* "$pkgdir/usr/share/licenses/$pkgname/"
-}
-
 # vim:set ts=2 sw=2 et:

Deleted: python-docutils/trunk/python2-docutils.install
===================================================================
--- docutils/trunk/python2-docutils.install	2021-10-31 21:35:35 UTC (rev 1035130)
+++ python-docutils/trunk/python2-docutils.install	2021-10-31 21:47:30 UTC (rev 1035131)
@@ -1,9 +0,0 @@
-post_upgrade() {
-  [ $(vercmp '0.8.1-2' "$2") -gt 0 ] && cat <<EOF || :
-python2-docutils:
-rst* binaries have been renamed to rst*2 to avoid conflict with python-docutils
-remember to update your scripts
-EOF
-}
-
-# vim:set ts=2 sw=2 ft=sh et: