commit: 93ecd46a13729884d11fa4070ca6e4914e5336fb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 3 02:37:41 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 3 02:37:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ecd46a
sys-libs/readline: drop 8.1_p2-r2, 8.2_p13
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/readline/Manifest | 6 -
.../readline-8.0-darwin-shlib-versioning.patch | 41 ----
.../files/readline-8.1-windows-signals.patch | 23 --
sys-libs/readline/readline-8.1_p2-r2.ebuild | 235 ------------------
sys-libs/readline/readline-8.2_p13-r1.ebuild | 3 -
sys-libs/readline/readline-8.2_p13.ebuild | 262 ---------------------
sys-libs/readline/readline-8.3_rc2.ebuild | 3 -
sys-libs/readline/readline-9999.ebuild | 3 -
8 files changed, 576 deletions(-)
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 6ce6d594a684..9dfa4203c752 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,14 +1,8 @@
DIST readline-8.1-rlfe-c99.patch.xz 5756 BLAKE2B
fb2df42d2c16bef68a3716c55374da7a9d95c8f4c5645da9a60aa72624d5baa50c70da78292adcb20e5fb11f28d6320d627522bc4c8faf0f7c4c782fd75664e8
SHA512
1bad39eff82212ed2cd5ae4ff574a4cdbe20ee56ecac1bae469c90304573d10ed82fdab75bc09725e400dbb5568a34345f3241a409b7ede5645a3c02c0101018
-DIST readline-8.1.tar.gz 2993288 BLAKE2B
f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69
SHA512
27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
-DIST readline-8.1.tar.gz.sig 95 BLAKE2B
8a297ef2ebf815ac53f02d6395aa2ff9f24234aef6b9793bfcd5a610cd3a5024182ad8ec8beb75eadd5cf876c57cd56d4226075578a86e0e2421d2e9b1677aa5
SHA512
42a6052d5882f16e5b6f8cd16433d793a9cbb43cf1886b2d858dc65ce067a4c39c8dda7331e52f76426c43de02c358f9ffdaf5c8fd7b089479008c1e5aa19112
DIST readline-8.2.tar.gz 3043952 BLAKE2B
7974322b9c092a756a79e537df08e8532f8e0fcb598f77732e28287c33ebec9e9837ed88b43334c310892d56a871b423903f0f564def2fbe700a1004f2ae7b18
SHA512
0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a
DIST readline-8.2.tar.gz.sig 95 BLAKE2B
dc510459c0c47782ca87364a6677b4d8f0b68a984143122c08bd15aef08a71bff59ac92d3c3ada518dad09f189c144748e840175041eb619f679e2d8b95dc2aa
SHA512
0effd273689e5f7fe7e049c8f2c5f3c97149f198a90d053231ee4de34901560a465ab0d4fd71fd07c7d7e233caed7f42e5b668bffaf1e23a7eb373c8f9e150fe
DIST readline-8.3-rc2.tar.gz 3417192 BLAKE2B
6306fa5c3f4bf532f869f6f2055a3cbc98b320c802f87d0fcd36300bd2553d2bbd36f2f60c5d39d84e5d7479f4825d1db4f1ae73fa2b1a036474f12713a23caf
SHA512
9e246a111a73ace7b3f9f536e931bdf1cf8fe6a28a61ece6b422d1cbc8116ec6d8007ff4ff4a035cae73e2c25afc71d4054aa41260f7cfa5894a204df7ab48e0
DIST readline-8.3-rc2.tar.gz.sig 95 BLAKE2B
e4338c0928989a590313864022dff9b92f054e2aa13cc4996904766a35770015f5f01c2964f979dd5c764ad56cacffc2ece3ad3042bd6a0a950f09cb1312c4c6
SHA512
0c6d89de878583fc0acff6bf50fd7faf93135375084c86d330c11238f9a496864beea2ffb58c89df2615585f8096061f4f64b0fef67ca3068e3cdaeacd6fb2c0
-DIST readline81-001 2454 BLAKE2B
7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2
SHA512
cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
-DIST readline81-001.sig 95 BLAKE2B
7d523d0fc21772cb03aa4b5d66ea58c1a99a6c0e4a8625e89cad015cbff63cd68e08207ca5150819225300ac864806032888104bbbea64ca38ebf89e28c24b7e
SHA512
7fa3747e388aecb26f2d4f8346b89b367710ea99a14618c625066b820901dc467bd156ec37340fde1f86f0fe0d6b33044c1ed5768cf8ed1a25386d32dc6419a6
-DIST readline81-002 1242 BLAKE2B
4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d
SHA512
e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff
-DIST readline81-002.sig 95 BLAKE2B
f85d8a65a7326d6e18b32a603c8082952e4b81c53b6a1bd1668c7b0064ecce6ef04a41e2a042f100424dbf152e4db32c0e07ff166d528aa4ac4a9bd7daf4c7a9
SHA512
9ffb6cc697499f57df133f5ebaa5e43e24d33df5eb450d94a02144e94c833424218594c366f21101bc63331c1d532299c9327bd447d0a9849b0bbedce206a5b7
DIST readline82-001 1198 BLAKE2B
2e8f3d2aa14c4c4c4f9621f80f4ffae9bbd6f46c3561e87aaf684c759ffd82e3c46843cf4c4224533b28a847d83f7b8b254813f8a306d438e9f7cb457516c4e0
SHA512
ea3800a62e992b3e594d78e77b6c4b662fb8c501b81010277e478656bb3b56db7747ba40c6c3d68c3ec5ab8e9e41be104788ec52268135d7e642ff40dea421a8
DIST readline82-001.sig 94 BLAKE2B
542ac331a7da3702b47f4828b3264bc7bf996f473807d675044beeb9688c4ca3645bcba0898d3ea9447c1cde540eb8a6b1934008b0a11baef33235e43f44c6c7
SHA512
01ad9769fee42dc601b511c87bd39e15c74226e1747c4ae8914e303213706005780135add180dbfe538fe847533dc56cfe8f51a3ad9ec55d1fde2cb2e096bfb5
DIST readline82-002 1134 BLAKE2B
799f089105be9931ba13d562d4579b4d1dbdd5440b625b8fe0f1cec6438a1623bf473944cb278b937ca5ab2b98eac2f5993d6e047b96368b5fcd5649fb536d96
SHA512
2d4058c5c886498486d8514c238c0a05c0a97409011a7da40745e842977f0a29754e8b678f7e6e7a47c00df7e2e4c522d34d473118a24524af3824eed912e74a
diff --git a/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch
b/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch
deleted file mode 100644
index 881280087715..000000000000
--- a/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-darwin: don't do multi-arch stuff, just build a normal shared library
-
---- a/support/shobj-conf
-+++ b/support/shobj-conf
-@@ -180,34 +180,8 @@
- SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
- SHLIB_LIBSUFF='dylib'
-
-- # unused at this time
-- SHLIB_SONAME='$(libdir)/`echo $@ | sed
"s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)'
--
-- case "${host_os}" in
-- # Darwin versions 1, 5, 6, 7 correspond to Mac OS X 10.0, 10.1, 10.2,
-- # and 10.3, respectively.
-- darwin[1-7].*)
-- SHOBJ_STATUS=unsupported
-- SHOBJ_LDFLAGS='-dynamic'
-- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name
$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)
-current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -v'
-- ;;
-- # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
-- *)
-- case "${host_os}" in
-- darwin[89]*|darwin1[012]*)
-- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
-- ;;
-- *) # Mac OS X 10.9 (Mavericks) and later
-- SHOBJ_ARCHFLAGS=
-- # for 32 and 64bit universal library
-- #SHOBJ_ARCHFLAGS='-arch i386 -arch x86_64'
-- #SHOBJ_CFLAGS=${SHOBJ_CFLAGS}' -arch i386 -arch x86_64'
-- ;;
-- esac
-- SHOBJ_LDFLAGS="-dynamiclib -dynamic -undefined dynamic_lookup
${SHOBJ_ARCHFLAGS}"
-- SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}"' -install_name
$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)
-current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -v'
-- ;;
-- esac
-+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
-+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/`basename $@
$(SHLIB_MINOR)$(SHLIB_DOT)$(SHLIB_LIBSUFF)`$(SHLIB_DOT)$(SHLIB_LIBSUFF)
-current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version
$(SHLIB_MAJOR)'
-
- SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
- ;;
diff --git a/sys-libs/readline/files/readline-8.1-windows-signals.patch
b/sys-libs/readline/files/readline-8.1-windows-signals.patch
deleted file mode 100644
index 2f818fc7f9c1..000000000000
--- a/sys-libs/readline/files/readline-8.1-windows-signals.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix from upstream
-
-commit 4be5608573b2be2e31f3d2a01446e22e1c9d7839
-Author: Chet Ramey <[email protected]>
-Date: Wed Jan 27 11:49:50 2021 -0500
-
- commit bash-20210122 snapshot
-
-diff --git a/lib/readline/signals.c b/lib/readline/signals.c
-index 0943c643b27d..ecaf699e9261 100644
---- a/signals.c
-+++ b/signals.c
-@@ -266,8 +266,10 @@ _rl_handle_signal (int sig)
- case SIGQUIT:
- #endif
-
-+#if defined (HAVE_POSIX_SIGNALS)
- if (block_sig)
- sigprocmask (SIG_BLOCK, &set, &oset);
-+#endif
-
- rl_echo_signal_char (sig);
- rl_cleanup_after_signal ();
diff --git a/sys-libs/readline/readline-8.1_p2-r2.ebuild
b/sys-libs/readline/readline-8.1_p2-r2.ebuild
deleted file mode 100644
index 9be426ec82e5..000000000000
--- a/sys-libs/readline/readline-8.1_p2-r2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2025 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
verify-sig
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html";
-
-case ${PV} in
- *_alpha*|*_beta*|*_rc*)
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig
)"
- ;;
-
- *)
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
- SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/readline-8.1-rlfe-c99.patch.xz";
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig
)"
-
- if [[ ${PLEVEL} -gt 0 ]] ; then
- # bash-5.1 -> bash51
- my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
- patch_url=
- my_patch_index=
-
- upstream_url_base="mirror://gnu/bash"
-
- for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ;
my_patch_index++)) ; do
- printf -v mangled_patch_ver ${my_p}-%03d
${my_patch_index}
-
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
- MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver}
)
- done
-
- unset my_p patch_url my_patch_index upstream_url_base
- fi
- ;;
-esac
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0/8" # subslot matches SONAME major
-[[ ${PV} == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- "${FILESDIR}"/${PN}-7.0-headers.patch
- "${FILESDIR}"/${PN}-8.0-headers.patch
- "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
- "${FILESDIR}"/${PN}-8.1-windows-signals.patch
- "${WORKDIR}"/${PN}-8.1-rlfe-c99.patch
-)
-
-src_unpack() {
- local patch
-
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- if use verify-sig; then
- verify-sig_verify_detached
"${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
- for patch in "${MY_PATCHES[@]}"; do
- verify-sig_verify_detached "${patch}"{,.sig}
- done
- fi
-
- unpack "${MY_P}.tar.gz"
- unpack readline-8.1-rlfe-c99.patch.xz
-
- #if [[ ${GENTOO_PATCH_VER} ]]; then
- # unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
- #fi
- fi
-}
-
-src_prepare() {
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
- default
-
- if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
- # If we're bootstrapping, make a guess. We don't have pkg-config
- # around yet. bug #818103.
- # Incorrectly populating this leads to underlinked libreadline.
- local ncurses_libs
- local ncurses_libs_suffix=$(usex unicode w '')
-
- ncurses_libs="-lncurses${ncurses_libs_suffix}"
-
- if has_version "sys-libs/ncurses[tinfo(+)]" ; then
- ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
- fi
- else
- # Force ncurses linking. #71420
- # Use pkg-config to get the right values. #457558
- local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode
w '') --libs)
- fi
-
- sed -i \
- -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
- support/shobj-conf || die
- sed -i \
- -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:"
\
- examples/rlfe/configure || die
-
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
- # objformat for years, so we don't want to rely on that.
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf
|| die
-
- ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
- # readline-8.3 drops unprototyped functions, earlier versions are
- # incompatible with C23.
- append-cflags $(test-flags-CC -std=gnu17)
-
- # fix implicit decls with widechar funcs
- append-cppflags -D_GNU_SOURCE
- # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc
-Dxfree=_rl_free
-
- # Make sure configure picks a better ar than `ar`. #484866
- export ac_cv_prog_AR=$(tc-getAR)
-
- # Force the test since we used sed above to force it.
- export bash_cv_termcap_lib=ncurses
-
- # Control cross-compiling cases when we know the right answer.
- # In cases where the C library doesn't support wide characters, readline
- # itself won't work correctly, so forcing the answer below should be OK.
- if tc-is-cross-compiler ; then
- export bash_cv_func_sigsetjmp='present'
- export bash_cv_func_ctype_nonascii='yes'
- export bash_cv_wcwidth_broken='no' #503312
- fi
-
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change
- # so we can re-use the config cache file between the two.
- append-ldflags -L.
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --cache-file="${BUILD_DIR}"/config.cache
- --with-curses
- $(use_enable static-libs static)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
- # code is full of AC_TRY_RUN()
- mkdir -p examples/rlfe || die
- cd examples/rlfe || die
- ECONF_SOURCE="${S}"/examples/rlfe \
- econf --cache-file="${BUILD_DIR}"/config.cache
- fi
-}
-
-multilib_src_compile() {
- emake
-
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
- # code is full of AC_TRY_RUN()
- cd examples/rlfe || die
- local l
- for l in readline history ; do
- ln -s ../../shlib/lib${l}$(get_libname)*
lib${l}$(get_libname) || die
- ln -s ../../lib${l}.a lib${l}.a || die
- done
- emake
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- if use utils && ! tc-is-cross-compiler; then
- dobin examples/rlfe/rlfe
- fi
- fi
-}
-
-multilib_src_install_all() {
- HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html"
einstalldocs
- dodoc USAGE
- docinto ps
- dodoc doc/*.ps
-}
-pkg_preinst() {
- # bug #29865
- # Reappeared in #595324 with paludis so keeping this for now...
- preserve_old_lib \
- /$(get_libdir)/lib{history,readline}$(get_libname 4) \
- /$(get_libdir)/lib{history,readline}$(get_libname 5) \
- /$(get_libdir)/lib{history,readline}$(get_libname 6) \
- /$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify \
- /$(get_libdir)/lib{history,readline}$(get_libname 4) \
- /$(get_libdir)/lib{history,readline}$(get_libname 5) \
- /$(get_libdir)/lib{history,readline}$(get_libname 6) \
- /$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
diff --git a/sys-libs/readline/readline-8.2_p13-r1.ebuild
b/sys-libs/readline/readline-8.2_p13-r1.ebuild
index a835109c5ed0..c11aa2cc41bc 100644
--- a/sys-libs/readline/readline-8.2_p13-r1.ebuild
+++ b/sys-libs/readline/readline-8.2_p13-r1.ebuild
@@ -94,9 +94,6 @@ PATCHES=(
"${WORKDIR}"/${PN}-8.1-rlfe-c99.patch
# Not needed with 8.3 which drops < C89 compat
"${FILESDIR}"/${PN}-8.2-c23.patch
-
- # TODO: rebase
- #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
)
src_unpack() {
diff --git a/sys-libs/readline/readline-8.2_p13.ebuild
b/sys-libs/readline/readline-8.2_p13.ebuild
deleted file mode 100644
index b100209d9609..000000000000
--- a/sys-libs/readline/readline-8.2_p13.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# There's no standard way of versioning the point releases upstream
-# make anyway, so while this was added for RC versions, it's fine
-# 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
verify-sig
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
- case ${PV} in
- 9999|*_alpha*|*_beta*|*_rc*)
- return 1
- ;;
- *)
- return 0
- ;;
- esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html
https://git.savannah.gnu.org/cgit/readline.git";
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git";
- EGIT_BRANCH=devel
- inherit git-r3
-elif is_release ; then
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
- SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/readline-8.1-rlfe-c99.patch.xz";
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-
- if [[ ${PLEVEL} -gt 0 ]] ; then
- # bash-5.1 -> bash51
- my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
- patch_url=
- my_patch_index=
-
- upstream_url_base="mirror://gnu/readline"
-
- for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ;
my_patch_index++)) ; do
- printf -v mangled_patch_ver ${my_p}-%03d
${my_patch_index}
-
patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
- MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
- done
-
- unset my_p patch_url my_patch_index upstream_url_base
- fi
-else
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-if ! is_release ; then
- inherit autotools
-fi
-
-LICENSE="GPL-3+"
-SLOT="0/8" # subslot matches SONAME major
-if is_release ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-fi
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- "${FILESDIR}"/${PN}-7.0-headers.patch
- "${FILESDIR}"/${PN}-8.0-headers.patch
- "${WORKDIR}"/${PN}-8.1-rlfe-c99.patch
-
- # TODO: rebase
- #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-)
-
-src_unpack() {
- local patch
-
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- if use verify-sig; then
- verify-sig_verify_detached
"${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
- for patch in "${MY_PATCHES[@]}"; do
- verify-sig_verify_detached "${patch}"{,.sig}
- done
- fi
-
- unpack "${MY_P}.tar.gz"
- unpack readline-8.1-rlfe-c99.patch.xz
-
- #if [[ ${GENTOO_PATCH_VER} ]]; then
- # unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
- #fi
- fi
-}
-
-src_prepare() {
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
- default
-
- is_release || eautoreconf
-
- if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
- # If we're bootstrapping, make a guess. We don't have pkg-config
- # around yet. bug #818103.
- # Incorrectly populating this leads to underlinked libreadline.
- local ncurses_libs
- local ncurses_libs_suffix=$(usex unicode w '')
-
- ncurses_libs="-lncurses${ncurses_libs_suffix}"
-
- if has_version "sys-libs/ncurses[tinfo(+)]" ; then
- ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
- fi
- else
- # Force ncurses linking, bug #71420.
- # Use pkg-config to get the right values, bug #457558.
- local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode
w '') --libs)
- fi
-
- sed -i \
- -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
- support/shobj-conf || die
- sed -i \
- -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:"
\
- examples/rlfe/configure || die
-
- # Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
- # objformat for years, so we don't want to rely on that.
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf
|| die
-
- # For local readline headers
- ln -s ../.. examples/rlfe/readline || die
-}
-
-src_configure() {
- # readline-8.3 drops unprototyped functions, earlier versions are
- # incompatible with C23.
- append-cflags $(test-flags-CC -std=gnu17)
-
- # Fix implicit decls with widechar funcs
- append-cppflags -D_GNU_SOURCE
- # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc
-Dxfree=_rl_free
-
- # Make sure configure picks a better ar than `ar`, bug #484866
- export ac_cv_prog_AR="$(tc-getAR)"
-
- # Force the test since we used sed above to force it.
- export bash_cv_termcap_lib=ncurses
-
- # Control cross-compiling cases when we know the right answer.
- # In cases where the C library doesn't support wide characters, readline
- # itself won't work correctly, so forcing the answer below should be OK.
- if tc-is-cross-compiler ; then
- export bash_cv_func_sigsetjmp="present"
- export bash_cv_func_ctype_nonascii="yes"
- # bug #503312
- export bash_cv_wcwidth_broken="no"
- fi
-
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change
- # so we can re-use the config cache file between the two.
- append-ldflags -L.
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --cache-file="${BUILD_DIR}"/config.cache
- --with-curses
- $(use_enable static-libs static)
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
- # Code is full of AC_TRY_RUN()
- mkdir -p examples/rlfe || die
- cd examples/rlfe || die
-
- ECONF_SOURCE="${S}"/examples/rlfe econf
--cache-file="${BUILD_DIR}"/config.cache
- fi
-}
-
-multilib_src_compile() {
- emake
-
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
- # Code is full of AC_TRY_RUN()
- cd examples/rlfe || die
- local l
- for l in readline history ; do
- ln -s ../../shlib/lib${l}$(get_libname)*
lib${l}$(get_libname) || die
- ln -s ../../lib${l}.a lib${l}.a || die
- done
- emake
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- if use utils && ! tc-is-cross-compiler; then
- dobin examples/rlfe/rlfe
- fi
- fi
-}
-
-multilib_src_install_all() {
- HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html"
einstalldocs
-
- dodoc USAGE
- docinto ps
- dodoc doc/*.ps
-}
-pkg_preinst() {
- # bug #29865
- # Reappeared in bug #595324 with paludis so keeping this for now...
- preserve_old_lib \
- /$(get_libdir)/lib{history,readline}$(get_libname 4) \
- /$(get_libdir)/lib{history,readline}$(get_libname 5) \
- /$(get_libdir)/lib{history,readline}$(get_libname 6) \
- /$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify \
- /$(get_libdir)/lib{history,readline}$(get_libname 4) \
- /$(get_libdir)/lib{history,readline}$(get_libname 5) \
- /$(get_libdir)/lib{history,readline}$(get_libname 6) \
- /$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
diff --git a/sys-libs/readline/readline-8.3_rc2.ebuild
b/sys-libs/readline/readline-8.3_rc2.ebuild
index 5d268da2a823..1afe268f7204 100644
--- a/sys-libs/readline/readline-8.3_rc2.ebuild
+++ b/sys-libs/readline/readline-8.3_rc2.ebuild
@@ -93,9 +93,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.0-no_rpath.patch
"${FILESDIR}"/${PN}-7.0-headers.patch
"${FILESDIR}"/${PN}-8.0-headers.patch
-
- # TODO: rebase
- #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
)
src_unpack() {
diff --git a/sys-libs/readline/readline-9999.ebuild
b/sys-libs/readline/readline-9999.ebuild
index 0ee65275495f..1cde47e3aa71 100644
--- a/sys-libs/readline/readline-9999.ebuild
+++ b/sys-libs/readline/readline-9999.ebuild
@@ -93,9 +93,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.0-no_rpath.patch
"${FILESDIR}"/${PN}-7.0-headers.patch
"${FILESDIR}"/${PN}-8.0-headers.patch
-
- # TODO: rebase
- #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
)
src_unpack() {
