From 6b94e856ed163d6f198fb76fa238645c849e6ef6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Feb 2024 07:16:08 +0000 Subject: [PATCH] sys-apps/attr: Sync with Gentoo It's from Gentoo commit c2aab29d5dad2191f966d19e094d20d9b1b69aab. --- .../attr/{attr-2.5.2.ebuild => attr-2.5.2-r1.ebuild} | 7 +------ .../portage-stable/sys-apps/attr/attr-9999.ebuild | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/attr/{attr-2.5.2.ebuild => attr-2.5.2-r1.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2-r1.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2-r1.ebuild index 0c5a2dce34..8aac35056b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild index 0c5a2dce34..8aac35056b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/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