Version bump. Add support for PGF/TikZ terminal with USE=lua, bug 233475. Other minor changes.

Package-Manager: portage-2.2_rc27/cvs/Linux i686

4 files changed, 307 insertions, 2 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index c671a612fd37..5e82ab6f5a85 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.98 2009/03/27 23:19:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.99 2009/03/31 22:28:22 ulm Exp $
+
+*gnuplot-4.2.5 (31 Mar 2009)
+
+  31 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/gnuplot-gentoo-version.patch, +gnuplot-4.2.5.ebuild:
+  Version bump. Add support for PGF/TikZ terminal with USE=lua, bug 233475;
+  thanks to Thomas Fischer <fischer@unix-ag.uni-kl.de>. Add Gentoo version
+  identification and contact information, in order to fulfil provisions 2
+  through 4 of the gnuplot licence for redistribution of binaries. Remove
+  the built_with_use test for media-libs/gd from src_unpack and replace it
+  by a USE dependency; therefore bump EAPI to 2. latex_rehash is not needed
+  any more, replace it by texmf-update.
 
   27 Mar 2009; Jeroen Roovers <jer@gentoo.org> gnuplot-4.2.4-r1.ebuild:
   Stable for HPPA (bug #262327).
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 5d8c3e78dff1..2294416af517 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 SHA1 dc566b4c6406c135e2505132fca598ea52da7b24 SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3
 AUX gnuplot-4.2.2-disable_texi_generation.patch 646 RMD160 ac2ed0785f72a6cc96ec10685f116a631ed80b78 SHA1 4d162a108fa2429d7aea49a416babc9b01124297 SHA256 922441e35ad4daefad70e3e2f7f1fe15b96f97d0b281f005eb70cd3130ad8f68
 AUX gnuplot-4.2.3-app-defaults.patch 1906 RMD160 dab9814a3e7178941fe68373870e8fcd6db9ee36 SHA1 10015c3efd632fa35adb3c70e62035226efb096b SHA256 99386dfe58188401a6e16d24ddd38026b687d8a3b22b14c2d9cd54e4b2c80697
 AUX gnuplot-4.2.3-disable-texhash.patch 601 RMD160 c11abb16a063190e1e92dc35ad8539138dacba60 SHA1 774db0406e61816769f18ddcafea7164655ae0f2 SHA256 db1b442628e2378459ec1627d93763ce5ca45f3510436fb68cd78460333012d6
+AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af30e22e SHA1 337c0b3b329965c01d75decf49a7ef678e3d46a9 SHA256 c6c1b8a6ccc9d8aeaa12d178f5e91653d4f7f5f9c49eae1feb1ec3f7267670e1
 DIST gnuplot-4.2.3.tar.gz 2840611 RMD160 b4692db884c9da2f0d160f33f53c3d2aba65f36e SHA1 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491 SHA256 4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
 DIST gnuplot-4.2.4.tar.gz 2904358 RMD160 88acf7561a74116aece627f9b5e41e0726daee75 SHA1 4226b959493a37bc5a1f40a3b165ffd9e1b9d202 SHA256 2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913
+DIST gnuplot-4.2.5-lua-term.patch.bz2 26660 RMD160 981db04276ce51ece9b95076856b9811de872e3d SHA1 845fffa290d66e51ce5924d020a1d9b3bf354986 SHA256 32f39b4eb14e41f22fc911c73adf740e38af0819315ee102449ad4e572ab1b7f
+DIST gnuplot-4.2.5.tar.gz 2873303 RMD160 79ab74627d66c2eff6d69276c1556acca89ec6dd SHA1 e7ad6afc1ca7b39a512a18f2dc6f2bcda9bf9128 SHA256 89477ede06ca5a6cc814e123babadeda75bc52d89b078b92b79fba957caf11f8
 EBUILD gnuplot-4.2.3-r2.ebuild 5555 RMD160 1311b1f27caebc88e45ae2f91f643b99957e4c7c SHA1 a0c1e9769e9e82e95b19f1c8d2b48b96048610b9 SHA256 31499eae8e8faac7908f60a961c6e3cf642ee1aa2cc14d71c1cd94ca959716a4
 EBUILD gnuplot-4.2.4-r1.ebuild 5483 RMD160 a17a211ccc73681fed56a1fcd62bf69148e0c955 SHA1 a128429ecd7fd2e97f1a4e28bb87a566643dd43e SHA256 03ee6c395f3059ced50b7d8018aa93884288d8e16db982d3750d8765c7dfb305
-MISC ChangeLog 20524 RMD160 61984db14af6cbb860e52aeed812e89bfe71eb1d SHA1 73b5f634942ccdaafd38e2b0afe76b53e9453b09 SHA256 8252472847fe2e6c1d34c21feeb344bde6afe5a00a4ec22edbc0383153710d29
+EBUILD gnuplot-4.2.5.ebuild 5775 RMD160 540c67b556c0928c9dcbcede9691aec6e6487dc9 SHA1 915dd7c06a57d14ee137d7adf74a30d49ab95965 SHA256 8a23a98e55e97bff3ecb048aa957fdb79131ad0865efc2e9c443282ef7ce5780
+MISC ChangeLog 21154 RMD160 fdf5701108ef1a3655f26feffe22a06d66778038 SHA1 cf4242821d1188877e7bb4ef56c25f4a2a242b5b SHA256 6d50e191970659b103f577dec48c8093842c55b6e671aa342dcad9ea8132a725
 MISC metadata.xml 215 RMD160 ec20f35cba71ed779c37faff72797d5162aca3ab SHA1 365b4e7ba49bbe889a7755c256161fcbf1bfd6cd SHA256 3c0405bae8c54a7aa4c92bbb44941fc4243a8474a6209063fa6f24e1c85e8bb6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAknSmVkACgkQOeoy/oIi7uyYTQCcD3+6sWe3NBIFhWjpi9e3/l8x
+eiwAni8TdVlc0AO36gafUilv8K646cdE
+=9mKG
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch b/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
new file mode 100644
index 000000000000..b1a530a7dfe7
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
@@ -0,0 +1,76 @@
+Add special version identification and Gentoo contact information,
+in order to fulfil provisions 2 through 4 of the gnuplot licence.
+
+--- gnuplot-orig/src/plot.c
++++ gnuplot/src/plot.c
+@@ -383,9 +383,11 @@
+ 		    "  -V, --version\n"
+ 		    "  -h, --help\n"
+ 		    "  -e  \"command1; command2; ...\"\n"
+-		    "gnuplot %s patchlevel %s\n"
+-		    "Report bugs to %s\n",
+-		    gnuplot_version, gnuplot_patchlevel, bug_email);
++		    "gnuplot %s patchlevel %s (Gentoo revision %s)\n"
++		    "Report bugs to <%s>\n"
++		    "or to <%s>\n",
++		    gnuplot_version, gnuplot_patchlevel, gentoo_revision,
++		    gentoo_bugtracker, bug_email);
+ 	    return 0;
+ 	}
+     }
+--- gnuplot-orig/src/show.c
++++ gnuplot/src/show.c
+@@ -1052,7 +1052,7 @@
+ 
+     fprintf(fp, "%s\n\
+ %s\t%s\n\
+-%s\tVersion %s patchlevel %s\n\
++%s\tVersion %s patchlevel %s (Gentoo revision %s)\n\
+ %s\tlast modified %s\n\
+ %s\tSystem: %s %s\n\
+ %s\n\
+@@ -1063,10 +1063,11 @@
+ %s\tThe gnuplot FAQ is available from %s\n\
+ %s\n\
+ %s\tSend bug reports and suggestions to <%s>\n\
++%s\tor to <%s>\n\
+ %s\n",
+ 	    p,			/* empty line */
+ 	    p, PROGRAM,
+-	    p, gnuplot_version, gnuplot_patchlevel,
++	    p, gnuplot_version, gnuplot_patchlevel, gentoo_revision,
+ 	    p, gnuplot_date,
+ 	    p, os_name, os_rel,
+ 	    p,			/* empty line */
+@@ -1076,6 +1077,7 @@
+ 	    p,			/* Type `help` */
+ 	    p, faq_location,
+ 	    p,			/* empty line */
++	    p, gentoo_bugtracker,
+ 	    p, bug_email,
+ 	    p);			/* empty line */
+ 
+--- gnuplot-orig/src/version.c
++++ gnuplot/src/version.c
+@@ -46,6 +46,9 @@
+ 
+ const char faq_location[] = FAQ_LOCATION;
+ 
++const char gentoo_revision[] = GENTOO_REVISION;
++const char gentoo_bugtracker[] = "http://bugs.gentoo.org/";
++
+ char *compile_options = (void *)0;	/* Will be loaded at runtime */
+ 
+ #define RELEASE_VERSION 1
+--- gnuplot-orig/src/version.h
++++ gnuplot/src/version.h
+@@ -47,6 +47,9 @@
+ extern const char bug_email[];
+ extern const char help_email[];
+ 
++extern const char gentoo_revision[];
++extern const char gentoo_bugtracker[];
++
+ extern char os_name[];
+ extern char os_rel[];
+ 
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
new file mode 100644
index 000000000000..72ec286e9ecf
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild,v 1.1 2009/03/31 22:28:22 ulm Exp $
+
+EAPI=2
+WX_GTK_VER="2.8"
+
+inherit autotools elisp-common eutils multilib wxwidgets
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
+	mirror://gentoo/${P}-lua-term.patch.bz2"
+
+LICENSE="gnuplot"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc emacs gd ggi latex lua pdf plotutils readline svga wxwindows X xemacs"
+RESTRICT="wxwindows? ( test )"
+
+RDEPEND="
+	xemacs? ( virtual/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
+	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
+	pdf? ( media-libs/pdflib )
+	lua? ( >=dev-lang/lua-5.1 )
+	ggi? ( media-libs/libggi )
+	gd? ( >=media-libs/gd-2[png] )
+	doc? ( virtual/latex-base
+		virtual/ghostscript )
+	latex? ( virtual/latex-base
+		lua? ( dev-tex/pgf ) )
+	X? ( x11-libs/libXaw )
+	svga? ( media-libs/svgalib )
+	readline? ( >=sys-libs/readline-4.2 )
+	plotutils? ( media-libs/plotutils )
+	wxwindows? ( =x11-libs/wxGTK-2.8*
+		>=x11-libs/cairo-0.9
+		>=x11-libs/pango-1.10.3
+		>=x11-libs/gtk+-2.8 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+E_SITEFILE="50${PN}-gentoo.el"
+TEXMF="/usr/share/texmf-site"
+
+pkg_setup() {
+	use wxwindows && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+	# Texinfo source is already shipped, so separate preparation not needed
+	# and error-prone, see bug 194216
+	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
+	# Don't store resource files in deprecated location, reported upstream:
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
+	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch
+	# Disable texhash to prevent sandbox violation, bug 201871
+	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch
+	# Support for lua/TikZ terminal
+	epatch "${WORKDIR}"/${P}-lua-term.patch
+	# Add Gentoo version identification since the licence requires it
+	epatch "${FILESDIR}"/${PN}-gentoo-version.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# See bug #156427.
+	if use latex ; then
+		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
+			share/LaTeX/Makefile.in || die
+	else
+		sed -i \
+			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
+	fi
+
+	local myconf="--with-gihdir=/usr/share/${PN}/gih"
+
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_with gd)"
+	myconf="${myconf} $(use_enable wxwindows wxwidgets)"
+	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with lua)"
+	myconf="${myconf} $(use_with doc tutorial)"
+
+	use ggi \
+		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
+		--with-xmi=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --without-ggi"
+
+	use readline \
+		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
+		|| myconf="${myconf} --with-readline"
+
+	myconf="${myconf} --without-lisp-files"
+
+	TEMACS=no
+	use xemacs && TEMACS=xemacs
+	use emacs && TEMACS=emacs
+
+	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
+	EMACS=${TEMACS} \
+		econf ${myconf} || die
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	VARTEXFONTS="${T}/fonts"
+
+	# 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:/dev/mouse:/dev/tts/0
+
+	emake || die
+
+	if use doc ; then
+		cd docs
+		emake pdf || die
+		cd ../tutorial
+		emake pdf || die
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	if use emacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for GNU Emacs..."
+		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
+		emake DESTDIR="${D}" install || die
+		emake clean
+		cd ..
+
+		# Gentoo emacs site-lisp configuration
+		echo -e "\n;;; ${PN} site-lisp configuration\n" > ${E_SITEFILE}
+		echo -e "(add-to-list 'load-path \"@SITELISP@\")\n" >> ${E_SITEFILE}
+		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE}
+		elisp-site-file-install ${E_SITEFILE}
+	fi
+
+	if use xemacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for XEmacs..."
+		EMACS="xemacs" \
+			econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" || die
+		emake DESTDIR="${D}" install || die
+		cd ..
+	fi
+
+	if use latex && use lua; then
+		# install style file in an (additional) place where TeX can find it
+		insinto "${TEXMF}/tex/latex/${PN}"
+		doins term/lua/gnuplot-lua-tikz.sty || die
+	fi
+
+	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* \
+		TODO VERSION
+	use lua && newdoc term/lua/README README-lua
+
+	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
+
+	if ! use X; then
+		# see bug 194527
+		rm -rf "${D}/usr/$(get_libdir)/X11"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+
+	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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+}