gentoo resync : 11.07.2019

4 files changed, 14 insertions, 12 deletions

diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 5982443ef2e5..727a12e0b916 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,9 +1,9 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
-DIST jaraco.packaging-5.1.1.tar.gz 11056 BLAKE2B 6dcca468be3d960674c7de73af48ef78d96c80896a5f09aa99dad35c7dacb90700ce3cd74f59f4a437e26190091e12fb82f3285f30f99a83550a52424cfdebe9 SHA512 96ab954c7fe23632284c0493f749c5fda1368df0a5b60f5dc852aa4c47dadd1743a26772c783f0ec46109f166c9e26811324e2beeadb3e0cfdf9808091107032
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 DIST jaraco.packaging-5.2.tar.gz 11573 BLAKE2B a119fe4e4de636ef5483cc8d16ca0076533c1cb86c8ec7061c0800aed84532a8689613401530223c0048ccd31d1ead974cc8ba37161b1e5601eb659453962e17 SHA512 5199caccf11952ac68f42462652730afec1aaa907495d65dcf9eb7d5ebcde3ebc8d1f2bf7d51543a764222f09606247a28bfedd9fa987d39934724bf7001c459
+DIST jaraco.packaging-6.1.tar.gz 14736 BLAKE2B 278ab889f236b4a53e6f3978b876952e83777da2e1c096801712bb6833fc85b342fe1c18bb7b1bd78a801c6216dbae74a75a416ef29cd4ec0a7017b8d5bd73bb SHA512 a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8
 EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B be57cd0dbe0562cf25139ca1cb70c6b3b349c824840f98059e8b9fc65d1171d9b8642cce9729e4bc72a1594d89fb22a1c68f86287cfec78570857f3ae91b7dc6 SHA512 4561bb60e08a83b1046cc2a28010ee2d4f22f793ea3e85f0f29cf095edc52a1ddddc31319769970ba16ecd21af0d4170f73ccc88ae6166a84cb5ac6939eea2a9
-EBUILD jaraco-packaging-5.1.1.ebuild 1411 BLAKE2B 2276ad87d78182df0ef6ec0a55f52cf81aeba2586bd8cbed5f9ce58b87dbdd099432b04f68bad0f9557ce994c18233af3b37b601f55a4ea23b69211bfffc7795 SHA512 092def67b5f1849c8c68c6aaa986c8f06bbdac83bc8b2b33e12f913a433006d2b4344327e36be3344fb8ebd963b74bb92b8d0ae800ee19f9b617a7b846b3a73c
-EBUILD jaraco-packaging-5.1.ebuild 1319 BLAKE2B 2165d6c45b731308a87d066a3025864b8cee76709df86c057ed91ebfd1df12797eef3c570bb6981fcb58e7c1669f62f874db3a2acac221dffbe0f75a2280c3eb SHA512 9b52352b958c4192ea6f38812df3c99751f38f032a22e5c2a61755d400b86a03abdcae50c14fbe11d218c5839284b495e1484909f65f25ac593322992bda62da
-EBUILD jaraco-packaging-5.2.ebuild 1417 BLAKE2B fc376ffd482cb9c6a7c9b4b812c6ee96f784e55c0e5a2295034f7aef2aa91c79f6772ded7083b5aad278b75ce662d9f970d48315a4f49ba4933d129e3bd62ff8 SHA512 ad6cd1ad34cb49b665209261e3e573b881610bdaf2da4e85c7560f19359d539d3dd4fc896a8c2a7d5a048322d0fe43b22d3ae86826a7beabf813d9fd535b0bae
+EBUILD jaraco-packaging-5.1-r1.ebuild 1322 BLAKE2B dd30c72b863ae2f6c1fe2d23c24ad4764f5ecce7eda30c1b8211e6211624885e8b6fac8358baefc89c7bdc3b0b6736623374e5267331b06551f9864066f22240 SHA512 3e583e87a4a5067b81d119c38824dd794919a5fd72c5b9a13f81fe4ae620bca552692c62785199f321029c10d5dfc5c67a9b2a0356cdd099a8b47ee5618f9a9a
+EBUILD jaraco-packaging-5.2-r1.ebuild 1420 BLAKE2B 0a2e9e484d65447b92084bc64bf19c56ec4f0144cd19a728ec4f5b627b0c97bbacaf6d6203a1641cd5e2ea363599cd08f436fb022f58e2487a8571344747b16e SHA512 14c287a80b57e78bc5b156315263d03f9989e470431143f2eec57418051c288c0ba00682fb85c5c6797937c6523f626971aa14ea4973fc471c9658423ca4fa6b
+EBUILD jaraco-packaging-6.1.ebuild 1602 BLAKE2B 20a8a452aa9b20d14f9b8872d75660b0c8d3f0915a6de6d03f9ae26522ee578649123cf5d9f0e7dcc8e65d7a82b46bc6c83c7d2d8afacffef07b64807692da03 SHA512 01d228b64777567adf993c587dbb75f7e34668ab54b7bb7d916bdbcdd89e011772cf26e206598af7d175538622181552dc38240cce4c9a3fb584f87b0405dde8
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
index 0df91a50e77a..18bde9c8b29d 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
index 40b2b4cd34fc..0b92ee431110 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
index ac2c79492cd4..a7e7b8e77797 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
@@ -14,12 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -47,12 +47,14 @@ python_compile_all() {
 python_test() {
 	# Skip one test which requires network access
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test -v -k "not test_revived_distribution" \
+	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
 		--override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
 }