Fixed missing help file directory and added default browser DEPEND. Closed Bug #23292

8 files changed, 271 insertions, 10 deletions

diff --git a/media-gfx/grace/ChangeLog b/media-gfx/grace/ChangeLog
index e1b94bc13c20..694f445ec257 100644
--- a/media-gfx/grace/ChangeLog
+++ b/media-gfx/grace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/grace
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.10 2003/08/18 17:36:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.11 2003/09/08 20:40:19 usata Exp $
+
+*grace-5.1.12-r1 (09 Sep 2003)
+
+  09 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild:
+  Fixed browsers dependency.  This closes Bug #23292
 
 *grace-5.1.12 (18 Aug 2003)
 
diff --git a/media-gfx/grace/Manifest b/media-gfx/grace/Manifest
index 8aff2eaa9dd2..39fec98b04d7 100644
--- a/media-gfx/grace/Manifest
+++ b/media-gfx/grace/Manifest
@@ -1,9 +1,9 @@
-MD5 b85665f5e67ac8ca1be51dce5429bad3 ChangeLog 2027
-MD5 4ccc37a908d6383cf0e7c5d9507c6c7b grace-5.1.7-r2.ebuild 2047
+MD5 50daaed2661abe137281538469f43886 ChangeLog 2211
+MD5 de60fec1c4a9fd521c07acc1a83ea650 grace-5.1.7-r2.ebuild 2040
 MD5 0d7bfa7bc19abd8c3c8872f31e46a2fd grace-5.1.12.ebuild 2593
-MD5 5c72feb306929019daa063bf6c9631b2 grace-5.1.10-r1.ebuild 3320
-MD5 cef107365b06f232409199c6f88c6ac6 grace-5.1.10.ebuild 2215
-MD5 0b54d7cde9c2cfb1ba0b9a7f62e147d5 grace-5.1.12-r1.ebuild 3698
+MD5 29cf6f3912e4f8cf4466512da2463c31 grace-5.1.10-r1.ebuild 3315
+MD5 78225ea4f85e42105262f087e9086109 grace-5.1.10.ebuild 2208
+MD5 ed1727f060bc58ae8fb513e049f183db grace-5.1.12-r1.ebuild 3699
 MD5 79d4cd7b5bb6c28a0b393294202477cb files/10grace 28
 MD5 0a86071d232bac0c0725906f6bde21bb files/digest-grace-5.1.10 65
 MD5 3e377b216955ff939acf4b4e7ee6227c files/digest-grace-5.1.7-r2 64
diff --git a/media-gfx/grace/files/digest-grace-5.1.10-r1 b/media-gfx/grace/files/digest-grace-5.1.10-r1
new file mode 100644
index 000000000000..041da8131412
--- /dev/null
+++ b/media-gfx/grace/files/digest-grace-5.1.10-r1
@@ -0,0 +1 @@
+MD5 fab6cf49cd233235dac5c5ac5161c081 grace-5.1.10.tar.gz 2418504
diff --git a/media-gfx/grace/files/digest-grace-5.1.12-r1 b/media-gfx/grace/files/digest-grace-5.1.12-r1
new file mode 100644
index 000000000000..98bd82ad1a8f
--- /dev/null
+++ b/media-gfx/grace/files/digest-grace-5.1.12-r1
@@ -0,0 +1 @@
+MD5 d54d1b57edd8daf6f10ac5563a552130 grace-5.1.12.tar.gz 2426776
diff --git a/media-gfx/grace/grace-5.1.10-r1.ebuild b/media-gfx/grace/grace-5.1.10-r1.ebuild
new file mode 100644
index 000000000000..8f7bdd4ba342
--- /dev/null
+++ b/media-gfx/grace/grace-5.1.10-r1.ebuild
@@ -0,0 +1,119 @@
+# 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 $
+
+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 )
+	>=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 )"
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/t1lib-5.0.0' ; then
+		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
+	fi
+}
+
+src_compile() {
+
+	local gracehelpviewer
+
+	if has_version 'net-www/mozilla' ; then
+		gracehelpviewer="mozilla %s"
+	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"
+	elif has_version 'net-www/opera' ; then
+		gracehelpviewer="opera %s"
+	elif has_version 'kde-base/kdebase' ; then
+		gracehelpviewer="konqueror %s"
+	elif has_version 'net-www/galeon' ; then
+		gracehelpviewer="galeon %s"
+	elif has_version 'net-www/dillo' ; then
+		gracehelpviewer="dillo %s"
+	else
+		gracehelpviewer="netscape %s"
+	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 \
+		`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 ${T}/10grace
+}
diff --git a/media-gfx/grace/grace-5.1.10.ebuild b/media-gfx/grace/grace-5.1.10.ebuild
index 9eead420f78a..73a6f8d34b09 100644
--- a/media-gfx/grace/grace-5.1.10.ebuild
+++ b/media-gfx/grace/grace-5.1.10.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.ebuild,v 1.6 2003/09/06 23:56:39 msterret Exp $
+# $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
 
@@ -66,7 +66,7 @@ src_compile() {
 src_install() {
 	make GRACE_HOME=${D}/usr/share/grace \
 		PREFIX=${D}/usr \
-    		install || die
+		install || die
 
 	dodoc CHANGES COPYRIGHT ChangeLog DEVELOPERS LICENSE README
 
diff --git a/media-gfx/grace/grace-5.1.12-r1.ebuild b/media-gfx/grace/grace-5.1.12-r1.ebuild
new file mode 100644
index 000000000000..221b4d06b3cf
--- /dev/null
+++ b/media-gfx/grace/grace-5.1.12-r1.ebuild
@@ -0,0 +1,134 @@
+# 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 $
+
+inherit eutils
+
+DESCRIPTION="WYSIWYG 2D plotting tool for the X Window System"
+HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+IUSE="debug png jpeg pdflib"
+
+DEPEND="virtual/x11
+	virtual/motif
+	>=sys-libs/zlib-1.0.3
+	>=dev-libs/fftw-2.1.3
+	>=app-sci/netcdf-3.0
+	>=media-libs/t1lib-1.3.1
+	>=media-libs/tiff-3.5
+	png? ( >=media-libs/libpng-0.9.6 )
+	jpeg? ( media-libs/jpeg )
+	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}"
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/t1lib-5.0.0' ; then
+		epatch ${FILESDIR}/${P}-t1lib-fix-gentoo.patch
+	fi
+}
+
+src_compile() {
+
+	local gracehelpviewer
+
+	if has_version 'net-www/mozilla' ; then
+		gracehelpviewer="mozilla %s"
+	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"
+	elif has_version 'net-www/opera' ; then
+		gracehelpviewer="opera %s"
+	elif has_version 'kde-base/kdebase' ; then
+		gracehelpviewer="konqueror %s"
+	elif has_version 'net-www/galeon' ; then
+		gracehelpviewer="galeon %s"
+	elif has_version 'net-www/dillo' ; then
+		gracehelpviewer="dillo %s"
+	else
+		gracehelpviewer="netscape %s"
+	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 \
+		--with-fftw \
+		--enable-netcdf \
+		`use_enable debug` \
+		`use_enable jpeg jpegdrv` \
+		`use_enable png pngdrv` \
+		`use_enable pdflib pdfdrv` || die
+		# --enable-xmhtml
+
+	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
+
+	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.7-r2.ebuild b/media-gfx/grace/grace-5.1.7-r2.ebuild
index c024264d5911..8bea92445270 100644
--- a/media-gfx/grace/grace-5.1.7-r2.ebuild
+++ b/media-gfx/grace/grace-5.1.7-r2.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.7-r2.ebuild,v 1.10 2003/09/06 23:56:39 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.7-r2.ebuild,v 1.11 2003/09/08 20:40:19 usata Exp $
 
 DESCRIPTION="WYSIWYG 2D plotting tool for the X Window System"
 SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
@@ -55,7 +55,7 @@ src_compile() {
 src_install() {
 	make GRACE_HOME=${D}/usr/share/grace \
 		PREFIX=${D}/usr \
-    		install || die
+		install || die
 
 	dodoc CHANGES COPYRIGHT ChangeLog DEVELOPERS LICENSE README