gentoo resync : 12.03.2021

7 files changed, 361 insertions, 10 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e8642db98908..2758cc7c845a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -40,20 +40,21 @@ DIST python-gentoo-patches-3.9.1-r1.tar.xz 10464 BLAKE2B d69ce207020b7a34eb45c14
 DIST python-gentoo-patches-3.9.1_p2.tar.xz 15556 BLAKE2B 5e265ef8edee70694d73c6df6eb908a747be34e1e89b900d2470d41e7e043d179408bc643a52ade6e54e61a210ee8850d02a2cb452a9336f3973345c1d027158 SHA512 eabfd304b39975258705f5e9b238f709196ce0cbd3803f157dc77d864631a3eea380084a3a4de180e3ba7e92239608ae369e810f8066c0f1ff9fa251bbc1816c
 DIST python-gentoo-patches-3.9.2.tar.xz 8824 BLAKE2B a1cd122837b50e6cf0459f86a1d88ecc4b266f5a0658975c9913f1f4e9cf6a79a0309c89c37421e92ab59f3854309cdea8ea233b771cdf517c7aea432e44bc53 SHA512 2e619ad2a7b2af2fef9070c85619e3104d99977f2c839eb1e20ed9cc3dd6c5092f7d9587c94e76d530f89272741fe6ce345e36448f6aa2800f2dc9b6b425b1e7
 EBUILD python-2.7.18-r6.ebuild 10337 BLAKE2B 014fdba169450128f1a0b9cb3af177db0135b0bcd71c8c6e91b4074e0919c6e83105c778a07f976f6bc430b5ce2950b470a5efacd3d7be5ab0e0f34a94a04456 SHA512 4c223212c0878987503ac9ab358678d21d6f7244b1426d80ccb46454792e6be523741baf1559be0a6fa29cd04e2f7b779d5f25200a87e6e3941a8b7eb7529086
-EBUILD python-2.7.18_p7.ebuild 10349 BLAKE2B 0431c6f2cfdf812e2705b8936c3069082150626b8b517379adf1edd28686731b95170bd559ac6fe94ac5ea36c7e22957e687eb8a0f41c7c2b26239cebed6727a SHA512 10331209f0982b876538858df2e1b7a0221a30fb6ef48cc1f291ca1eb2a6e14e4a8b3e23473f7ee5375a24a558e67930356bccecd7742577452c82210e032b46
+EBUILD python-2.7.18_p7.ebuild 10347 BLAKE2B ded8ce3ad4f1cee4c13d38206f3d3cdd0158c13ff8ca450a70bac1199ba8c23c0cffca0583d0d22431591a53b6012671fea6ec385f158b0484f2adf4f135a521 SHA512 fa6986369baf88d98c93947fd9350b54f7e59a04c038e335e0f31ca39789c26ce509c95fa1e36699140ec84253e47ff59fc350b357d8da681a4f557afbbf17f5
 EBUILD python-3.10.0_alpha5.ebuild 10019 BLAKE2B c5e228133915489c20e6979ef3a37209922e5b5c4f280674669f322470e5bf50a5bb0bdbcc8c301c673fb6def152006ec65188889a2b2a1ef1ca9b15baf8554b SHA512 a730f9a4ed404f3d0df5f57f772c7d8a6eefb70f25bca174c6b4971e96002f1dda6f2f0344da6591dd3f129bf3751df8ac0f564077c94bdec19caba51212768e
 EBUILD python-3.10.0_alpha5_p1.ebuild 10040 BLAKE2B 24835b3340fe4ad65f05490f174e177e2b632aed63446dfa0a9a017a542b18351f316c4b56927e8eff32cfdb225fe5eacc051e921429a2ce79d088090fa09243 SHA512 c1f549bfadd97ab8d667609cfc971db3be8932f57f0ae998fc52d0ae50698ef004ce9f789a2196e95b680b8490f89e2539835c1397b57001bbed8aebe98765ad
 EBUILD python-3.10.0_alpha6-r1.ebuild 10137 BLAKE2B 411b359510370cd0d1fa7602bc9ebccd45e7a987455fff2d167e9d5b89b1e1e95f8b4ffee85c8aa11aab25c953a8fc3bf25a4f9722e293e603384aa467cf01ae SHA512 45b15e538790b2fd5eea8ca90573e1d824f602a75f6d10619899fdbff3f9fa273406404fd2b3233bf1d1c958257d531cc066eddbc69da1c5b69c61c99389af47
+EBUILD python-3.10.0_alpha6-r2.ebuild 10108 BLAKE2B 360796ea9118662281e571a396b38897ece476ceb56ed73301551d42599640f2a98467a02ce39ab53ad996d3b949ce3f5ddbc4c4050edc69194977ff08406502 SHA512 0ef5f571b4108446953cf03dc948cb2ea643f29ac0164605506c898f5d4223d4e2e072cb990fc786e2b8fbef9b0ea4ed0191b7e3a9d5746961607eacd9398bd8
 EBUILD python-3.6.12-r2.ebuild 9884 BLAKE2B 6070ecc3e0b388012426d9591d87bdceed4ab7c76e7bfec69aca3a1980e0720fe8295b8d7fc9e5e6914fa68a4e7f3d146ff0f403a4959c5f9b750db46349a414 SHA512 f7f207e63071dfc4ff475d1106e970d83e6b03acb85ba09481a05f9279f96b2cccee6adae0ebf8a23c4ec9f5b8ccb74db4130270821457999075655c1e62852b
 EBUILD python-3.6.12_p3.ebuild 9897 BLAKE2B a3de467ac2e729268d122a6ba2572caf4671fd67526d0cb553755368d892340d03e06785b012cfe3d6aefaee2cce8aaac2ae397739210c8ed4ac859e1bfd8d89 SHA512 7b93d6ba30855586f451113c933555f1edc7efec3b97f6e6f161a32670f7717add5fde19effa6e5d712d834fb19dd8a4b727f608aa9d3231280664e75c34ed08
-EBUILD python-3.6.13.ebuild 9897 BLAKE2B a3de467ac2e729268d122a6ba2572caf4671fd67526d0cb553755368d892340d03e06785b012cfe3d6aefaee2cce8aaac2ae397739210c8ed4ac859e1bfd8d89 SHA512 7b93d6ba30855586f451113c933555f1edc7efec3b97f6e6f161a32670f7717add5fde19effa6e5d712d834fb19dd8a4b727f608aa9d3231280664e75c34ed08
-EBUILD python-3.7.10.ebuild 9702 BLAKE2B 1732961443de66431d4363eef2d5ec0caa044afc102227bcf85efc51a6a9cdebe8be9dadfa1aedec7c757f478897d2af47c3fdbcbb9dccf05ff4f15b0509b957 SHA512 d6e2660554f8bb3acdfc93141ceb8132e9b880ff89bb8b3b12eb475a14c298b2141d1143e21470d378aace07d64f2169525aecd7d4be8c688db5918f5c2717e2
+EBUILD python-3.6.13.ebuild 9895 BLAKE2B 6a3be039de9e3b89b8ba88641981b93593c446be9d3169154191a7d6f9e97a0a026c2ffa69efe4667e62f18062fdc8b0df378c14951a4dc2c14f425d1fa20166 SHA512 c4ad6a0b10484b1cf53d85f86f91b6b6cd256f87daf322e74a5f45e3015a72eb19ccdf38ecef4f8927eee7844ff1f8a8c2760fa68676183f0493018ca16e26c9
+EBUILD python-3.7.10.ebuild 9700 BLAKE2B 83df5ca5fee6ab856da3778710782cb666eec2569faf470e9756eb9cf46e5091da981c07fd5922e175aad1f512d201e4b73273dedea2bb63f4b9f772ee25688e SHA512 e3f070549c58c987ee3a030bbfaa2e75ef3f819756d2d119f6e0f1952298aa3f3615db0a421c5e16f75d2b5bfc577de1fc9e75b6565a53af60c34ee2d84560c5
 EBUILD python-3.7.9-r2.ebuild 9689 BLAKE2B a7b010040fce4663b1693e36fd4f417a7774f4f72f3294656013d3c2ee6076cb1e8e3caf6f0ec76162248ba9db2bc73814e99c7ae83ddb2c59a4cc97f08fb079 SHA512 c59a1e356cca66351789f13b0aa78d322ea5d8e472746f120635a12bb5abba638f2f32033c4ccd0a9e986c7c531b85879772155ac47b194c8393d90384fc788d
 EBUILD python-3.7.9_p3.ebuild 9702 BLAKE2B 1732961443de66431d4363eef2d5ec0caa044afc102227bcf85efc51a6a9cdebe8be9dadfa1aedec7c757f478897d2af47c3fdbcbb9dccf05ff4f15b0509b957 SHA512 d6e2660554f8bb3acdfc93141ceb8132e9b880ff89bb8b3b12eb475a14c298b2141d1143e21470d378aace07d64f2169525aecd7d4be8c688db5918f5c2717e2
 EBUILD python-3.8.7-r1.ebuild 9790 BLAKE2B aad0ae19e4e64af3ac6da2b1f73fd46e6d32cac53b56dbbec74a4176ff7987137c06f8f793b50355cc1f1bff6a41b30024ff044413a8fb9ab585c6e9f0718cd9 SHA512 035e1ec195a2625acc37656a6689cec71d631d013e4bbab2f95fe43f68578e7b0f922fff2b6962f389e5de04a316908e6e49eba3088a7c076ee3a898adebfb47
 EBUILD python-3.8.7_p2.ebuild 9803 BLAKE2B af3770efda34e9281819b81cbfce96d8cb8096ab2a9e31e132b0e898737750937726430b3455e739a7a26dbe430d4bbe933ff9d8e937357e4afefaac187cf028 SHA512 93ed9d7d56fd0d66b8c55229f14603d5a041a690bb47c2fcf8f9291e45fbaf0b93d15be82529e75f18a9b5662e83526fa862efdf952cb4de188ee69f5841d9b8
-EBUILD python-3.8.8.ebuild 9828 BLAKE2B 9b5c2cab21a6124d31c83c0df01a22352546f09c4821a3a1146e827bfacf83582e4805ac88598e80e519533d3a30bb665c414e814739837283e0e69fe5c45ffb SHA512 548f8a3870bd67c8a544333e114158f01a0c5dc9cdd4155e1a028511720e4e91db754771e85031f374d4a1dfc1364b79efb7a2f9225e64a7eb6f2d7989173672
+EBUILD python-3.8.8.ebuild 9826 BLAKE2B bda1d45792be1e6d1c94b8b3c55716c5797c852f7eb9466303a2058730fef1c6464be1042e0d587a479d860cdc4ff87fc624e99abc7493e4402f8f43d8806e0e SHA512 b9f9e90afb4439d2f73ecf835e7b531eaaab3c7eb2845a52518fe28f466dd359e09906a700cf6d435749119312f260d0095fec702f123b468fe2f63f24887d48
 EBUILD python-3.9.1-r1.ebuild 9935 BLAKE2B 7c8f73800e02697200748e4beea21af471cd23664f6b35b40dc26d5f46fb3aa96c1bb3a4f2fc9038613b4117ddcb71586c68d3fefc1f6a646b083bdefff7a223 SHA512 f1536b40a0ccb25d41bd9f7933e1ec6391f367400a9a5b4a08541c7e4d69bf50c3235a20c80c84d7825611dd3c71adea7dceb476ffad2c5dfb316c3a6a6a0332
 EBUILD python-3.9.1_p2.ebuild 9942 BLAKE2B efad280cd9b6b8792defdb63e1618053e195a7c1421900032c1ade8de288a4fa6abd5f1705fd31d6f54740f5ed235c924b7244c816a6bf4ef5e32fc074926c92 SHA512 b9085e3ace1d842bd1e81b0882ece3249700936129cfd5f904635fb9c42a6e914c5699953a216e61663f3ed6fa4b3d6cc5f84af12048ffffce6b4d8ec846a12e
-EBUILD python-3.9.2.ebuild 9967 BLAKE2B f20e61eeb8b05c2ed3ad7da9e23c47578bec92cff2908b04e9f716e9324600342f863a85602d9fe7fd0644d5a1a8eb32c60094d87c23cfa5e2fd87fe7ff552c5 SHA512 9a1fcac09a1e242b57009003da4f05a3ae79c4b2bbaf76c3b9302367916ae5b8c688fb42b22053c9d6f28c6b36d6bd0e66418ed151d82e009b1b25fe476174c4
+EBUILD python-3.9.2.ebuild 9965 BLAKE2B 639f7d5c44d7eb1f0d98de81b40aa5dfbec89b27c9ec42f7824b659fcb02671b58d28d59ebe7111d17a2327ae8554d0bd917486ca5fd0b4c9e2a615992b77c38 SHA512 304ede26ae513794b9e5bee6708193c6f7a5717e07e8f61bb3ba87fb0f7b2bce758c7a217da0b070b30107c8c08068aa4381d4e67ecd3e60a51f1a4777411105
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18_p7.ebuild b/dev-lang/python/python-2.7.18_p7.ebuild
index 65446e2f1aec..b022d92234dd 100644
--- a/dev-lang/python/python-2.7.18_p7.ebuild
+++ b/dev-lang/python/python-2.7.18_p7.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.10.0_alpha6-r2.ebuild b/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
new file mode 100644
index 000000000000..adedfd6f3388
--- /dev/null
+++ b/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_alpha/a}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+PDEPEND="app-eselect/eselect-python"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.6.13.ebuild b/dev-lang/python/python-3.6.13.ebuild
index 0070a1017519..9c9faa0f5c7f 100644
--- a/dev-lang/python/python-3.6.13.ebuild
+++ b/dev-lang/python/python-3.6.13.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.7.10.ebuild b/dev-lang/python/python-3.7.10.ebuild
index f61897fc7963..0228c646c667 100644
--- a/dev-lang/python/python-3.7.10.ebuild
+++ b/dev-lang/python/python-3.7.10.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.8.8.ebuild b/dev-lang/python/python-3.8.8.ebuild
index c4ef86dff67a..e30fdd1c11fb 100644
--- a/dev-lang/python/python-3.8.8.ebuild
+++ b/dev-lang/python/python-3.8.8.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.9.2.ebuild b/dev-lang/python/python-3.9.2.ebuild
index b4b4cbc7a33c..9d724f7f9372 100644
--- a/dev-lang/python/python-3.9.2.ebuild
+++ b/dev-lang/python/python-3.9.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"