gentoo auto-resync : 04:11:2022 - 21:16:37

7 files changed, 55 insertions, 25 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6a010f8a3391..9f3e38bd718c 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -12,16 +12,16 @@ DIST Python-3.8.15.tar.xz 19038408 BLAKE2B 4ce84171b2f7ca8c9cf1d130adf70f16a0899
 DIST Python-3.8.15.tar.xz.asc 833 BLAKE2B bff055e28f4a2e59bb9e6d131ed39f954b729ac791279a6ac618521b545ace16e4eba3aaab629ca1c155d973c0c255b3d184b38fd82ee943d59a328d0603b1b6 SHA512 8ed69db7773a111e7b356848e18fc35b8835426e8d2cb8f311644d511682960c97740232c32c92196391adaecebc0ff842c2f918aad07e5dd46b168e8277ac04
 DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06ebd7b8b79db564d668cd1f0c7fe89e0ef37ec4481ff82b30778e2be1a96c1b16199b9dce1f82de32f73b4343ddd SHA512 9310d263bc7a7925f73a6f66fd254ae61f377f43011a6bc5c58e57c8b170c2da4f197a646927ab9d05f8912ed8be4369c09576063931a3f93c3b0228ccb33a39
 DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
-DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
-DIST python-gentoo-patches-3.10.8_p1.tar.xz 12712 BLAKE2B 54370dc973fedfab4dda33a20733f483f1592fede407541b90d8389bf03f9697bf755e35a39d1d45ea99b42edaa434a0901a35b7058c73fbc4e9ca8472fce35e SHA512 093a9a532713eea68b18a0681db782cf38176f4582473e4fb45c45ce6d27f9a4a7f8fd37141ae44492283bbe9eda698c7190cfd8b4cddaf4f945124b908f3cf2
-DIST python-gentoo-patches-3.11.0.tar.xz 5404 BLAKE2B 7109040bd27e77b4a17e94d24060644ae9b42f618768beb4ae0659c65b33a943e6158ccf8724432ff0f97d7b3a86e2efb99795fbeed801723049a99d2dcc96c3 SHA512 94f3f7f3262f5c064fec4977230bbde09ca8f77e92739aa230f73ef9e1012049a2d9cefc7774a2538f732e0e7ba170214956578d64c19124bd964d4915982bb0
-DIST python-gentoo-patches-3.12.0a1.tar.xz 4896 BLAKE2B 2c1582f37372eedd3fddae0a07db718cb9bd2ae41e1b9c5807ee400c554bb9aa928445ea8043fe8d12dc64c6d23766875b5957e10aa8414658cc9e037ad87244 SHA512 d6f6f522ee8c9c616bea4237449417f585b0dd3606307fe80e0a3f719856ea5691c90a6ea5bf8b330d71d88477a5411f66146dc2aebb697edcfa04112bad4e2c
-DIST python-gentoo-patches-3.8.15_p1.tar.xz 26988 BLAKE2B c289b6c17052187b0c8ea012c6c283c3513f7465bc14f58be22d4d38447390a6f334f60a2f5aa7b1a3393dcdb175adf6c8cc659148ea2742046fba26ad8a65b4 SHA512 6d20d2329b4bd9cbd147cf12211ad14d071be7434571c45a4ab4535af16ae865a09a924bf2960281e716cd0f57c7b290a7786c607995c996d2211d41fb8c7a14
-DIST python-gentoo-patches-3.9.15_p1.tar.xz 22716 BLAKE2B 8bfe3ed3642a6734d7662c68be50c050112c1f2ae5bc10742b47e2b2943336df3bc6b0b5e6f0c1a1180dffc0590bbdd7341e84bafbfcfaf5977cde3184de6278 SHA512 f68b88a296a5ba6cf352c20345abe8c1dcaf9fbcaf6e48c2d7390e5d3ca57f786bfcefb912962d6642272f00dde832595bb73b48b03f3300bc11e3417e0f5fa6
-EBUILD python-2.7.18_p15-r1.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
-EBUILD python-3.10.8_p1.ebuild 12688 BLAKE2B 389b8c4090310a79e3f8b35606f92e965aef5811726d3b81588dbd3d87597031d857ca1e1492149baa23c59d79ce8f98c03e41077a51deae441e4917b5a9a2e3 SHA512 4d2206754e2a00fb32bf16e71d639323cf209f097fb6d88ef9c8f4191fe56a5f5605b66755e95e286a1da7f6f37984651b9f15d706a8383bc5e5034d48a5c81b
-EBUILD python-3.11.0.ebuild 13796 BLAKE2B 68a3298bf892bcb49b231d55e5bdc4795860324f4be5c128cb322871f6f851c3a82e955229d5e44aa01f18d38c95a44c967ad4aa4117d1aeb5e368353838fb80 SHA512 355d220ecc17ae85ee0c8c1bf5140bce8014c7c60bb6965c6d09493fe3e98cd25f78e4611cadbb40b6e35d8ce90f67eb77b03d13e129fe2373d663a745f778d6
-EBUILD python-3.12.0_alpha1.ebuild 13444 BLAKE2B b922e3b8951b3e531ca34856bb20e4e7d79911af876c783993699c427e87497fbf5a6f8badbdf5e2e177a3c3a022f2b8e349992e521fe1aa277f280327c86bab SHA512 2255f8918c8c98cb59d6f9766da2f06137e4a19a5110ca4ec44d16eae054fdb4da0aae3b09ec2fac75974c178d7de037c211a80022669d18fb407cb7517fcf67
-EBUILD python-3.8.15_p1.ebuild 11238 BLAKE2B 8299e6660df9f222e3e1ba22f2baa30686f5be412294f3266db0431c0cb28a530b957bbba8170581f095c7bdb8ea25e3374aad831a52df936e4ffe748eb20837 SHA512 991a3fdf9f69a39600542b5a70ffba5113213689f7a1efe0d3307ce63fd00a31c046bc7c114c126c0fec1b9bd74e27b0dce52f7d4d9863211c9e5eb04b2682d3
-EBUILD python-3.9.15_p1.ebuild 12491 BLAKE2B ea7e3f7bf9d06e6c995ee7f4ce62179ced7a2791a42e4d53013b8f6fbb363992f3547c2dc844669f92bf27ee880bd69bfa7af366124cd83bfb36a9d5214112ae SHA512 c3b701a2d63ca021f948df9b23426c938b3c005a2fe6570cb543a997fffd289ebce58815460d930265b0ad124cfab0ebf378cf2c6e42ee9ac7f0a139bdea9ab6
+DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
+DIST python-gentoo-patches-3.10.8_p2.tar.xz 13252 BLAKE2B 34424b7337c5bcde63bfd0149f9e343056696f4126b8b093c5120dbfd13bdb98e1b8395bf09dfd0dcc1e6c7de062cb54ddfb91ede25c6aa5a1c02e8f05c1685f SHA512 6f99f6b3ff0b5375e9d516e3299e197a175a589e6773e3e07277cc25f8d6d7d5f04952d4b5110055fdd3923e3908d8154e4580da0fca03ffd8788e6999036d85
+DIST python-gentoo-patches-3.11.0_p1.tar.xz 5920 BLAKE2B c1fefa593faa4b65b646310bf924f697c2e85ccc620d749ca478839198687147813f0794597bd0451403958c56b575ece27209b152f3872a1a510ebbafa63206 SHA512 241313f70d282ada1c7153ffd62556722d4763c1a6053b91fc0a10be3d18304c39086202ccd02be99c4dca849e2de998d79c8799c0b0cdf25b2d1ff866267491
+DIST python-gentoo-patches-3.12.0a1_p1.tar.xz 5436 BLAKE2B 6d69bc7bc5c1cca6ef099efd1236fb5ce3a1437f5c97f924e1d9070651deb77661634801f0cd8af4344d4c23f3cbaec5e0114bcae0d086606059f30e98348feb SHA512 c37569133492a61cc77a69669b0a04376b832252197fc1164f254c0f50be1e8ec45af3db25db0d2bbc2c6f27bc752c0da70ba145b14e052824b79d5d30a20ca7
+DIST python-gentoo-patches-3.8.15_p2.tar.xz 27472 BLAKE2B eef7e3f944b59573078580ad056e2720d1ee04bfb0c86b3b387775a9b93990011babad7f2a59ece0dd490b4e52804c2bd5ed5587683314045503e3863600520b SHA512 f56d61cf93fe9981e6d126bc3c4f9e18d322b605b6d4e76f8e44288f21063c23dc49544653e4c92879020eb178f96f919dd8606a4f9d2bbe5fb75ae93ac5a2b8
+DIST python-gentoo-patches-3.9.15_p2.tar.xz 23244 BLAKE2B 0917396dd08f652f8ba06c019961c81f795678da55979934e4d3d8b85ff53bd44f98bc1564ab47efaf11f581271b49f15a41538452d49dbe8ea6bfd0a9d6e3e9 SHA512 c4635fe88cb59f3d16a2a3c1d1519c9566b069995151d6caabc661af3d980522dd00b4a7c9de9969c0d10dafe27b6e0524af4469148fad6841e5f3329a5dad3d
+EBUILD python-2.7.18_p16.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
+EBUILD python-3.10.8_p2.ebuild 12901 BLAKE2B 6d259918ecdb3a6eade1af1af0fe8b034592292a9e5269011ba4615d744f3294d5f8232d1e6fcadb6c76e341b635fd62b499c5f5e0cdb37c1cd437bcc3da0ca0 SHA512 426c18dbcf638f14c68819a46bcaea99d68076d7ed0ffc08b16884873f426bbc1003c5ecbfde2362fd3d9ec47eeaa5e58a6fd4dbe15fc8ec310cd2daa5b5521f
+EBUILD python-3.11.0_p1.ebuild 13808 BLAKE2B 242a131b0fe2130e761f379a2004a8adc865b50d4c763948ea0855a4000e736b20f23a0257f9333912fe4251e897b67f5989d0b8ed46f1a39baac5b9ef57868a SHA512 9ec6285022c61f2a064c13f2c26dabd6bf66fb16469509a2428360c7e046374c543fca22dadd7f41f9be96081b5cfbbf0a32cffbed0be8ee1ab0b6336d1f241c
+EBUILD python-3.12.0_alpha1_p1.ebuild 13456 BLAKE2B 43db1e36dc1fe6154f7b0b6969f0a25b885c0e53710079883ddab68161a081e1b6b907590204fd7c743b4e4ffd6cc10fe7f75d3cc29b73db2be35c8fa77853e8 SHA512 c398149be0fad02be3b4b89c5260c0ca7b6a0eb330cd1edd6c7e01111bb8af7d064f8bd277e7e628aa3ca23ec4ec56a0cbbbaac2393e976aab29249c75191dc0
+EBUILD python-3.8.15_p2.ebuild 11439 BLAKE2B e19f8f07a642ef1c7c1850f86c31f65731adba847fd662a92c3547aee668c2ce58cd035d158a20a1b55741f59e1dccc9480f8a6941e65d5fd4990170eccfd178 SHA512 d63384ed346f226eab77a9e39b65094f298cd46e4026387af983a85962514a76efafd6fc4556e3ed41f92682aacb1b3b730efbdb7c40271c5070eccffe566c0d
+EBUILD python-3.9.15_p2.ebuild 12699 BLAKE2B 269aadf7695f429458f7d44d53cab5e6f3508350bc266f32956fdac13fa38bc2218fd4d04a4f6466a220e5292885966c653f1d53ed8d221cdc287af00f614a4a SHA512 188c8eda7b0fc3bdea36d3dc1bb478c28bafbf183b71ff6f9bd5751fcc3fd61f325951c52016c41c5dc00de6f98e45647f5d8e8bb3de55aedd7a859b129e8006
 MISC metadata.xml 1125 BLAKE2B 5302c84538eb30fe86c91d15faa2f6de0eaa4ee38c26a0f6845b4a95bda94ad0006a509bedf9f71288332a593d245191c0f358f0515d96c8aec8693eca22fd2a SHA512 2280aa3f309e1338d7e41c8cfa50cde4d0441bee7d98a86ce7bf4969560b34dfab8ef6171cbbe0d6a19f56c676e9c9dd63c65340ac7145317d2eab0fe618ae0d
diff --git a/dev-lang/python/python-2.7.18_p15-r1.ebuild b/dev-lang/python/python-2.7.18_p16.ebuild
index 051f660f8f9b..051f660f8f9b 100644
--- a/dev-lang/python/python-2.7.18_p15-r1.ebuild
+++ b/dev-lang/python/python-2.7.18_p16.ebuild
diff --git a/dev-lang/python/python-3.10.8_p1.ebuild b/dev-lang/python/python-3.10.8_p2.ebuild
index 0b7ad7f2c527..b1ce528e225d 100644
--- a/dev-lang/python/python-3.10.8_p1.ebuild
+++ b/dev-lang/python/python-3.10.8_p2.ebuild
@@ -319,7 +319,7 @@ src_compile() {
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
 
-		addpredict /usr/lib/python3.10/site-packages
+		addpredict "/usr/lib/python${PYVER}/site-packages"
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -360,14 +360,24 @@ src_test() {
 		)
 	fi
 
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
 	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.10/site-packages
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
 
-	emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
 }
 
 src_install() {
diff --git a/dev-lang/python/python-3.11.0.ebuild b/dev-lang/python/python-3.11.0_p1.ebuild
index ab0050062031..5d7d0355e38c 100644
--- a/dev-lang/python/python-3.11.0.ebuild
+++ b/dev-lang/python/python-3.11.0_p1.ebuild
@@ -326,7 +326,7 @@ src_compile() {
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
 
-		addpredict /usr/lib/python3.11/site-packages
+		addpredict "/usr/lib/python${PYVER}/site-packages"
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -381,7 +381,7 @@ src_test() {
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
 	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.11/site-packages
+	addwrite "/usr/lib/python${PYVER}/site-packages"
 
 	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
 		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
diff --git a/dev-lang/python/python-3.12.0_alpha1.ebuild b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild
index 41887948b0bd..8d748fa37b67 100644
--- a/dev-lang/python/python-3.12.0_alpha1.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild
@@ -315,7 +315,7 @@ src_compile() {
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
 
-		addpredict /usr/lib/python3.11/site-packages
+		addpredict "/usr/lib/python${PYVER}/site-packages"
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -370,7 +370,7 @@ src_test() {
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
 	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.11/site-packages
+	addwrite "/usr/lib/python${PYVER}/site-packages"
 
 	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
 		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
diff --git a/dev-lang/python/python-3.8.15_p1.ebuild b/dev-lang/python/python-3.8.15_p2.ebuild
index c45c62c2e163..f03d22173cd6 100644
--- a/dev-lang/python/python-3.8.15_p1.ebuild
+++ b/dev-lang/python/python-3.8.15_p2.ebuild
@@ -297,12 +297,22 @@ src_test() {
 		)
 	fi
 
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
 
-	emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
 }
 
 src_install() {
diff --git a/dev-lang/python/python-3.9.15_p1.ebuild b/dev-lang/python/python-3.9.15_p2.ebuild
index a4f409cd861b..d5d9a2e273eb 100644
--- a/dev-lang/python/python-3.9.15_p1.ebuild
+++ b/dev-lang/python/python-3.9.15_p2.ebuild
@@ -313,7 +313,7 @@ src_compile() {
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
 
-		addpredict /usr/lib/python3.9/site-packages
+		addpredict "/usr/lib/python${PYVER}/site-packages"
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -354,12 +354,22 @@ src_test() {
 		)
 	fi
 
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
 
-	emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
 }
 
 src_install() {