commit: 00d188ed60e89e215f77d02195ec435288f62116 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Aug 23 08:56:00 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Aug 23 09:07:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d188ed
sys-libs/readline: Bump to version 7.0_rc2 Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-libs/readline/Manifest | 1 + sys-libs/readline/readline-7.0_rc2.ebuild | 161 ++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index d52b1ac..f8b0d21 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -3,6 +3,7 @@ DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0 DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda DIST readline-7.0-beta2.tar.gz 2899447 SHA256 4b78c5998c588ff5a233a4cbfea08f1248c2d7febfafe82cee9479de9265e43f SHA512 36ff46c63d89bca2d198ea32a37db9157ac55ce6369f5bccb3acfdfcd1a144551b4db4c907daef87773d8bdac57ce262a2b5f3c9598da85c7aba570fca9d55fb WHIRLPOOL 5bb584d8b0b1582061fe8e5edb596335028826952010f20e0d910327cf1bb85dde532f8cb1134b77cc9fe3e2cc27c02307c9879ef12045b51897c0b90915fd13 +DIST readline-7.0-rc2.tar.gz 2900408 SHA256 80c6e492f813bb8886e6342e294fd67362973fbb4fe281b31dcd25e22d872fe8 SHA512 ce31569fd2c12e14b67f02ca604614e7564f60b4a386680ac9a11f6b5be2508ac3fd6c73d4edc2d65ebba8f0500fcf52c23b5f756e6a7ed47cead822e4735ad1 WHIRLPOOL c9b314c8b70af39bf3507f3f8d8846cf50a6b809a16522c17199d880244f17503dec6cb78777c47d25e293841878bba9f350590c9efb098fa687aff629858a1a DIST readline43-001 1126 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955 SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc WHIRLPOOL 080c0cffb0637bba2f6819524291c8efd1832b42b7ca619fda551b00ed82558d9c03a6f739b350b8a1de2c32e6ab92fd86137a9620473439c5b6ced6d3a06f91 DIST readline43-002 738 SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226 SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2 WHIRLPOOL d3b43145a4ed207f353c5b95b52bdb81be31bd5b077ad60152799333ca582c7524c5587a4e0d9a0fc9246a114552f0c26933d2bc8f60e9de2536a8b6ec9f2cda DIST readline43-003 2202 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e WHIRLPOOL 076d101812e7a98d445fd447d816fd0b15c9690869f4a567d76287c495c257f85e4e79f11f7e6e8354093613ca1c0a758514672cec98d303279daf597dee2577 diff --git a/sys-libs/readline/readline-7.0_rc2.ebuild b/sys-libs/readline/readline-7.0_rc2.ebuild new file mode 100644 index 0000000..a9958df --- /dev/null +++ b/sys-libs/readline/readline-7.0_rc2.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} +MY_P=${PN}-${MY_PV} +[[ ${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 ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do + printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" + done + fi +} + +DESCRIPTION="Another cute console display library" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"; +case ${PV} in +*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"; ;; +*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;; +esac + +LICENSE="GPL-3" +SLOT="0/7" # subslot matches SONAME major +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="static-libs utils" + +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch + epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 + epatch "${FILESDIR}"/${PN}-7.0-headers.patch + + # Force ncurses linking. #71420 + # Use pkg-config to get the right values. #457558 + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) + 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 # 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 + 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() { + ECONF_SOURCE=${S} \ + econf \ + --cache-file="${BUILD_DIR}"/config.cache \ + --docdir='$(datarootdir)'/doc/${PF} \ + --with-curses \ + $(use_enable static-libs static) + + 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) + ln -sf ../../lib${l}.a lib${l}.a + 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() { + einstalldocs + dodoc USAGE + dohtml -r doc/. + docinto ps + dodoc doc/*.ps +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} +}
