gentoo Easter resync : 12.04.2020

7 files changed, 10 insertions, 132 deletions

diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index de1a38491974..1fe72af1be1d 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,9 +1,5 @@
-AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f623ebe7279205465bba16640fb85df1d1f9d15020d7e19b9d0ca8fb409426dbcfec4729e8d1b16d90e9c075f674c25 SHA512 e6195c6f0c0fb0ba725621ad564e85e69db31a3e2e903279512d0af06db32d7fee1284ddd0db00c80312c29a19f345325a7353bc5fc2e1f0bc64f8c32f71d918
-AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6fa6489e23acad4f61beb535e37aff1e3182a5317ab4e424a1b632924bb3c1b3562aefda17b638aa5a367d861f164c64 SHA512 937ce1168ab488387918220995f1f32e4664a505af3b6610143af15b6cfd3bab1d1fa4a0dc54c59db2ce0775edcc762f70ff948f8bd4e3bbeceb14774d30f287
-DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
-DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
-EBUILD pygments-2.3.1.ebuild 1428 BLAKE2B a266ed307506d6863aa0f0f759d448721bbdab8f159b6c6e765e0b435bd424b167215d2bb848bed19964bf5577eba29d8a0c07c940b4d31968865478f6d021a3 SHA512 b06dd64b3eafe026004dc2dab8f8806bac397642a9aa171444a8deeac1f1edfd3b180dee5ec6f7bdb044b47ca4c212abb204119760500320693dd32184c01f6c
-EBUILD pygments-2.4.2.ebuild 1157 BLAKE2B b3d1df915fa7a56074bea2bd51430fa1b1e6ba9a837e4573ac2c5f5e6dbb2d4c2d5823525b0d1dfd7ec98ba3a8b4b4169fa1f4dc882b866fa8aeb1dcc00ae842 SHA512 e82fd0d04cf54e193d7d3d4afcaf14a9bdce89e2500ac809866b2893efa164facc041ede9c54b8b1154462034555dcb102bcbb51bcc21ea8a5c393d8c9737616
-EBUILD pygments-2.5.2.ebuild 1136 BLAKE2B dbf4dc8cb4351522fe8c6bffe4e218dddbbb5cd406a331b2264e3c0055e6d6d8981d14a3ea39e0b2e75bb7c6202b22ef28650f23eb76706b4c709302f4ec1539 SHA512 4ec29f369fb1694814480b945abcfb6479ad6e0a7611bebda7e984b83c7f18420550d359a6caea11b0cb6218f5bb4b9f0abaf70a2fa9f42d29ba2d0f068a9ab7
-MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
+DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
+EBUILD pygments-2.5.2.ebuild 1125 BLAKE2B 8caf8b88d694d0b2eeb410bd97e1cad576fa8cc0851ef219d4a9d4eaae02556a90755ecda70902f8b9d9b3a563399be11e7e5284d106081f401a791142de7ac6 SHA512 8250965575420e11ae7d255006934fb7d1b62eddfe5a7b076ca500d5cba3fa724063536001aee79efa71672a3bd7b4c0ba97f325d80fb70857257668ecfe6379
+EBUILD pygments-2.6.1.ebuild 1129 BLAKE2B 7d33720725792eb0ae6211ea7e707f9718a5dc0885222c8f0cfaeef201449b0578e5d785c99fea449d89426daff8b27a0649ab93c6ed54717383283942692fe7 SHA512 2fa462167541439f1bc84f55117b96b4a85cb52a55e9500e3789b756a4d8ad5e4761020e7ca9d92d20920bf992f7c458703a67f754834fb9bf596d698936568b
+MISC metadata.xml 566 BLAKE2B 59eee3ae82c16c84fe57d3c1f757627e8ae05651e3a70e9a39ae53aefd3087201679d17962fca2ac45c8c1e3ca3b8568af534328e95c1d02cd8cfcf2a5caf565 SHA512 9b98bb9303be406d2f521b7a772fd45fdd560542f6f69c042ba219f9e261935faeae9ba2f82f328e6a34627a18cdaa030244d7cdc422641ab4fa921c64ae0166
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
deleted file mode 100644
index 28d40e9566a2..000000000000
--- a/dev-python/pygments/files/pygments-2.2.0-pep479.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Miro Hrončok <miro@hroncok.cz>
-# Date 1530720528 -7200
-# Branch py37
-# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87
-# Parent  7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-PEP 479: Raising StopIteration from a generator is now an error
-
-So we return instead. Fix needed for Python 3.7.
-
-Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457
-
-diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
---- a/pygments/lexers/lisp.py
-+++ b/pygments/lexers/lisp.py
-@@ -2327,13 +2327,13 @@
-             token = Name.Function if token == Literal else token
-             yield index, token, value
- 
--        raise StopIteration
-+        return
- 
-     def _process_signature(self, tokens):
-         for index, token, value in tokens:
-             if token == Literal and value == '}':
-                 yield index, Punctuation, value
--                raise StopIteration
-+                return
-             elif token in (Literal, Name.Function):
-                 token = Name.Variable if value.istitle() else Keyword.Type
-             yield index, token, value
-diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
---- a/pygments/lexers/sql.py
-+++ b/pygments/lexers/sql.py
-@@ -347,7 +347,10 @@
-             # Emit the output lines
-             out_token = Generic.Output
-             while 1:
--                line = next(lines)
-+                try:
-+                    line = next(lines)
-+                except StopIteration:
-+                    return
-                 mprompt = re_prompt.match(line)
-                 if mprompt is not None:
-                     # push the line back to have it processed by the prompt
diff --git a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
deleted file mode 100644
index bb7c6074ff9d..000000000000
--- a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User WAKAYAMA Shirou <shirou.faw@gmail.com>
-# 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/metadata.xml b/dev-python/pygments/metadata.xml
index c3ac451b5ed0..1af0e3d5058b 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Pygments</remote-id>
 		<remote-id type="bitbucket">birkenfeld/pygments-main</remote-id>
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
deleted file mode 100644
index 24361968ca75..000000000000
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( 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}"
-
-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.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
index 5406c0facffb..6a570f116b6f 100644
--- a/dev-python/pygments/pygments-2.5.2.ebuild
+++ b/dev-python/pygments/pygments-2.5.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.6.1.ebuild
index 23ba2c8178ee..df797ed9eb14 100644
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ b/dev-python/pygments/pygments-2.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 bash-completion-r1
 
@@ -18,13 +18,13 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		virtual/ttf-fonts
 	)"
 
@@ -32,8 +32,7 @@ distutils_enable_sphinx doc
 
 python_test() {
 	cp -r -l tests "${BUILD_DIR}"/ || die
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
+	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {