From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80ABC1581D0 for ; Tue, 6 Feb 2024 22:49:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86632E2A46; Tue, 6 Feb 2024 22:49:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F0A5E2A46 for ; Tue, 6 Feb 2024 22:49:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73D923430D8 for ; Tue, 6 Feb 2024 22:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8F7C14CB for ; Tue, 6 Feb 2024 22:49:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1707259770.c2aab29d5dad2191f966d19e094d20d9b1b69aab.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/attr/attr-2.5.2-r1.ebuild sys-apps/attr/attr-2.5.2.ebuild sys-apps/attr/attr-9999.ebuild X-VCS-Directories: sys-apps/attr/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c2aab29d5dad2191f966d19e094d20d9b1b69aab X-VCS-Branch: master Date: Tue, 6 Feb 2024 22:49:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d75262cc-7d1b-4777-b755-f4ae51c88fe7 X-Archives-Hash: 050d75fa829b70b4214e59a7d3ad5145 commit: c2aab29d5dad2191f966d19e094d20d9b1b69aab Author: Eli Schwartz gmail com> AuthorDate: Tue Feb 6 13:15:10 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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