commit:     4cd3855252ecb97dd4f2615cd3d8bd3b0bbfed94
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 02:23:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 02:23:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd38552

sys-libs/readline: drop straggler usr-ldscript

I guess it was lost in rebasing bbe9df2faea3c51501ba9764cdaf88cb76cc8ab0
or vice-versa.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/readline/readline-8.1_p2-r1.ebuild | 6 ++----
 sys-libs/readline/readline-8.2_p10.ebuild   | 5 +----
 sys-libs/readline/readline-9999.ebuild      | 7 ++-----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/sys-libs/readline/readline-8.1_p2-r1.ebuild 
b/sys-libs/readline/readline-8.1_p2-r1.ebuild
index ae1ca18df34d..86e18ce55222 100644
--- a/sys-libs/readline/readline-8.1_p2-r1.ebuild
+++ b/sys-libs/readline/readline-8.1_p2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs 
usr-ldscript verify-sig
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs 
verify-sig
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
@@ -189,8 +189,6 @@ multilib_src_install() {
        default
 
        if multilib_is_native_abi ; then
-               gen_usr_ldscript -a readline history #4411
-
                if use utils && ! tc-is-cross-compiler; then
                        dobin examples/rlfe/rlfe
                fi

diff --git a/sys-libs/readline/readline-8.2_p10.ebuild 
b/sys-libs/readline/readline-8.2_p10.ebuild
index 23981336f2a3..a7f0d5654c3a 100644
--- a/sys-libs/readline/readline-8.2_p10.ebuild
+++ b/sys-libs/readline/readline-8.2_p10.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 # in general.
 QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs 
usr-ldscript verify-sig
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs 
verify-sig
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
@@ -218,9 +218,6 @@ multilib_src_install() {
        default
 
        if multilib_is_native_abi ; then
-               # bug #4411
-               gen_usr_ldscript -a readline history
-
                if use utils && ! tc-is-cross-compiler; then
                        dobin examples/rlfe/rlfe
                fi

diff --git a/sys-libs/readline/readline-9999.ebuild 
b/sys-libs/readline/readline-9999.ebuild
index 7b772ace3779..a7f0d5654c3a 100644
--- a/sys-libs/readline/readline-9999.ebuild
+++ b/sys-libs/readline/readline-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ EAPI=7
 # in general.
 QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs 
usr-ldscript verify-sig
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs 
verify-sig
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
@@ -218,9 +218,6 @@ multilib_src_install() {
        default
 
        if multilib_is_native_abi ; then
-               # bug #4411
-               gen_usr_ldscript -a readline history
-
                if use utils && ! tc-is-cross-compiler; then
                        dobin examples/rlfe/rlfe
                fi

Reply via email to