commit: 6d4c00a18a8b017aa4e603d9c5805e07758413c9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 18:09:02 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 18:09:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6d4c00a1
sys-libs/readline: 6.3_p8-r2 in tree works.
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA
sys-libs/readline/Manifest | 12 --
.../readline/files/readline-5.0-no_rpath.patch | 13 --
.../readline-5.2-no-ignore-shlib-errors.patch | 24 ----
.../readline/files/readline-6.2-rlfe-tgoto.patch | 14 --
sys-libs/readline/metadata.xml | 5 -
sys-libs/readline/readline-6.2_p4-r99.ebuild | 110 ---------------
sys-libs/readline/readline-6.2_p5-r99.ebuild | 154 ---------------------
7 files changed, 332 deletions(-)
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
deleted file mode 100644
index 7836e0d..0000000
--- a/sys-libs/readline/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX readline-5.0-no_rpath.patch 363 SHA256
59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b SHA512
c0344c5b831433ad3a8499a91d36615e849a9b520f8ca35cd9cae6d5bc55729adbf97d003e335d210cb3806b2f39af273b4b5f98380dac371dc184053e245bb2
WHIRLPOOL
c0d2fe9d1d1f36cf89279f315c373a7385d255ebbeab8ebf1ede7b99196660611499c7db85554b036ad3df4f0b4375558b1d1ce7cbae5f5731172181f7d167ac
-AUX readline-5.2-no-ignore-shlib-errors.patch 688 SHA256
2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6 SHA512
23f88aee11a9ebe15406293695f3de2a7a6c52b8b138c199c64f9dbb9b59d9063f12f8693656e61611e72f6298f7d919016cd240434e78ea2232876690a8b738
WHIRLPOOL
ae87d544fa32dbd2b6f27f164dd4e6d0e8a3f399d4a9bde81bcb631985c6e69db11705dc372c21a4f9d3a26cf4279023aeae97fd0d243ca8e1c0e547b59084a4
-AUX readline-6.2-rlfe-tgoto.patch 379 SHA256
6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512
1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c
WHIRLPOOL
daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a
-DIST readline-6.2.tar.gz 2277926 SHA256
79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512
fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59
WHIRLPOOL
5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
-DIST readline62-001 1388 SHA256
38a86c417437692db01069c8ab40a9a8f548e67ad9af0390221b024b1c39b4e3 SHA512
e505161a9ab28f6c1086a6a4ecc5a82da9001d79e4c2b7c44cd82e86dca90bc726ee2387a31e8b4c6893b240877a766fdd913ee7294389722214e6281c518478
WHIRLPOOL
28c63b09a62fa1b64902b04a3c5607da742f7f308648262736240138fa7c957f21856556c8dd2dc08749acf143c271907c69124a978191a5ddb21a6dcf9ee70a
-DIST readline62-002 1714 SHA256
1e6349128cb573172063ea007c67af79256889c809973002ca66c5dfc503c7d4 SHA512
e86cb15b4df7b2a4cf68148a3e2414b48f70ad23d9685764627906164a74f31967ba8247510229aa19dfb7f6e8e92ff89164896e79b2d7320d3a62187a9173f5
WHIRLPOOL
444fa6eaa6b3e13728224f49a012f969f736d9b448d4c7da6cf0fdd3cfb33d24ca7566801d0ffa5a642fa581571c485e3c913b4a057a096a665735a84d9fbfe8
-DIST readline62-003 1911 SHA256
cb2131ff352d6e5f82edc09755191f74220b15f026bdb6c52624931c79622374 SHA512
863a4f0725df357fdd4a2ea738a8b81d850f36652705a45a415762a643fcf32f71ecb29f9faf9acd84d0b4b67580329adc491ab3562f0ad6f4b808768539301e
WHIRLPOOL
86d10b4c23eef4c64ece0a4537f13cf68198888cfdd83eb38124da8610b971e87dfcdbd64c52fd21ca6d3753298b6582ce15378112d575944ff7d9b68baea3a6
-DIST readline62-004 3335 SHA256
09bd342479ea5bb8b6411bfdf7d302fab2e521d1d241bcb8344d3bad5d9f5476 SHA512
d5c80fb49748b586867a4df0900a73257a2973653c00e1403b9ba4eb5b265cdf6b32b6432f10c23482051f173fe63c18f2b569940b9a609ee29da60ce0ae38b2
WHIRLPOOL
471ace4d86d241d11fb494e885b6e6f78a5938bcbd7f438250e0410849ed2c94ae6743162576412d7d2b7125c2151b009d97295578a716327d8a9cd003543884
-DIST readline62-005 2143 SHA256
ef02905e4d544a5a511142e8b8282e325411200c7eaca4287f413f3ea85cc1f4 SHA512
8717df6034b64cc185e006cd0a00ba80b2cc06406420fb4e080affc4bfe2d4bab07b4d0c8fdd1f5b95692ee6b572199731daeaa64c17a0d799853e132d130e90
WHIRLPOOL
5469407cbc196bfffff890d288ac8dc1a11c34a9ac87baba615587617a3e540331cf54db89de861c8fcc126a443afc91af108d9e94f6234ec80c1ade219b51a0
-EBUILD readline-6.2_p4-r99.ebuild 3020 SHA256
feac9434c2e6ce418a919329cfb9d4ae804d463d6cc43e0d1ae2848477d3c4b5 SHA512
17058b0652f75580bf330e07dcf5dc0df455ad4c51cfdeba2cb8ec4fa1148f16b117d6176de69b00552c7ea2a880a9a014e960e74632b10d3bf45172fdc4a6c8
WHIRLPOOL
5e67c7bef740e0758a6bfc82c334d77f7c44f5038401ca8fc66b827f8ec6b7217002fc4d277484b955c942d0002c8a1c934b891cb9474a013fbdba2c38954fee
-EBUILD readline-6.2_p5-r99.ebuild 4081 SHA256
249c584db3fd7638c03f6313600d87e6701b1c86edd18b2e6a972b94521ddb4b SHA512
ca46b44366edc031c791dca4d36037546d234d384319697210b632ec937bf3c939856bdf5812b89dfc399421d57cb9d9dd2cb7f16b074548079a08287f1d0007
WHIRLPOOL
4ccb6f2eb525d4e109a7a4bdfaf38faeb16a9303287dc83c76084caa175adf4d426208147d4f583366ff1813755aa50370222f3f5e2226813322cd0a91b870e1
-MISC metadata.xml 164 SHA256
f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512
8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca
WHIRLPOOL
11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
diff --git a/sys-libs/readline/files/readline-5.0-no_rpath.patch
b/sys-libs/readline/files/readline-5.0-no_rpath.patch
deleted file mode 100644
index 624b2d7..0000000
--- a/sys-libs/readline/files/readline-5.0-no_rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-ripped from Fedora
-
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -102,7 +102,7 @@
- SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@
$(SHLIB_MINOR)`'
-+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
- ;;
-
diff --git a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
deleted file mode 100644
index fc63491..0000000
--- a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-dont ignore errors in the shlib subdir
-
-http://bugs.gentoo.org/216952
-
---- Makefile.in
-+++ Makefile.in
-@@ -194,7 +194,7 @@
-
- shared: force
- -test -d shlib || mkdir shlib
-- -( cd shlib ; ${MAKE} ${MFLAGS} all )
-+ ( cd shlib ; ${MAKE} ${MFLAGS} all )
-
- documentation: force
- -test -d doc || mkdir doc
-@@ -238,7 +238,7 @@
- -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
-
- install-shared: installdirs install-headers shared install-doc
-- -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
-+ ( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
-
- uninstall-shared: maybe-uninstall-headers
- -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
diff --git a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
deleted file mode 100644
index b898bf0..0000000
--- a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/385091
-
-https://lists.gnu.org/archive/html/bug-readline/2011-10/msg00000.html
-
---- a/examples/rlfe/configure
-+++ b/examples/rlfe/configure
-@@ -4062,6 +4062,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+extern char *tgoto(char *, int, int);
- main()
- {
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-libs/readline/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-libs/readline/readline-6.2_p4-r99.ebuild
b/sys-libs/readline/readline-6.2_p4-r99.ebuild
deleted file mode 100644
index 54df6a4..0000000
--- a/sys-libs/readline/readline-6.2_p4-r99.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p4.ebuild,v
1.2 2013/02/17 23:40:35 zmedico Exp $
-
-inherit eutils multilib toolchain-funcs flag-o-matic
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.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="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html";
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- cd "${S}"
- sed -i -e 's:sgtty:termios:' examples/rlfe/os.h
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
-
- # force ncurses linking #71420
- sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf ||
die "sed"
-
- # 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_compile() {
- # fix implicit decls with widechar funcs
- append-cppflags -D_GNU_SOURCE
- # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc
-Dxfree=_rl_free
-
- # 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.
- econf \
- --cache-file="${S}"/config.cache \
- --with-curses \
- $(use_enable static-libs static)
- emake || die
-
- if ! tc-is-cross-compiler ; then
- # code is full of AC_TRY_RUN()
- cd examples/rlfe
- 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
- econf --cache-file="${S}"/config.cache
- emake || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- gen_usr_ldscript -a readline history #4411
-
- if ! tc-is-cross-compiler; then
- dobin examples/rlfe/rlfe || die
- fi
-
- dodoc CHANGELOG CHANGES README USAGE NEWS
- docinto ps
- dodoc doc/*.ps
- dohtml -r doc
-}
-
-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}
-}
diff --git a/sys-libs/readline/readline-6.2_p5-r99.ebuild
b/sys-libs/readline/readline-6.2_p5-r99.ebuild
deleted file mode 100644
index ee13305..0000000
--- a/sys-libs/readline/readline-6.2_p5-r99.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.14
2014/07/18 10:56:45 pacho Exp $
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-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";
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r7
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- sed -i -e 's:sgtty:termios:' examples/rlfe/os.h # For musl
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
- epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-
- # 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
- # http://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
-
- # 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 \
- --with-curses \
- $(use_enable static-libs static)
-
- if 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 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 ! 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}
-}
