From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- dev-python/pygments/Manifest | 4 +- .../pygments/files/pygments-2.2.0-sphinx17.patch | 22 +++++++++ dev-python/pygments/pygments-2.1.1.ebuild | 52 -------------------- dev-python/pygments/pygments-2.2.0-r1.ebuild | 55 ++++++++++++++++++++++ 4 files changed, 79 insertions(+), 54 deletions(-) create mode 100644 dev-python/pygments/files/pygments-2.2.0-sphinx17.patch delete mode 100644 dev-python/pygments/pygments-2.1.1.ebuild create mode 100644 dev-python/pygments/pygments-2.2.0-r1.ebuild (limited to 'dev-python/pygments') diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest index 7334cac03ab2..efc4fb506694 100644 --- a/dev-python/pygments/Manifest +++ b/dev-python/pygments/Manifest @@ -1,6 +1,6 @@ AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f623ebe7279205465bba16640fb85df1d1f9d15020d7e19b9d0ca8fb409426dbcfec4729e8d1b16d90e9c075f674c25 SHA512 e6195c6f0c0fb0ba725621ad564e85e69db31a3e2e903279512d0af06db32d7fee1284ddd0db00c80312c29a19f345325a7353bc5fc2e1f0bc64f8c32f71d918 -DIST Pygments-2.1.1.tar.gz 2114190 BLAKE2B b0e5d5a62849c97aaac6f0edf26230d5573715fb759667ca888372666634ab68da4580b1337ec4ada013b643411c221c572651c6fca6745b976794d5c6246e5d SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807 +AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6fa6489e23acad4f61beb535e37aff1e3182a5317ab4e424a1b632924bb3c1b3562aefda17b638aa5a367d861f164c64 SHA512 937ce1168ab488387918220995f1f32e4664a505af3b6610143af15b6cfd3bab1d1fa4a0dc54c59db2ce0775edcc762f70ff948f8bd4e3bbeceb14774d30f287 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29 -EBUILD pygments-2.1.1.ebuild 1670 BLAKE2B 646364f36a2c9b8a3a9f09d32c77d42f79f403ae6af47b88ae8254ccaf825cc8d99e77b26ff6f3262f559b08204e02772f603f8a7451e887206495ba2b167c18 SHA512 70f3d14b209d32bf5732cd1d1087ce539958a06ec1938335796208687adb1ed488c9f9a1e93c66fd346df5b51f186727b33c7ac4d24be6ffbad0d4db9dabc713 +EBUILD pygments-2.2.0-r1.ebuild 1619 BLAKE2B 0ce67e1c2184243e27e0af9500334a8bbc672a5820d1095c45a18759009c39611de47900787455889e70bedc2d77aff36d75ea0f27ec9680559c3c004c8f0e74 SHA512 eed66e18d882fdb5ee5120d825e4dea785bd1bdcdce6da2b9a4c6031366bc5279c37cb882337f0c1a8ea7cb7bc8f1813f8ad62baba14b3694061d5c59d3ed401 EBUILD pygments-2.2.0.ebuild 1773 BLAKE2B 4994e4e0f2e0f98e2900ce3d2e39f9b14f82d1b357fa4a530f59ffc4b73d744288d3d7a55cacbfb58248f5fe754d0840b0bc82c2ab6138bfa540c78383cbca6a SHA512 58ed43530ae8ce8da04a04a7d38a09b1ec43fb0237eef446a6050ab480a584ae0c4805fab8dbe24694469372426358c434941117a0eed33d49e773b306161e5d MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b diff --git a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch new file mode 100644 index 000000000000..bb7c6074ff9d --- /dev/null +++ b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User WAKAYAMA Shirou +# Date 1500298269 -32400 +# Node ID 1a78f58afb5066cf35b04676d0d5ffbb18d5d540 +# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80 +Change to docutils.parsers in sphinxext. + +From Sphinx 1.7, sphinx.utils.compat will be removed. + +diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py +--- a/pygments/sphinxext.py ++++ b/pygments/sphinxext.py +@@ -16,7 +16,7 @@ + + from docutils import nodes + from docutils.statemachine import ViewList +-from sphinx.util.compat import Directive ++from docutils.parsers.rst import Directive + from sphinx.util.nodes import nested_parse_with_titles + + + diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild deleted file mode 100644 index 82cfec6da8f3..000000000000 --- a/dev-python/pygments/pygments-2.1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 bash-completion-r1 vcs-snapshot - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts )" -# dev-texlive/texlive-latexrecommended -# Removing / commenting out this dep. I can find no mention of it in tests other than -# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add -# Tests pass without it - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - # With pypy3 there is 1 error out of 1556 tests when run as is and - # (SKIP=8, errors=1, failures=1) when run with 2to3; meh - nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/dev-python/pygments/pygments-2.2.0-r1.ebuild b/dev-python/pygments/pygments-2.2.0-r1.ebuild new file mode 100644 index 000000000000..617820a1b612 --- /dev/null +++ b/dev-python/pygments/pygments-2.2.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 ) + +inherit distutils-r1 bash-completion-r1 + +MY_PN="Pygments" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Pygments is a syntax highlighting package written in Python" +HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + virtual/ttf-fonts )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # fix generators for python3.7+ + "${FILESDIR}"/pygments-2.2.0-pep479.patch + # Fixing USE="doc" with sphinx1.7+. bug #662640 + "${FILESDIR}"/pygments-2.2.0-sphinx17.patch +) + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + cp -r -l tests "${BUILD_DIR}"/ || die + # With pypy3 there is 1 error out of 1556 tests when run as is and + # (SKIP=8, errors=1, failures=1) when run with 2to3; meh + nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/_build/html/. ) + + distutils-r1_python_install_all + newbashcomp external/pygments.bashcomp pygmentize +} -- cgit v1.2.3