diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild index ae1ca18df3..86e18ce552 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r2.ebuild index 0fb8f4fb1b..86e18ce552 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r2.ebuild @@ -61,7 +61,7 @@ esac LICENSE="GPL-3+" SLOT="0/8" # subslot matches SONAME major [[ ${PV} == *_rc* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs +unicode utils" RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild index 23981336f2..a7f0d5654c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild index 7b772ace37..a7f0d5654c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/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