commit: 69960702286be8b12e80935660fa7d3e83b7331d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 04:09:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 04:09:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69960702
sys-libs/readline: drop 8.2_beta, 8.2_rc1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/readline/Manifest | 4 -
sys-libs/readline/readline-8.2_beta.ebuild | 224 -----------------------------
sys-libs/readline/readline-8.2_rc1.ebuild | 224 -----------------------------
3 files changed, 452 deletions(-)
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 6434cbfe95dc..1b253f910dcc 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,9 +1,5 @@
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-beta.tar.gz 3041165 BLAKE2B
1ed1e2a80baa8cdd7002da2eb50cde114c3daa743a58ab09d9b572c3049429363af7695f2cafa830b7e1881471b4291a2b7ae9f46d7ab4ac274efd41f7a2ffed
SHA512
15ca277b954111a2f852f86853c88729fadca48459df05a45f13681af3c679c35db3c053b69cbfbc8424fb1a53d0d1e775679d8e14068038b4ce35d45425493e
-DIST readline-8.2-beta.tar.gz.sig 95 BLAKE2B
c3e7b8d2d909f2bdbd8ea77ea1d851ccc94ecae602a401f4fb02b671178517ed9b22cb8e0c88620924842c234d97946331faf5b6d130b81a6c98a658ddfa3a7e
SHA512
ab1b3583b3dd6c9248ee4fc310d698895e29b95bc86b678d7af5ce8d7a46d3c94ee2e8c75966bfd0467c69f4a1973940e7ecd3507254cb031f8b30ce28054f65
-DIST readline-8.2-rc1.tar.gz 3041567 BLAKE2B
7e3fb7fc336b790c5760d33733f9937f7fd660a6e74a6a023b58d81484a5f3ad80cd93e53e7f010a06e63a0a7d543eb58074bb80f84ea8c873c29f6efb522611
SHA512
13bae7789c88a55a66103eeea57a12251d490ce4be73279a2f38d43194f6fbf200918dc84501a1000897dac3a1edb5af5a24ee887af49ba8aa3fad05e26a637f
-DIST readline-8.2-rc1.tar.gz.sig 95 BLAKE2B
d3ad8223e0537519fe8c8532d477f031f15535fada41766b1b5da1f67da1f35afd82b0b622f1bd8a48486b1f14d0c7518ee03fc4850776d5a2ef3c3705802576
SHA512
0a7cd93fa685694630f8e17667f4793a37536a301285476e00ca2a37f7114ff63c5d762d719d8512dbe55073bf1f93d997edbd37cdcb6200d6bda33f12b68db4
DIST readline-8.2-rc2.tar.gz 3041602 BLAKE2B
1a9ad2c2d52486fd47b7aada15eae186bf5538cc0864a8a102306b4150ad0e560f4b09d3098f9905cb00918e5b119ad472acaf0d1814a63be8cab90192e880fa
SHA512
cc327569e138a6d4a5fd41c6092d6229fba89befd2d68996b6b2b60baa2d2f7805666260327779571a5f82670c55daa36c9bd773ea818e5722ad808bbc6eeddd
DIST readline-8.2-rc2.tar.gz.sig 95 BLAKE2B
57bcfb4493d1323bf30bdff221b967b69f90392feab6c869f4f3a40b6991f1db40ee05f2928a821c5230850cf7471224aa89cf007228a2e92279671c4b8f6153
SHA512
a244b46c1f33fbb230ae71ea0e8f408a1598d9aa2d01f3a7480bd4a395b79307ac7e28fba4bc2eb32056fd62cd786301893780d7d6eb87bfd8e2c5332eeb3baf
DIST readline81-001 2454 BLAKE2B
7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2
SHA512
cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
diff --git a/sys-libs/readline/readline-8.2_beta.ebuild
b/sys-libs/readline/readline-8.2_beta.ebuild
deleted file mode 100644
index 90c2837bb864..000000000000
--- a/sys-libs/readline/readline-8.2_beta.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs
usr-ldscript 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}"
-is_release() {
- case ${PV} in
- 9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
- *) return 0 ;;
- esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- [[ ${PLEVEL} -eq 0 ]] && return 1
- local opt=$1
- eval set -- {1..${PLEVEL}}
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
- printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
- done
- fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html";
-
-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 $(patches)"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-else
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz";
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-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 ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
- "${FILESDIR}"/${PN}-7.0-headers.patch
- "${FILESDIR}"/${PN}-8.0-headers.patch
-
- # TODO: rebase
- #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- else
- # Needed because we don't want the patches being unpacked
- # (which emits annoying and useless error messages)
- verify-sig_src_unpack
- unpack ${MY_P}.tar.gz
- fi
-}
-
-src_prepare() {
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
- 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. #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() {
- # 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
- use kernel_Winnt || 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
- gen_usr_ldscript -a readline history #4411
-
- 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_rc1.ebuild
b/sys-libs/readline/readline-8.2_rc1.ebuild
deleted file mode 100644
index 90c2837bb864..000000000000
--- a/sys-libs/readline/readline-8.2_rc1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs
usr-ldscript 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}"
-is_release() {
- case ${PV} in
- 9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
- *) return 0 ;;
- esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- [[ ${PLEVEL} -eq 0 ]] && return 1
- local opt=$1
- eval set -- {1..${PLEVEL}}
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
- printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
- done
- fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html";
-
-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 $(patches)"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-else
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz";
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig
ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-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 ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
- "${FILESDIR}"/${PN}-7.0-headers.patch
- "${FILESDIR}"/${PN}-8.0-headers.patch
-
- # TODO: rebase
- #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- else
- # Needed because we don't want the patches being unpacked
- # (which emits annoying and useless error messages)
- verify-sig_src_unpack
- unpack ${MY_P}.tar.gz
- fi
-}
-
-src_prepare() {
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
- 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. #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() {
- # 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
- use kernel_Winnt || 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
- gen_usr_ldscript -a readline history #4411
-
- 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)
-}
