gentoo auto-resync : 09:10:2022 - 01:31:00

9 files changed, 206 insertions, 8 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d63c1f8c973b..527af6d838de 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 0c89caa3fa34..0084eea13684 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -18,6 +18,14 @@ DIST julia-1.7.3-llvm_13_compat_part_4.patch 2425 BLAKE2B 9440296aa9669c44f23757
 DIST julia-1.7.3-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
 DIST julia-1.7.3-llvm_13_compat_part_6.patch 27063 BLAKE2B 3878cba37be6f270a1ba240b22bea65c2c0efe77b0d415cc47370f234c8d26f01c66bec4b01824472926ba231a8881deadb21006efe6fa6c5bf6fd6250933a0b SHA512 7c27b4b49465a4fbe206c1e9ba6c48d74264124a866fb414bb698cab151a9e1fb7180c7e07c0bc843d4817e9e99cbd70b35c2906384503d44ab7051ebb1948fe
 DIST julia-1.7.3_Downloads.jl_1.5.3.tar.gz 23484 BLAKE2B cebdc572a10faadf4aa673da2c9cd364ddc76b6299c3d0eaaa54014e199f9c0002188d6281dc4935c2be1f32ffcddc6b98f19f07ea488466fa7ae66db55fa23a SHA512 ec895ebe2b96d8590f34c152d3b4963531250b254c96fadffeee8b2cec132c20ce42d585839a2304dc1a30b13b1cbebcfa88b021b3646a77162a1476ec1d8f16
+DIST julia-1.8.0-074d761f.patch 2198 BLAKE2B 7d4b147e290defceaad1b5b6d0c2c9a323b47d685bb1865b23c84aa68135c00104e653a5046d276aa540415ee4c95426f1a4538df3ba0ae4c348966a2f2b1742 SHA512 ff1e23746851b1b7a4480df75815abb35ccc8006f622acb5fb3928e20832cf55022c96650590c8dfea9b39185a3284a0d1310dee3f439429c91e00af567b66f1
+DIST julia-1.8.0-ed9851b0.patch 6957 BLAKE2B f40a56bf3b00cc8d0a764ce7d9ef75b6e5dbab70aa13aad810e7288c4b1b0609ee61b1c6661a4d34423c5f25b19c56b326fa0ae520f1310c673d2c0921e4dabb SHA512 a4b6ee8b80639e74185ddaf8567b81eaee18efef02003e254b5e31268f730e022dcb1a53d8595a82570303b5f57ea885ca86374ca5eb7c0b2b270a5c104b79b5
+DIST julia-1.8.0-julia-hardcoded-libs.patch 2411 BLAKE2B d71683c68c350c16c61c13e0378072a7689cb6e07ab7d4b940a5049f37ec58d8f4061b94ba5ba3d2dcf73a403b34d5fbe92bb723a0c5a2c318f9c3bd3631f143 SHA512 0256c5af1713b3551b39e0d89168eafb235e6337a9f07efd24a2e271a11bf724295d0a46761bf1a4d3ed14c4539ef1ef56adcf5580879cac268867aac3e2c20e
+DIST julia-1.8.0-julia-libunwind-1.6.patch 750 BLAKE2B 35bc6a5fef212c1596c88ddff723795cd3dd46852a602e5c30739af3b3bd8ee78b99635fa35273d0702fc354d31f75c109503225ff6f564a2f9afb64c84e9eda SHA512 7623d7c897ef90909f331c9bad27625505df758d7b21d765385efc7b02a48360ca2e2092057802a5e523b255eca036393ec27148fb567313db1497f691cd6d1c
+DIST julia-1.8.0-julia-llvm-14.patch 882 BLAKE2B f46f02554a6fc997763d368b813298da7158c82adbbf43ec98b3d7830163c167d9e1f0e22e17cd42b2900baea91c49611bf5e14a57169beb7f29c505ed161307 SHA512 856e299e7523ae15e6bf579c7aef24d3de67d6e10bfb168f7c5caa887fab1752e321b777d465a3c85947441153c5e898431103272b9f94f28d0fabff77afe7a2
+DIST julia-1.8.0-julia-system-cblas.patch 4078 BLAKE2B 58aac552ea63859a03fe24fed69c02f9968aa7924abe2ffdf9e33e965d64877206216f1604f28fc67739cada4b5ce7b508feaad18080e3a5e78d89447d0f2a05 SHA512 d4b437da35672aa0b9f371da66a8675ca5be28276886edafb3566c3ea0d0ed8ed2bac192b43a0d292ee4f2754b596b7b79de76f136cfcada9916ff94a544b372
+DIST julia-1.8.0-make-install-no-build.patch 555 BLAKE2B 36a86c3dd281a85f1b1fd68ac9796e70b06bb6afe3140fed97b5c7cd4b24987dc75709c4b1b192d5663c4d704cfb9818ec8d895c293b9b0bd741a3a61c860e47 SHA512 97687d24a3aa0a39994a691026981a91496cd2a82112e9acf9a8edd0f7c2a50d946944e8af495a3b1703f397c7a0e620be76dc28f3bbe14357ee8c4a68a5a3bc
+DIST julia-1.8.2-full.tar.gz 275255487 BLAKE2B dd4cb035c3ec3b37fd08215baa76764c2a447ec50f0afbec5e6c02b047e62188015ba1492704fbc31081465f3837d6b8e02b31cfe10239ddd31e80e4bd7121e8 SHA512 0660911bbd9b0e0df9e6c2af851e7119b6067b08c845422e44101b9a92a1cbc069e52838f503b06f64db5b282cde1b533aafd9c6f47d349ae7d2beb48cf7d7a6
 DIST julia-hardcoded-libs.patch 2411 BLAKE2B 54eb1d0bbf15bbeea723c32c8ddbb42d3e3fbd22c6d8e2fa4c660d857bc8b6b131f442065689fd1a70c09563ef5c9efa7cb8ff9493ea6b3ed9ec7b05a9cc042e SHA512 4a35a80592c64c8e8924d381b9405283c3c5447ea201715acdcb4e7f6be0560655b0f816fa05127b7df6f9154a74224960aba57b291bd3a8431174eb13c7610e
 DIST julia-libblastrampoline-4.patch 856 BLAKE2B 5efe1602022eaaadb5f6ed06edd5f9e30e19978c5c469f1619efbcc4604efa3f0cd42bb80ba7cf903a89edbabeefca06bf7f5efe78510b6feea5e188655ad456 SHA512 62097e29865a0d4a633974a3ca4ea35623a6de08d8c63316896cdd95844a394302ad892121ec85d8b2a9ca305dff3123cd01e4b7a27b97beb5da36cbe4cd3fa3
 DIST julia-libgit-1.2.patch 17322 BLAKE2B 163ca3dc12e6e654962afc781ef7ae57ea0a74a13d72e40a2944ac6b9ad688467fea2df603f0b5509bd882406c81742ae168a80ae312dea5e7188a3c96996772 SHA512 59688c5f6437fd745e3a37bc8387678a18e7d4ed223907456a426a55f1daaa747b70e2b7907975e4e1af4c32b535d91f1e2685416c4d811aed2f4b6ce5f3bc36
@@ -27,4 +35,5 @@ DIST julia-system-cblas.patch 4816 BLAKE2B f5f56cf6a5c4919f002da4865e51022e738fa
 DIST make-install-no-build.patch 555 BLAKE2B b49576a9b4fa49ba46f871e774a72f1b78ed37a4cb9be47655617b30e251ce2ef7b4236b045c271be3f3c00b9bd2b907281040658a2068ca986f84a80f5fc141 SHA512 8cb54dc9aac12450cc9d5041b1c4ea9a2b7ddb3c73533d58ce5e78e0547f36ac77f04576e28e15769d73ed02fcdfcd90a9036816fa8a669b2210332f972ee15f
 EBUILD julia-1.7.1-r4.ebuild 4992 BLAKE2B 590b6dabb0c0bd821db60b389d4f329c67b51de3b029818c6c564d826b2a742ced7e2644202e43cd001bb9cacb160da16cf0658a0a712f5ebef4bbdb6a3acbfa SHA512 6a84e43d2c283fa364dc41a9fa6483fcd4bda27376c25ca56111235d9e870bc7035736c17d7a79c1c8ba81fe51b155fb012e31944f8fb7c0679f6b46e8d6ecf3
 EBUILD julia-1.7.3.ebuild 6219 BLAKE2B 9950809d1207c7559a83997728aa905792c1407210a7570b6688606a71e76e412ced767118febba6ffa34541d3d2d21f63ea077b014235134a6eb245b187031c SHA512 ab14e9ebe85006bfc1ce34a7df1137c86ada0bcaa1d001e2b587e333bc303d23d9983997d941a008f094b82106946757cb8556c71257be3ccd2ba90f18e50544
+EBUILD julia-1.8.2.ebuild 4724 BLAKE2B 03364d405678e22f11c63f39c5d24c476956048177b51c3962504c55f12f7326cb5b87b01524692bc2f93fdb7fb85addf62fdd0c215d17aafc80cbc914c14f5e SHA512 e7feb970adbb3af3ac5956cbec9fe1499c70fd16d4e267d5e5bdedbdaf242b58220d4a421307f200911f185a5f2770b711e56d6265d1065104fa1361c25aad42
 MISC metadata.xml 1530 BLAKE2B 776f8e2eaaebf6a0429b9019ec606c76f80828c5d27ec07f6503e855d44f681a476d9fe0631de0eb0f609b0256e063c172e8fbfacd3e37118e66c07ade2cb42d SHA512 d172e00e631a7a4e4b61c0f3ad90849b189c8b8aa8586fceb63c26ca407c4e477339f51b05d48681be37d06b873d6c2fce62b61efb4b9874323d92022d570288
diff --git a/dev-lang/julia/julia-1.8.2.ebuild b/dev-lang/julia/julia-1.8.2.ebuild
new file mode 100644
index 000000000000..febe76536081
--- /dev/null
+++ b/dev-lang/julia/julia-1.8.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic llvm pax-utils toolchain-funcs optfeature
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+# 1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
+MY_LLVM_V="13.0.0"
+LLVM_MAX_SLOT=13
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+
+SRC_URI="https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz"
+PATCHES=( )
+
+# Huge thanks to Arch Linux developers for the patches.
+# Patches form version 1.8.0 also apply to 1.8.2.
+archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
+archlinux_patches=(
+	074d761f.patch
+	ed9851b0.patch
+	julia-hardcoded-libs.patch
+	julia-libunwind-1.6.patch
+	julia-llvm-14.patch
+	julia-system-cblas.patch
+	make-install-no-build.patch
+)
+for archlinux_patch in ${archlinux_patches[@]} ; do
+	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
+	SRC_URI+="
+		${archlinux_uri}/${archlinux_patch} -> ${archlinux_patch_name}
+	"
+	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
+done
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+system-llvm"
+
+RDEPEND="
+	system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
+"
+RDEPEND+="
+	app-arch/p7zip
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0
+	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
+	dev-libs/mpfr:0=
+	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+	>=dev-util/patchelf-0.13
+	>=net-libs/mbedtls-2.2
+	net-misc/curl[http2,ssh]
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	>=sci-mathematics/dsfmt-2.2.4
+	>=sys-libs/libunwind-1.1:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	!system-llvm? ( dev-util/cmake )
+"
+
+pkg_setup() {
+	use system-llvm && llvm_pkg_setup
+}
+
+src_unpack() {
+	local tounpack=(${A})
+	# the main source tree, followed by deps
+	unpack "${tounpack[0]}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+
+	sed -i \
+		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting	git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# bug #855602
+	filter-lto
+
+	use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+
+	# julia does not play well with the system versions of libuv
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		LOCALBASE:="${EPREFIX}/usr"
+		override prefix:="${EPREFIX}/usr"
+		override libdir:="\$(prefix)/$(get_libdir)"
+		override CC:=$(tc-getCC)
+		override CXX:=$(tc-getCXX)
+		override AR:=$(tc-getAR)
+
+		BUNDLE_DEBUG_LIBS:=0
+		USE_BINARYBUILDER:=0
+		USE_SYSTEM_CSL:=1
+		USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_PCRE:=1
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_DSFMT:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_LIBSUITESPARSE:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_UTF8PROC:=1
+		USE_SYSTEM_MBEDTLS:=1
+		USE_SYSTEM_LIBSSH2:=1
+		USE_SYSTEM_NGHTTP2:=1
+		USE_SYSTEM_CURL:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_ZLIB:=1
+		USE_SYSTEM_P7ZIP:=1
+		VERBOSE:=1
+	EOF
+}
+
+src_compile() {
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	default
+	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc README.md
+
+	if ! use system-llvm ; then
+		local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+		cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
+	fi
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+
+	# The appdata directory is deprecated.
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+}
+
+pkg_postinst() {
+	optfeature "Julia Plots" sci-visualization/gr
+}
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index d0bc415c27a7..151188895d81 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -8,6 +8,6 @@ DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f7
 DIST mercury-srcdist-22.01.tar.gz 48960609 BLAKE2B 4ac45251bc098c1465f4bc418501db152bfcf36a2e04bb9153a44c44ff2dff300545103c29551818e773728c5a61947c019997fcc2cb64900e538d5ef64c1b39 SHA512 35b3b1e9fd85062edea5263b304bfc965382d04353e5548d59211519ee222bb6a8e8c95cb03faa089062e39c90b2d1c4af7ca0d9eabbf3bb44872d461e10ff2d
 EBUILD mercury-extras-20.06.1.ebuild 7427 BLAKE2B bc23528da4b623f0d9d2bf554f4ac991ac168bd3c735a5a0929d062627be313c74b3e88bbda05f9fb97dbb1a16ffd02326712254ec6da3b6411c5124a8de8e3a SHA512 a1960b7b5fe84778f9a4976ae6fdf5a241b7c91985da381b64cdbc1bc9fdcc9718c73d01247c0dd4033d3ed738752c3c5560c2d7bc50bdedcb69c8e3c5f6ed60
 EBUILD mercury-extras-20.06.ebuild 7425 BLAKE2B 8e6c683c23df1f3a78232f98f1f952dff7dc0b44572329f0a3144c029c5cdc0013665c73b0f78bf8ab4b0e6b0f02de4294ea408dec464b18a652c750be3ad299 SHA512 82516ccaa126c5aaf67eaabce6056e69bd74e5faa2c608d44238462cca31929e6734815d660bf475a9ea86d024ef9132741b099d623d7338515d847053a8194c
-EBUILD mercury-extras-22.01.1.ebuild 7176 BLAKE2B 147b18be9010a746465c4928ecbd4f6315bb4a8cef8a5b31633a43af1dfc7f3897f640e2729135ed397f2a5b4b016eae43c43aefc4844dfd98be58e9443ea5bd SHA512 33fb19a33af51c55dadc4f36a98add643b40cb435e8dce692716bb66206d0c01e4db424782935b1a300fd52232ef76c8b13dd7065f65353b5400358de0a4bf02
-EBUILD mercury-extras-22.01.ebuild 7178 BLAKE2B 2301476d4aaf8197d2e744c9ae0c0209ddfbd01cde6f7aa41391acc1451c8e65f229596fbd10bfe1541437ed70e55900f01d4562e71489b156357268b3c82ae1 SHA512 e8299b195087ba15122ed6455c080d93f4e959cba1989df0ff9950915b98eb9a7e9c3e6a72625a349320fd95ea04ec676cf304d98fb2bcaee1b3e5b81275f330
+EBUILD mercury-extras-22.01.1.ebuild 7169 BLAKE2B 671c063c175dd52de6f876a4ba7e03be77e58b5592c633a2bc499eb7cbf30b116c93dd2f4b7282f07531e1ad2117f4d15c2b457f140b46daeffffd1d151c29d4 SHA512 c8b8b6f41ae548c86e6034ab334c3010c63c84fab55a6eff34911d02cb60639736c1807d3c411404f8239227e9ec2aaa577bce2e3687137baff1df6ca0f7d8cc
+EBUILD mercury-extras-22.01.ebuild 7171 BLAKE2B 30e1cbe12ca19954ab9df8110a467a18aac9f2fdb39db06357c1eb5521a2bfc9fe49dd13c55ad9e0802b729b5e8773a445532e39583a06abfbcbdbc9625d24ad SHA512 c8f0e1b208caa76e319fe6d401d42c9ddb442724d5022d5b13a5ff4b6def255104a3fe44454e8c5fb5a7bb27943e76025373a8cb939fa250bbd8aa2aa0da485a
 MISC metadata.xml 319 BLAKE2B 0f18145c4e9a495434e942a72df22a21a6cc09a3f8d896a0ade3ac4c94da8a743c15c4ff5d48c355b4d507b56ab90c96492aa42403310346dc0bea9de86b86e4 SHA512 ea952456995b9fd16f129dbe31a2deb46fceea5f7ad2a4d484c2195227805fe120795a9fc1238090a1cd2a032061ab5c35209ed498b6f64deb1391e42c1d2677
diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 55097f04e108..173c1939754c 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils multilib vcs-clean
+inherit multilib vcs-clean
 
 PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
index c90f5ea06af4..c73b6e8a9b8c 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils multilib vcs-clean
+inherit multilib vcs-clean
 
 PATCHSET_VER="0"
 MY_P=mercury-srcdist-${PV}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 17bf40a5f6a6..9527196cda19 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -28,7 +28,7 @@ DIST python-gentoo-patches-3.8.14.tar.xz 25700 BLAKE2B de4ff020ecc6889a1c7ae2991
 DIST python-gentoo-patches-3.9.13_p4.tar.xz 22072 BLAKE2B a0e084eff35d075d2255b139d0db114d282cb6c9c0c2ea51a8ecb7f5f1dc8096d6578ae5f804b7583a2b7842152b5723ad802ca816d46813c40aaa756118afc8 SHA512 cdf8d43fd5263c4956be234f36c0767215ab2495705d4f2a060b32ecbfbe159e618e31693b0538a1b970f7b27ebe4953063f585930d074dcaf59f2f61486e6b6
 DIST python-gentoo-patches-3.9.13_p6.tar.xz 37508 BLAKE2B 6d55aec9ae139cbe6d35b84335174d5fba5784bf52eb665e2d3a27693a2abb843bce1f190c92bfd173359c3782cae06a6b3520932b08aec678332928c5a27277 SHA512 1b1dec45d959849bf72b0646329e8cf74301e0f5373d6e2dbefb63d60fdddbe9fc33abda7d2312af8c52feadf3bacd04b627626d876acecc8984d3192a2d029d
 DIST python-gentoo-patches-3.9.14.tar.xz 20208 BLAKE2B 964f1eca6423247bbe862de36ea6d3a337acd70405d5f046493907da3519bad99f6ab9065b2d8af1ce31bbad4183cf95c285f1040d55ce1b5dfca986fc2c849a SHA512 271ccfdc065fe6ef26621d79eb9e758264c53aad2b74d1d50bdb0bf64462389019503a3383c8d5b044231e9c3e2019d7f1240b27ca7fb9502a0beb728161b9bb
-EBUILD python-2.7.18_p15-r1.ebuild 8309 BLAKE2B b41802cf88e35498fdacc296c7842d6531a134bd28621f9412192e7cf8c15abac2e1e5912995fa954c892bbb49a9adf9af24dc090376cb4e1cc096c55254bdf7 SHA512 1e6e09e145a8afe266f536aa5ab29b5150886ff2c147b62db802c6136aa204e0acce86fd48f11db7f1aab3ade50cf01c52f4bd6898b1d84219b32aaef5804abf
+EBUILD python-2.7.18_p15-r1.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.6_p2.ebuild 11181 BLAKE2B f8180bd07e43dffedafd7d912bcb9a002e93c1514c72055b24c65f36b7ef477e748bb777fa02da4c6d2c6391a1eaa9f59266b09fafb2e7ca8a67a96efd6f423c SHA512 4613ab1e7336e38a91877d4b1c5558e5221a770d8171d92fff319c6a4f64127bd9cb6dd8c56d84e70558de8ac647a315d740336834cdfa1ad3b86b184408c54b
 EBUILD python-3.10.6_p3.ebuild 11161 BLAKE2B b1d379be929e3a5ef8eb45beff1581e99085fdfc3af2aad29c9202284b73c225b82ba8ae81fe1db6191bc97f45d59ad9de2bcf664407269e890bb658da4072e5 SHA512 724f964f56c8c8e7859719eaf3b009f84371b5c70c509147f2a010959e93455daf469399c4159a3cba61de80ab08c327e908d8ffdbbbdb2e9893e88172969a41
@@ -40,5 +40,5 @@ EBUILD python-3.8.13_p8.ebuild 9705 BLAKE2B ce8180be109068fe25e8b2931a69f4247ee1
 EBUILD python-3.8.14.ebuild 9708 BLAKE2B 5b5a745272d4f416e8e8b044a3b8b75674b5cba19f8a1dcc0c3b4f3c3bb5ccbb0b37f48d0b49d9001cf9fe35918199f4d8e40fe8c9269d32fd078e54dab9ec8c SHA512 c2bf2a454e3fb368bac78483f4898798ba6b6d9869e0019808b2a1ac89c84ecde4a7221e810bbafc40d008e08fd3185234ea24bdec5f62fd091813b39e73580e
 EBUILD python-3.9.13_p4.ebuild 10984 BLAKE2B 8743da1a832eb69289727f94f19a9ca7c9e42156847d25168adb1bee66cbc980d28f2969260baf5ddca124c01498f085bb9fd50c5e80083609a5d987337429b4 SHA512 d8cf0aae2e36445efb4a0d0df4a028ab7d990f017196a18127973b7d88dc4979585901102106c32d8281f640334b079a8efedea8f45fca75a13c2453cff4b64c
 EBUILD python-3.9.13_p6.ebuild 10960 BLAKE2B dcd386bfd116294e4723017de6afe87f8b99749553a57d20671e1a3454cfa481af0e2e15353dc2f0aa85fa050ae64b542e8c4707090fc0736496eb17407c7cde SHA512 13263d81cbd8e40e0428034753a6c290e48c44a149b438c5e23132b15b908fd49991a64515772860c89a9fd0dc867e4a309341ad52289242505ef7d92044d759
-EBUILD python-3.9.14.ebuild 10965 BLAKE2B 971e8c4cffb53ce7b45971b171bb9552b7187f81e88322e774931b9d0e3619fbc6508cb9f847656bfdb227702aca298bf1b42715696692dd4ea5b37dd7a91d2d SHA512 7ea76b2370612035ea5f95059f7314aca8b7c3c8c128b86d0e42f55ab3dd350e132e020ae629d05e493fba16384cdf0e5a68028f0c2d9aaa1f1c04941afb06ce
+EBUILD python-3.9.14.ebuild 10959 BLAKE2B 35040f6e41a454b1595fc5f4914a2a07d0b11f319986e53f1eddf74b930c30a39a2f4e64b0d8bd1fd853902a4835702997a748d42f5263e1731eb08fedea43cf SHA512 b0093d91a125d4968e0a8033567691834a9cabc4ab698ae0d9c0a42a7f4101318b3dd9afb538cc553b764b7a39a71b5ec8683d1dbd64d6d5c2a4e0e36ea2d24a
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-2.7.18_p15-r1.ebuild b/dev-lang/python/python-2.7.18_p15-r1.ebuild
index 6ca25eb84b3b..051f660f8f9b 100644
--- a/dev-lang/python/python-2.7.18_p15-r1.ebuild
+++ b/dev-lang/python/python-2.7.18_p15-r1.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	berkdb bluetooth build examples gdbm hardened +ncurses +readline
 	+sqlite +ssl tk wininst +xml
diff --git a/dev-lang/python/python-3.9.14.ebuild b/dev-lang/python/python-3.9.14.ebuild
index 57aa423c9b08..34c4173385b1 100644
--- a/dev-lang/python/python-3.9.14.ebuild
+++ b/dev-lang/python/python-3.9.14.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk +xml