new version, closing bug #26842

4 files changed, 122 insertions, 2 deletions

diff --git a/media-gfx/grace/Manifest b/media-gfx/grace/Manifest
index 7b85ae0c197c..aaa9660ae2d8 100644
--- a/media-gfx/grace/Manifest
+++ b/media-gfx/grace/Manifest
@@ -1,7 +1,7 @@
-MD5 dc046426cce2852ebc000815bfef8852 ChangeLog 1614
+MD5 1052af77ebc597dd81200141b9b1c6b2 ChangeLog 1926
 MD5 9a0e201115f9b7e9bcd078a87ecc5804 grace-5.1.10.ebuild 2213
 MD5 07a6bd9ed6d0c4a79e67a651ef0b07f5 grace-5.1.7-r2.ebuild 2049
-MD5 a313595bb6c7ccb8ca08b79e61d154ad grace-5.1.12.ebuild 2585
+MD5 29a697e25ff885a6b5dd3e97a2dee8f0 grace-5.1.12.ebuild 2585
 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.12 b/media-gfx/grace/files/digest-grace-5.1.12
new file mode 100644
index 000000000000..98bd82ad1a8f
--- /dev/null
+++ b/media-gfx/grace/files/digest-grace-5.1.12
@@ -0,0 +1 @@
+MD5 d54d1b57edd8daf6f10ac5563a552130 grace-5.1.12.tar.gz 2426776
diff --git a/media-gfx/grace/files/grace-5.1.12-t1lib-fix-gentoo.patch b/media-gfx/grace/files/grace-5.1.12-t1lib-fix-gentoo.patch
new file mode 100644
index 000000000000..2f6285946816
--- /dev/null
+++ b/media-gfx/grace/files/grace-5.1.12-t1lib-fix-gentoo.patch
@@ -0,0 +1,24 @@
+diff -urN grace-5.1.12.ORIG/src/fontwin.c grace-5.1.12/src/fontwin.c
+--- grace-5.1.12.ORIG/src/fontwin.c	2002-08-22 05:19:51.000000000 +0900
++++ grace-5.1.12/src/fontwin.c	2003-08-18 21:45:58.000000000 +0900
+@@ -320,7 +320,7 @@
+     Widget font_table = (Widget) data;
+     
+     FontID = value;
+-    switch (CheckForFontID(FontID)) {
++    switch (T1_CheckForFontID(FontID)) {
+     case 0:
+         T1_LoadFont(FontID);
+         break;
+diff -urN grace-5.1.12.ORIG/src/t1fonts.c grace-5.1.12/src/t1fonts.c
+--- grace-5.1.12.ORIG/src/t1fonts.c	2002-08-14 05:31:25.000000000 +0900
++++ grace-5.1.12/src/t1fonts.c	2003-08-18 21:46:40.000000000 +0900
+@@ -89,7 +89,7 @@
+         return (RETURN_FAILURE);
+     }
+     
+-    nfonts = T1_Get_no_fonts();
++    nfonts = T1_GetNoFonts();
+     if (nfonts < 1) {
+         return (RETURN_FAILURE);
+     }
diff --git a/media-gfx/grace/grace-5.1.12.ebuild b/media-gfx/grace/grace-5.1.12.ebuild
new file mode 100644
index 000000000000..fccbbd985319
--- /dev/null
+++ b/media-gfx/grace/grace-5.1.12.ebuild
@@ -0,0 +1,95 @@
+# 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.1 2003/08/18 13:16:06 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"
+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 )"
+#	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() {
+	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 ${FILESDIR}/10grace || die
+}