gentoo auto-resync : 07:02:2024 - 03:59:02

11 files changed, 28 insertions, 44 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e79c7b4ac35c..59c8e4462d4b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index b11a9c7f9b92..637074e8de6c 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -2,5 +2,5 @@ AUX acl-2.3.1-musl-1.2.4-lfs64-fix.patch 1028 BLAKE2B 3ce13de7ee1f58b7fd1c39ca9b
 DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b
 EBUILD acl-2.3.1-r2.ebuild 1951 BLAKE2B af49c5dff0ec7e53fdc1f8671eab74fe88184b3a22e62beef1e4a9db1ffe8268ccffca52f9e2f4981862d21da0553c4dece14422bd4201d2df8f37a4c0ab416a SHA512 fff12fef1da544137734a8c524b0f812cb7c353b94ce5e82f35bb266c65300923d5c7dd17f95c30606f673cd23500891246c5b2595ac7589e3fe76564315b456
-EBUILD acl-2.3.2.ebuild 1379 BLAKE2B 20a7fbc8b342726d0ff42fdebc93d18833470f65e998e9698a02b4c2a1ff6ffac27147f27422afbb914ff9fe4c2a5fd03d7d63121070f1ebb08d5740c5f469c8 SHA512 a86bf381a230f885b30a5832a00ac9ebe6803c8b4ddd09c1951e632d31c205f1c1c8b584c7963903f8931bc0538812924f2c5811ba3f525628a26e25306d6321
+EBUILD acl-2.3.2-r1.ebuild 1278 BLAKE2B cbacdd9ea411196be2fe89d4fb24291a6e50905eecc55e2c75dd0f75278bee705082ea29569cdefccbfff7b3e7402a58ed089d20217d782c17bfba5d9bf15146 SHA512 2edc2c2832c978ca160b845939f1121fed68f5d9fbeec687900219e2a491762f81aea4c2074f23c53f762bd2fb4bfdbad06f6842b9cbd584f2d23e930fef8887
 MISC metadata.xml 345 BLAKE2B b168c40ceb66cfacdb1fbe9b5031705f5c3249afeb872163663564dac2ea85e6fa857804831a80b4c44323223b417a24a156d27f8231396d5b090e44a0dc9288 SHA512 e0cbeec10fb47ace3d0fd3c1ba8a5a0bba02345a3e0df30aa82777507fb6ab75f2705b06e7635a00406d2b0839bc41d0a9fafcd8926844e1d9877b8cf2ed6f78
diff --git a/sys-apps/acl/acl-2.3.2.ebuild b/sys-apps/acl/acl-2.3.2-r1.ebuild
index 1143bebd9578..83ade1a687c9 100644
--- a/sys-apps/acl/acl-2.3.2.ebuild
+++ b/sys-apps/acl/acl-2.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal
 
 DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
@@ -48,13 +48,6 @@ multilib_src_test() {
 	multilib_is_native_abi && default
 }
 
-multilib_src_install() {
-	default
-
-	# Move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
 multilib_src_install_all() {
 	if ! use static-libs ; then
 		find "${ED}" -type f -name "*.la" -delete || die
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 97148bc78968..78af3ac68bd9 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -3,6 +3,6 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f
 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.ebuild 1569 BLAKE2B 030fb32e6d92e176d411ca3ffcae4f8ef7f2899efa15f26a8467495145be833fd8c75b493b385293e4d2493ea2b9c1861b17a47bf60463d243a1dc7da0370d35 SHA512 9c9e430773fc3a24abfed98bd9eb8ecdfce577a3334bb1ba41e48defc3ff2297842e2cab278d2328a43bca5480a9e852a736fdfdaa08d6344e0fc32b9301e474
-EBUILD attr-9999.ebuild 1569 BLAKE2B 030fb32e6d92e176d411ca3ffcae4f8ef7f2899efa15f26a8467495145be833fd8c75b493b385293e4d2493ea2b9c1861b17a47bf60463d243a1dc7da0370d35 SHA512 9c9e430773fc3a24abfed98bd9eb8ecdfce577a3334bb1ba41e48defc3ff2297842e2cab278d2328a43bca5480a9e852a736fdfdaa08d6344e0fc32b9301e474
+EBUILD attr-2.5.2-r1.ebuild 1426 BLAKE2B bc876babca1c006bac117c2c0c1fbdc2ce178963e302c6dd50541fe79e6360efb0aed20398ac01f1773f652180f967d4ae1b87ec1312d361555e52d380ac8051 SHA512 61effca67ce3d0496d29d1a989eca3fba11d277649613462adf2aa098ea241eb9802befc59181555ae2ae3e27ff990b408c61b9cfca28a4c812f36ae9981f24a
+EBUILD attr-9999.ebuild 1426 BLAKE2B bc876babca1c006bac117c2c0c1fbdc2ce178963e302c6dd50541fe79e6360efb0aed20398ac01f1773f652180f967d4ae1b87ec1312d361555e52d380ac8051 SHA512 61effca67ce3d0496d29d1a989eca3fba11d277649613462adf2aa098ea241eb9802befc59181555ae2ae3e27ff990b408c61b9cfca28a4c812f36ae9981f24a
 MISC metadata.xml 389 BLAKE2B e857460e11e0ea047e3cc0a9ee3f02e9271dc01d12d82fc9412348dc2fd1173fc5ed2c12a9c4de5cb7098eb2de2a78f6865ef88148179f67121a92c04eb509e9 SHA512 ae5a0d549f4226808931af6479c023d6d02a7f40c8eed053e534061458bd3e7a1921bbb24bf4a8f5f02816f66ca6e17b9774c00b3063ffaf2adba7e2a921dd00
diff --git a/sys-apps/attr/attr-2.5.2.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild
index 0c5a2dce3464..8aac35056b3e 100644
--- a/sys-apps/attr/attr-2.5.2.ebuild
+++ b/sys-apps/attr/attr-2.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal usr-ldscript
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -53,11 +53,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	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
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 0c5a2dce3464..8aac35056b3e 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal usr-ldscript
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -53,11 +53,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	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
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index ef3b7b3821e2..cdb2c2f691d8 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -12,5 +12,5 @@ DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ec
 EBUILD systemd-utils-254.5-r2.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
 EBUILD systemd-utils-254.7.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
 EBUILD systemd-utils-254.8.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
-EBUILD systemd-utils-254.9.ebuild 13446 BLAKE2B 61a389ac353a77e2673c5b1fd23d37099f7dc4491aef107d63668821b794517e7768af5e90c5d69aeb3fa1cd8c9b5e5ded1e1ab28d1a70cdd7d86c5ed85b465c SHA512 85754bbe69776963fe34d9cefb097d8b95c997ff642408b419288fbc6e2a675e81f34190be6e061473803bab74a99aaf2945ec896ea257451fca9d2fc040e27e
+EBUILD systemd-utils-254.9-r1.ebuild 13406 BLAKE2B 449e1933a2ab091466acbea019572d098881f55333200cbfcde87e58a7fed83fd4775f10eb2a60033f3fa1c654f6b7ffde11ab9545877a556aef7165a4a2e5f0 SHA512 ecb864a2f00ba37d696a53be92e04a7d57862ec519f9bb0b756e5493e3cc2da92265889cef95f215eb8945942214a937758e62979e3181954db1f1a8feb310cb
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
index 0f7730c67c88..e0ac974de10f 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
+inherit python-single-r1 secureboot toolchain-funcs udev
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -494,7 +494,6 @@ multilib_src_install() {
 	fi
 	if use udev; then
 		meson_install --no-rebuild --tags libudev
-		gen_usr_ldscript -a udev
 		insinto "/usr/$(get_libdir)/pkgconfig"
 		doins src/libudev/libudev.pc
 	fi
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a357ce2a8f02..a3414d76027e 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -14,6 +14,6 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d00
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
 EBUILD util-linux-2.38.1-r3.ebuild 10652 BLAKE2B ffce17852c9c268991be22e76eb9beef14331968f5b8cef20b336a0c58c71b76dd04b757181a31ff5c9f3caf01a48f09dde91d32ee5af1fff0bd2a1d6a5a5a86 SHA512 fe76840ce7d4d37416e51370c1788af1356c8f978683aee5a8d90a240e65905fab1aea7ca3811032f5f4f23d773971ff0614df20215183a12f9f6a1d2caaf7ed
 EBUILD util-linux-2.39.2-r1.ebuild 10950 BLAKE2B 2be9d6b75028e7e0a1d6e08ae1d03abba6e359b3be8bbbe27cb2863b0d435f4a48e50a2428b78cd3fe46fd3517a36c71c11ba7ea197a3a9878f866f1a75c4261 SHA512 8845c504ebcf28031a9239ba26cc2d9ec03538cd92782ca72ebc402a06673a0a424a5d01de457e82cd49f942888f953756576de7751f396aa9a3def79d95f3f9
-EBUILD util-linux-2.39.3-r1.ebuild 10954 BLAKE2B 9244cb6b8928210b1d08c3a044f51245775a9bb7f0f3719976418be1d54e19541a2a29e0d2a3ee5d1aab414a87a7eb97fa123198463cc4039b6f766fb5346042 SHA512 ddfaa770ab53ddb577204d15e1299c3347602a155d0f6eb98be14a4ab733e0d15c2af63cb845d7af9674634688be571c85fbd5f3ac646f4c52e9174d9b8f5034
-EBUILD util-linux-9999.ebuild 10482 BLAKE2B ada4654d66dac470020c274948442fd531e5221005e0c01f4864c9acfb330b465382656ef1b0152cab1afe0bf815219ca6ecb0fe2056496b1d533fe0373c0b38 SHA512 e95f952e501cb0aa9b8699a5ef13eb43732571f221b2bb6e2f522ae83cc858d2b0276af9c83d67c684d27390e599534bcdfdf5adf188a88fac4e1accf4ffe197
+EBUILD util-linux-2.39.3-r2.ebuild 10824 BLAKE2B 1c84b199627cf7c1286d57814158d7235e2c6977b377e08be3bc8999e75a91c1dbbf486b250724f5fb244019040a9797594feff28e42ea4cdd23b7d19e83dfdd SHA512 72df7f6ab7b8b3382db709d0762ecfe24670776cdaee4f88ff3965f3c4b2c12f3292ff799f24054901c7668f44e2cfef442b3a683500cfdfe77c09f4e54e535b
+EBUILD util-linux-9999.ebuild 10471 BLAKE2B 00c7b828d20666fa23bbc289766af5170ee8cacd9afa37b9ee7570d2e5f91d29b1a92276df50d74eeabbf5b528b024cb3a3d5bb91f0de8f70f61eebec561a517 SHA512 696e6acf62b7ace446ccca46ba05d94a23f4aa80fbb21cf6c06f3f3a75e3afea88c819791a5e8bcd06a2bec0624c88a13edd41497dbf6776b354ba99c87c2f5a
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
index 6d2aa61d4365..bea51fe15f33 100644
--- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
 
 MY_PV="${PV/_/-}"
@@ -356,11 +356,6 @@ multilib_src_install() {
 
 	# This needs to be called AFTER python_install call, bug #689190
 	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d7b81f31df52..f0f5f21353c8 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
 
 MY_PV="${PV/_/-}"
@@ -55,8 +55,10 @@ RDEPEND="
 	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )
+	!build? (
+		systemd? ( sys-apps/systemd )
+		udev? ( virtual/libudev:= )
+	)
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -213,8 +215,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
@@ -228,6 +228,18 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 
+	if use build ; then
+		myeconfargs+=(
+			--without-systemd
+			--without-udev
+		)
+	else
+		myeconfargs+=(
+			$(multilib_native_use_with systemd)
+			$(multilib_native_use_with udev)
+		)
+	fi
+
 	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
@@ -334,11 +346,6 @@ multilib_src_install() {
 
 	# This needs to be called AFTER python_install call, bug #689190
 	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
 }
 
 multilib_src_install_all() {