fix locale patch to make flameeyes happy

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 21 insertions, 22 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index c808d38a9c07..1cc2705698b6 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,9 +1,6 @@
 # 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.96 2006/06/22 19:38:17 flameeyes Exp $
-
-  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> gdb-6.5-r1.ebuild:
-  Remove the -locale patch as gdb crashes elseway, reopen bug #125264.
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.97 2006/06/22 23:41:20 vapier Exp $
 
   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 ab48baa4522f..21d7740ef738 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -97,10 +97,10 @@ AUX gdb-6.4-uclibc.patch 2435 RMD160 dbdc31ecf0f1797e389be965221594d1923c0f66 SH
 MD5 78d8fa43c0e2e339346b3bc7aa10c2d9 files/gdb-6.4-uclibc.patch 2435
 RMD160 dbdc31ecf0f1797e389be965221594d1923c0f66 files/gdb-6.4-uclibc.patch 2435
 SHA256 85cb69990ab8ed722433b79c6564ec65676009cd75bc258b20b7f2900a7a6676 files/gdb-6.4-uclibc.patch 2435
-AUX gdb-6.5-locale.patch 1412 RMD160 525309c87b7ae98e81a1a78464f923a299f82c1e SHA1 07accad805d9f2b5bf4cf94a30c22865ed08ec8c SHA256 a96f41ae34d36863e8fe212fc14de1386800ccdd455efb8872dc0e3eec1a697c
-MD5 9cb8988a3052f658720f48783c21d973 files/gdb-6.5-locale.patch 1412
-RMD160 525309c87b7ae98e81a1a78464f923a299f82c1e files/gdb-6.5-locale.patch 1412
-SHA256 a96f41ae34d36863e8fe212fc14de1386800ccdd455efb8872dc0e3eec1a697c files/gdb-6.5-locale.patch 1412
+AUX gdb-6.5-locale.patch 1439 RMD160 3b90588b758a0112ee0acf26522c8585f474d303 SHA1 7b9293c660f8b9b0a8906d7a3c040fa21f87f9d3 SHA256 f0df7aae51ac669ceb2161165e2f2045f54117133772b7941857be283938b379
+MD5 c527214cb0992f09797bca5feff14011 files/gdb-6.5-locale.patch 1439
+RMD160 3b90588b758a0112ee0acf26522c8585f474d303 files/gdb-6.5-locale.patch 1439
+SHA256 f0df7aae51ac669ceb2161165e2f2045f54117133772b7941857be283938b379 files/gdb-6.5-locale.patch 1439
 AUX gdb-6.5-scanmem.patch 6114 RMD160 e5a8eb2c513a9add2abf9c876e818900f5864f1a SHA1 4d009aee0073f3e7e767087d31f932e7384f58e5 SHA256 b9cf4fdc0bc8f8fc94a410ab26d1f85f88f85b52da4f57bc43b4aaab80ff1a82
 MD5 3c330fea2199743ef3822f86c408bb5e files/gdb-6.5-scanmem.patch 6114
 RMD160 e5a8eb2c513a9add2abf9c876e818900f5864f1a files/gdb-6.5-scanmem.patch 6114
@@ -162,18 +162,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 2449 RMD160 f933df2a86ee76f62237b035cd0aad12e4968763 SHA1 5bd6920239e657b0cd1b2003195cf93b1bf030f7 SHA256 56522d519c620b313237c6ba8c6f0fd2270564b78aff4ff30be7d2fd087b65a0
-MD5 6cc42e202ac7d1e8932e50b43acb5d43 gdb-6.5-r1.ebuild 2449
-RMD160 f933df2a86ee76f62237b035cd0aad12e4968763 gdb-6.5-r1.ebuild 2449
-SHA256 56522d519c620b313237c6ba8c6f0fd2270564b78aff4ff30be7d2fd087b65a0 gdb-6.5-r1.ebuild 2449
+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.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 14412 RMD160 698de7f642010a0bb52a6da3976ae75abd3e9725 SHA1 d4ed3925bcf8f630cd66661e6d990962cfe85bac SHA256 c0dbaa608706168f852b0106eeb27a68f85f927be64e2f6f53052c3fd2c1fe45
-MD5 a9d861136764f23a8c9cb3bb4f0ac8d3 ChangeLog 14412
-RMD160 698de7f642010a0bb52a6da3976ae75abd3e9725 ChangeLog 14412
-SHA256 c0dbaa608706168f852b0106eeb27a68f85f927be64e2f6f53052c3fd2c1fe45 ChangeLog 14412
+MISC ChangeLog 14265 RMD160 c968842317dd6a99bc426aa7812e2d30c4a2608d SHA1 6212bac033103ae6aa1e4304832545a2333c1835 SHA256 dfa1c0d98f13ebb8df412ad84b280d6af7a55f5a6b0a2d59748cb4cca864925d
+MD5 516a15d71a9fd2ac9d45566541f0d249 ChangeLog 14265
+RMD160 c968842317dd6a99bc426aa7812e2d30c4a2608d ChangeLog 14265
+SHA256 dfa1c0d98f13ebb8df412ad84b280d6af7a55f5a6b0a2d59748cb4cca864925d ChangeLog 14265
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -217,7 +217,7 @@ SHA256 1932bbb4d6dc9ae50c50caa7d99dacde75670122c6beb9ea303bb7023ae6ccea files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmvG+AiZjviIA2XgRAjTYAKDkMKu5Cic2IgTZ82vA9QWaMaoHHQCglMA4
-JNNrq9ea1RHINFzpkqXyLVk=
-=6+dX
+iD8DBQFEmyvbamhnQswr0vIRAjjHAKCqDEWmfC5n/hAWQdFybrjk89ApkQCgpoiE
+2UxgFzBBdCRyt6haYv4fqZ4=
+=qNVF
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/files/gdb-6.5-locale.patch b/sys-devel/gdb/files/gdb-6.5-locale.patch
index c50913169e79..b297d8cc7f00 100644
--- a/sys-devel/gdb/files/gdb-6.5-locale.patch
+++ b/sys-devel/gdb/files/gdb-6.5-locale.patch
@@ -9,9 +9,10 @@
  	@rm -f init.c-tmp init.l-tmp
  	@touch init.c-tmp
  	@echo gdbtypes > init.l-tmp
-+	LANG=c ; export LANG ; \
++	@-LANG=c ; export LANG ; \
 +	LC_ALL=c ; export LC_ALL ; \
- 	@-echo $(INIT_FILES) | \
+-	@-echo $(INIT_FILES) | \
++	echo $(INIT_FILES) | \
  	tr ' ' '\012' | \
  	sed \
 --- gdb/gdb_indent.sh
diff --git a/sys-devel/gdb/gdb-6.5-r1.ebuild b/sys-devel/gdb/gdb-6.5-r1.ebuild
index 3387a544b625..7adabe3b012e 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.3 2006/06/22 19:38:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.5-r1.ebuild,v 1.4 2006/06/22 23:41:20 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -50,6 +50,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/gdb-6.3-gdbinit-stat.patch
 	fi
 
+	epatch "${FILESDIR}"/gdb-6.5-locale.patch
 	epatch "${FILESDIR}"/gdb-configure-LANG.patch
 	strip-linguas -u bfd/po opcodes/po
 }