Added extra documentation and tutorials, and a fix for a sandbox violation.

4 files changed, 130 insertions, 6 deletions

diff --git a/media-gfx/gnuplot/ChangeLog b/media-gfx/gnuplot/ChangeLog
index d4acbc4fd726..b8d2a37586a2 100644
--- a/media-gfx/gnuplot/ChangeLog
+++ b/media-gfx/gnuplot/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/gnuplot
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.27 2004/07/31 03:26:14 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.28 2004/08/07 19:44:50 ribosome Exp $
+
+*gnuplot-4.0-r1 (07 Aug 2004)
+
+  07 Aug 2004; Olivier Fisette <ribosome@gentoo.org> gnuplot-4.0-r1.ebuild:
+  Moved help and demo files to "/usr/share/gnuplot".
+  Added gnuplot tutorial.
+  Added documentation and files related to PostScript
+  creation. (Fixes bug #41729.)
+  Provided access to /dev/svga from inside the sandbox 
+  environment. (Fixes bug #41711.)
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> gnuplot-3.8j.ebuild:
   stable on ppc64, bug #57147
diff --git a/media-gfx/gnuplot/Manifest b/media-gfx/gnuplot/Manifest
index 6d19201f61c9..fa2bb3493660 100644
--- a/media-gfx/gnuplot/Manifest
+++ b/media-gfx/gnuplot/Manifest
@@ -1,10 +1,12 @@
-MD5 ed6285d82ff89e24639d7a11397ce98d ChangeLog 3985
-MD5 fba6d79f940f9261fbca68b3b241f739 gnuplot-3.8j-r1.ebuild 2117
-MD5 174dc45e9be9beb7e7bd6556c3c6b209 gnuplot-3.8j.ebuild 2000
 MD5 b6cefe9b7b098978ff2a50ac87a1cebc gnuplot-4.0.ebuild 2558
+MD5 174dc45e9be9beb7e7bd6556c3c6b209 gnuplot-3.8j.ebuild 2000
+MD5 fba6d79f940f9261fbca68b3b241f739 gnuplot-3.8j-r1.ebuild 2117
+MD5 74800b3b57be48ee20cd5ca9756ccce3 gnuplot-4.0-r1.ebuild 2884
+MD5 a4da6c59acbbf88482a7bb2b481fa0ca ChangeLog 4352
 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j 67
-MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j-r1 67
+MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
+MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0-r1 66
 MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0 66
+MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j-r1 67
 MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329
-MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-4.0-r1 b/media-gfx/gnuplot/files/digest-gnuplot-4.0-r1
new file mode 100644
index 000000000000..fe9dcb46f985
--- /dev/null
+++ b/media-gfx/gnuplot/files/digest-gnuplot-4.0-r1
@@ -0,0 +1 @@
+MD5 66258443d9f93cc4f46b147dac33e63a gnuplot-4.0.0.tar.gz 2160918
diff --git a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
new file mode 100644
index 000000000000..39d9ac74c680
--- /dev/null
+++ b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.1 2004/08/07 19:44:50 ribosome Exp $
+
+inherit eutils
+
+MY_P="${P}.0"
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+LICENSE="gnuplot"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc gd ggi pdflib plotutils png readline svga X xemacs"
+
+DEPEND="
+	xemacs? ( virtual/xemacs )
+	pdflib? ( media-libs/pdflib )
+	ggi? ( media-libs/libggi )
+	png? ( media-libs/libpng )
+	gd? ( >=media-libs/gd-2 )
+	doc? ( virtual/tetex )
+	X? ( virtual/x11 )
+	svga? ( media-libs/svgalib )
+	readline? ( >=sys-libs/readline-4.2 )
+	plotutils? ( media-libs/plotutils )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/header-order.patch
+}
+
+src_compile() {
+	local myconf="--datadir=/usr/share/${PN} --with-gihdir=/usr/share/${PN}/gih"
+
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_with gd)"
+
+	use ggi \
+		&& myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
+		|| myconf="${myconf} --without-ggi"
+
+	use readline \
+		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
+		|| myconf="${myconf} --with-readline"
+
+	use plotutils \
+		&& myconf="${myconf} --with-plot=/usr/lib" \
+		|| myconf="${myconf} --without-plot"
+
+	use png \
+		&& myconf="${myconf} --with-png=/usr/lib" \
+		|| myconf="${myconf} --without-png"
+
+	use pdflib \
+		&& myconf="${myconf} --with-pdf=/usr/lib" \
+		|| myconf="${myconf} --without-pdf"
+
+	! use xemacs && myconf="${myconf} --without-lisp-files"
+
+	# This is a hack to avoid sandbox violations when using the Linux console.
+	# Creating the DVI and PDF tutorials require /dev/svga to build the
+	# example plots.
+	addwrite /dev/svga
+
+	econf ${myconf} || die
+	emake || die
+
+	if use doc ; then
+		cd docs
+		make pdf || die
+		cd ../tutorial
+		make pdf || die
+	fi
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
+
+	if use doc; then
+		# Demo files
+		insinto /usr/share/${PN}/demo
+		doins demo/*
+		# Manual
+		insinto /usr/share/doc/${PF}/manual
+		doins docs/gnuplot.pdf
+		# Tutorial
+		insinto /usr/share/doc/${PF}/tutorial
+		doins tutorial/{tutorial.dvi,tutorial.pdf}
+		# Documentation for making PostScript files
+		insinto /usr/share/doc/${PF}/psdoc
+		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+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
+}