[arch-commits] Commit in python2-sphinx/repos/community-any (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Apr 18 21:24:26 UTC 2020
Date: Saturday, April 18, 2020 @ 21:24:26
Author: arojas
Revision: 616172
archrelease: copy trunk to community-any
Added:
python2-sphinx/repos/community-any/PKGBUILD
(from rev 616171, python2-sphinx/trunk/PKGBUILD)
python2-sphinx/repos/community-any/python2-lexer.patch
(from rev 616171, python2-sphinx/trunk/python2-lexer.patch)
Deleted:
python2-sphinx/repos/community-any/PKGBUILD
python2-sphinx/repos/community-any/python2-lexer.patch
---------------------+
PKGBUILD | 142 ++++++++++++++++++++------------------------------
python2-lexer.patch | 44 +++++++--------
2 files changed, 80 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-18 21:23:13 UTC (rev 616171)
+++ PKGBUILD 2020-04-18 21:24:26 UTC (rev 616172)
@@ -1,84 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
-# Contributor: Sébastien Luttringer
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Fabio Volpe <volpefabio at gmail.com>
-
-pkgbase=python2-sphinx
-pkgname=(python2-sphinx python-sphinx-1)
-pkgver=1.8.5
-pkgrel=4
-pkgdesc='Python2 documentation generator'
-arch=('any')
-url='https://www.sphinx-doc.org/'
-license=('BSD')
-depends=('python2-babel'
- 'python2-docutils'
- 'python2-imagesize'
- 'python2-jinja'
- 'python2-pygments'
- 'python2-requests'
- 'python2-setuptools'
- 'python2-six'
- 'python2-snowballstemmer'
- 'python2-sphinx-alabaster-theme'
- 'python2-sphinxcontrib-websupport'
- 'python2-typing')
-makedepends=(python-setuptools)
-optdepends=('imagemagick: for ext.imgconverter'
- 'texlive-latexextra: for generation of PDF documentation')
-source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc}
- python2-lexer.patch)
-sha512sums=('d7e6a7a6186d1d4e4de0233fb6859da1ef3e02f628512ff9096ef4775b9fb8589edb9052d752925d7a2f1cb7901291af96b5036a5d00f5f58966609bd42872f4'
- 'SKIP'
- '2a94562e26a4fd52f327ba7e45a3c97d8ab8cc0d85a6739b5546fb7005ff9f5e574685644837f6b12bed01fe8bedc698286fc55dbd0132a61ba5943d0f6f4d5c')
-validpgpkeys=('8A11B79A5D0D749A66F0A030102C2C17498D6B9E' # Takeshi KOMIYA
- 'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07') # Takayuki Shimizukawa
-
-prepare() {
- (cd Sphinx-$pkgver
- patch -p1 -i ../python2-lexer.patch # Use proper python lexer with new pygments
- )
-
- cp -r Sphinx-$pkgver{,-py2}
- # change python2 interpreter
- find Sphinx-$pkgver-py2 -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 \
- 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
- 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
-}
Copied: python2-sphinx/repos/community-any/PKGBUILD (from rev 616171, python2-sphinx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-18 21:24:26 UTC (rev 616172)
@@ -0,0 +1,58 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Contributor: Sébastien Luttringer
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Fabio Volpe <volpefabio at gmail.com>
+
+pkgname=python2-sphinx
+pkgver=1.8.5
+pkgrel=5
+pkgdesc='Python2 documentation generator'
+arch=('any')
+url='https://www.sphinx-doc.org/'
+license=('BSD')
+depends=('python2-babel'
+ 'python2-docutils'
+ 'python2-imagesize'
+ 'python2-jinja'
+ 'python2-pygments'
+ 'python2-requests'
+ 'python2-setuptools'
+ 'python2-six'
+ 'python2-snowballstemmer'
+ 'python2-sphinx-alabaster-theme'
+ 'python2-sphinxcontrib-websupport'
+ 'python2-typing')
+makedepends=(python-setuptools)
+optdepends=('imagemagick: for ext.imgconverter'
+ 'texlive-latexextra: for generation of PDF documentation')
+source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc}
+ python2-lexer.patch)
+sha512sums=('d7e6a7a6186d1d4e4de0233fb6859da1ef3e02f628512ff9096ef4775b9fb8589edb9052d752925d7a2f1cb7901291af96b5036a5d00f5f58966609bd42872f4'
+ 'SKIP'
+ '2a94562e26a4fd52f327ba7e45a3c97d8ab8cc0d85a6739b5546fb7005ff9f5e574685644837f6b12bed01fe8bedc698286fc55dbd0132a61ba5943d0f6f4d5c')
+validpgpkeys=('8A11B79A5D0D749A66F0A030102C2C17498D6B9E' # Takeshi KOMIYA
+ 'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07') # Takayuki Shimizukawa
+
+prepare() {
+ cd Sphinx-$pkgver
+ patch -p1 -i ../python2-lexer.patch # Use proper python lexer with new pygments (NixOS)
+
+ # change python2 interpreter
+ find . -type f -exec \
+ sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+ # change sphinx-binaries name in source code
+ find . -type f -name '*.py' -exec \
+ sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
+}
+
+build() {
+ cd Sphinx-$pkgver
+ make PYTHON=python2 build
+}
+
+package() {
+ cd Sphinx-$pkgver
+ python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE
+}
Deleted: python2-lexer.patch
===================================================================
--- python2-lexer.patch 2020-04-18 21:23:13 UTC (rev 616171)
+++ python2-lexer.patch 2020-04-18 21:24:26 UTC (rev 616172)
@@ -1,22 +0,0 @@
-diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
-index ac2bd1b06..63ca52de2 100644
---- a/sphinx/highlighting.py
-+++ b/sphinx/highlighting.py
-@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
- from pygments.formatters import HtmlFormatter, LatexFormatter
- from pygments.lexer import Lexer # NOQA
- from pygments.lexers import get_lexer_by_name, guess_lexer
--from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
-+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
- CLexer, TextLexer, RstLexer
- from pygments.styles import get_style_by_name
- from pygments.util import ClassNotFound
-@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
-
- lexers = dict(
- none = TextLexer(stripnl=False),
-- python = PythonLexer(stripnl=False),
-+ python = Python2Lexer(stripnl=False),
- python3 = Python3Lexer(stripnl=False),
- pycon = PythonConsoleLexer(stripnl=False),
- pycon3 = PythonConsoleLexer(python3=True, stripnl=False),
Copied: python2-sphinx/repos/community-any/python2-lexer.patch (from rev 616171, python2-sphinx/trunk/python2-lexer.patch)
===================================================================
--- python2-lexer.patch (rev 0)
+++ python2-lexer.patch 2020-04-18 21:24:26 UTC (rev 616172)
@@ -0,0 +1,22 @@
+diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
+index ac2bd1b06..63ca52de2 100644
+--- a/sphinx/highlighting.py
++++ b/sphinx/highlighting.py
+@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
+ from pygments.formatters import HtmlFormatter, LatexFormatter
+ from pygments.lexer import Lexer # NOQA
+ from pygments.lexers import get_lexer_by_name, guess_lexer
+-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
++from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
+ CLexer, TextLexer, RstLexer
+ from pygments.styles import get_style_by_name
+ from pygments.util import ClassNotFound
+@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
+
+ lexers = dict(
+ none = TextLexer(stripnl=False),
+- python = PythonLexer(stripnl=False),
++ python = Python2Lexer(stripnl=False),
+ python3 = Python3Lexer(stripnl=False),
+ pycon = PythonConsoleLexer(stripnl=False),
+ pycon3 = PythonConsoleLexer(python3=True, stripnl=False),
More information about the arch-commits
mailing list