gentoo resync : 15.12.2019

4 files changed, 55 insertions, 2 deletions

diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index a9dd9f91187e..97098d1a7195 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -2,6 +2,7 @@ DIST python-distutils-extra-2.38.tar.gz 27748 BLAKE2B 5f47e27dc639a6259a812bd618
 DIST python-distutils-extra-2.39.tar.gz 27389 BLAKE2B 06deca885aa283e0a52e38c89f71637573d45d73dfbace5a06b4bbfa04098a7fa4fde1c2891bde5cc5ed3a3a65e31d243feaa8465a4fddb4623435e7a47c902e SHA512 e3b4d1ed22767fb4c6dbbdccef960865b6fda01d18dc38cb8f9357c09c7eabb78466fce053e407a196eca257d07d57c5c1ef47f358a5979c7f22e4b11775124e
 DIST python-distutils-extra_2.42.tar.xz 37996 BLAKE2B dee4cc950bb34027b60dcf58e173bae502a7090062e3c2218fd2ec562d6350f5872ed5c0865b89f1463bd35be0f365f23e05bb0220f70a944181af40df42ee60 SHA512 ff0df0a25a29504bec89970dbbf24d0b618e9f2d5d07a037f67778b86c92e880eafee86dd102b4ada4f280abd3102de9f4a4e47dbc68c1eaaa05fb492cbbae29
 EBUILD python-distutils-extra-2.38.ebuild 1063 BLAKE2B ed1ba60ec0d9a2a4193550c54597a76e7e9d428670c0018e38bc0dd0ebb24ee5918f5d98d210851c74c7021cb01a3ba6b85390c1504faa2b568e154e5c37c206 SHA512 89eaea3dfadb3e385f17dc05eacf7d36f2766114be278e82a43851a1b313bda100b10dcfb03aeab42c59e8dda546ca45f40f47db4b5f1c24fc1838131416d320
-EBUILD python-distutils-extra-2.39.ebuild 1407 BLAKE2B 4e7bca8828cf129a31ea16e0720528ecf4032e16871a7580d72914fcba0512fd5575ba11cfc1680ef9f8b580d10ddff5f28dc7f3b3dadf3bd584a909d238e876 SHA512 f75cb32a2df779dac30d8de71509323933f011cb3e113eb9b5768f32ce085ef1d96d177a1bd641a0001291406586e31ebe993bb5a150578b481277d442ee869c
-EBUILD python-distutils-extra-2.42.ebuild 1408 BLAKE2B b84de65ba0ab70185e7949b4d78d6904b6e053e206f199e187c279d900952771a28e6954592dd5b324f77e8815814de301a9a8a8c6c8857d1d4437def6475dd7 SHA512 ee26e13ec82892af52eecd514c6d3912d3731736e54dd9634989213aaba27382d42759fc4a9fed65779ee94534d26fb14cc769fe4e5a23f7374748a40c8f6619
+EBUILD python-distutils-extra-2.39.ebuild 1434 BLAKE2B ccfe4711062b806328eef64102c2d1a41f5c0da2828eccb72fd4bdb4698e8249d3e46668b104bfdfb4ed43cf4ced45690695a5c51c26387cb27383a57402f11c SHA512 c9bb28f93279d96f96c670d5cc7b2beef93472df7d9cb0237d2f8fc108578c17d31d4a3f7f755c01f08142ae698f89ac8dd8a02bf4fc21cb685b5eef367e7e5f
+EBUILD python-distutils-extra-2.42-r1.ebuild 1423 BLAKE2B d3c564fa3d1905524b09c5229156f1adfb271cde53ef71278dd5390fa2c6f8a8660818e6573b63074ef7c9e953773f43562df700e2a77a17b33c3de0779ff9c8 SHA512 7434e51b7c1e94d6b0131d7a1e5cba6b16d7395695582a05920374c5848d8449867d3c24c425ff1f01f07319e626c0c92e328548424b64ab67982bd6391492c3
+EBUILD python-distutils-extra-2.42.ebuild 1435 BLAKE2B f4ea6787f3b27d08161fcb5f276576e0b15a6f64306e2c7290a0059c29cb5732412d99c69d1c8c8c107e54a92b3be70294d31664708a06a4a5a37d5c2d2fb4b0 SHA512 c79ad758ea21e522f002fb88876ff63672ca8d6bbe5ce4ebbd12598d8675b3630c6833526ceb3f445867f93f80050f8129ef6c5754c42aa4c20f7d882af928b9
 MISC metadata.xml 401 BLAKE2B 6ba770986ed5364c9311bbf2a48957c0ec46f3c16e7718b564865b9ca7459f3c64cbcf6ee04c4b66564429e7f6714b0a128f83f2bd0d33f062b3670210d11858 SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
index 599aa3fe2e11..0cf77cb9873f 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
new file mode 100644
index 000000000000..62d980be4a82
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="https://launchpad.net/python-distutils-extra"
+SRC_URI="mirror://ubuntu/pool/universe/p/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( doc/{README,FAQ} )
+
+python_prepare_all() {
+	# This line is run when the file is imported
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1657919
+	sed -i '/^unittest.main()$/d' test/auto.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 5 tests fail with disabled byte-compilation (they rely on exact
+	# output from python).
+	# The other 4 are broken.
+	pytest -vv -k "not (test_pot_manual or test_pot_auto_explicit or \
+		test_pot_auto or test_modules or test_packages) and not \
+		(test_desktop or test_po or test_policykit or \
+		test_requires_provides)" test/auto.py || \
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	docinto examples
+	dodoc doc/{setup.cfg.example,setup.py.example}
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
index f870cfc550a7..532623b92a62 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"