Use system readline only if it is version 5 #259865 by michel.

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

3 files changed, 21 insertions, 18 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 68c27615e442..baf3df771637 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.150 2009/02/01 19:29:31 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.151 2009/02/22 19:45:43 vapier Exp $
+
+  22 Feb 2009; Mike Frysinger <vapier@gentoo.org> gdb-6.8-r1.ebuild:
+  Use system readline only if it is version 5 #259865 by michel.
 
   01 Feb 2009; nixnut <nixnut@gentoo.org> gdb-6.8-r1.ebuild:
   ppc stable #255219
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index bd4e2067ddb9..14317de406d7 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,21 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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-patches-1.0.tar.bz2 12838 RMD160 18f3c59508996260a2802ff7c448c052745e09ed SHA1 b5808222cb1ca227966cc3f893dac7be0a9fa16c SHA256 12f8c9b7cfbfb26c93be2f0947ae7a8dc79330a8e0bfe09ef75de5af811c4288
-DIST gdb-6.7.1-patches-1.0.tar.bz2 12966 RMD160 6a71494624e4b48a50e735c41fc2575ac8ec320d SHA1 46167b8d56708264474d19a6adbb75787014bd57 SHA256 641c0a6d18521ef05eaee0bf2c95889c330504e9cb8e01a68223ff800aa5e003
-DIST gdb-6.7.1-patches-1.2.tar.bz2 108825 RMD160 fbc3f10cae8decabc863c82d13d714e84bfa8960 SHA1 66b3ea852a27dec99d5bdba8ccaa63bbfaa7a191 SHA256 3be9b6f2a6e1ec849051863fe0403c37039bed24956bfc7b6a021aada4798dcf
 DIST gdb-6.7.1-patches-1.3.tar.bz2 109192 RMD160 412c8ef3a4dd2073bd56b01d762af8c5bcd1ba6c SHA1 c648fe09b120ab45e367e904758cdd95abeb675e SHA256 8d614d6ecdb343310904e293bc86f154550829cb45c5b5bd3bff9c26543f9132
 DIST gdb-6.7.1.tar.bz2 15080950 RMD160 c5ae709aefe75094c8d08341bfb882b490ddb2a2 SHA1 4ecfb5896d511111d9a5d91e937501caa9d33ced SHA256 f98cec38420f4f1ce3da2f16e6045f086d24dfcf05996b2d74f8620691442f62
-DIST gdb-6.7.tar.bz2 15073550 RMD160 f0986444276aab71812de18a68d985c69bff053a SHA1 ae382e15bae724040612bab463f1df911ce0056e SHA256 ee9426b4e63414de2435a46f5f3f764fc2a343b9bc764de04e8652ab68c095b5
-DIST gdb-6.8-patches-1.2.tar.lzma 99050 RMD160 788ce6d9ec97c5edb6d1e662fa0b49347bda063e SHA1 f9b2f9c1ad2832d5507f8f1b2acfe150382531f6 SHA256 140631a0bb19516eb3ff7045d7e8f8dadc1e3e717bdb39dbc7a8907470179534
-DIST gdb-6.8-patches-1.3.tar.lzma 122576 RMD160 aa6551a41e8116c8006fd17c00852ef1c5ef45c2 SHA1 6bbe3c4938ec11f88cecf47c0edca46d9e8dd359 SHA256 428deff35788ab4e7938eb978df7ea97e29d3947a50cfbbc982c9c0257d526ab
+DIST gdb-6.8-patches-1.4.tar.lzma 122922 RMD160 fbe74b5dc6400389a4a7d70597b0028cbe480c93 SHA1 1c37bb223ff4b7eb7cbba249af1a216a3bf289e6 SHA256 83121b238df52e4556ea197112f6103b34965b8e1773ab1af2949baf53f8dde4
 DIST gdb-6.8.tar.bz2 15581509 RMD160 23fc9442290b6383ce8f943ef1eb117fa06e79fb SHA1 ba1394d59dd84a1dd3a83322bd82c799596f0bcf SHA256 eedffd586bf41cf2ae2f77e6819545d6eb1e5062052320a27332fdfaaebdf818
 EBUILD gdb-6.6-r2.ebuild 1965 RMD160 dd9796c54dd064da5320890ae75b5daeb990966e SHA1 3fa16ab607a198a45df1c97a89ce014428e67cc0 SHA256 8616917d220910323743342822761795e29ee199e77fc7602ca9483e7e7d1e37
-EBUILD gdb-6.7.1-r1.ebuild 2019 RMD160 2e6672ba901b1604da827f3ea144e0eee2017905 SHA1 41320faec8433881937795fc57d981dd0ea0f91f SHA256 900f1d97aa84d90c05f27feecac357da51b460982aa1c80da639c8d43db99c77
-EBUILD gdb-6.7.1-r2.ebuild 2059 RMD160 d0ee80f1e74c86e984b39d39bb863fe9bd76372e SHA1 3254b7f25cc2e78ee3ebf084530b3f5f84f09155 SHA256 678d63538ad0dbaf1e28338f416f10f926f237ef068c107f1985f8fb4b1752ea
 EBUILD gdb-6.7.1-r3.ebuild 2057 RMD160 c0b55697d29010498fba876759fd5761ac30da33 SHA1 97aa63d6901f8ee641f0295d4e7ec3b0f718cf50 SHA256 e19744a4814fd530cde4420f1d24a81ae61c141b7f5f8866a8ae964e0a898b12
-EBUILD gdb-6.7.1.ebuild 2006 RMD160 71ca5f9acbf6e910e7a35fdca3cf5cf3eed91200 SHA1 9f1a771042a178e04a1d91802dc4053a7f0a08f9 SHA256 779f8edfe16bf839cc7dea920e843047357910705d9a0e2f548d824fe801c7a2
-EBUILD gdb-6.7.ebuild 2014 RMD160 b23a09a5d0d773d0b6e2404fd585561ee2925f48 SHA1 6520d8ece4ce1c3268c2f4cf0486c753ffb2c54c SHA256 b3d686f0ce7d5e3033b0239b4a45a984238df54cbb79593783369524ae088df6
-EBUILD gdb-6.8-r1.ebuild 2141 RMD160 f540f4ed6e075b3e6f7b5e309a06ef3118f15de5 SHA1 9a6112b910593735e1b2d9ecf268b478ba4f03ee SHA256 4727a1b7a8cdd64a10dc978d9cd0b6e4eeed81219559468f4ddc8b6615d8904e
-EBUILD gdb-6.8.ebuild 2148 RMD160 79fc382fdfb90a2f9a5748c872db88839ab757bc SHA1 f461383d362a70e27078c8d745a8f87b2b669465 SHA256 339cd1cb813668c95551496284974003dc246beca8b830d23f3915ff45891953
-MISC ChangeLog 20384 RMD160 29cd4e2ad96d42a11e4dddd755c38ee3c9dba37d SHA1 e4b911cdacdb282f53d7a4e017e7aaf6111dd5a3 SHA256 e90251a6213dd2e3cb0e750c5cb9d6081224ee8290b23ff673b104ab31f09104
+EBUILD gdb-6.8-r1.ebuild 2189 RMD160 77072e164800b37bb1967f1248b5d068b090b8bb SHA1 3441778e4a41c54f1ee17c64eaed81052e8db90a SHA256 53f153ece09bdba48c8639e5f26b9491074f8d8360ec7d7bd458f1668e58e358
+MISC ChangeLog 20519 RMD160 c88097e03ce340025de7be3b35b05af435dec84c SHA1 8c7e6f12cc263269f1bcf5e2f5378aaeb9edb6d5 SHA256 09b7322704f48b52e9318398378334e70d0dffc4c038f7e8f5a64f2a6bb6dcae
 MISC metadata.xml 251 RMD160 cb176faa89c777027383a74e60c27715c40bf23e SHA1 03fd413e01587f416f4c34afe2cf23946584100a SHA256 49bbfdebf288c2c31f6f6733c58c4092104a208f9e34533b824ec20b15915be2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmhq24ACgkQn/5bYzqsSmHx2gCcCmTTZxXyE2sVw/qNw8spjsm7
+QoMAoItGawij8PZppj4kVPWt2j8AuqMd
+=mJz6
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-6.8-r1.ebuild b/sys-devel/gdb/gdb-6.8-r1.ebuild
index 2fb707ef5736..1e65043bfe0f 100644
--- a/sys-devel/gdb/gdb-6.8-r1.ebuild
+++ b/sys-devel/gdb/gdb-6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r1.ebuild,v 1.8 2009/02/01 19:29:31 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r1.ebuild,v 1.9 2009/02/22 19:45:43 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-PATCH_VER="1.3"
+PATCH_VER="1.4"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
 SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
@@ -43,7 +43,7 @@ src_compile() {
 	strip-unsupported-flags
 	econf \
 		--disable-werror \
-		--with-system-readline \
+		$(has_version '=sys-libs/readline-5*' && echo --with-system-readline) \
 		$(use_enable nls) \
 		$(use multitarget && echo --enable-targets=all) \
 		|| die
@@ -51,7 +51,7 @@ src_compile() {
 }
 
 src_test() {
-	make check || ewarn "tests failed"
+	emake check || ewarn "tests failed"
 }
 
 src_install() {