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 02A4D15815E for ; Tue, 6 Feb 2024 22:42:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FF9BE2A36; Tue, 6 Feb 2024 22:42:25 +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 14691E2A36 for ; Tue, 6 Feb 2024 22:42:25 +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 1D6153430C6 for ; Tue, 6 Feb 2024 22:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0B4DACA for ; Tue, 6 Feb 2024 22:42:22 +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: <1707259334.b62b9e7ca8ec68c3a741690d291546a5949359e8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild app-arch/xz-utils/xz-utils-5.4.6.ebuild app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild app-arch/xz-utils/xz-utils-9999.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b62b9e7ca8ec68c3a741690d291546a5949359e8 X-VCS-Branch: master Date: Tue, 6 Feb 2024 22:42:22 +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: f3402119-8d5e-4f43-bd3f-75dc2d632235 X-Archives-Hash: 05faa86232750d41a9642d988148434f commit: b62b9e7ca8ec68c3a741690d291546a5949359e8 Author: Eli Schwartz gmail com> AuthorDate: Tue Feb 6 05:16:18 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 6 22:42:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62b9e7c app-arch/xz-utils: 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> .../xz-utils/{xz-utils-5.4.6.ebuild => xz-utils-5.4.6-r1.ebuild} | 8 +------- app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild | 8 +------- app-arch/xz-utils/xz-utils-9999.ebuild | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.4.6.ebuild b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild similarity index 97% rename from app-arch/xz-utils/xz-utils-5.4.6.ebuild rename to app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild index 10993a19d076..15cea9ec02c1 100644 --- a/app-arch/xz-utils/xz-utils-5.4.6.ebuild +++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 -inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then # Per tukaani.org, git.tukaani.org is a mirror of github and @@ -123,12 +123,6 @@ multilib_src_compile() { fi } -multilib_src_install() { - default - - gen_usr_ldscript -a lzma -} - multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild index 1ce7c6d3d900..8283f1a12b3e 100644 --- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild +++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild @@ -6,7 +6,7 @@ EAPI=8 -inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then # Per tukaani.org, git.tukaani.org is a mirror of github and @@ -123,12 +123,6 @@ multilib_src_compile() { fi } -multilib_src_install() { - default - - gen_usr_ldscript -a lzma -} - multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index 1ce7c6d3d900..8283f1a12b3e 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 -inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then # Per tukaani.org, git.tukaani.org is a mirror of github and @@ -123,12 +123,6 @@ multilib_src_compile() { fi } -multilib_src_install() { - default - - gen_usr_ldscript -a lzma -} - multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die