Switch back to system readline now that newer versions work again.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 23 insertions, 9 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 98398b820b7c..15abb9943b64 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.182 2011/03/16 15:18:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.183 2011/03/22 16:14:19 vapier Exp $
+
+  22 Mar 2011; Mike Frysinger <vapier@gentoo.org> gdb-7.1.ebuild,
+  gdb-7.2.ebuild:
+  Switch back to system readline now that newer versions work again.
 
   16 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> gdb-7.2.ebuild:
   ppc64 stable wrt #350259
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 996ed628c87e..6701107813dc 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gdb-6.6-patches-1.3.tar.bz2 15697 RMD160 b9b8576241c1df2288a2473b606155d1e14b0f0a SHA1 075eb0f1817963d0a1fab400d3183bc8d976a208 SHA256 7911134ce63ede4e1a45488481cf7cdc1b69ab00c8b3a432983344ff95a0051e
 DIST gdb-6.6.tar.bz2 14535755 RMD160 6430798ba47a1913676622db9a73bf2bcfa703be SHA1 744bd0f0740dfe6527036b1dda8fe6a08adbbaeb SHA256 6e602987298db5ddb479bbb84ce653eabd9c304957a49552245f65cdc70d43bd
 DIST gdb-6.7.1-patches-1.3.tar.bz2 109192 RMD160 412c8ef3a4dd2073bd56b01d762af8c5bcd1ba6c SHA1 c648fe09b120ab45e367e904758cdd95abeb675e SHA256 8d614d6ecdb343310904e293bc86f154550829cb45c5b5bd3bff9c26543f9132
@@ -17,8 +20,15 @@ EBUILD gdb-6.7.1-r3.ebuild 2057 RMD160 c0b55697d29010498fba876759fd5761ac30da33
 EBUILD gdb-6.8-r1.ebuild 2217 RMD160 52a6b0aab722ab31ba81c0d69594018722e116ec SHA1 53ef7917808a0831c43b2c1227fa5738a1fa0ded SHA256 c06f279e6fb71eaba409a4a9c3d8ef559d3fc9615edc126110639c333013a3aa
 EBUILD gdb-6.8-r2.ebuild 2281 RMD160 d954946874299851eb7208dcfe46b59a6884fc90 SHA1 50b82fe8fa0898f1addbef936084da71e2de7bd3 SHA256 cecbcc830902a52f65998fdddb153a939596db5fdb5a7f4352db3384f6230878
 EBUILD gdb-7.0.1.ebuild 2662 RMD160 b0b28b127070a76420944c4b33bed46f73bf79b3 SHA1 90bc46657854cc1611d011a61d571b3ebb4669a1 SHA256 018f756e5b16deb603844761e8630cff51fa4c367390681d346247074e346a38
-EBUILD gdb-7.1.ebuild 2670 RMD160 8a257a0dd3994f46850405b3f3ff1635575a1429 SHA1 2883816a8af5b8b2690157a539fb9401c2aa0778 SHA256 38bef842b2120058e1818d2c3403bb6faccfea6e22093c1d52460920fdf8d890
+EBUILD gdb-7.1.ebuild 2621 RMD160 11f84a78dbe93023ad5ee5cb726284f84bba8d3b SHA1 288f227938c607bc551e190a80a2e460e2be6e21 SHA256 46ba95a663ac81bfdb61b43f0b19ab05ae6f287fdd49a5174f492fe1cf5aca36
 EBUILD gdb-7.2.50.20101117.4.15.ebuild 3089 RMD160 b6ecd83162d74f5977678a1b48625949a2ef897b SHA1 0b73196b1914b7a4aaebc07f96c20ab293bd80bc SHA256 8f4c0108099ddc82cafd77896a1fa1b07a30f0bfec02909d61a84b9b93b070fc
-EBUILD gdb-7.2.ebuild 3145 RMD160 df8ddf98d67d911dac24c73b5599a8adde094530 SHA1 f6e8e337154e3da20606075ec8b914a33c6462ed SHA256 4a6cb110606fe8bf96f6b61bd0a2e74805713d1433089df645fe4f088a20a4e8
-MISC ChangeLog 24182 RMD160 2a0434f1401e983c2703b79709da1fa6aad25f11 SHA1 06ee10c1eb9a1231e195e488d486aaebb3dcbbe4 SHA256 c80c77c2983c430d394264e1ed9fd99d1d35fdd4022ef303b6d53c652618a5c9
+EBUILD gdb-7.2.ebuild 3092 RMD160 da91ca414c05e724d6fb53a97236acc701d7a7f9 SHA1 e7dd698f0ae963f159b32a0b27928f357b58267e SHA256 1e3db9c54513e7e833966dd708b53c9ea55ddfd158e6b7b9a474359bd8d54c9e
+MISC ChangeLog 24332 RMD160 62a3f015a6e14757e1fb47d297eb63f2b54baab6 SHA1 842a01de92ede14894af79056edde36838093474 SHA256 51fcfa58b2a070854d84015a743b52f813b56ff5e2ec984c57060c4660700070
 MISC metadata.xml 252 RMD160 13550896f405ea2c00c68851097c455b13211ea8 SHA1 66fb63761a7800e71fa8d88244676f588c1e3490 SHA256 2bda98dae8fab414bb0fe138ac6cc256ad1bbdc031937ab18990674fc58f1e9e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2Iyt4ACgkQaC/OocHi7JbZxQD/bLbMJusj+g3+xryL4y7WLAKU
+tTmUMLqLtr5YS6srI2EBAInEeRiNdLNbw0UMcL+kKliKbuT4P22TN1SPqv2BOjO+
+=O9Z4
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.1.ebuild b/sys-devel/gdb/gdb-7.1.ebuild
index b3e286247d11..12fa13f1617b 100644
--- a/sys-devel/gdb/gdb-7.1.ebuild
+++ b/sys-devel/gdb/gdb-7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.1.ebuild,v 1.1 2010/03/19 02:21:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.1.ebuild,v 1.2 2011/03/22 16:14:19 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -57,7 +57,7 @@ src_compile() {
 		--with-pkgversion="$(gdb_branding)" \
 		--with-bugurl='http://bugs.gentoo.org/' \
 		--disable-werror \
-		$(has_version '=sys-libs/readline-5*:0' && echo --with-system-readline) \
+		--with-system-readline \
 		$(is_cross && echo --with-sysroot=/usr/${CTARGET}) \
 		$(use_with expat) \
 		$(use_enable nls) \
diff --git a/sys-devel/gdb/gdb-7.2.ebuild b/sys-devel/gdb/gdb-7.2.ebuild
index 7a62f105c05b..e228a15bf4c5 100644
--- a/sys-devel/gdb/gdb-7.2.ebuild
+++ b/sys-devel/gdb/gdb-7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.ebuild,v 1.10 2011/03/16 15:18:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.ebuild,v 1.11 2011/03/22 16:14:19 vapier Exp $
 
 EAPI="3"
 
@@ -76,7 +76,7 @@ src_configure() {
 		--with-bugurl='http://bugs.gentoo.org/' \
 		--disable-werror \
 		--enable-64-bit-bfd \
-		$(has_version '=sys-libs/readline-5*:0' && echo --with-system-readline) \
+		--with-system-readline \
 		$(is_cross && echo --with-sysroot=/usr/${CTARGET}) \
 		$(use_with expat) \
 		$(use_enable nls) \