added fix for bug 131412

Package-Manager: portage-2.1_pre10-r2

7 files changed, 108 insertions, 22 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index f8c6d88d03f8..19653d811f54 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/sourcenav
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.16 2006/04/24 02:43:21 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.17 2006/05/07 20:23:08 nerdboy Exp $
+
+  07 May 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/sourcenav-5.2_beta2-gcc4.patch, sourcenav-5.2_beta2.ebuild:
+  Added fix for bug 131412 (gcc 4 barfs on -fwritable-strings).  Thanks to
+  dirtyepic.sk@gmail.com for the patch (filter-flags won't do it).
 
   24 Apr 2006; Steve Arnold <nerdboy@gentoo.org> sourcenav-5.2_beta2.ebuild:
   added debug USE flag, fix for bug 119580, reworked for modular X
diff --git a/dev-util/sourcenav/Manifest b/dev-util/sourcenav/Manifest
index 7657c7bcb80b..ae5408a69473 100644
--- a/dev-util/sourcenav/Manifest
+++ b/dev-util/sourcenav/Manifest
@@ -1,30 +1,45 @@
-MD5 91145aedbb922ffe93ebfed45c48aebf ChangeLog 2766
-RMD160 2da74ab985668bdc3bb6c574694d27bd7d79b11c ChangeLog 2766
-SHA256 5d0d254bd0b938235f538cd45d71e5985f7d0d911ee6d37550f9ce1049dfa19b ChangeLog 2766
-MD5 f9473966bdccef516f67d1afcf91f0af files/digest-sourcenav-5.1.1 69
-RMD160 3d313a95360a3920b81ee47d70442ee0b72e14a8 files/digest-sourcenav-5.1.1 69
-SHA256 1bea167aafa4cfababeb084f2b5b518c61d715a7522fb85407cdb945fbc9c4af files/digest-sourcenav-5.1.1 69
-MD5 c7216746f2408527875ea2b91c3546b3 files/digest-sourcenav-5.1.4 142
-RMD160 3786fcb470c427dc638945192dc51fe062f3b0a0 files/digest-sourcenav-5.1.4 142
-SHA256 e2a016bad775f38819bf8b6af0fc4ebbd1e6baf816081400b79592026c161f9e files/digest-sourcenav-5.1.4 142
-MD5 aa772944ff2487b5f0ad0bc74407615a files/digest-sourcenav-5.2_beta2 69
-RMD160 905a274dec679b906358418293c61c328a3345a1 files/digest-sourcenav-5.2_beta2 69
-SHA256 b30494ddc4116db4890a7028e8e69aa8851559ee6fdcf15279d7af3be41844c8 files/digest-sourcenav-5.2_beta2 69
+AUX sourcenav-5.1.1-gentoo.diff 19582 RMD160 751964abc412c0bc599b486681fc9a944fc32933 SHA1 a70481caa2e4b127ca1cb5b620328a07068373db SHA256 fdd6b5c9b029dadd2b4fd389460c2042257a87767c35bb4cb93852b1d8e548d0 size 19582
 MD5 e76d446608de5aa7eb565c5a13ea1fac files/sourcenav-5.1.1-gentoo.diff 19582
 RMD160 751964abc412c0bc599b486681fc9a944fc32933 files/sourcenav-5.1.1-gentoo.diff 19582
 SHA256 fdd6b5c9b029dadd2b4fd389460c2042257a87767c35bb4cb93852b1d8e548d0 files/sourcenav-5.1.1-gentoo.diff 19582
+AUX sourcenav-5.2_beta2-gcc4.patch 2138 RMD160 1378b66a9300d23873c6e2e21a5ef395e0806e5e SHA1 2194d964a6e7b3f1bf61ef447b580c4b4e803c84 SHA256 a13f1d209cc452e9abdc1eb3292c41dcf212193ae6803f4037ed009dea713ecd size 2138
+MD5 490e9f23967f217f34a213c62f5fd0ed files/sourcenav-5.2_beta2-gcc4.patch 2138
+RMD160 1378b66a9300d23873c6e2e21a5ef395e0806e5e files/sourcenav-5.2_beta2-gcc4.patch 2138
+SHA256 a13f1d209cc452e9abdc1eb3292c41dcf212193ae6803f4037ed009dea713ecd files/sourcenav-5.2_beta2-gcc4.patch 2138
+AUX sourcenav_destdir.patch 455 RMD160 d4ccf55b39869f2be931680c87fa7db05b9f5e34 SHA1 e8c62966b001317541c37ff38a6af804cdc65c57 SHA256 e62679456dfda54cf8268a813f0fa932b83c1cab0ea8467cae315180b8d281ca size 455
 MD5 96c9ea7073d13510db6b2b3387d795c8 files/sourcenav_destdir.patch 455
 RMD160 d4ccf55b39869f2be931680c87fa7db05b9f5e34 files/sourcenav_destdir.patch 455
 SHA256 e62679456dfda54cf8268a813f0fa932b83c1cab0ea8467cae315180b8d281ca files/sourcenav_destdir.patch 455
-MD5 9b44ceac3e42ae2c276343e13124b919 metadata.xml 440
-RMD160 1abe25221723d019af0ecb4ede17037d383e6e60 metadata.xml 440
-SHA256 1ff54a7e138b26b1a4a02eb30c28843b47de2965a1f6375604367b554d62463f metadata.xml 440
+DIST sourcenav-5.1.1.tar.gz 14308659 RMD160 ad7ae632156f4237b0736ce91335e7eb07aeed26 SHA256 e344aed5335bbf91db4a1a5290fb7acc1b8b06b4e654ed7a189e3a699dd3a8db size 14308659
+DIST sourcenav-5.1.4-gentoo.diff.gz 4560 RMD160 ef800f88f9d878f83894bb1ff72b4b633c3a73f5 SHA256 46429bf59d2aeafaf3db45e943c345eaab9f59378c4f0625226e3318d91f3662 size 4560
+DIST sourcenav-5.1.4.tar.gz 11101823 RMD160 1e4fc7f4b3791e3e39e1b23b9d4d8453fb067493 SHA256 338a583c044f2ca1db3850e13206ff205a9867b2cfdabd51f159f255bfd906c7 size 11101823
+DIST sourcenav-5.2b2.tar.gz 13486494 RMD160 84c4e8f208cbb3af4899a3a564a440018513dcbf SHA256 c03cb65f875250c8a6cc48ecbd2934e5f90b65cf428fe561ec2a1705747f1355 size 13486494
+EBUILD sourcenav-5.1.1.ebuild 1366 RMD160 a281315a3f5d600e2ee9b83c2aff2a8620e41497 SHA1 70419001e5b61bc041b7fddd255e93c1fa55cd67 SHA256 9b29e3d4333360419f0dcc53ca08fda2b89529096cfbf550f35632d8ae06219e size 1366
 MD5 70fc27723830381f431999fdd4db6e4d sourcenav-5.1.1.ebuild 1366
 RMD160 a281315a3f5d600e2ee9b83c2aff2a8620e41497 sourcenav-5.1.1.ebuild 1366
 SHA256 9b29e3d4333360419f0dcc53ca08fda2b89529096cfbf550f35632d8ae06219e sourcenav-5.1.1.ebuild 1366
+EBUILD sourcenav-5.1.4.ebuild 1247 RMD160 c425fb600075dbfce9d0e1da771c1fbaeecc313a SHA1 d37ac531ebd69bb736adccfc9736dbc0285a56fa SHA256 92fb564cd7ccbeb90521c2add5a73143002c3755442339e4d5ce2afa0fb4a958 size 1247
 MD5 c09d1e281094ce26fc7f1420187c7078 sourcenav-5.1.4.ebuild 1247
 RMD160 c425fb600075dbfce9d0e1da771c1fbaeecc313a sourcenav-5.1.4.ebuild 1247
 SHA256 92fb564cd7ccbeb90521c2add5a73143002c3755442339e4d5ce2afa0fb4a958 sourcenav-5.1.4.ebuild 1247
-MD5 f259dbcd1c3c8541d0c81e12d11f2408 sourcenav-5.2_beta2.ebuild 1747
-RMD160 18ae3f18a5223c9ba9ba105fa743b0e8512c0e70 sourcenav-5.2_beta2.ebuild 1747
-SHA256 8d127dd995c0833cf7316d89113675880cd268a11a5669c72abf3879033e9013 sourcenav-5.2_beta2.ebuild 1747
+EBUILD sourcenav-5.2_beta2.ebuild 1854 RMD160 0273cd51c2432b5ff6b59be8a5fce570fb900bd7 SHA1 b654b1bf17d7db2b9ca1e687d8c5ec051791908f SHA256 06749c00fc768f2fbfaca79de2254d3c18709be73888ccb748dcfca85c96f15a size 1854
+MD5 fdbb4d329f465410e0efa57f3cbf8710 sourcenav-5.2_beta2.ebuild 1854
+RMD160 0273cd51c2432b5ff6b59be8a5fce570fb900bd7 sourcenav-5.2_beta2.ebuild 1854
+SHA256 06749c00fc768f2fbfaca79de2254d3c18709be73888ccb748dcfca85c96f15a sourcenav-5.2_beta2.ebuild 1854
+MISC ChangeLog 3027 RMD160 4cf84a44af0926e2c5e95d7944163c39c6dd10ed SHA1 f57d8a096efc021d279600d00a1e53dfc78de7a1 SHA256 7c027db48bd8c8811d0be758b4dcd4419eea0af9567d7c21225a90dae1b63392 size 3027
+MD5 7f2ce0046c24324471b4fdcb5dd4e3be ChangeLog 3027
+RMD160 4cf84a44af0926e2c5e95d7944163c39c6dd10ed ChangeLog 3027
+SHA256 7c027db48bd8c8811d0be758b4dcd4419eea0af9567d7c21225a90dae1b63392 ChangeLog 3027
+MISC metadata.xml 440 RMD160 1abe25221723d019af0ecb4ede17037d383e6e60 SHA1 2f565db452c1cc45b762927b4a0c6cebe2f8b6f1 SHA256 1ff54a7e138b26b1a4a02eb30c28843b47de2965a1f6375604367b554d62463f size 440
+MD5 9b44ceac3e42ae2c276343e13124b919 metadata.xml 440
+RMD160 1abe25221723d019af0ecb4ede17037d383e6e60 metadata.xml 440
+SHA256 1ff54a7e138b26b1a4a02eb30c28843b47de2965a1f6375604367b554d62463f metadata.xml 440
+MD5 0a051ea715ac4c17fd5a76124276e952 files/digest-sourcenav-5.1.1 253
+RMD160 4b8128e2f46c7ba6e36062262551febcbccf1166 files/digest-sourcenav-5.1.1 253
+SHA256 22bd31b10ae884f394766a949feb1f6e4169f0e571c5edb5c402711f46983db6 files/digest-sourcenav-5.1.1 253
+MD5 6a9556d7dd1ba7a4baf1d5cad354c2df files/digest-sourcenav-5.1.4 518
+RMD160 7f572dafbf061908276cd507f2fd8fc90cb44f53 files/digest-sourcenav-5.1.4 518
+SHA256 72e010aa128fad7eb5281cb9f73ebf46a88e903eba881b974cc7e69d77e7fac1 files/digest-sourcenav-5.1.4 518
+MD5 756b6e3e743b327ca43955b9001d1353 files/digest-sourcenav-5.2_beta2 253
+RMD160 019535e93f28c53389630136e7bb73c53aabc7af files/digest-sourcenav-5.2_beta2 253
+SHA256 0921374e2d5871875066ecf5f534121aabbf0f7b633604de68c2aa07e21fba2e files/digest-sourcenav-5.2_beta2 253
diff --git a/dev-util/sourcenav/files/digest-sourcenav-5.1.1 b/dev-util/sourcenav/files/digest-sourcenav-5.1.1
index cb634d0dd1b7..c53a42c13c30 100644
--- a/dev-util/sourcenav/files/digest-sourcenav-5.1.1
+++ b/dev-util/sourcenav/files/digest-sourcenav-5.1.1
@@ -1 +1,3 @@
 MD5 770d87915ab81b78a20efdf6e25a3c11 sourcenav-5.1.1.tar.gz 14308659
+RMD160 ad7ae632156f4237b0736ce91335e7eb07aeed26 sourcenav-5.1.1.tar.gz 14308659
+SHA256 e344aed5335bbf91db4a1a5290fb7acc1b8b06b4e654ed7a189e3a699dd3a8db sourcenav-5.1.1.tar.gz 14308659
diff --git a/dev-util/sourcenav/files/digest-sourcenav-5.1.4 b/dev-util/sourcenav/files/digest-sourcenav-5.1.4
index b0f5c5d9e257..0347ab7aaa5d 100644
--- a/dev-util/sourcenav/files/digest-sourcenav-5.1.4
+++ b/dev-util/sourcenav/files/digest-sourcenav-5.1.4
@@ -1,2 +1,6 @@
 MD5 2158eaf6c6534c7b06dc03aebacadd19 sourcenav-5.1.4-gentoo.diff.gz 4560
+RMD160 ef800f88f9d878f83894bb1ff72b4b633c3a73f5 sourcenav-5.1.4-gentoo.diff.gz 4560
+SHA256 46429bf59d2aeafaf3db45e943c345eaab9f59378c4f0625226e3318d91f3662 sourcenav-5.1.4-gentoo.diff.gz 4560
 MD5 a0d03e062851adf1364a6adba0350219 sourcenav-5.1.4.tar.gz 11101823
+RMD160 1e4fc7f4b3791e3e39e1b23b9d4d8453fb067493 sourcenav-5.1.4.tar.gz 11101823
+SHA256 338a583c044f2ca1db3850e13206ff205a9867b2cfdabd51f159f255bfd906c7 sourcenav-5.1.4.tar.gz 11101823
diff --git a/dev-util/sourcenav/files/digest-sourcenav-5.2_beta2 b/dev-util/sourcenav/files/digest-sourcenav-5.2_beta2
index cde22366f186..6e5245249dbb 100644
--- a/dev-util/sourcenav/files/digest-sourcenav-5.2_beta2
+++ b/dev-util/sourcenav/files/digest-sourcenav-5.2_beta2
@@ -1 +1,3 @@
 MD5 e21c52c5db7a9da5712881b8bfc30064 sourcenav-5.2b2.tar.gz 13486494
+RMD160 84c4e8f208cbb3af4899a3a564a440018513dcbf sourcenav-5.2b2.tar.gz 13486494
+SHA256 c03cb65f875250c8a6cc48ecbd2934e5f90b65cf428fe561ec2a1705747f1355 sourcenav-5.2b2.tar.gz 13486494
diff --git a/dev-util/sourcenav/files/sourcenav-5.2_beta2-gcc4.patch b/dev-util/sourcenav/files/sourcenav-5.2_beta2-gcc4.patch
new file mode 100644
index 000000000000..82bd6e0ce917
--- /dev/null
+++ b/dev-util/sourcenav/files/sourcenav-5.2_beta2-gcc4.patch
@@ -0,0 +1,55 @@
+diff -Naur sourcenav-5.2b2-orig/libgui/configure sourcenav-5.2b2/libgui/configure
+--- sourcenav-5.2b2-orig/libgui/configure	2006-05-06 19:06:40.000000000 -0600
++++ sourcenav-5.2b2/libgui/configure	2006-05-06 19:07:28.000000000 -0600
+@@ -1920,14 +1920,7 @@
+ fi
+ rm -f conftest*
+ 
+-
+-# Tcl8.1 requires writable strings for gcc
+-
+-if test "$GCC" = "yes"; then
+-   LIBGUI_CFLAGS=-fwritable-strings
+-else
+-   LIBGUI_CFLAGS=
+-fi
++LIBGUI_CFLAGS=
+ 
+ echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
+ echo "configure:1934: checking for cygwin32" >&5
+diff -Naur sourcenav-5.2b2-orig/snavigator/configure sourcenav-5.2b2/snavigator/configure
+--- sourcenav-5.2b2-orig/snavigator/configure	2006-05-06 19:06:39.000000000 -0600
++++ sourcenav-5.2b2/snavigator/configure	2006-05-06 19:07:45.000000000 -0600
+@@ -1429,7 +1429,7 @@
+ 
+ if test x$ide_cv_os_cygwin32 = xyes ||
+        test x$sn_cv_os_mingw32 = xyes ; then
+-   HYPER_CFLAGS="-Wall -fwritable-strings"
++   HYPER_CFLAGS="-Wall"
+ fi
+  
+ 
+diff -Naur sourcenav-5.2b2-orig/tix/unix/tk8.1/Makefile.in sourcenav-5.2b2/tix/unix/tk8.1/Makefile.in
+--- sourcenav-5.2b2-orig/tix/unix/tk8.1/Makefile.in	2006-05-06 19:06:31.000000000 -0600
++++ sourcenav-5.2b2/tix/unix/tk8.1/Makefile.in	2006-05-06 19:08:20.000000000 -0600
+@@ -46,7 +46,7 @@
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+ CFLAGS = -O
+-TIX_CFLAGS = $(CFLAGS) -fwritable-strings
++TIX_CFLAGS = $(CFLAGS)
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
+diff -Naur sourcenav-5.2b2-orig/tix/unix/tk8.3/Makefile.in sourcenav-5.2b2/tix/unix/tk8.3/Makefile.in
+--- sourcenav-5.2b2-orig/tix/unix/tk8.3/Makefile.in	2006-05-06 19:06:31.000000000 -0600
++++ sourcenav-5.2b2/tix/unix/tk8.3/Makefile.in	2006-05-06 19:08:32.000000000 -0600
+@@ -47,7 +47,7 @@
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+ CFLAGS = @CFLAGS@
+-TIX_CFLAGS = $(CFLAGS) -fwritable-strings
++TIX_CFLAGS = $(CFLAGS)
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
diff --git a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index 7fa343d1e63f..02b331f3b80d 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.6 2006/04/24 02:58:28 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.7 2006/05/07 20:23:08 nerdboy Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 IUSE="debug"
 
@@ -44,11 +44,14 @@ src_unpack() {
 	epatch ${FILESDIR}/sourcenav_destdir.patch || die "epatch failed"
 	sed -i -e "s/relid'/relid/" tcl/unix/configure
 	sed -i -e "s/relid'/relid/" tk/unix/configure
+	# Bug 131412
+	if [ $(gcc-major-version) -ge 4 ]; then
+	    epatch ${FILESDIR}/${P}-gcc4.patch || die "gcc4 patch failed"
+	fi
 }
 
 src_compile() {
 	cd ${S}
-#	../sourcenav-${MY_P}/configure \
 	./configure ${MY_CONF} \
 		--host=${CHOST} \
 		--prefix=${SN} \