[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/

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

commit:     f9efb6a33633d85afc85372f0a2f92516b20294f
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb  6 05:50:41 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 22:44:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9efb6a3

sys-libs/zlib: 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-libs/zlib/{zlib-1.3-r3.ebuild => zlib-1.3-r4.ebuild}  | 3 +--
 sys-libs/zlib/{zlib-1.3.1.ebuild => zlib-1.3.1-r1.ebuild} | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r4.ebuild
similarity index 97%
rename from sys-libs/zlib/zlib-1.3-r3.ebuild
rename to sys-libs/zlib/zlib-1.3-r4.ebuild
index 1c7cc6d899c1..5ec332438f41 100644
--- a/sys-libs/zlib/zlib-1.3-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports.
 AUTOTOOLS_AUTO_DEPEND="no"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="https://zlib.net/"
@@ -145,7 +145,6 @@ multilib_src_install() {
 
 		*)
 			emake install DESTDIR="${D}" LDCONFIG=:
-			gen_usr_ldscript -a z
 
 			;;
 	esac

diff --git a/sys-libs/zlib/zlib-1.3.1.ebuild b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
similarity index 97%
rename from sys-libs/zlib/zlib-1.3.1.ebuild
rename to sys-libs/zlib/zlib-1.3.1-r1.ebuild
index f12a76540f6e..fb44717aca45 100644
--- a/sys-libs/zlib/zlib-1.3.1.ebuild
+++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports.
 AUTOTOOLS_AUTO_DEPEND="no"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="https://zlib.net/"
@@ -142,7 +142,6 @@ multilib_src_install() {
 
 		*)
 			emake install DESTDIR="${D}" LDCONFIG=:
-			gen_usr_ldscript -a z
 
 			;;
 	esac