[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/

["Sam James" <sam@gentoo.org>]

commit:     c2aab29d5dad2191f966d19e094d20d9b1b69aab
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb  6 13:15:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 22:49:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2aab29d

sys-apps/attr: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/attr/{attr-2.5.2.ebuild => attr-2.5.2-r1.ebuild} | 7 +------
 sys-apps/attr/attr-9999.ebuild                            | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sys-apps/attr/attr-2.5.2.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild
similarity index 89%
rename from sys-apps/attr/attr-2.5.2.ebuild
rename to 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