- fix gdbinit file causing errors with recent gdb. bug 97409

Package-Manager: portage-3679-svn

4 files changed, 29 insertions, 23 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 1cc2705698b6..591a8fae4b97 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.97 2006/06/22 23:41:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.98 2006/07/01 10:39:11 solar Exp $
+
+  01 Jul 2006; <solar@gentoo.org> gdb-6.5-r1.ebuild:
+  - fix gdbinit file causing errors with recent gdb. bug 97409
 
   22 Jun 2006; <solar@gentoo.org> files/gdb-6.4-scanmem.patch,
   files/gdb-6.5-scanmem.patch, gdb-6.5-r1.ebuild:
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 21d7740ef738..75633b1aeda8 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -122,6 +122,7 @@ DIST gdb-6.4.tar.bz2 13917226 RMD160 17e020f34628a004c9ff4539b23e630719d8c34c SH
 DIST gdb-6.5.tar.bz2 14303558 RMD160 ec5138a833d0f67b3e27fde653f1a80dec79b99f SHA1 4ec883314affaecc564fd5980996b4e81119a886 SHA256 0011318d9720781d486c835e88b915f90f2c10e7101d648b64dd4739218d3faf
 DIST gdb_6.3-6.diff.gz 201861 RMD160 9b55f1925a84002e25b4e82aa41abc55d79ac771 SHA256 9ef1f8a7f0b8c9d539ac93d997901ef34cdad7a5af9594463f51f3cb934b17e9
 DIST gdb_init.txt.bz2 6247 RMD160 877e32656cd77f0083cc2506795979884671b7d4 SHA1 5fab02365c535e9c7df3cb541e3e61cf7ff58b01 SHA256 dbd88def6a317eba947a7c37af471d9deb447c4a9906322c1afccd6537f1c724
+DIST gdbinit-6.2.txt.bz2 6834 RMD160 1e1d3103f06a3232807fdc21fe644727334c4159 SHA1 b117916865ff4d510c3a751a08b4275bfe7d335f SHA256 519951e8a2370687237b1d6994376656fd11120bee1aaa2b3f0a60c90bb18d4f
 EBUILD gdb-6.1.ebuild 1806 RMD160 e781bfc3dc4a9a28f83203b5e7694b8239a98242 SHA1 8c3f3729ee0b8830a860eb92e1eb978f9aa72eed SHA256 c0c522d870e2a300bcefc99d6395ee5f9b581ca5b03ccbb054691e097372ab14
 MD5 b002ee501a5bbd828a0f08376505fb70 gdb-6.1.ebuild 1806
 RMD160 e781bfc3dc4a9a28f83203b5e7694b8239a98242 gdb-6.1.ebuild 1806
@@ -162,18 +163,18 @@ EBUILD gdb-6.4.ebuild 2995 RMD160 64d7c67013e9029c9387cf26d5c70275d6ae39c9 SHA1
 MD5 64854d9e61c5f0c03dae7184dafa4f08 gdb-6.4.ebuild 2995
 RMD160 64d7c67013e9029c9387cf26d5c70275d6ae39c9 gdb-6.4.ebuild 2995
 SHA256 b83ed62def04ae3fd8812868c77fa7eb961a8475e57be5d4f9e407c926d6c575 gdb-6.4.ebuild 2995
-EBUILD gdb-6.5-r1.ebuild 2489 RMD160 b72f6beffbefcc2153dc32c1fe1118cacea9d488 SHA1 17b34265e5c558a25ade259d706ea494fa402f6c SHA256 ce31875dbda021ad67e64e4c5c8e228f9e5ec2a80d3b94602b1cde2d9282d0b4
-MD5 ff2beabb167c010f1264b5ac9bd03753 gdb-6.5-r1.ebuild 2489
-RMD160 b72f6beffbefcc2153dc32c1fe1118cacea9d488 gdb-6.5-r1.ebuild 2489
-SHA256 ce31875dbda021ad67e64e4c5c8e228f9e5ec2a80d3b94602b1cde2d9282d0b4 gdb-6.5-r1.ebuild 2489
+EBUILD gdb-6.5-r1.ebuild 2497 RMD160 24712686f09988b111613ba474df40945ae037f3 SHA1 e727ceeab84980064b4aa4673f31e6b2bf9c250f SHA256 a6085fff6c5faf1214b8bc96e4d72541cd630ac4ce6b5302a970da5a34f48cf5
+MD5 34d172d24654d8b0b92afdefd5cd7c82 gdb-6.5-r1.ebuild 2497
+RMD160 24712686f09988b111613ba474df40945ae037f3 gdb-6.5-r1.ebuild 2497
+SHA256 a6085fff6c5faf1214b8bc96e4d72541cd630ac4ce6b5302a970da5a34f48cf5 gdb-6.5-r1.ebuild 2497
 EBUILD gdb-6.5.ebuild 2487 RMD160 0a4226ee18bf49f7d1d78ac2f8163c057fe2c297 SHA1 70ef75845b708874ed072f077d4b40f5e9fb1f8d SHA256 478564c21c882249e406ea73a6ccc5f1844ce3d549e26d6428e66cc74a94b54a
 MD5 d9c9bd9149ab7b0078f1fb057f835391 gdb-6.5.ebuild 2487
 RMD160 0a4226ee18bf49f7d1d78ac2f8163c057fe2c297 gdb-6.5.ebuild 2487
 SHA256 478564c21c882249e406ea73a6ccc5f1844ce3d549e26d6428e66cc74a94b54a gdb-6.5.ebuild 2487
-MISC ChangeLog 14265 RMD160 c968842317dd6a99bc426aa7812e2d30c4a2608d SHA1 6212bac033103ae6aa1e4304832545a2333c1835 SHA256 dfa1c0d98f13ebb8df412ad84b280d6af7a55f5a6b0a2d59748cb4cca864925d
-MD5 516a15d71a9fd2ac9d45566541f0d249 ChangeLog 14265
-RMD160 c968842317dd6a99bc426aa7812e2d30c4a2608d ChangeLog 14265
-SHA256 dfa1c0d98f13ebb8df412ad84b280d6af7a55f5a6b0a2d59748cb4cca864925d ChangeLog 14265
+MISC ChangeLog 14381 RMD160 99053ae51c89d39b58a0d52cb7d6cc8b2889dcc9 SHA1 11e03b0448cc926120160277e38446e062047bf9 SHA256 094b83eb8178ef8fc54a0454f810602ba0599036c867ba124cea750fdd47b5c2
+MD5 1c8131d41e74c978f2d19bbddfa8c62f ChangeLog 14381
+RMD160 99053ae51c89d39b58a0d52cb7d6cc8b2889dcc9 ChangeLog 14381
+SHA256 094b83eb8178ef8fc54a0454f810602ba0599036c867ba124cea750fdd47b5c2 ChangeLog 14381
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -211,13 +212,15 @@ SHA256 4d4002b4f56c521a4c1a52e1faa05689242bbc7bb5b6b63b1e2e3ffbcadef0ce files/di
 MD5 3355b559d843142239ddba932461a7ca files/digest-gdb-6.5 455
 RMD160 c5b703aca040cf069665e1e0c6d4e8154c747f40 files/digest-gdb-6.5 455
 SHA256 1932bbb4d6dc9ae50c50caa7d99dacde75670122c6beb9ea303bb7023ae6ccea files/digest-gdb-6.5 455
-MD5 3355b559d843142239ddba932461a7ca files/digest-gdb-6.5-r1 455
-RMD160 c5b703aca040cf069665e1e0c6d4e8154c747f40 files/digest-gdb-6.5-r1 455
-SHA256 1932bbb4d6dc9ae50c50caa7d99dacde75670122c6beb9ea303bb7023ae6ccea files/digest-gdb-6.5-r1 455
+MD5 116faf55c6aee2acda4ace745c0f070c files/digest-gdb-6.5-r1 464
+RMD160 0ac8aacb4d461333cb59b2bbf3fd7c543802505c files/digest-gdb-6.5-r1 464
+SHA256 4a5c8930aaac85bb3c18bd1f2207411f412e664a5bd77475b24b079a4b6fa420 files/digest-gdb-6.5-r1 464
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEmyvbamhnQswr0vIRAjjHAKCqDEWmfC5n/hAWQdFybrjk89ApkQCgpoiE
-2UxgFzBBdCRyt6haYv4fqZ4=
-=qNVF
+iQCVAwUBRKZQ3J4WFLgrx1GWAQJwnwQAvTsxQZciL96iNuhKRnrT9lGuQKS2psUj
+Sk19PSWOeUSK3o6R6Obq47kqV6LWtmwsKIa5ZUaPO/VuoUO3DDSS3ucbu8wgUXYj
+t5kkrtgs2KqK/yIvcdsC4WQpbFavxujzManNjsYL/gr/NQ4M8s5M7ZrBdQ6nxpls
+j6/1XOuqai8=
+=7PHI
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/files/digest-gdb-6.5-r1 b/sys-devel/gdb/files/digest-gdb-6.5-r1
index 02eca76cd6e7..2ebbda40b311 100644
--- a/sys-devel/gdb/files/digest-gdb-6.5-r1
+++ b/sys-devel/gdb/files/digest-gdb-6.5-r1
@@ -1,6 +1,6 @@
 MD5 af6c8335230d7604aee0803b1df14f54 gdb-6.5.tar.bz2 14303558
 RMD160 ec5138a833d0f67b3e27fde653f1a80dec79b99f gdb-6.5.tar.bz2 14303558
 SHA256 0011318d9720781d486c835e88b915f90f2c10e7101d648b64dd4739218d3faf gdb-6.5.tar.bz2 14303558
-MD5 35e70c29e393433b3847527d808f59c2 gdb_init.txt.bz2 6247
-RMD160 877e32656cd77f0083cc2506795979884671b7d4 gdb_init.txt.bz2 6247
-SHA256 dbd88def6a317eba947a7c37af471d9deb447c4a9906322c1afccd6537f1c724 gdb_init.txt.bz2 6247
+MD5 7311f96c9606720950a1277c22e6f1b8 gdbinit-6.2.txt.bz2 6834
+RMD160 1e1d3103f06a3232807fdc21fe644727334c4159 gdbinit-6.2.txt.bz2 6834
+SHA256 519951e8a2370687237b1d6994376656fd11120bee1aaa2b3f0a60c90bb18d4f gdbinit-6.2.txt.bz2 6834
diff --git a/sys-devel/gdb/gdb-6.5-r1.ebuild b/sys-devel/gdb/gdb-6.5-r1.ebuild
index 7adabe3b012e..7030a7eed3e4 100644
--- a/sys-devel/gdb/gdb-6.5-r1.ebuild
+++ b/sys-devel/gdb/gdb-6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.5-r1.ebuild,v 1.4 2006/06/22 23:41:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.5-r1.ebuild,v 1.5 2006/07/01 10:39:11 solar Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,7 +16,7 @@ DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
 SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
-	mirror://gentoo/gdb_init.txt.bz2"
+	mirror://gentoo/gdbinit-6.2.txt.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	mv "${WORKDIR}"/gdb_init.txt . || die
+	cp "${WORKDIR}"/gdbinit-6.2.txt . || die
 
 	if ! use vanilla ; then
 		if [[ -n ${DEB_VER} ]] ; then
@@ -90,7 +90,7 @@ src_install() {
 
 	if use x86 ; then
 		dodir /etc/skel/
-		cp "${S}"/gdb_init.txt "${D}"/etc/skel/.gdbinit \
+		cp "${S}"/gdbinit-6.2.txt "${D}"/etc/skel/.gdbinit \
 			|| die "install ${D}/etc/skel/.gdbinit"
 	fi