removed broken older version and updated stable with gcc4 and bash3 patches

(Portage version: 2.1.1_pre2-r8)

5 files changed, 164 insertions, 20 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index 19653d811f54..64bb5dbeaa5a 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,14 @@
 # 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.17 2006/05/07 20:23:08 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.18 2006/07/20 04:58:45 nerdboy Exp $
+
+  20 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/sourcenav-5.1.4-bash3.patch, +files/sourcenav-5.1.4-gcc4.patch,
+  sourcenav-5.1.4.ebuild, sourcenav-5.2_beta2.ebuild,
+  -sourcenav-5.1.1.ebuild:
+  removed broken older version and updated stable with gcc4 and bash3 patches
+  (old bug reopened).  Still thinking about stablizing a beta release (since
+  it may be the last official upstream release for the forseeable future).
 
   07 May 2006; Steve Arnold <nerdboy@gentoo.org>
   +files/sourcenav-5.2_beta2-gcc4.patch, sourcenav-5.2_beta2.ebuild:
diff --git a/dev-util/sourcenav/files/sourcenav-5.1.4-bash3.patch b/dev-util/sourcenav/files/sourcenav-5.1.4-bash3.patch
new file mode 100644
index 000000000000..6c0e93cf3c91
--- /dev/null
+++ b/dev-util/sourcenav/files/sourcenav-5.1.4-bash3.patch
@@ -0,0 +1,42 @@
+--- tcl/unix/configure.orig	2006-07-18 21:53:35.000000000 -0700
++++ tcl/unix/configure	2006-07-18 21:54:04.000000000 -0700
+@@ -4966,7 +4966,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- tcl/unix/configure.orig	2006-07-18 21:58:59.000000000 -0700
++++ tcl/unix/configure	2006-07-18 21:59:47.000000000 -0700
+@@ -6004,7 +6004,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- tk/unix/configure.orig	2006-07-18 22:32:21.000000000 -0700
++++ tk/unix/configure	2006-07-18 22:33:17.000000000 -0700
+@@ -535,7 +535,7 @@
+ 
+ ac_exeext=
+ ac_objext=o
+-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++if (echo "testing\\c"; echo 1,2,3) | grep c >/dev/null; then
+   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+     ac_n= ac_c='
+@@ -1470,7 +1470,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
diff --git a/dev-util/sourcenav/files/sourcenav-5.1.4-gcc4.patch b/dev-util/sourcenav/files/sourcenav-5.1.4-gcc4.patch
new file mode 100644
index 000000000000..b3f9a10da9ac
--- /dev/null
+++ b/dev-util/sourcenav/files/sourcenav-5.1.4-gcc4.patch
@@ -0,0 +1,80 @@
+diff -ru ../sourcenav-5.1.4/itcl/itcl/unix/configure ../sourcenav-5.1.4.new/itcl/itcl/unix/configure
+--- ../sourcenav-5.1.4/itcl/itcl/unix/configure	2000-02-06 16:19:46.000000000 -0800
++++ ../sourcenav-5.1.4.new/itcl/itcl/unix/configure	2006-07-19 18:39:26.000000000 -0700
+@@ -1113,7 +1113,7 @@
+ fi
+ # CYGNUS LOCAL - use -fwritable-strings with gcc, needed for Tcl8.1
+ if test "$itcl_cv_prog_gcc" = "yes" ; then
+-    CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall"
++    CFLAGS="$CFLAGS -Wshadow -Wtraditional -Wall"
+ fi
+ 
+ echo $ac_n "checking default compiler flags""... $ac_c" 1>&6
+diff -ru ../sourcenav-5.1.4/itcl/itk/unix/configure ../sourcenav-5.1.4.new/itcl/itk/unix/configure
+--- ../sourcenav-5.1.4/itcl/itk/unix/configure	2000-02-06 16:19:46.000000000 -0800
++++ ../sourcenav-5.1.4.new/itcl/itk/unix/configure	2006-07-19 18:39:41.000000000 -0700
+@@ -1173,7 +1173,7 @@
+     # that they obscure everything else.
+     # CYGNUS LOCAL - add -fwritable-strings to CFLAGS for gcc.  Needed 
+     # with Tcl8.1
+-    CFLAGS="$CFLAGS -fwritable-strings -Wshadow -Wtraditional -Wall -Wno-implicit-int"
++    CFLAGS="$CFLAGS -Wshadow -Wtraditional -Wall -Wno-implicit-int"
+ fi
+ 
+ echo $ac_n "checking default compiler flags""... $ac_c" 1>&6
+diff -ru ../sourcenav-5.1.4/libgui/configure ../sourcenav-5.1.4.new/libgui/configure
+--- ../sourcenav-5.1.4/libgui/configure	2001-10-28 08:22:24.000000000 -0800
++++ ../sourcenav-5.1.4.new/libgui/configure	2006-07-19 18:41:08.000000000 -0700
+@@ -1921,11 +1921,11 @@
+ 
+ # Tcl8.1 requires writable strings for gcc
+ 
+-if test "$GCC" = "yes"; then
+-   LIBGUI_CFLAGS=-fwritable-strings
+-else
+-   LIBGUI_CFLAGS=
+-fi
++#if test "$GCC" = "yes"; then
++#   LIBGUI_CFLAGS=-fwritable-strings
++#else
++LIBGUI_CFLAGS=
++#fi
+ 
+ echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
+ echo "configure:1932: checking for cygwin32" >&5
+diff -ru ../sourcenav-5.1.4/snavigator/configure ../sourcenav-5.1.4.new/snavigator/configure
+--- ../sourcenav-5.1.4/snavigator/configure	2003-06-26 13:01:11.000000000 -0700
++++ ../sourcenav-5.1.4.new/snavigator/configure	2006-07-19 18:41:51.000000000 -0700
+@@ -1369,7 +1369,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 -ru ../sourcenav-5.1.4/tix/unix/tk8.1/Makefile.in ../sourcenav-5.1.4.new/tix/unix/tk8.1/Makefile.in
+--- ../sourcenav-5.1.4/tix/unix/tk8.1/Makefile.in	2001-09-08 16:25:55.000000000 -0700
++++ ../sourcenav-5.1.4.new/tix/unix/tk8.1/Makefile.in	2006-07-19 18:42:37.000000000 -0700
+@@ -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 -ru ../sourcenav-5.1.4/tix/unix/tk8.3/Makefile.in ../sourcenav-5.1.4.new/tix/unix/tk8.3/Makefile.in
+--- ../sourcenav-5.1.4/tix/unix/tk8.3/Makefile.in	2006-07-19 18:43:48.000000000 -0700
++++ ../sourcenav-5.1.4.new/tix/unix/tk8.3/Makefile.in	2006-07-19 18:42:55.000000000 -0700
+@@ -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 --git a/dev-util/sourcenav/sourcenav-5.1.4.ebuild b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
index 8069a1030e91..1bef1c6839b5 100644
--- a/dev-util/sourcenav/sourcenav-5.1.4.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1.4.ebuild,v 1.9 2005/11/26 06:04:50 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.10 2006/07/20 04:58:45 nerdboy Exp $
 
-inherit eutils libtool toolchain-funcs
+inherit eutils libtool toolchain-funcs flag-o-matic
 
 S=${WORKDIR}/build
 
@@ -13,16 +13,34 @@ HOMEPAGE="http://sourcenav.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ~sparc ppc"
+KEYWORDS="amd64 sparc ppc ppc64 x86"
 IUSE=""
-DEPEND=">=sys-libs/glibc-2.2.4"
 SN="/opt/sourcenav"
 
+RDEPEND="|| (
+	  ( x11-libs/libX11
+	    x11-libs/libXdmcp
+	    x11-libs/libXaw )
+	virtual/x11
+	)
+	sys-libs/glibc"
+
+DEPEND="${RDEPEND}
+	|| (
+	 ( x11-proto/xproto )
+	virtual/x11
+	)"
+
 src_unpack() {
 	unpack ${A}
 	mkdir ${WORKDIR}/build
 	cd ${WORKDIR}/${P}
-	zcat ${DISTDIR}/${PF}-gentoo.diff.gz | patch -p0 || die "patch failed"
+	epatch ${DISTDIR}/${PF}-gentoo.diff.gz || die "big patch failed"
+	epatch ${FILESDIR}/${P}-bash3.patch || die "bash3 patch failed"
+	# Backported from 5.2
+	if [ $(gcc-major-version) -ge 4 ]; then
+	    epatch ${FILESDIR}/${P}-gcc4.patch || die "gcc4 patch failed"
+	fi
 }
 
 src_compile() {
diff --git a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index 02b331f3b80d..eff8579e5213 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.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/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.7 2006/05/07 20:23:08 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.8 2006/07/20 04:58:45 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -17,24 +17,20 @@ HOMEPAGE="http://sourcenav.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~sparc ~ppc ~ppc64 ~x86"
 
 RDEPEND="|| (
-	    ( x11-libs/libXmu
-	    x11-libs/libXext
-	    x11-libs/libXp
-	    x11-libs/libX11
-	    x11-libs/libXt
-	    x11-libs/libSM
-	    x11-libs/libICE
-	    x11-libs/libXpm
+	  ( x11-libs/libX11
+	    x11-libs/libXdmcp
 	    x11-libs/libXaw )
 	virtual/x11
-	)"
+	)
+	sys-libs/glibc"
+
 DEPEND="${RDEPEND}
 	|| (
-	    ( x11-proto/xproto x11-proto/xextproto )
-	        virtual/x11
+	 ( x11-proto/xproto )
+	virtual/x11
 	)"
 
 src_unpack() {