New version to fix bug #38261.

12 files changed, 35 insertions, 273 deletions

diff --git a/media-gfx/gnuplot/ChangeLog b/media-gfx/gnuplot/ChangeLog
index 62ef565ab2ec..5edc0666b07d 100644
--- a/media-gfx/gnuplot/ChangeLog
+++ b/media-gfx/gnuplot/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/gnuplot
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.14 2003/12/14 19:17:37 zul Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.15 2004/02/09 00:17:54 g2boojum Exp $
+
+*gnuplot-3.8j (08 Feb 2004)
+
+  08 Feb 2004; Grant Goodyear <g2boojum@gentoo.org> gnuplot-3.7.1-r3.ebuild,
+  gnuplot-3.7.2.ebuild, gnuplot-3.7.3-r1.ebuild, gnuplot-3.7.3.ebuild,
+  gnuplot-3.8j.ebuild, metadata.xml:
+  Old versions fail to build due to some libpng setjmp weirdness that
+  I don't understand.  I've added a new version that builds just fine
+  (on x86, at least), and is much less out-of-date.  I've also removed
+  the versions that don't build.
 
   14 Dec 2003; Chuck Short <zul@gentoo.org> gnuplot-3.7.3-r1.ebuild:
   Added amd64 keyword, closes #35807.
diff --git a/media-gfx/gnuplot/Manifest b/media-gfx/gnuplot/Manifest
index 16dfc276652c..ff33efc423f2 100644
--- a/media-gfx/gnuplot/Manifest
+++ b/media-gfx/gnuplot/Manifest
@@ -1,9 +1,4 @@
-MD5 0eef9dff7a6a14bb2ddd9c5892f6f296 gnuplot-3.7.3.ebuild 2255
-MD5 118558a66fb810260ecc981ee43bf024 gnuplot-3.7.1-r3.ebuild 2117
-MD5 7b9a2b9ec85c4fec010440bb9adaa3e6 gnuplot-3.7.3-r1.ebuild 2519
-MD5 e2e202d9596760f70eac74f332871e8c ChangeLog 2191
-MD5 b88d23050e0b0c5272a0465c23e6bf89 gnuplot-3.7.2.ebuild 2242
-MD5 48e8cfbf9c54abadeb745852cbf228a2 files/digest-gnuplot-3.7.2 66
-MD5 c54a92a7dd33235eabf9610499f8adb4 files/digest-gnuplot-3.7.3 66
-MD5 5e79534e55aae9132c24e01965a7db2c files/digest-gnuplot-3.7.1-r3 66
-MD5 c54a92a7dd33235eabf9610499f8adb4 files/digest-gnuplot-3.7.3-r1 66
+MD5 180d864400833da18d2f3422aa0969a7 gnuplot-3.8j.ebuild 2170
+MD5 cf0247434fdb066f2e414d6f39937df3 ChangeLog 2655
+MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
+MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j 67
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-3.7.1-r3 b/media-gfx/gnuplot/files/digest-gnuplot-3.7.1-r3
deleted file mode 100644
index b393482c3a52..000000000000
--- a/media-gfx/gnuplot/files/digest-gnuplot-3.7.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30798b4c14ea734969a86ee41a9c1dca gnuplot-3.7.1.tar.gz 1319233
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-3.7.2 b/media-gfx/gnuplot/files/digest-gnuplot-3.7.2
deleted file mode 100644
index 4fcda79ff70d..000000000000
--- a/media-gfx/gnuplot/files/digest-gnuplot-3.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 92f2ef0d6ab39a3fcaa0d008bf1b21c8 gnuplot-3.7.2.tar.gz 1399872
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-3.7.3 b/media-gfx/gnuplot/files/digest-gnuplot-3.7.3
deleted file mode 100644
index fa088ac5cdec..000000000000
--- a/media-gfx/gnuplot/files/digest-gnuplot-3.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07921c091153b1f52825fb291849d36d gnuplot-3.7.3.tar.gz 1418889
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-3.7.3-r1 b/media-gfx/gnuplot/files/digest-gnuplot-3.7.3-r1
deleted file mode 100644
index fa088ac5cdec..000000000000
--- a/media-gfx/gnuplot/files/digest-gnuplot-3.7.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07921c091153b1f52825fb291849d36d gnuplot-3.7.3.tar.gz 1418889
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-3.8j b/media-gfx/gnuplot/files/digest-gnuplot-3.8j
new file mode 100644
index 000000000000..a7642c4ce441
--- /dev/null
+++ b/media-gfx/gnuplot/files/digest-gnuplot-3.8j
@@ -0,0 +1 @@
+MD5 929e210e2d6585d34b029fa59d39915f gnuplot-3.8j.0.tar.gz 2072307
diff --git a/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild b/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild
deleted file mode 100644
index 7d3e98f4a7dd..000000000000
--- a/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild
+++ /dev/null
@@ -1,77 +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/gnuplot/gnuplot-3.7.1-r3.ebuild,v 1.12 2003/02/13 12:33:41 vapier Exp $
-
-IUSE="X readline svga plotutils"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Quick and useful plotting program"
-SRC_URI="ftp://ftp.gnuplot.org/pub/gnuplot/${P}.tar.gz"
-HOMEPAGE="http://www.gnuplot.info"
-
-SLOT="0"
-LICENSE="gnuplot"
-KEYWORDS="x86 ppc ~alpha"
-
-DEPEND="media-libs/libpng
-	X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )
-	readline? ( sys-libs/readline )
-	plotutils? ( media-libs/plotutils )"
-
-src_compile() {
-	local myconf
-	#--with-lasergnu flag seems to be broken and I'm too lazy to fix now
-	#myconf=" --with-png --without-gd --with-lasergnu"
-	myconf=" --with-png --without-gd --with-plot=/usr/lib"
-	#--with-plot enables the Gnu plotutils library
-	#need to specify path to differentiate from Unix plot
-
-	use plotutils \
-		&& myconf="${myconf} --with-plot=/usr/lib" \
-		|| myconf="${myconf} --without-plot"
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline"
-
-	use svga \
-		&& myconf="${myconf} --with-linux-vga" \
-		|| myconf="${myconf} --without-linux-vga"
-
-	econf \
-		--datadir=/usr/share/gnuplot \
-		${myconf} || die
-
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-	    -e 's/mandir = \/usr/mandir = ${prefix}/' \
-	    Makefile.orig > Makefile
-
-	cd docs
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-		Makefile.orig > Makefile
-
-	cd ${S}
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-
-	dodoc 0* ChangeLog CodeStyle Copyright NEWS PGPKEYS TODO
-}
-
-pkg_postinst() {
-	if [ "`use svga`" ] ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually chmod u+s /usr/bin/gnuplot"
-	fi
-}
diff --git a/media-gfx/gnuplot/gnuplot-3.7.2.ebuild b/media-gfx/gnuplot/gnuplot-3.7.2.ebuild
deleted file mode 100644
index d8e43b5d197f..000000000000
--- a/media-gfx/gnuplot/gnuplot-3.7.2.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/gnuplot/gnuplot-3.7.2.ebuild,v 1.4 2003/07/12 16:44:48 aliz Exp $
-
-IUSE="X readline svga plotutils"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Quick and useful plotting program"
-SRC_URI="mirror://sourceforge/gnuplot/${P}.tar.gz"
-HOMEPAGE="http://www.gnuplot.info"
-
-SLOT="0"
-LICENSE="gnuplot"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="media-libs/libpng
-	X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )
-	readline? ( sys-libs/readline )
-	plotutils? ( media-libs/plotutils )"
-
-src_compile() {
-	local myconf
-	#--with-lasergnu flag seems to be broken and I'm too lazy to fix now
-	#myconf=" --with-png --without-gd --with-lasergnu"
-	myconf=" --with-png --without-gd --with-plot=/usr/lib"
-	#--with-plot enables the Gnu plotutils library
-	#need to specify path to differentiate from Unix plot
-
-	use plotutils \
-		&& myconf="${myconf} --with-plot=/usr/lib" \
-		|| myconf="${myconf} --without-plot"
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline"
-
-	use svga \
-		&& myconf="${myconf} --with-linux-vga" \
-		|| myconf="${myconf} --without-linux-vga"
-
-	econf \
-		--datadir=/usr/share/gnuplot \
-		${myconf} || die
-
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-	    -e 's/mandir = \/usr/mandir = ${prefix}/' \
-		-e 's/infodir = \/usr/infodir = ${prefix}/' \
-	    Makefile.orig > Makefile
-
-	cd docs
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-		-e 's/infodir = \/usr/infodir = ${prefix}/' \
-		-e 's/mandir = \/usr/mandir = ${prefix}/' \
-		Makefile.orig > Makefile
-
-	cd ${S}
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-
-	dodoc 0* ChangeLog CodeStyle Copyright NEWS PGPKEYS TODO
-}
-
-pkg_postinst() {
-	if [ "`use svga`" ] ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually chmod u+s /usr/bin/gnuplot"
-	fi
-}
diff --git a/media-gfx/gnuplot/gnuplot-3.7.3.ebuild b/media-gfx/gnuplot/gnuplot-3.7.3.ebuild
deleted file mode 100644
index 4223387c4e44..000000000000
--- a/media-gfx/gnuplot/gnuplot-3.7.3.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/gnuplot/gnuplot-3.7.3.ebuild,v 1.4 2003/08/25 19:51:15 weeve Exp $
-
-IUSE="X readline svga plotutils"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Quick and useful plotting program"
-SRC_URI="mirror://sourceforge/gnuplot/${P}.tar.gz"
-HOMEPAGE="http://www.gnuplot.info"
-
-SLOT="0"
-LICENSE="gnuplot"
-KEYWORDS="x86 ~ppc alpha sparc"
-
-DEPEND="media-libs/libpng
-	X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )
-	readline? ( sys-libs/readline )
-	plotutils? ( media-libs/plotutils )"
-
-src_compile() {
-	local myconf
-	#--with-lasergnu flag seems to be broken and I'm too lazy to fix now
-	#myconf=" --with-png --without-gd --with-lasergnu"
-	myconf=" --with-png --without-gd --with-plot=/usr/lib"
-	#--with-plot enables the Gnu plotutils library
-	#need to specify path to differentiate from Unix plot
-
-	use plotutils \
-		&& myconf="${myconf} --with-plot=/usr/lib" \
-		|| myconf="${myconf} --without-plot"
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline"
-
-	use svga \
-		&& myconf="${myconf} --with-linux-vga" \
-		|| myconf="${myconf} --without-linux-vga"
-
-	econf \
-		--datadir=/usr/share/gnuplot \
-		${myconf} || die
-
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-	    -e 's/mandir = \/usr/mandir = ${prefix}/' \
-		-e 's/infodir = \/usr/infodir = ${prefix}/' \
-	    Makefile.orig > Makefile
-
-	cd docs
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-		-e 's/infodir = \/usr/infodir = ${prefix}/' \
-		-e 's/mandir = \/usr/mandir = ${prefix}/' \
-		Makefile.orig > Makefile
-
-	cd ${S}
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-
-	dodoc 0* ChangeLog CodeStyle Copyright NEWS PGPKEYS TODO
-}
-
-pkg_postinst() {
-	if [ "`use svga`" ] ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually chmod u+s /usr/bin/gnuplot"
-	fi
-}
diff --git a/media-gfx/gnuplot/gnuplot-3.7.3-r1.ebuild b/media-gfx/gnuplot/gnuplot-3.8j.ebuild
index 07a7dfec60bd..24ab77b0c368 100644
--- a/media-gfx/gnuplot/gnuplot-3.7.3-r1.ebuild
+++ b/media-gfx/gnuplot/gnuplot-3.8j.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-3.7.3-r1.ebuild,v 1.2 2003/12/14 19:17:37 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-3.8j.ebuild,v 1.1 2004/02/09 00:17:54 g2boojum Exp $
 
 IUSE="X readline svga plotutils pdflib doc"
 
-S=${WORKDIR}/${P}
+MY_P="${P}.0"
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Quick and useful plotting program"
-SRC_URI="mirror://sourceforge/gnuplot/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 HOMEPAGE="http://www.gnuplot.info"
 
 SLOT="0"
 LICENSE="gnuplot"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
 
-DEPEND="media-libs/libpng
+# Old png driver seems to have problems; switching to gd instead
+DEPEND=">=media-libs/libgd-2
 	pdflib? ( media-libs/pdflib )
 	doc? ( virtual/tetex )
 	X? ( virtual/x11 )
@@ -25,7 +27,7 @@ src_compile() {
 	local myconf
 	#--with-lasergnu flag seems to be broken and I'm too lazy to fix now
 	#myconf=" --with-png --without-gd --with-lasergnu"
-	myconf=" --with-png --without-gd --with-plot=/usr/lib"
+	myconf="  --with-gd --with-plot=/usr/lib"
 	#--with-plot enables the Gnu plotutils library
 	#need to specify path to differentiate from Unix plot
 
@@ -53,19 +55,6 @@ src_compile() {
 		--datadir=/usr/share/gnuplot \
 		${myconf} || die
 
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-	    -e 's/mandir = \/usr/mandir = ${prefix}/' \
-		-e 's/infodir = \/usr/infodir = ${prefix}/' \
-	    Makefile.orig > Makefile
-
-	cd docs
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
-		-e 's/infodir = \/usr/infodir = ${prefix}/' \
-		-e 's/mandir = \/usr/mandir = ${prefix}/' \
-		Makefile.orig > Makefile
-
 	cd ${S}
 	emake || die
 
@@ -76,7 +65,7 @@ src_compile() {
 }
 
 src_install () {
-	make prefix=${D}/usr install || die
+	make DESTDIR=${D} install || die
 
 	dodoc 0* ChangeLog CodeStyle Copyright NEWS PGPKEYS TODO
 	use doc && dodoc docs/gnuplot.pdf
diff --git a/media-gfx/gnuplot/metadata.xml b/media-gfx/gnuplot/metadata.xml
new file mode 100644
index 000000000000..b60eba97bb2a
--- /dev/null
+++ b/media-gfx/gnuplot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>g2boojum@gentoo.org</email>
+</maintainer>
+</pkgmetadata>