[arch-commits] Commit in python2-sphinx/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, April 18, 2020 @ 21:23:13
  Author: arojas
Revision: 616171

Drop no longer needed python-sphinx-1

Modified:
  python2-sphinx/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-18 21:15:09 UTC (rev 616170)
+++ PKGBUILD	2020-04-18 21:23:13 UTC (rev 616171)
@@ -4,10 +4,9 @@
 # Contributor: Angel Velasquez <angvp at archlinux.org>
 # Contributor: Fabio Volpe <volpefabio at gmail.com>
 
-pkgbase=python2-sphinx
-pkgname=(python2-sphinx python-sphinx-1)
+pkgname=python2-sphinx
 pkgver=1.8.5
-pkgrel=4
+pkgrel=5
 pkgdesc='Python2 documentation generator'
 arch=('any')
 url='https://www.sphinx-doc.org/'
@@ -36,49 +35,24 @@
               'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07') # Takayuki Shimizukawa
 
 prepare() {
-  (cd Sphinx-$pkgver
-   patch -p1 -i ../python2-lexer.patch # Use proper python lexer with new pygments (NixOS)
-  )
+  cd Sphinx-$pkgver
+  patch -p1 -i ../python2-lexer.patch # Use proper python lexer with new pygments (NixOS)
 
-  cp -r Sphinx-$pkgver{,-py2}
   # change python2 interpreter
-  find Sphinx-$pkgver-py2 -type f -exec \
+  find . -type f -exec \
     sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
   # change sphinx-binaries name in source code
-  find Sphinx-$pkgver-py2 -type f -name '*.py' -exec \
+  find . -type f -name '*.py' -exec \
     sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
 }
 
 build() {
   cd Sphinx-$pkgver
-  make build
-
-  cd ../Sphinx-$pkgver-py2
   make PYTHON=python2 build
 }
 
-package_python2-sphinx() {
-  cd Sphinx-$pkgver-py2
+package() {
+  cd Sphinx-$pkgver
   python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
   install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE
 }
-
-package_python-sphinx-1() {
-  pkgdesc='Python documentation generator (legacy version)'
-  depends=('python-babel'
-           'python-docutils'
-           'python-imagesize'
-           'python-jinja'
-           'python-pygments'
-           'python-requests'
-           'python-setuptools'
-           'python-six'
-           'python-snowballstemmer'
-           'python-sphinx-alabaster-theme'
-           'python-sphinxcontrib-websupport')
-  conflicts=(python-sphinx)
-  provides=(python-sphinx=$pkgver)
-  cd Sphinx-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE
-}