gentoo resync : 24.12.2018

4 files changed, 53 insertions, 47 deletions

diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index dc46ede422ff..1b37db96a65e 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,8 +1,8 @@
 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.17.tar.gz 231163 BLAKE2B b264fbdf235f63559c96d103ca42fd0faf2c5e125420e75503e7dc2cc6e86a23347b9070a33b1e28721b919d89d0281b69b04c2761b180fa535c748933392172 SHA512 c9caaa8d256748e0623d077b11931abb38d19367136c70a835f7587e1f7ceb64f3acb7a983dcb68bedd2cf187517762a5753844e8ed58d1d9ed6f364c55839b4
 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 933 BLAKE2B d8d4b0647e4418b862c156d09fda502480147bc080b85ec45aec4e13e816b79b0868dafab2eccf4c31eb1a18bfcf5f0da67fc7504b647f0761a1c132959659dd SHA512 ba616d6faf9e158c3df3754dfad56cc596f56613cd44f05f9da7b8779b7a8508956852729ad586d47ff33ed77d38eef030ded8be6affa9179ccd080a17cdc9d7
-EBUILD pycparser-2.17.ebuild 1262 BLAKE2B 6ed786693227a34be8c60abbd17d6c6b7c95c539e5d1d4161fd3b5d53b20fb8c7e5a50237afafb33a0305e1f7048d1a69a209300ee44978bdcdf80c4d16b2de8 SHA512 2308dc89f2e277ba7195b892258ba82075365caa7f774f92ed89ab78152b856a83c6d17c473a1162a1d48312164dfdaac7afa1e1f4a47e3ce03bc9e87914e80f
-EBUILD pycparser-2.18-r1.ebuild 1523 BLAKE2B c2430ab4e04b77d6e6de031d94ee01f67367b59901da669ee223e9da1680aea3b15522f6e8260503ada6d304cef6d6b4cd16ae9faf143ec78f5c9988e7e2d9ff SHA512 2f138b6f0d539a0b313ca1885e72c03f4bc72931e3529e86b3d0b21ea313b12e569c9be3b4bb8f75891518bb488ad036dee56abc4d69972177c4b3d74c1fc8f1
+EBUILD pycparser-2.18-r1.ebuild 1550 BLAKE2B 9e2616fa365a0ec718bfee4afc05b80439f597a85878aa12d566f8283b8bb763002e5f7ee98e5382ae46acb49cdcf218ade52ad7578733bf55bb5bcf6fbfe292 SHA512 38d69df12d87298cac52cf534c911655bbe257d7fea59f7163063481ef5c2fc7fcd097562e9e89d588ea687cd25119da31f6ef003047d3390536a55fbffd9ad7
+EBUILD pycparser-2.19.ebuild 1498 BLAKE2B d5183a8d59e1259a0284a2700f3c2997a7c83fd55ae41f25a7239768ec75f5a04e2533c1f078c485f9565baa95e985db57742f9b89bf634cff60444d73df598c SHA512 652d15c836991130eb6fb3f8b709fbd91fe1d38437dcbd70ee95e95ed25bba9216693508b70e5dad832f31e584cce6d96a0703bfea7d06c84723b4b3539745d2
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.17.ebuild b/dev-python/pycparser/pycparser-2.17.ebuild
deleted file mode 100644
index ba18c49470cd..000000000000
--- a/dev-python/pycparser/pycparser-2.17.ebuild
+++ /dev/null
@@ -1,42 +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 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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-pkg_pretend() {
-	if has_version "=dev-python/pycparser-2.16"; then
-		eerror "You have a broken version of dev-python/pycparser installed."
-		eerror "Please remove the broken version before continuing."
-		eerror "eg. emerge --unmerge =dev-python/pycparser-2.16"
-		die "Broken dev-python/pycparser"
-	fi
-}
-
-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.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
index 84a6436fe58e..1c9fd1b22957 100644
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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="test"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycparser/pycparser-2.19.ebuild b/dev-python/pycparser/pycparser-2.19.ebuild
new file mode 100644
index 000000000000..238e14f63875
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.19.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+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 ~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="test"
+
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# note: tables built by py3.5+ are incompatible with older versions
+	# because of 100 group limit of 're' module -- just generate them
+	# separately optimized for each target instead
+	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	# change workdir to avoid '.' import
+	nosetests -v -w tests || die
+}