added fix for bug 131412

(Portage version: 2.1_pre10-r2)

6 files changed, 75 insertions, 4 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/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} \