[gentoo-commits] repo/proj/libressl:master commit in: dev-lang/python/

["Quentin Retornaz" <gentoo@retornaz.com>]

commit:     3136caead6171472ecfac4bea02c05ee3c11e456
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Nov  6 04:39:54 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Nov  6 21:06:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3136caea

dev-lang/python: Add 2.7.18_p16, 3.9.15_p2, 3.10.8_p2

Removes old versions 2.7.18_p15-r1, 3.9.15_p1, 3.10.8_p1.

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/467
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 dev-lang/python/Manifest                               |  6 +++---
 ...n-2.7.18_p15-r1.ebuild => python-2.7.18_p16.ebuild} |  0
 ...python-3.10.8_p1.ebuild => python-3.10.8_p2.ebuild} | 18 ++++++++++++++----
 ...python-3.9.15_p1.ebuild => python-3.9.15_p2.ebuild} | 16 +++++++++++++---
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a3e1918..1ef7558 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -4,6 +4,6 @@ DIST Python-3.10.8.tar.xz 19619508 BLAKE2B 8bbfbae34fbc517c4a746e5e4c360efc57aca
 DIST Python-3.10.8.tar.xz.asc 833 BLAKE2B 1e94822a57d055f5db1a5d2915df24be9d6fd9e6b301d148919a7643285a93ca1c8a16db7d74e0adabe7d2a21678b5126e3df7fffb253b35f8db6f74284a0aba SHA512 0c2ef09d898257ba5e9ec7c5bb224a7e50e5ebca96843b4d9e25be6cdd2f17144772aafc92280af20c21491e3c8cedc697414688ece613c93b28ff7ecddcf93f
 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.9.15_p1.tar.xz 22716 BLAKE2B 8bfe3ed3642a6734d7662c68be50c050112c1f2ae5bc10742b47e2b2943336df3bc6b0b5e6f0c1a1180dffc0590bbdd7341e84bafbfcfaf5977cde3184de6278 SHA512 f68b88a296a5ba6cf352c20345abe8c1dcaf9fbcaf6e48c2d7390e5d3ca57f786bfcefb912962d6642272f00dde832595bb73b48b03f3300bc11e3417e0f5fa6
+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.9.15_p2.tar.xz 23244 BLAKE2B 0917396dd08f652f8ba06c019961c81f795678da55979934e4d3d8b85ff53bd44f98bc1564ab47efaf11f581271b49f15a41538452d49dbe8ea6bfd0a9d6e3e9 SHA512 c4635fe88cb59f3d16a2a3c1d1519c9566b069995151d6caabc661af3d980522dd00b4a7c9de9969c0d10dafe27b6e0524af4469148fad6841e5f3329a5dad3d

diff --git a/dev-lang/python/python-2.7.18_p15-r1.ebuild b/dev-lang/python/python-2.7.18_p16.ebuild
similarity index 100%
rename from dev-lang/python/python-2.7.18_p15-r1.ebuild
rename to 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
similarity index 96%
rename from dev-lang/python/python-3.10.8_p1.ebuild
rename to dev-lang/python/python-3.10.8_p2.ebuild
index bf31d54..dc1972f 100644
--- a/dev-lang/python/python-3.10.8_p1.ebuild
+++ b/dev-lang/python/python-3.10.8_p2.ebuild
@@ -320,7 +320,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
@@ -361,14 +361,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.9.15_p1.ebuild b/dev-lang/python/python-3.9.15_p2.ebuild
similarity index 97%
rename from dev-lang/python/python-3.9.15_p1.ebuild
rename to dev-lang/python/python-3.9.15_p2.ebuild
index da56be4..d897137 100644
--- a/dev-lang/python/python-3.9.15_p1.ebuild
+++ b/dev-lang/python/python-3.9.15_p2.ebuild
@@ -315,7 +315,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
@@ -356,12 +356,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() {