9 files changed, 84 insertions, 133 deletions
diff --git a/media-gfx/grace/Manifest b/media-gfx/grace/Manifest
index f80a01adb694..08374ced3a32 100644
--- a/media-gfx/grace/Manifest
+++ b/media-gfx/grace/Manifest
@@ -1,19 +1,13 @@
-MD5 50daaed2661abe137281538469f43886 ChangeLog 2211
-MD5 f264ce3121a89643ca0704102a68e9e4 grace-5.1.13.ebuild 3629
+MD5 dca21820e4d7df19e277733a3e19fe3c ChangeLog 2611
+MD5 6b7e2640597da6bbf01657a86da37b24 grace-5.1.13.ebuild 3523
 MD5 de60fec1c4a9fd521c07acc1a83ea650 grace-5.1.7-r2.ebuild 2040
-MD5 0d7bfa7bc19abd8c3c8872f31e46a2fd grace-5.1.12.ebuild 2593
-MD5 92bde600410c477147acc21625b7f522 grace-5.1.10-r1.ebuild 3317
-MD5 78225ea4f85e42105262f087e9086109 grace-5.1.10.ebuild 2208
-MD5 f264ce3121a89643ca0704102a68e9e4 grace-5.1.12-r1.ebuild 3629
-MD5 773baa40947f23a0e324187bf5a51150 grace-5.1.12-r1.ebuild.bak 3620
+MD5 01a1a2ab5bf245cd3958bed587aeb2fa grace-5.1.10-r1.ebuild 3251
+MD5 2277be34704e76e25cc4fa46042e0035 grace-5.1.12-r1.ebuild 3628
 MD5 79d4cd7b5bb6c28a0b393294202477cb files/10grace 28
-MD5 0a86071d232bac0c0725906f6bde21bb files/digest-grace-5.1.10 65
 MD5 3e377b216955ff939acf4b4e7ee6227c files/digest-grace-5.1.7-r2 64
 MD5 5061fe8c4ba85c767decf9e69a312bfe files/grace-5.1.10-t1lib-fix-gentoo.patch 836
 MD5 32c9edc625157e58d92136712af4dc0b files/grace-5.1.12-t1lib-fix-gentoo.patch 836
-MD5 7dda34766a45f35b55c6518f69dafb08 files/digest-grace-5.1.12 65
 MD5 7dda34766a45f35b55c6518f69dafb08 files/digest-grace-5.1.12-r1 65
 MD5 0a86071d232bac0c0725906f6bde21bb files/digest-grace-5.1.10-r1 65
 MD5 97e5d164e32726698f9e90f93d723c8f files/grace-helpviewer-gentoo.diff 384
 MD5 84d71fa68c349e7f6bac28b10766e203 files/digest-grace-5.1.13 65
-MD5 d2c8a3277412ff3d5f9a29b0803953f5 files/grace-helpviewer-gentoo.diff.bak 382
diff --git a/media-gfx/grace/files/digest-grace-5.1.10 b/media-gfx/grace/files/digest-grace-5.1.10
deleted file mode 100644
index 041da8131412..000000000000
--- a/media-gfx/grace/files/digest-grace-5.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fab6cf49cd233235dac5c5ac5161c081 grace-5.1.10.tar.gz 2418504
diff --git a/media-gfx/grace/files/digest-grace-5.1.12 b/media-gfx/grace/files/digest-grace-5.1.12
deleted file mode 100644
index 98bd82ad1a8f..000000000000
--- a/media-gfx/grace/files/digest-grace-5.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d54d1b57edd8daf6f10ac5563a552130 grace-5.1.12.tar.gz 2426776
diff --git a/media-gfx/grace/files/digest-grace-5.1.13 b/media-gfx/grace/files/digest-grace-5.1.13
new file mode 100644
index 000000000000..355455601101
--- /dev/null
+++ b/media-gfx/grace/files/digest-grace-5.1.13
@@ -0,0 +1 @@
+MD5 bc12e2bc373c7ecd6c8d51857a9858dc grace-5.1.13.tar.gz 2432291
diff --git a/media-gfx/grace/files/grace-helpviewer-gentoo.diff b/media-gfx/grace/files/grace-helpviewer-gentoo.diff
new file mode 100644
index 000000000000..f1b034f4f1d4
--- /dev/null
+++ b/media-gfx/grace/files/grace-helpviewer-gentoo.diff
@@ -0,0 +1,11 @@
+--- configure.orig	2003-02-24 17:08:34.000000000 +0900
++++ configure	2003-10-27 04:49:08.000000000 +0900
+@@ -899,7 +899,7 @@
+ # Check whether --with-helpviewer or --without-helpviewer was given.
+ if test "${with_helpviewer+set}" = set; then
+   withval="$with_helpviewer"
+-  HELPVIEWER="-DGRACE_HELPVIEWER=${withval}"
++  HELPVIEWER="-DGRACE_HELPVIEWER=\\\"'${withval} %s'\\\""
+ fi
+ 
+ 
diff --git a/media-gfx/grace/grace-5.1.10-r1.ebuild b/media-gfx/grace/grace-5.1.10-r1.ebuild
index 8f7bdd4ba342..fc1c38aeaed1 100644
--- a/media-gfx/grace/grace-5.1.10-r1.ebuild
+++ b/media-gfx/grace/grace-5.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10-r1.ebuild,v 1.1 2003/09/08 20:40:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10-r1.ebuild,v 1.2 2003/10/26 20:22:11 usata Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="pdflib"
 
 DEPEND="virtual/x11
@@ -37,6 +37,8 @@ src_unpack() {
 	if has_version '>=media-libs/t1lib-5.0.0' ; then
 		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
 	fi
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-helpviewer-gentoo.diff
 }
 
 src_compile() {
@@ -44,31 +46,29 @@ src_compile() {
 	local gracehelpviewer
 
 	if has_version 'net-www/mozilla' ; then
-		gracehelpviewer="mozilla %s"
+		gracehelpviewer="mozilla"
 	elif has_version 'net-www/mozilla-firebird' \
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
-		gracehelpviewer="MozillaFirebird %s"
+		gracehelpviewer="MozillaFirebird"
 	elif has_version 'net-www/opera' ; then
-		gracehelpviewer="opera %s"
+		gracehelpviewer="opera"
 	elif has_version 'kde-base/kdebase' ; then
-		gracehelpviewer="konqueror %s"
+		gracehelpviewer="konqueror"
 	elif has_version 'net-www/galeon' ; then
-		gracehelpviewer="galeon %s"
+		gracehelpviewer="galeon"
 	elif has_version 'net-www/dillo' ; then
-		gracehelpviewer="dillo %s"
+		gracehelpviewer="dillo"
 	else
-		gracehelpviewer="netscape %s"
+		gracehelpviewer="netscape"
 	fi
 
-	cp ${FILESDIR}/10grace ${T}/10grace
-	echo GRACE_HELPVIEWER="\"${gracehelpviewer}\"" >> ${T}/10grace
-
 	sed -i -e "s%doc/%/usr/share/doc/${PF}/html/%g" src/*
 	sed -i -e "s%examples/%/usr/share/doc/${PF}/examples/%g" src/xmgrace.c
 
 	econf \
-		--with-grace-home=/usr/share/grace \
+		--enable-grace-home=/usr/share/grace \
+		--with-helpviewer=${gracehelpviewer} \
 		`use_enable pdflib pdfdrv` \
 		|| die
 
@@ -113,7 +113,4 @@ src_install() {
 	#mv ${D}/usr/share/doc/${PF}/html/*.1 ${D}/usr/share/man/man1
 	doman ${D}/usr/share/doc/${PF}/html/*.1
 	rm -f ${D}/usr/share/doc/${PF}/html/*.1
-
-	insinto /etc/env.d
-	doins ${T}/10grace
 }
diff --git a/media-gfx/grace/grace-5.1.10.ebuild b/media-gfx/grace/grace-5.1.10.ebuild
deleted file mode 100644
index 73a6f8d34b09..000000000000
--- a/media-gfx/grace/grace-5.1.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10.ebuild,v 1.7 2003/09/08 20:40:19 usata Exp $
-
-inherit eutils
-
-DESCRIPTION="WYSIWYG 2D plotting tool for the X Window System"
-SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
-HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="pdflib"
-
-DEPEND="virtual/x11
-	virtual/motif
-	media-libs/libpng
-	media-libs/t1lib
-	>=media-libs/tiff-3.5
-	pdflib? ( >=media-libs/pdflib-3.0.2 )"
-
-src_unpack() {
-	unpack ${A}
-
-	if has_version '>=media-libs/t1lib-5.0.0' ; then
-		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-grace-home=/usr/share/grace \
-		`use_enable pdflib pdfdrv` \
-		|| die
-
-	cp doc/Makefile doc/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/doc:$(PREFIX)/share/doc/$(PF)/html:g' \
-		doc/Makefile.orig >doc/Makefile || die
-
-	cp auxiliary/Makefile auxiliary/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		auxiliary/Makefile.orig >auxiliary/Makefile || die
-
-	cp grconvert/Makefile grconvert/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		grconvert/Makefile.orig >grconvert/Makefile || die
-
-	cp src/Makefile src/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		src/Makefile.orig >src/Makefile || die
-
-	cp grace_np/Makefile grace_np/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/lib:$(PREFIX)/lib:g' \
-		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
-		grace_np/Makefile.orig >grace_np/Makefile || die
-
-	cp examples/Makefile examples/Makefile.orig
-	sed -e 's:/examples:/share/doc/$(PF)/examples:g' \
-		-e 's:$(GRACE_HOME):$(PREFIX):g' \
-		examples/Makefile.orig >examples/Makefile || die
-
-	make || die
-}
-
-src_install() {
-	make GRACE_HOME=${D}/usr/share/grace \
-		PREFIX=${D}/usr \
-		install || die
-
-	dodoc CHANGES COPYRIGHT ChangeLog DEVELOPERS LICENSE README
-
-	#dodir /usr/share/man/man1
-	#mv ${D}/usr/share/doc/${PF}/html/*.1 ${D}/usr/share/man/man1
-	doman ${D}/usr/share/doc/${PF}/html/*.1
-	rm -f ${D}/usr/share/doc/${PF}/html/*.1
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10grace
-}
diff --git a/media-gfx/grace/grace-5.1.12-r1.ebuild b/media-gfx/grace/grace-5.1.12-r1.ebuild
index 221b4d06b3cf..f9279945d854 100644
--- a/media-gfx/grace/grace-5.1.12-r1.ebuild
+++ b/media-gfx/grace/grace-5.1.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12-r1.ebuild,v 1.1 2003/09/08 20:40:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12-r1.ebuild,v 1.2 2003/10/26 20:22:11 usata Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE="debug png jpeg pdflib"
 
 DEPEND="virtual/x11
@@ -44,6 +44,8 @@ src_unpack() {
 	if has_version '>=media-libs/t1lib-5.0.0' ; then
 		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
 	fi
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-helpviewer-gentoo.diff
 }
 
 src_compile() {
@@ -51,31 +53,29 @@ src_compile() {
 	local gracehelpviewer
 
 	if has_version 'net-www/mozilla' ; then
-		gracehelpviewer="mozilla %s"
+		gracehelpviewer="mozilla"
 	elif has_version 'net-www/mozilla-firebird' \
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
-		gracehelpviewer="MozillaFirebird %s"
+		gracehelpviewer="MozillaFirebird"
 	elif has_version 'net-www/opera' ; then
-		gracehelpviewer="opera %s"
+		gracehelpviewer="opera"
 	elif has_version 'kde-base/kdebase' ; then
-		gracehelpviewer="konqueror %s"
+		gracehelpviewer="konqueror"
 	elif has_version 'net-www/galeon' ; then
-		gracehelpviewer="galeon %s"
+		gracehelpviewer="galeon"
 	elif has_version 'net-www/dillo' ; then
-		gracehelpviewer="dillo %s"
+		gracehelpviewer="dillo"
 	else
-		gracehelpviewer="netscape %s"
+		gracehelpviewer="netscape"
 	fi
 
-	cp ${FILESDIR}/10grace ${T}/10grace
-	echo GRACE_HELPVIEWER="\"${gracehelpviewer}\"" >> ${T}/10grace
-
 	sed -i -e "s%doc/%/usr/share/doc/${PF}/html/%g" src/*
 	sed -i -e "s%examples/%/usr/share/doc/${PF}/examples/%g" src/xmgrace.c
 
 	econf \
-		--with-grace-home=/usr/share/grace \
+		--enable-grace-home=/usr/share/grace \
+		--with-helpviewer=${gracehelpviewer} \
 		--with-fftw \
 		--enable-netcdf \
 		`use_enable debug` \
@@ -128,7 +128,4 @@ src_install() {
 	rm -f ${D}/usr/share/doc/${PF}/html/*.1
 
 	dosym /usr/share/doc/${PF}/examples /usr/share/grace/examples
-
-	insinto /etc/env.d
-	doins ${T}/10grace || die
 }
diff --git a/media-gfx/grace/grace-5.1.12.ebuild b/media-gfx/grace/grace-5.1.13.ebuild
index 6f55cb9a0b2f..2850732931b6 100644
--- a/media-gfx/grace/grace-5.1.12.ebuild
+++ b/media-gfx/grace/grace-5.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12.ebuild,v 1.2 2003/08/18 17:36:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.13.ebuild,v 1.1 2003/10/26 20:22:11 usata Exp $
 
 inherit eutils
 
@@ -22,7 +22,18 @@ DEPEND="virtual/x11
 	>=media-libs/tiff-3.5
 	png? ( >=media-libs/libpng-0.9.6 )
 	jpeg? ( media-libs/jpeg )
-	pdflib? ( >=media-libs/pdflib-4.0.3 )"
+	pdflib? ( >=media-libs/pdflib-4.0.3 )
+	>=sys-apps/sed-4
+	|| ( net-www/mozilla
+		net-www/mozilla-firebird
+		net-www/mozilla-firebird-bin
+		net-www/mozilla-firebird-cvs
+		net-www/opera
+		kde-base/kdebase
+		net-www/galeon
+		net-www/dillo
+		net-www/netscape-communicator
+		net-www/netscape-navigator )"
 #	x11-libs/xmhtml
 
 S="${WORKDIR}/${P}"
@@ -30,14 +41,38 @@ S="${WORKDIR}/${P}"
 src_unpack() {
 	unpack ${A}
 
-	if has_version '>=media-libs/t1lib-5.0.0' ; then
-		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
-	fi
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-helpviewer-gentoo.diff
 }
 
 src_compile() {
+
+	local gracehelpviewer
+
+	if has_version 'net-www/mozilla' ; then
+		gracehelpviewer="mozilla"
+	elif has_version 'net-www/mozilla-firebird' \
+		|| has_version 'net-www/mozilla-firebird-bin' \
+		|| has_version 'net-www/mozilla-firebird-cvs' ; then
+		gracehelpviewer="MozillaFirebird"
+	elif has_version 'net-www/opera' ; then
+		gracehelpviewer="opera"
+	elif has_version 'kde-base/kdebase' ; then
+		gracehelpviewer="konqueror"
+	elif has_version 'net-www/galeon' ; then
+		gracehelpviewer="galeon"
+	elif has_version 'net-www/dillo' ; then
+		gracehelpviewer="dillo"
+	else
+		gracehelpviewer="netscape"
+	fi
+
+	sed -i -e "s%doc/%/usr/share/doc/${PF}/html/%g" src/*
+	sed -i -e "s%examples/%/usr/share/doc/${PF}/examples/%g" src/xmgrace.c
+
 	econf \
-		--with-grace-home=/usr/share/grace \
+		--enable-grace-home=/usr/share/grace \
+		--with-helpviewer=${gracehelpviewer} \
 		--with-fftw \
 		--enable-netcdf \
 		`use_enable debug` \
@@ -76,6 +111,7 @@ src_compile() {
 }
 
 src_install() {
+
 	make \
 		GRACE_HOME=${D}/usr/share/grace \
 		PREFIX=${D}/usr \
@@ -89,7 +125,4 @@ src_install() {
 	rm -f ${D}/usr/share/doc/${PF}/html/*.1
 
 	dosym /usr/share/doc/${PF}/examples /usr/share/grace/examples
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10grace || die
 }