Version bump #259830 by Lars (Polynomial-C).

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

4 files changed, 132 insertions, 3 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 8d8726915ed6..90b3c6eeb674 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2009/02/21 21:31:57 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.125 2009/02/21 21:38:02 vapier Exp $
+
+*readline-6.0 (21 Feb 2009)
+
+  21 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-6.0-rlfe-build.patch, +readline-6.0.ebuild:
+  Version bump #259830 by Lars (Polynomial-C).
 
   21 Feb 2009; Ferris McCormick <fmccor@gentoo.org> readline-5.2_p13.ebuild:
   Sparc really stable this time --- Bug #255707.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 0bc1f611e196..a4970b8a6730 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
 AUX readline-5.0-darwin.patch 461 RMD160 43c4f4af91ab61d05dfb1561f3bbf68f2eb2c88a SHA1 9c971543144248c883db953c6547f520f61cfb83 SHA256 449a7cc02ca053511dff11d29481ff40e76eb9a3ac0b3f0e119fe4501d06587e
 AUX readline-5.0-del-backspace-policy.patch 1074 RMD160 785fc7768f3a017a56e9119f25fece1f58490275 SHA1 376d47bfefb1a9da8c908e2e5e07b2fa273bb142 SHA256 d607c4b902a838662df132badc7ea8a38cc041c0c9b224b34ffd28cf6a43fe7b
@@ -12,10 +15,12 @@ AUX readline-5.1-rlfe-libutil.patch 530 RMD160 4f0d86709159d8299d51da21de99abd4f
 AUX readline-5.1-rlfe-uclibc.patch 1694 RMD160 715127465c03df7329f23b1a12aece8001aca96c SHA1 c43ace7708b19e55ce59127b7c4ff8bd7683e670 SHA256 8045b4a37c1a3b19171fe4192161af46188223bdd61ab5e32561593f9c89270e
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
 AUX readline-5.2-rlfe-build.patch 350 RMD160 b6563fbd50795759543f3294c1bf93a9e485cf7b SHA1 de2c1a03e054bdc94c641ff943d2677fb0542d58 SHA256 2a6e8890363b367e4df890c4d4c1afa30437712fbdae98d8f04b7baed3b4c58c
+AUX readline-6.0-rlfe-build.patch 743 RMD160 49ddd8e98588ea3efbd2c8fd613e27fa52d70b95 SHA1 29e6ca942db168919973d79a0f11e0c9b88268ac SHA256 3a084fe0c976355031b2b7a467b60489e4d26d5d4c443b69f102e55fa8ca4f2b
 DIST readline-4.3.tar.gz 961662 RMD160 07aebeb250284d0ef68acf44d1c1ff8578e2ae2f SHA1 4e226fd5f6f919707f11b9e28d47b5487448895d SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.0.tar.gz 1808946 RMD160 17b38d5cafab6dbc663aba4fbba5a2e282bb4876 SHA1 9b9959c3f62e3e82d3edd604c0bf6124d5256c9e SHA256 d19e4f820da653b94262b0e5cdeda45f474c2d7b378a85a4b9aeaae76269a611
 DIST readline-5.1.tar.gz 2030276 RMD160 e7e755bcde7a38740dd0ef6fc10d66614b74ea21 SHA1 4b2ee2bc9c6dd1d238c84a58f7e6db173600b850 SHA256 163ec6407ec75a709c9077657b1fca9314cc74999d57d1c35ab185702bb067c6
 DIST readline-5.2.tar.gz 2037705 RMD160 983cbb25192e0a376b80cb2428fe8ee254a041c7 SHA1 18f3412c73068509d5f491b7b4535aeaf9522834 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
+DIST readline-6.0.tar.gz 2270818 RMD160 9f886f437dfa3387cb3a4ce3439cefecffc2c789 SHA1 1e511b091514ef631c539552316787c75ace5262 SHA256 1199d905c025735b34cf67d03078585e18f84707052413279fe68ce48c1cc1de
 DIST readline43-001 1126 RMD160 57c72678aba1dd571ac3e8e9e1ba13eecba9725e SHA1 23a75df0b127ec1e29e627471cdf5618862dc9b2 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955
 DIST readline43-002 738 RMD160 70a53adbf3cd0f6d4867d71f8d1be3b898833463 SHA1 4500d4ee9d447c6e35569bb965ecf2905aa2b11e SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226
 DIST readline43-003 2202 RMD160 951968e3e937db9f4847c128ad78b2aab20df002 SHA1 e68ff498502ab28ec12826c97fdc87249f0af874 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b
@@ -46,7 +51,14 @@ DIST readline52-013 5147 RMD160 a9d06dc1bef660882b5cff82728a8cd5bea47ff0 SHA1 fc
 EBUILD readline-4.3-r5.ebuild 2440 RMD160 ed95358297a09a5c7b4006802ea9943f123e0473 SHA1 89c00be5142c25eca535bb79ac12379194cb56ec SHA256 ac0c10bef015db00ae60c547c3b2d12d59f8f30f32a3beaa712d913805a4b3eb
 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_p12-r1.ebuild 2733 RMD160 a098d35f886c199054105d4aa69d36fc200e6c1f SHA1 260317ba644fbe8be946c91daf0ea45afb5639c2 SHA256 138b0966ee76de881779a65b4d6acb1b228d2e8c6f12a92ef914b5f0c490f3df
 EBUILD readline-5.2_p13.ebuild 2730 RMD160 4b1c83ad3d87b97736f57cd6b2fe7fd556b474a6 SHA1 e47ce0cc60f83336995d305bae118fc960559cb8 SHA256 0efebbffeb7ade4fd1244a5a455a19eb51328640a90298420ec3ee85872ff5fb
-MISC ChangeLog 15825 RMD160 c64d8aeeb1b035b4754da87ca001c69fffaef868 SHA1 2af2336e53d9faa6fa36621312115d87c5b5a6c3 SHA256 10287cef8f6cfa5f056d8752144f653ca0018be1a0a39e71edb62c6c3d5174cc
+EBUILD readline-6.0.ebuild 2465 RMD160 34c76226ff3657388a3f071c1bd7be1d89cbb9a4 SHA1 49ac8b0ec544f96dead6ca9dca6ef5826c5cb0d5 SHA256 abc37fd57677d3b929f10ef3488590e69e106f453291e83a0f5c5c68a1c28ac7
+MISC ChangeLog 16014 RMD160 59c721e2bde25cec65b629f4ff7b79913cd830c6 SHA1 48c073a12dbaad2f2522fb9e245ccb8e9d448eb1 SHA256 142191df26979648c77bf607141b8525a44fc952dbf00643794528de9b7b6b00
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmgdEAACgkQn/5bYzqsSmE5TACfRK2DiqFJDDb+Y2dHWiNPAgPS
+vEMAn15lLGjdg0iiufliuAiQPpjQYIJM
+=cGBg
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.0-rlfe-build.patch b/sys-libs/readline/files/readline-6.0-rlfe-build.patch
new file mode 100644
index 000000000000..cc4ca97ee849
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.0-rlfe-build.patch
@@ -0,0 +1,21 @@
+--- a/examples/rlfe/Makefile.in
++++ b/examples/rlfe/Makefile.in
+@@ -55,7 +55,7 @@ rlfe-$(VERSION).tar.gz:
+ 	tar czf $@ $(CFILES) $(HFILES) $(EXTRA_DIST)
+ 
+ .c.o:
+-	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
++	$(CC) -c -I. -I$(srcdir) $(CPPFLAGS) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
+ 
+ install_bin: .version screen
+ 	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+@@ -170,6 +170,9 @@ depend.in: $(CFILES) term.h
+ 	for i in $(CFILES); do echo $$i; $(CPP_DEPEND) $$i >> tmp_make; done 
+ 	mv tmp_make Makefile.in
+ 
++Makefile: $(srcdir)/Makefile.in
++	./config.status
++
+ ###############################################################################
+ 
+ ### Dependencies:
diff --git a/sys-libs/readline/readline-6.0.ebuild b/sys-libs/readline/readline-6.0.ebuild
new file mode 100644
index 000000000000..24a7a780a141
--- /dev/null
+++ b/sys-libs/readline/readline-6.0.ebuild
@@ -0,0 +1,90 @@
+# 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.ebuild,v 1.1 2009/02/21 21:38:02 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
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/readline/${MY_P}.tar.gz
+	$(for ((i=1; i<=PLEVEL; i++)); do
+		printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \
+			${MY_PV} ${MY_PV/\.} ${i}
+		printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \
+			${MY_PV} ${MY_PV/\.} ${i}
+	done)"
+
+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}"
+	# Official patches
+	local i
+	for ((i=1; i<=PLEVEL; i++)); do
+		epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
+	done
+	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"
+
+	# 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
+
+	cd examples/rlfe
+	append-ldflags -Lreadline
+	econf || die
+	emake || die "make rlfe failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	gen_usr_ldscript -a readline history #4411
+
+	dobin examples/rlfe/rlfe || die
+
+	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}
+}