gcc3 patch #24154

3 files changed, 35 insertions, 22 deletions

diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog
index 600c05f5a789..8375a89def45 100644
--- a/app-text/gv/ChangeLog
+++ b/app-text/gv/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for app-text/gv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.8 2003/08/03 14:24:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.9 2003/09/12 02:11:10 vapier Exp $
+
+*gv-3.5.8-r2 (03 Oct 2002)
+
+  11 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc3 patch #24154.
 
   03 Aug 2003; Jason Wever <weeve@gentoo.org> gv-3.5.8-r2.ebuild:
   Added sparc to keywords to fix big #25043.
 
-*gv-3.5.8-r2 (03 Oct 2002)
-
   10 Mar 2003; Aron Griffis <agriffis@gentoo.org> gv-3.5.8-r2.ebuild:
   Mark stable on alpha
 
diff --git a/app-text/gv/files/3.5.8-gcc3.patch b/app-text/gv/files/3.5.8-gcc3.patch
new file mode 100644
index 000000000000..f218edc7039c
--- /dev/null
+++ b/app-text/gv/files/3.5.8-gcc3.patch
@@ -0,0 +1,16 @@
+--- source/paths.h.orig Sun Apr  6 00:00:00 1997
++++ source/paths.h      Fri Jul 18 19:18:09 2003
+@@ -34,9 +34,9 @@
+ #   define INC_XMU(aaa) <XMU_DIRECTORY/aaa>
+ #   define INC_XAW(aaa) <XAW_DIRECTORY/aaa>
+ #else
+-#   define INC_X11(aaa) <X11/##aaa##>
+-#   define INC_XMU(aaa) <X11/Xmu/##aaa##>
+-#   define INC_XAW(aaa) <X11/Xaw3d/##aaa##>
++#   define INC_X11(aaa) <X11/aaa>
++#   define INC_XMU(aaa) <X11/Xmu/aaa>
++#   define INC_XAW(aaa) <X11/Xaw3d/aaa>
+ #endif
+ 
+ #endif /* _PATHS_H_ */
+
diff --git a/app-text/gv/gv-3.5.8-r2.ebuild b/app-text/gv/gv-3.5.8-r2.ebuild
index 2d7d599619f6..712d84ea4a8e 100644
--- a/app-text/gv/gv-3.5.8-r2.ebuild
+++ b/app-text/gv/gv-3.5.8-r2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.5.8-r2.ebuild,v 1.7 2003/09/05 22:37:21 msterret Exp $
-
-# this r1 is a major change. it uses sed instead of patches.
-# hopefully this will enable everyone to compile gv on widely
-# different configurations, eliminating the gv.man/gv._man problem
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.5.8-r2.ebuild,v 1.8 2003/09/12 02:11:10 vapier Exp $
 
 DESCRIPTION="standard ghostscript frontend used by programs like LyX"
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/${P}.tar.gz"
 HOMEPAGE="http://wwwthep.physik.uni-mainz.de/~plass/gv/"
+SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc x86 alpha sparc"
+SLOT="0"
+KEYWORDS="x86 ppc alpha sparc"
 
 # There's probably more, but ghostscript also depends on it,
 # so I can't identify it
@@ -23,7 +19,8 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${PV}-gcc3.patch
 }
 
 src_compile() {
@@ -35,17 +32,14 @@ src_compile() {
 	make Makefiles || die
 
 	cd source
-
-	cp Makefile 1
-	cat 1 | sed -e 's/install.man:: gv.man/install.man::/' \
+	sed -i \
+		-e 's/install.man:: gv.man/install.man::/' \
 		-e 's/all:: gv./\#all:: gv./' \
-		-e '/gv.man/ c \#removed by sed for ebuilding' > Makefile
-	rm 1
-	if [ ! "`grep gv.man Makefile`" = "" ];
-	then
-		echo "sed didn't completely remove gv.man references from the Makefile."
-		echo "We'll just run make and pray."
-		sleep 2s
+		-e '/gv.man/ c \#removed by sed for ebuilding' \
+		Makefile
+	if [ ! "`grep gv.man Makefile`" = "" ] ; then
+		ewarn "sed didn't completely remove gv.man references from the Makefile."
+		ewarn "We'll just run make and pray."
 	fi
 
 	cd ${S}