6 files changed, 59 insertions, 9 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c1ce568ca213..46fa20d5ef8b 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index d766721881e7..fcab72237789 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -1,5 +1,6 @@
 DIST elt-patches-20221210.tar.xz 42080 BLAKE2B abcdae6dedac89bd913d6809d335c13cd59b675c4b68198925bf758013e988a9bf82e9f6ccc3a70ac1c49775bb7579addda6c0bb7ea4ceea3c4b8e4acf0d65ea SHA512 3dad3c0be8d69de731bb10d5a6007539c2966f8a370a3dee27faf9655a38e39f272a9059cd98c8b6f32c2495143667f8b28a6a3425f22c0c5421f3969b417cf7
 DIST elt-patches-20231228.tar.xz 42512 BLAKE2B 00d9e9ee06da0c6d218c3af79aeb171e78aee75a2e2d586746ecc10c1e0083b317e3c5f27c923f982557e075e39210775203d25c162e34b1698542a6c1d8c1c1 SHA512 e0278fe7776dfcb6e7e869da95dbb9a65b78efc08298a7c03c16953c0f1fcff34e0ef6533dbb7fd3c60297ed85c20eb0ca89a01d74d2f1e9c6f723341c867108
 EBUILD elt-patches-20221210.ebuild 845 BLAKE2B 1ae3fde1aa2475890679f2a0d47aedeb89cf37b824629fadece58545fa4a2cf8c124a0f0217c55af81a976161131df4cb625113de80feb2640130c6ee6d75ff6 SHA512 e36402d95eea9498126512f6b6e6ea40b67f996efd407173a683e24151382195389ba28d74b2b65dc5b9447dd84bdd13029eddc22d857b3bbb4f8dd83dcad972
-EBUILD elt-patches-20231228.ebuild 853 BLAKE2B 9cf700b39c8d8942caf15f8590e9472091e0343256070a60c2574ed075a08a7573c0423154647f8f3f55187a19d1bc9f97860080d7c1105704701c6772da03e5 SHA512 4a889ae0242df3b312dc442afb551aef31cbd71b59d97381df5697229b41565e1281e89c8d9fe59f5ce3f02af1fd70dac5479745d14b011db41ad8636b1d89aa
+EBUILD elt-patches-20231228.ebuild 1034 BLAKE2B d07a3a0b178b1b2b37fa55bc348f21aa602ec64fc056e6ad5578a6f02fecb145ae41a2d95a4612c95bb0b19ddbe9617aa484d246f4af76de0e0ecaadaba911d6 SHA512 0a0acd2163b7e0c0898dcd6fe9684a27e78bfbcd67a016651e5b069f5072182374c66c638636b45ac472c68c27fea9e16bfa34cf6b7f34ce8573f74ad72771cc
+EBUILD elt-patches-99999999.ebuild 1034 BLAKE2B d07a3a0b178b1b2b37fa55bc348f21aa602ec64fc056e6ad5578a6f02fecb145ae41a2d95a4612c95bb0b19ddbe9617aa484d246f4af76de0e0ecaadaba911d6 SHA512 0a0acd2163b7e0c0898dcd6fe9684a27e78bfbcd67a016651e5b069f5072182374c66c638636b45ac472c68c27fea9e16bfa34cf6b7f34ce8573f74ad72771cc
 MISC metadata.xml 363 BLAKE2B 731813601fd3cc8df41566cb2b4c41314250296cfd08921c4167f633aa5107651f41ecce090f8b179b549a0b86b0cad5d0e7b14be00b2f9bf38591f249aa3c79 SHA512 77290264148f7fd68a99059beb41a937f4983879a205054cef4845f693138ba611d95ebc4ab67cbf678481b7c9a14ca19e170cc04d696bf82b83f93dd3429518
diff --git a/app-portage/elt-patches/elt-patches-20231228.ebuild b/app-portage/elt-patches/elt-patches-20231228.ebuild
index b1667bd39ced..76e331af750c 100644
--- a/app-portage/elt-patches/elt-patches-20231228.ebuild
+++ b/app-portage/elt-patches/elt-patches-20231228.ebuild
@@ -1,17 +1,29 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Collection of patches for libtool.eclass"
 HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/elt-patches.git
+		https://github.com/gentoo/elt-patches
+	"
+	inherit git-r3
+else
+	SRC_URI="
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="sys-apps/gentoo-functions"
 BDEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-99999999.ebuild b/app-portage/elt-patches/elt-patches-99999999.ebuild
new file mode 100644
index 000000000000..76e331af750c
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-99999999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/elt-patches.git
+		https://github.com/gentoo/elt-patches
+	"
+	inherit git-r3
+else
+	SRC_URI="
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="sys-apps/gentoo-functions"
+BDEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
+}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index b9be325cde43..9b87286659e0 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -4,5 +4,5 @@ DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4
 DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B 0f9befac53faa2b578b461a55c7113934a60478fc5d8d5ab0e06cb836ff5a2de75bb290ed797a2b085ec9f33c8494e3c3d5d0d6b643c525fff4dd0a82657118f SHA512 cf51480213fd4bac45d44f5eb5e4be4cb5c5b97ad63ecd832eb54fc7043ab8e974491005431f0897d6c41d251ae0f9fc95cfdfc4d613fc56340630a094bfc61d
 EBUILD gentoolkit-0.6.1-r3.ebuild 2061 BLAKE2B f3cbbe94e63f285e9eb5826f98fe311649ea2b82ff034ba738ebeb851d9a6f757688f5fce84d7142074fd1a1cdfaf811ebd52f0321ed127a006f7bb5fd608d38 SHA512 75037990e0dbd389e1ff755831fb8773529696596b380cda30a0936b8efd03a39f544e042e57b10a1e080eb0f18ee317eb78fff960f3e7c2195b664846a44e23
 EBUILD gentoolkit-0.6.3-r1.ebuild 2916 BLAKE2B d86a5333db072a5e1094269ceb1eabc3d49b6ef8732118e1b000bbaf2d12f8b55a5100bb8972a35a69b0c252c977c6736390ffc53335909dcf9972ee025a0c6f SHA512 266981afccd2592558b3fe7bce644f68b396f1979fe59d466e50cf1d984da1fe8dcec8afce97174ac2789cfe6c63ab2962679ca7a2a6a48f64d84c76528fd377
-EBUILD gentoolkit-9999.ebuild 2924 BLAKE2B 0121361077b1c450693ff8254f66ce29970db2bb887fb1f7275d0c749f6f60c58f0a09ee56b1a840df1980a6430c33cf029688ae7520465e186d1b8a771108f3 SHA512 4adee822c456b6941d4eb1a6fd5cb8f95a000cd04359ec9e662679c58d4873a50b70a08e4d5ba410c936d281d404b88386c37c8aba37e3c1c5edd2a488528709
+EBUILD gentoolkit-9999.ebuild 2924 BLAKE2B 746e34c5e4c0b3f70209e83990c2fb1706f002948c7fa1d881e52e16645e3a5699266a72d579a5eb4643d032021051c2c8617600cf52d8cb451c4433d0f8a3c5 SHA512 580bac9c9143de02588ae6f464d35f4abc8e9dab14bc84a7d51dd7edb993658b2f0ad1ffd415e74c563c567c2b367f1e04ba4aded046208cea4bad309f3df5e0
 MISC metadata.xml 737 BLAKE2B 4145e08f0b544b2bd32a5322944bad4d019d5a693e23ace8d7b0592230c6660bf7ef4d1df4f8852745af7939c8e88e58aa04233d3a69a6e7ad624349b8e335f0 SHA512 28ec82f6a523f69d2c908b4e2cf9823ff8825e39a01187b74d37f90ee78cec751002cdf0786b177df048a5cb1c728bb29fc9f2f743b18200bf307eccdf052ce8
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 82c6182f649e..42a5a95fdd99 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -95,8 +95,8 @@ my_src_install() {
 	)
 
 	meson_src_install
-	python_optimize "${pydirs[@]}"
 	python_fix_shebang "${pydirs[@]}"
+	python_optimize "${pydirs[@]}"
 }
 
 pkg_postinst() {