gentoo Easter resync : 12.04.2020

5 files changed, 18 insertions, 110 deletions

diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 536fc93146ed..58b1acf47217 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,8 +1,5 @@
-AUX pycparser-2.18-OO.patch 2224 BLAKE2B 38955919380a0ec7dbaacde434a327b9842be0285f830b7b7de67d00b7fee27f2b15d56e0a90ba777b799f00cb54f59abd3985a8cdceeda9e16e324699427b0f SHA512 b9568bc4fb06015497f8fd7c56ee4312c07d0d7621a84aa946254ebd4e80da8fe4c94c13065780666a44e5d8d3bb72271e9703c7c5af39325f2b699c250bf71b
-DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
-DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
 DIST pycparser-2.19.tar.gz 158295 BLAKE2B 8836914e7549517f0c23a1c75457beefd013161f19c51a9f2a236ebd69466edd11235bf0a3f59c5cbece9e9e287eeb24b707bfa5afc30fcb079d134dcd4d9a80 SHA512 7f830e1c9066ee2d297a55e2bf6db4bf6447b6d9da0145d11a88c3bb98505755fb7986eafa6e06ae0b7680838f5e5d6a6d188245ca5ad45c2a727587bac93ab5
-EBUILD pycparser-2.14.ebuild 937 BLAKE2B 2d74e1598e8e924abe49990bd6b739c6e51d5457b5bcf633a4bd47f30ba4c08cee2667a0edce5bbe111f06c2588c6d5771b57f765b6634d6a38cb477818d7729 SHA512 ab61306a759c731b1ad2ea4b60eed1ed320859d2ff3d3e8c3e4d8195e30e764a4c2e22b50b552a9b6cd1b159a5cf5008109d8af45c588ce222bf749d62eca9cf
-EBUILD pycparser-2.18-r1.ebuild 1546 BLAKE2B 7866aaa73b1338de2905b0d6cd112e5cea41ed70d28487095679f4b420920924ab290151a0e644c11742d96ac25b3d0bee3e33456ba15b58a5d90f7823cfca24 SHA512 a20aaa69e14031578116492155e3e46bf574b45f4b74ba799e4f55eaac6ac4e6e76056fa9a90d9b33947734e93ae4f3313e9fce17ee9a606b263846ac848c3f3
-EBUILD pycparser-2.19-r1.ebuild 1635 BLAKE2B f2c50c07039079b37a11b8476263211b29484316437d4cdf382d521b7aa1b74e168d1a8ae5094f49ce272f7aafb596296bdf1028cd9575d0b02773203942e2f3 SHA512 d095fd84b65fb6cae0ef1e06df8da1a23c01a43b7dac3d331a52e3302b9f8d2371c6398c9e5e88a784a5d769f102c95e499fc8f37144855d50992bd2da16542e
+DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
+EBUILD pycparser-2.19-r1.ebuild 1623 BLAKE2B 827b9d2e40a94afa500da23741ae6d0e8e662c1c76fae60015f8eda973f801e3074bb06bfdafa0a7533a9f430f15fab29dbe7145d33fbf82a8ae531bd3b79b42 SHA512 55cc9f93a4953883bdffe949abe21100a8c5c82f354fc5b50d6cc0dbe6d48ba287dccd783447ce2fba3d20703faef8bdb2ac26f352e66e82833504b4cfd83a27
+EBUILD pycparser-2.20.ebuild 1611 BLAKE2B ec1d35bb62031d8e7f9b902653bac95bc3bdfd00ca9190cd9489a2d5b855984fda82a76a92bcc2fde7ef3bb0af4138e7479c696a2b520d7eb55a20a77ca4121e SHA512 04571ae58328b1588552fff3823ff2000da60a6fd7902555f3e7d2c5c4143c1d115517acb9f117566cfb51cbccb70eda1ee59e69a6fa8dede06ff214fa0202eb
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/files/pycparser-2.18-OO.patch b/dev-python/pycparser/files/pycparser-2.18-OO.patch
deleted file mode 100644
index ae42b2b9bd1d..000000000000
--- a/dev-python/pycparser/files/pycparser-2.18-OO.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 673accec311a027c22b0718d753f8da922915305 Mon Sep 17 00:00:00 2001
-From: Eli Bendersky <eliben@gmail.com>
-Date: Thu, 13 Jul 2017 20:25:29 -0700
-Subject: [PATCH] Address an import of pycparser in -OO mode.
-
-In this mode there are no docstrings; we don't want an instantiation of CParser
-to fail, though it won't actually work correctly if used.
-
-See #197 and #198
----
- pycparser/plyparser.py | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/pycparser/plyparser.py b/pycparser/plyparser.py
-index af91922..b6640fa 100644
---- a/pycparser/plyparser.py
-+++ b/pycparser/plyparser.py
-@@ -8,6 +8,7 @@
- # License: BSD
- #-----------------------------------------------------------------
- 
-+import warnings
- 
- class Coord(object):
-     """ Coordinates of a syntactic element. Consists of:
-@@ -87,12 +88,28 @@ def template(cls):
- 
-     See `parameterized` for more information on parameterized rules.
-     """
-+    issued_nodoc_warning = False
-     for attr_name in dir(cls):
-         if attr_name.startswith('p_'):
-             method = getattr(cls, attr_name)
-             if hasattr(method, '_params'):
--                delattr(cls, attr_name)  # Remove template method
--                _create_param_rules(cls, method)
-+                # Remove the template method
-+                delattr(cls, attr_name)
-+                # Create parameterized rules from this method; only run this if
-+                # the method has a docstring. This is to address an issue when
-+                # pycparser's users are installed in -OO mode which strips
-+                # docstrings away.
-+                # See: https://github.com/eliben/pycparser/pull/198/ and
-+                #      https://github.com/eliben/pycparser/issues/197
-+                # for discussion.
-+                if method.__doc__ is not None:
-+                    _create_param_rules(cls, method)
-+                elif not issued_nodoc_warning:
-+                    warnings.warn(
-+                        'parsing methods must have __doc__ for pycparser to work properly',
-+                        RuntimeWarning,
-+                        stacklevel=2)
-+                    issued_nodoc_warning = True
-     return cls
- 
- 
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
deleted file mode 100644
index 7c122a71fd48..000000000000
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile() {
-	distutils-r1_python_compile
-	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pycparser/pycparser-2.19-r1.ebuild b/dev-python/pycparser/pycparser-2.19-r1.ebuild
index f8579432a3b7..1e4ccc55d168 100644
--- a/dev-python/pycparser/pycparser-2.19-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.19-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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-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 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/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.20.ebuild
index 20f5f714a28a..7f1f79c16a8e 100644
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.20.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,18 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/pycparser-2.18-OO.patch
-)
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# remove the original files to guarantee their regen
@@ -49,5 +42,13 @@ python_compile() {
 
 python_test() {
 	# change workdir to avoid '.' import
-	nosetests -v -w tests || die
+	cd tests || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
+	python_optimize
 }