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 884CB158041 for ; Thu, 14 Mar 2024 02:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F299E29CA; Thu, 14 Mar 2024 02:25:48 +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 E0415E29CA for ; Thu, 14 Mar 2024 02:25:47 +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 AE77734068A for ; Thu, 14 Mar 2024 02:25:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D417E1521 for ; Thu, 14 Mar 2024 02:25:43 +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: <1710383006.4cd3855252ecb97dd4f2615cd3d8bd3b0bbfed94.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/readline/readline-8.1_p2-r1.ebuild sys-libs/readline/readline-8.2_p10.ebuild sys-libs/readline/readline-9999.ebuild X-VCS-Directories: sys-libs/readline/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4cd3855252ecb97dd4f2615cd3d8bd3b0bbfed94 X-VCS-Branch: master Date: Thu, 14 Mar 2024 02:25:43 +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: 327864cc-ae5e-47b0-8dcd-3ea75fb6e593 X-Archives-Hash: d66f3e3d91bf5b1f1ba6be5930f1e4cc commit: 4cd3855252ecb97dd4f2615cd3d8bd3b0bbfed94 Author: Sam James gentoo org> AuthorDate: Thu Mar 14 02:23:26 2024 +0000 Commit: Sam James gentoo 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 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