gentoo auto-resync : 28:04:2024 - 23:59:44

10 files changed, 329 insertions, 101 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a17e1182384b..2a2ec8e0c48f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index eb446e92c6fc..067cbd00dd57 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,8 +1,7 @@
 AUX attr-2.5.1-r2-fix-symver.patch 6909 BLAKE2B 844f6d9e87ca3cfd9413047cd8fbebc6265545d1aed3653ec2d1d8fc18ee0eb42ebca756a62c9d8a8cc2c4c7f38720a66afcbe0d052525f58e4748ba50d267b3 SHA512 874a4e770a624ce4dd86b6b03e6dd0abef737cafccf2580f5c5e6f75a66425b2e34da6ee520991693387f55000448451fdc96883c2759c9fb4c650d667df63c8
+AUX attr-2.5.2-r1-musl-1.2.5.patch 527 BLAKE2B 90a08645c0574602e3b225e211876e400c5d0594ecbfc848e71e79a1672e362ac5842cc6dad7bd77cddae4eb903bc1b30e5b20ec688a9a8a50a20fff3323ba5a SHA512 34d59776851fe8cdb2ef179b74483045fab981141bf75622cb4077e24cdf6c84406f7870de935bba07d2e7bec4008d32320fcd51e4517ab108c6c3dc39421fd6
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
-DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
 DIST attr-2.5.2.tar.xz 334180 BLAKE2B cf26348c3a96622e4f62493ac7655e14b6580d36a5784ef4c3750178856eceabd33192fd58516be21c8aa1ad41d56c024ad440ef4bc922bed8f7a4984ea16c63 SHA512 f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3
-EBUILD attr-2.5.1-r2.ebuild 2365 BLAKE2B 25f73132b6c1e92a6786474718cf399e5e1958be5b63d455e85d6e466febcab161c4787fda2e35958b55c90999a11d1378805197f5bc21895681ceaf489cebae SHA512 1f81875d8338e9df204cfc75b5c12d3e40fc3c782c2105bf8d02bc2e3b99455303bb99cff2da44bdfd1a20c3146bd1e2c13866f27c70da9b6ed620cc95d9234b
-EBUILD attr-2.5.2-r1.ebuild 1418 BLAKE2B c882861079efdb9b137d7285c9d37d400833254ba291c77f017a1e41231783fc6639602552be5c177e8f233bc4c09362d0af7d15c21c69b238763bf85d6e954e SHA512 c2d0c87ee9241eb871a43f0bc4e228b3c9ce1b6e64b5e95deebb79f7852e1c3d837a2b676602c6469c3a639b60a816439909fb61d8e69394e098b8b35eccfc20
-EBUILD attr-9999.ebuild 1426 BLAKE2B bc876babca1c006bac117c2c0c1fbdc2ce178963e302c6dd50541fe79e6360efb0aed20398ac01f1773f652180f967d4ae1b87ec1312d361555e52d380ac8051 SHA512 61effca67ce3d0496d29d1a989eca3fba11d277649613462adf2aa098ea241eb9802befc59181555ae2ae3e27ff990b408c61b9cfca28a4c812f36ae9981f24a
+EBUILD attr-2.5.2-r1.ebuild 1478 BLAKE2B 0346889aeb58771d116288f349a48cadfc68788a071ca45d91fcba09ab496820a0c41e0ace69430b85921478117e39e5bc3e51f8166419ca6c6bb2f05d921cb5 SHA512 c1aaee4b11cac71fe2f38e1270e4cde61ad7d822547e3259e82b0e425ea7d848b61d8a92ab33483bc9ba2e330e752f005e715327310a97fe3fd5d9ea7602963e
+EBUILD attr-9999.ebuild 1486 BLAKE2B d17b125c05cc38ccb197ffc516c8f6e0f6fef7addfda8303693e83b7c1804e662c218484ff15a94789ddcdff6d6b95115a8c3aee5a3293781033ff06fdc44bb8 SHA512 05f1f2acebeccfb840b5050ca0c33e9e96aa033a2c7eac3b539145836772e46e746a02ec44199d8b366a3675a8ba77ff4dda5e63557ebdb57025c94a5974b375
 MISC metadata.xml 389 BLAKE2B e857460e11e0ea047e3cc0a9ee3f02e9271dc01d12d82fc9412348dc2fd1173fc5ed2c12a9c4de5cb7098eb2de2a78f6865ef88148179f67121a92c04eb509e9 SHA512 ae5a0d549f4226808931af6479c023d6d02a7f40c8eed053e534061458bd3e7a1921bbb24bf4a8f5f02816f66ca6e17b9774c00b3063ffaf2adba7e2a921dd00
diff --git a/sys-apps/attr/attr-2.5.1-r2.ebuild b/sys-apps/attr/attr-2.5.1-r2.ebuild
deleted file mode 100644
index 93dc3a36329f..000000000000
--- a/sys-apps/attr/attr-2.5.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-	inherit autotools git-r3
-else
-	inherit libtool
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		# bug #580792
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. bug #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# We install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	# TODO: figure out when this was added & when we can drop it!
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-2.5.2-r1.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild
index 850befff79d5..2ba543d8d0e8 100644
--- a/sys-apps/attr/attr-2.5.2-r1.ebuild
+++ b/sys-apps/attr/attr-2.5.2-r1.ebuild
@@ -24,6 +24,10 @@ IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 8aac35056b3e..f240734877d9 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -24,6 +24,10 @@ IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch b/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch
new file mode 100644
index 000000000000..6a1200ad2f17
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch
@@ -0,0 +1,23 @@
+
+If we're not building with glibc, then add its basename definition manually
+
+diff --git a/tools/attr.c b/tools/attr.c
+index f12e4af..d321b37 100644
+--- a/tools/attr.c
++++ b/tools/attr.c
+@@ -33,6 +33,15 @@
+ 
+ #include "misc.h"
+ 
++#if !defined(__GLIBC__)
++char *
++basename (const char *filename)
++{
++  char *p = strrchr (filename, '/');
++  return p ? p + 1 : (char *) filename;
++}
++#endif
++
+ #define	SETOP		1		/* do a SET operation */
+ #define	GETOP		2		/* do a GET operation */
+ #define	REMOVEOP	3		/* do a REMOVE operation */
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 5f153251ff8d..faddea2bd70d 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -2,9 +2,12 @@ DIST ed-1.19.tar.lz 66448 BLAKE2B 139305a1d64e96f7eadcb462325918e5eee18de229ec8e
 DIST ed-1.19.tar.lz.sig 72 BLAKE2B ada611148a6347d8953c65669b61f69eb0ed8d48f6dc4ffaab8975dd7e28f1d87e434493a77e817ca05874f741e243309529e60e95f2a7636148fa71c711f5e3 SHA512 03ff7cf2f337fdc94efaa1374ce95d37c29c556b2a9a13f7216e05e8e9e9efc95bcbb554bd05000b5283d5f20884f3f50b16f220fba8e6ff318b1b975c6a44c9
 DIST ed-1.20.1.tar.lz 69062 BLAKE2B bcdfd8390d69bc5980823b81863bfa3e871d525140c77790ac1b39fd0cab201c8e9ab63c708eb619e305e6a1dfb8db0cb1e3cad66a90acff528c7bd3214157ea SHA512 a528e5f8e53a6102a25d5607dccf14310aca3b19fad3341cc72b7e5cd560ebd1ff9361d422525e456da5752b8ff2ee92bd7d5d8e6d545e4ff8e1c31d20ab83df
 DIST ed-1.20.1.tar.lz.sig 72 BLAKE2B 5fe7a32df4d889983b03bbbb21cb7c0aff705e8357cf961cec202703ae1cc23e01057c8b236582a3f17ad03e219248b6fe1d25ae5197640ccc2e14b9f11c682a SHA512 9d63dc1f32a41d0c5d1878cee3756e418fcf33d2d3e769ded3a358190e3f42c86040b3c4ff158afb1e6b7a4ae21867705b76cc15f92ce7a9b2f160fa9daea3f1
+DIST ed-1.20.2.tar.lz 69182 BLAKE2B 5a9d36dba98488e3cacb3e4c0b9d70003345ca94dbf9a3ebd3181b93567b9ef94df0e72614e99e2c6dde4929933d9333c6dba90fafcea6962e2c1abccb0525af SHA512 5efad386399035329892d8349500544f76e1b18406e164aae35af872c15a0935d412dd4a6996bd15b960d0e899857cc7d8657805f441b1b9f2ae3d73c73dcf4f
+DIST ed-1.20.2.tar.lz.sig 72 BLAKE2B f62d5fc9d909cd1f665ed2b4793407d1d91981bad6b4da0383b84936d03d2ee78c37dca1f0c09fbb84cbbfd8211980ea489b897ff14834773185fce0339c7fe3 SHA512 dc895c0634d73c5ddaaffc78c8dd86df88c477607a7d5f1828229009e2a72091cbb24286dbad295019a30651cc6e98d07a1181b0ae38b94d66cb28532876098e
 DIST ed-1.20.tar.lz 69366 BLAKE2B d212c6d5302627145332ec25b989ca2d4a064ce5c0ea45ad1ad6b780ffd72037ff2144b933c52667c52192d6f5acd5766b5c31d4a2b5cf5993813c43e1523af3 SHA512 90c0f24b1d0b7abd18d34345bc37de0e67a0bb96375a4531a742a89b53d4858c30781911c22d81aa0387d0cf4d2153e0b4286fd3483b05e4c35d5e02c0991c53
 DIST ed-1.20.tar.lz.sig 72 BLAKE2B 25673b17d6b97f21255d3c706928ea7eed6a06b2d39787f0a6791e809218cb6a610091ed9ed1147c8027855279ac65b948d4faaef4774ffd567f6ea172c0744f SHA512 d1360a08cc430301ba2baf8be112b08f48545815d3090ae7da8e448f3e13806eba286d9ec13cd00f3e289e6e82b861fa7dabd63b48c75bee1e0ab59b72dc239d
 EBUILD ed-1.19-r1.ebuild 1267 BLAKE2B 923aedcccc0c877b2fa96e85c9e89a287e4357bc5f21e77da2eddaf8fb264452ccb5c6dab0ecbe6f23ec9cf8de59e666fda385283d9c8562f082d21905c5da97 SHA512 e75323602bb76428ff371bf0edeffefd452a7f6ba8b167d5c3016a2ac0589af35b020ca91a49d0a17fab430835cacd89673811f1b7c534f655464124254dc0a1
 EBUILD ed-1.20.1.ebuild 1267 BLAKE2B 59f7f55fda19c846c6f15bca2eb27af02f5a6007c1f68b83f672b33389c0ffc7eb15d1d2935b84512ac8ac32dab478d840144e589c14263658294e879c74260f SHA512 4390d9b207153a05b25cd9e4e90ee292219a041873aabdcc79ab5f7bee0e063dc1cfa8c0039c2aaeee9fa97a60eea8f6d17144226ffb8b1e0a92f84827859a0f
+EBUILD ed-1.20.2.ebuild 1270 BLAKE2B b8bf188716b83873f99a605df2e90377a62f8fb4c4a19a8f8bce73359746a980283a8b5472893d3802815d68f22356f7edc9a04478ef84400ff45fc6e0b3ca23 SHA512 c6263b42bae0415c632f397169e5e5785036be9030826604c7752baec7f82d027cb3602921d3931275084ee85e9206018f9775658a9004fb2b6f4585cf02323a
 EBUILD ed-1.20.ebuild 1275 BLAKE2B 0bcd0700fa45c8c14c3c22bab6bb0108417f371a6f2e451336c4e3840f01fa78985edcc6c26a63afb615b9081dc280b8f39ea225f6dd0144c92358169639766b SHA512 6b57efb0c09c663df8caf08b8e90986be50a99930753e7d2cc6dfcb683543251ca81a2f01b2b60904b83bc6faba41d3ec4d5373bca35f108a63f8038c99cd169
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.20.2.ebuild b/sys-apps/ed/ed-1.20.2.ebuild
new file mode 100644
index 000000000000..16334930ef75
--- /dev/null
+++ b/sys-apps/ed/ed-1.20.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit edo toolchain-funcs unpacker verify-sig
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="https://www.gnu.org/software/ed/"
+SRC_URI="
+	mirror://gnu/ed/${MY_P}.tar.lz
+	https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz
+	verify-sig? (
+		mirror://gnu/ed/${MY_P}.tar.lz.sig
+		https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz.sig
+	)
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+BDEPEND="
+	sys-apps/texinfo
+	$(unpacker_src_uri_depends)
+	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
+"
+
+src_unpack() {
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.lz{,.sig}
+	unpacker "${DISTDIR}"/${MY_P}.tar.lz
+}
+
+src_configure() {
+	edo ./configure \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		--bindir="${EPREFIX}/bin" \
+		--prefix="${EPREFIX}/usr"
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5786c6337a3d..7260b2a19fc7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,8 +4,10 @@ AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205
 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd SHA512 8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638
 DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b SHA512 1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f SHA512 323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699
+DIST portage-3.0.64.tar.bz2 1187654 BLAKE2B 622cdda85315ab60ca3b1ae7cf1cb1fe479b69c945dafe14655030387d857ae89c0d8326b85fb3d3754ea95ecf2792ae60ba36f1ad9b18d1ac693fdabf9b235e SHA512 26a9fc9532aebd5965c6d62d78914d827ac48df100b5fc518934857881ca19b927e05b2cd9a2bb674b0e1bd5feff2058a083de9c8fb86af16efe8752325c7722
 EBUILD portage-3.0.59-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e598940717296163e500434a8c2bdf08b280915aecf8dc9d5f3b6d9eb5dc09c8718f689b459ec6a1f5df03187935d17d447f8b2e0f25 SHA512 59cfb6566b72a82cf81503b40b3ad73bb1616c39a6957d14681c55b53a60b662eb5330b7021d6c860212c4e583c4ed67e64ff5a55738f2f8f1a22d5cf4442e03
 EBUILD portage-3.0.61-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e598940717296163e500434a8c2bdf08b280915aecf8dc9d5f3b6d9eb5dc09c8718f689b459ec6a1f5df03187935d17d447f8b2e0f25 SHA512 59cfb6566b72a82cf81503b40b3ad73bb1616c39a6957d14681c55b53a60b662eb5330b7021d6c860212c4e583c4ed67e64ff5a55738f2f8f1a22d5cf4442e03
 EBUILD portage-3.0.63.ebuild 6927 BLAKE2B e6ea3a331b29c53e5dbc2240db2923a75f27ac77533c3dcf12eec266d2418deb5939887c112460fdb5e8c67681e6a134109065fdf32b2ec66573edf5bac74515 SHA512 5443ee6ba6d1c1b340f87908811becdc1821ec1410aa2e9eb860268400f66fa26d7d7cc8216c93afcb04a4d7b41360506a8e3c54412b95154576a988933cb89e
+EBUILD portage-3.0.64.ebuild 6790 BLAKE2B c0c4b0323ecf461cdd38831f8644944803b3c3cc653e11b7ed88ac4495f99ccf6fffc170d1bf41daffa60e5d8d262766a3e9641eac3f106f2dd866b6354722fd SHA512 73def9620f9e55157d298d89064cf7c7011ed0320fe1a2fb597b5ad74cf2ff2696a60ef1a89780883aecd98964bc559ed4d91d2d73f37082795885dc8181f169
 EBUILD portage-9999.ebuild 6790 BLAKE2B c0c4b0323ecf461cdd38831f8644944803b3c3cc653e11b7ed88ac4495f99ccf6fffc170d1bf41daffa60e5d8d262766a3e9641eac3f106f2dd866b6354722fd SHA512 73def9620f9e55157d298d89064cf7c7011ed0320fe1a2fb597b5ad74cf2ff2696a60ef1a89780883aecd98964bc559ed4d91d2d73f37082795885dc8181f169
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.64.ebuild b/sys-apps/portage/portage-3.0.64.ebuild
new file mode 100644
index 000000000000..ea323e5a917c
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.64.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.27
+	>=dev-build/meson-1.2.1-r1
+	|| (
+		>=dev-build/meson-1.3.0-r1
+		<dev-build/meson-1.3.0
+	)
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+	doc? (
+		~app-text/docbook-xml-dtd-4.4
+		app-text/xmlto
+	)
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-user/portage
+	>=app-arch/tar-1.27
+	app-arch/zstd
+	>=app-misc/pax-utils-0.1.17
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=sys-apps/findutils-4.9
+	!build? (
+		>=app-admin/eselect-1.2
+		app-portage/getuto
+		>=app-shells/bash-5.0:0
+		>=sec-keys/openpgp-keys-gentoo-release-20230329
+		>=sys-apps/sed-4.0.5
+		rsync-verify? (
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	if use prefix-guest; then
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		-Deprefix="${EPREFIX}"
+		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(meson_use doc)
+		$(meson_use apidoc)
+		$(meson_use gentoo-dev)
+		$(meson_use ipc)
+		$(meson_use xattr)
+	)
+
+	if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
+		emesonargs+=( -Dnative-extensions=true )
+	else
+		emesonargs+=( -Dnative-extensions=false )
+	fi
+
+	if use build; then
+		emesonargs+=( -Drsync-verify=false )
+	else
+		emesonargs+=( $(meson_use rsync-verify) )
+	fi
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local EPYTEST_XDIST=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+		"${ED}/usr/lib/portage/${EPYTHON}"
+	)
+
+	meson_src_install
+	python_fix_shebang "${pydirs[@]}"
+	python_optimize "${pydirs[@]}"
+}
+
+pkg_preinst() {
+	if ! use build && [[ -z ${ROOT} ]]; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+		env -u BINPKG_FORMAT \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}