Version bump #283138 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 114 insertions, 5 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 3d20e19a976d..413cc5130823 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.129 2009/05/18 11:48:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.130 2009/08/29 21:10:20 vapier Exp $
+
+*readline-6.0_p4 (29 Aug 2009)
+
+  29 Aug 2009; Mike Frysinger <vapier@gentoo.org> +readline-6.0_p4.ebuild:
+  Version bump #283138 by Arfrever Frehtes Taifersar Arahesis.
 
   18 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   readline-6.0_p3.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 6b016dba62b9..bae593d6384e 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -51,18 +51,20 @@ DIST readline52-013 5147 RMD160 a9d06dc1bef660882b5cff82728a8cd5bea47ff0 SHA1 fc
 DIST readline60-001 2428 RMD160 df7512fcd5d75a0d345c6d23a12669123df5e418 SHA1 32bba5b3ecf00d461c0a365505501f76ff7a96a5 SHA256 9190e23f877e22e4ac7044772fa4b6f05e8116c3ad223a99cca85952bbb678f1
 DIST readline60-002 1369 RMD160 d1e9e7d6bdb53b11348a1502335a715733130415 SHA1 8e6f714e087ef9579814055cba2f9142b0b31b33 SHA256 749ac881832967db2458f027a6ca8586db4767e7e0d0e1fd09b86887be1c0c1c
 DIST readline60-003 1970 RMD160 9c6276146a6358d87bdf86ce0d1b9eb8e3a4a2e6 SHA1 f1ffdd3ad847272ce37de17494bca1a895ad1a02 SHA256 523c9bee365edce4ce051c33b157c7f340a695c69756eb998c0c0ae29dd29abf
+DIST readline60-004 1840 RMD160 b03c01243ea3653cd5b7307c2546aae110603b60 SHA1 4fb45252521e063776bef3aecd874a524fc9c4f8 SHA256 f5cbb02ad37e682f0876d454a07bc2b4ad433a4b0f9f096893454bec1af3eafb
 EBUILD readline-4.3_p5.ebuild 1729 RMD160 48f13ee68538f8f28e196b14dfaeba57d0c56ffe SHA1 85a93c67c7570f01ed204b9792222d70bd2d3270 SHA256 f4233d79f15277edf6321c781997d04d435d15c1a99b06d2e979d751db92dcf1
 EBUILD readline-5.0-r2.ebuild 2425 RMD160 76e46f0270a9e6f3c35365062ffd55f9ec9266ea SHA1 9b6c5bdbba268712a483f3099010ebd438ba1c56 SHA256 26f7b110e6c4cf106877f735cc10a2dca5312f95d5b7063d61e6e74dd4f0de53
 EBUILD readline-5.1_p4.ebuild 2801 RMD160 93031c30d6014333ce909240ca2acee4440f6833 SHA1 4764bb18084786f1674d85d4924f890582662722 SHA256 14b489d5603af47ba0d42a5dfdd807747ecdca198b1f53df44fd6d506e5dc851
 EBUILD readline-5.2_p13.ebuild 2730 RMD160 4b1c83ad3d87b97736f57cd6b2fe7fd556b474a6 SHA1 e47ce0cc60f83336995d305bae118fc960559cb8 SHA256 0efebbffeb7ade4fd1244a5a455a19eb51328640a90298420ec3ee85872ff5fb
 EBUILD readline-6.0.ebuild 2559 RMD160 136e085e20fe7d31e85e622f36966f7026eca181 SHA1 cadf748051225d12cec18aa7ea1aa1fb5b0e2b9f SHA256 cebdcbffb7a73c8465e958eb945b278780e23ddc5cbef3b7a02cbdb28b549a63
 EBUILD readline-6.0_p3.ebuild 2769 RMD160 77a63430a1b78b9b7777a5fbf4b33bf29bb8dac8 SHA1 572de0d0390497c935bfdb9cea24c977f091518e SHA256 04bd67930c64c4765c276d407d69d67f6126778c765655fb54e9485f6ed19efb
-MISC ChangeLog 16590 RMD160 a4654cda6df580c7cf3f209378f58e39e1d7cc10 SHA1 a6825f14e2257c38d3114e7ce1177d6a32cb2880 SHA256 f5fe74ecc6d78ca44f057fea1161472bcc6459ce15ca0267d71f9cd78ea450b1
+EBUILD readline-6.0_p4.ebuild 2766 RMD160 826366163854b580f13aa54cf0e4fd1e0171f6b2 SHA1 9651b790e0c71a0c43f7addaab7aea72b472f198 SHA256 945eb6921d80e34c1ce86826c261a8afd423fb2953ce95d8cea3a11ab6ef7a74
+MISC ChangeLog 16758 RMD160 8c19d5a350364f84dacd64ff8c1cf82c869e90a0 SHA1 31189f2191bf7150f9b82bdc4e15535ba05fddb2 SHA256 dc362c444822dae257790d2bbc58f079f84627104794a008b506ad5c3e720955
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoRSxAACgkQAiZjviIA2XifpACfSR/BUGtwJXdzBJO87VHL63ua
-0M0AoMqmM1iJB2pa4T1L7IUIqNdYe0nA
-=H3dO
+iEYEARECAAYFAkqZmUIACgkQlPl3HsVfCDoyxwCbBmkRXZ9qzU+cbuWhk0yPbk8f
+O+MAn1hMqX2rYUXQTAfy4opHLAzQSazO
+=1Fi9
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.0_p4.ebuild b/sys-libs/readline/readline-6.0_p4.ebuild
new file mode 100644
index 000000000000..cf8c5b173bd3
--- /dev/null
+++ b/sys-libs/readline/readline-6.0_p4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p4.ebuild,v 1.1 2009/08/29 21:10:20 vapier Exp $
+
+inherit autotools 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_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-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+# We must be certain that we have a bash that is linked
+# to its internal readline, else we may get problems.
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-2.05b-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	cd "${S}"
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.0-rlfe-build.patch #151174
+	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
+
+	# the bundled rlfe had its configure.in updated, but no one actually
+	# ran autoconf to have the configure file updated
+	ln -s ../.. examples/rlfe/readline
+	cd examples/rlfe
+	eautoconf
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+
+	econf --with-curses || die
+	emake || die
+
+	if ! tc-is-cross-compiler ; then
+		cd examples/rlfe
+		append-ldflags -Lreadline
+		econf || die
+		emake || die "make rlfe failed"
+	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}
+}