diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
tree | 9f1f0dee23e13658e52f49437befe78427148c51 /sys-libs/readline | |
parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) |
gentoo resync : 10.02.2020
Diffstat (limited to 'sys-libs/readline')
-rw-r--r-- | sys-libs/readline/Manifest | 6 | ||||
-rw-r--r-- | sys-libs/readline/readline-8.0.ebuild | 173 | ||||
-rw-r--r-- | sys-libs/readline/readline-8.0_p4.ebuild (renamed from sys-libs/readline/readline-8.0_p1.ebuild) | 8 |
3 files changed, 8 insertions, 179 deletions
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index d1f1ff661deb..b604bf697274 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -23,9 +23,11 @@ DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b05443254393 DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c +DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c +DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca +DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461 EBUILD readline-6.3_p8-r3.ebuild 4369 BLAKE2B 56745c4a1370762aec7400cd3bd51f4bca5ac8316a5a2d5e292e79aa6647f143a9e6c7a5b449abc4443c6c474a8ffd2c2c0fd2d151def10983127327259f38c4 SHA512 4c744b2801297d65d600c9d2812e0a95fd2bac456b1c0619fcf7875af2761688f075562c00808c72ae974bf0749bdbc46d5b6d810a8a9ff1021c13063abeae71 EBUILD readline-7.0_p5-r1.ebuild 4860 BLAKE2B 2bdfc9253d1efccc2b2fdd9df631039d41692e8e392ac827b748142cc346b10a5bafd1d4e1fbf2238deabb32becc01c581a57cffd2caa549db79ae5e1eb52403 SHA512 48bb2ebd5d22a0b6ea7812896059e99f4302d04a7427e4c8c918cc1291b268976052d2b1b15f840724a2de9a27fb5290167ed6523c7419d237bb3a8fc14d066f -EBUILD readline-8.0.ebuild 4790 BLAKE2B 42833b30980fc6593bf4d21a74866467f23c5814c7eed4f26cfbe16343f78c99ae2b4c340e2f8b893a8ba728e6f677ffda22e451eca6bc539a0ac8113a6a5f79 SHA512 f8763e2bb3900626e4392bf0afb8672778f105bcaad146b61a78cab36f6b4a5fcf14b019a202c514b73f64353af0b42ac320c81fc9ca12881c034f82daec7ec6 EBUILD readline-8.0_p1-r1.ebuild 4856 BLAKE2B e2196b310a064d321278860c53eccfefedfec9411c11f632281496b9dff318a01e18156d7539bb35dc6366a2f025ca4211aba2cd8b8b70b8e05566c2d7188f6b SHA512 8d8709911c6fb4387097ec6d37334cb59b669a4eaa7ff0b4e0c171ca351e24f3008eabc44ba81a9214251412ee624668bee33b9396af3e818d3113ef25efe4ab -EBUILD readline-8.0_p1.ebuild 4818 BLAKE2B 9088e7a27a355c2ee20e5ce491196b806df4480597a949c2a3191f306845abda51669aac2e9bfecd44fcd62a914f66c1ea789393ed6bf62bd1e2a66afab8181a SHA512 d414288e8c571712d311c874c1150ba1271bc48e574f3768eca30e4d8a99548b83d840a8e6356782d80d8bdec9de15ec39cbf93aa35c4ceaba1d53a03f767c58 +EBUILD readline-8.0_p4.ebuild 4856 BLAKE2B 4edbc4c4cb063f9fc85ab133ac1d226bc9c4f55aca0d95b4d29963d818464c534a392d8fb4600ced4759d4de54392a6fbf1dea043edaeac580096eac8529c920 SHA512 e24f61e80accf06b84fc947c78dded27dedcde8bcb9cf87354d75c1555074403d173c5e3559ab87cdccadb841926755351f2317fe2fae1e2c65516df3154dbce MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173 diff --git a/sys-libs/readline/readline-8.0.ebuild b/sys-libs/readline/readline-8.0.ebuild deleted file mode 100644 index 000bd8c3d8d7..000000000000 --- a/sys-libs/readline/readline-8.0.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript - -# Official patches -# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-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="https://tiswww.case.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/8" # subslot matches SONAME major -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-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} - -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 -) - -# Needed because we don't want the patches being unpacked -# (which emits annoying and useless error messages) -src_unpack() { - unpack ${MY_P}.tar.gz -} - -src_prepare() { - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) - default - - # 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 || 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}.so.{4,5,6,7} -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7} -} diff --git a/sys-libs/readline/readline-8.0_p1.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild index ccd33bb415ff..cd51e2e93524 100644 --- a/sys-libs/readline/readline-8.0_p1.ebuild +++ b/sys-libs/readline/readline-8.0_p4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,9 +42,9 @@ esac LICENSE="GPL-3" SLOT="0/8" # subslot matches SONAME major KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs utils" +IUSE="static-libs +unicode utils" -RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]" +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig @@ -71,7 +71,7 @@ src_prepare() { # Force ncurses linking. #71420 # Use pkg-config to get the right values. #457558 - local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) sed -i \ -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ support/shobj-conf || die |