avoid outdated documentation from the gnuplot.texi (bug #366129#c15)

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 276 insertions, 15 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 846c256aaca7..b0435f984ae1 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.154 2011/05/07 10:16:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.155 2011/05/28 12:54:20 ottxor Exp $
+
+*gnuplot-4.4.3-r1 (28 May 2011)
+
+  28 May 2011; Christoph Junghans <ottxor@gentoo.org> +gnuplot-4.4.3-r1.ebuild,
+  metadata.xml:
+  avoid outdated documentation from the gnuplot.texi (bug #366129#c15)
 
   07 May 2011; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.2.6-r2.ebuild,
   gnuplot-4.4.2-r1.ebuild, gnuplot-4.4.3.ebuild:
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 1b864891ae6d..d3064bd2ea01 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -12,13 +12,18 @@ DIST gnuplot-4.4.2.tar.gz 3299690 RMD160 077d6d353e0370d1f8463693380030722f5789a
 DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc4 SHA1 a4d315b9288739e3cbaa04d8ddda7861b4009bd4 SHA256 6faa236ed5c744f34a9ac58ef89dab6177a15c5835dc3644a0a12779439426e6
 EBUILD gnuplot-4.2.6-r2.ebuild 6207 RMD160 82509ca48ef70de10a3d7606619b32ef22eb2ee2 SHA1 83a7c5272ceab4f6214a7c76d1e6ce91c71e9ef3 SHA256 3baf97adb0c118f66d0d2402a4ca84daff17995f7c58b4bc4480c6299e4af3a3
 EBUILD gnuplot-4.4.2-r1.ebuild 6127 RMD160 33002726f6e94e0eda1df996787806e443c705da SHA1 8c2dbe949e7b644c2e1ace9d404b889460b1775a SHA256 6ceea186fe74ca9d45dc5865a6c21a7acd77827e381c9311b9e5a8fae6e7dc24
+EBUILD gnuplot-4.4.3-r1.ebuild 6831 RMD160 0970ba561ca357205ba0d5b924baf15cc6df7bdf SHA1 6464d43980b65a1a85a1f5e5dcb9d34676cb0649 SHA256 650154166f17a27f266149ab78a146a80d54fe08cd49a1d4434476fcceda3005
 EBUILD gnuplot-4.4.3.ebuild 6187 RMD160 14cd8ee37e638ec9ccd4bee37162e70d547f3b6f SHA1 cfaffdb48e97e784250509d933e8b52b7ee4712d SHA256 f7bc48f05c53480634bfd2de68bb942a09cd78dc2dd851cdea345dbd664390c5
-MISC ChangeLog 29003 RMD160 b697345f98240dfb5051a6d3203d2a1086ebacc7 SHA1 04b0235cf800fba8566455e2b720bc0ec00de3d2 SHA256 d00ab5f78a7c8589775b5c06302cd0c37c4b9ab38bfba7f8bc20509a6a1d6ff8
-MISC metadata.xml 404 RMD160 7c05f336a5561bb8b6dfa4ac1f70889c0c6d3f5c SHA1 a8ae16bc80aedbedbfa575b538bf95b71ce4c319 SHA256 dfacaf36a82a2dd67ea22d03f8c6c56bd4bd60588e9187c8a8e0988ae10a3a3b
+MISC ChangeLog 29207 RMD160 65c9e847388a61efaa4ae7b114b186e022fd525d SHA1 5c69285aef043db9897e735eb9ce05f79de8516e SHA256 f1db728dfde908f7a100754a5a0f9d8adba833808834f61609bd0013d55ffa28
+MISC metadata.xml 511 RMD160 d1aca682659cec35000b5beb01d035313865a7e8 SHA1 f0168f6f851e7729a3033383f50e3495b813657e SHA256 dff37a68daad7ef0f042891288528d693183726bff6c685c3bf579a8dd228e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3FIOEACgkQOeoy/oIi7uyebwCguFVudrPqPeP6olCKVCIYIUzf
-GQ0AoNkXUyAFIzyoNdkIyahk5514Q7Z6
-=P4l3
+iQEcBAEBAgAGBQJN4PCBAAoJEOeBhlrCAAWG544H/3LNaj8eilWFygDfaRuQ23Cf
+Li8iMLuaNHdND+M5T5ZmpDxErmnWo/g8vphsYR72HZcYPlG9XSf1F2zBUpu++6ZS
+5fcHKkFxUbaAFjdf5JHpu9+iZqQZCboXSbbiM7P00dw5K1dhkpDX4Zcwe6P7xH6A
+GxYd4AgIzHDH1ET6s6GkQ9gmx2yaUx1tM91XDKxdGYzX4zsTNO1qgRjOb6uquOsG
+b6l5xVf0RUHtuvurpk26mIE/O5MaYODTahRuvogK3EIdoUAfnQ50HFFEWiA/kMD5
+vAH/K5GP3JiMTqC+43cmawY8p42E05uZ/RewOczSFtJYes/MWQ3UVik87uwQBJ4=
+=Xew6
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
new file mode 100644
index 000000000000..3f72a52a7be0
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.1 2011/05/28 12:54:20 ottxor Exp $
+
+EAPI=3
+
+inherit elisp-common multilib wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit autotools cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-4-4-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+else
+	MY_P="${P/_/-}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+fi
+
+LICENSE="gnuplot GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
+
+RESTRICT="wxwidgets? ( test )"
+
+RDEPEND="!app-emacs/gnuplot-mode
+	cairo? ( x11-libs/cairo
+		x11-libs/pango )
+	emacs? ( virtual/emacs )
+	gd? ( media-libs/gd[png] )
+	ggi? ( media-libs/libggi )
+	latex? ( virtual/latex-base
+		lua? ( dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	lua? ( dev-lang/lua )
+	plotutils? ( media-libs/plotutils )
+	readline? ( sys-libs/readline )
+	svga? ( media-libs/svgalib )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )
+	xemacs? ( app-editors/xemacs
+		app-xemacs/xemacs-base )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base
+		app-text/ghostscript-gpl )
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )
+	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+
+S="${WORKDIR}/${MY_P}"
+GP_VERSION="${PV%.*}"
+E_SITEFILE="50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am || \
+				die "make -f Makefile.am.in Makefile.am in $dir failed"
+		done
+		eautoreconf
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
+	local myconf
+	myconf="${myconf} --without-lisp-files"
+	myconf="${myconf} --without-pdf"
+	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
+	myconf="${myconf} $(use_with cairo)"
+	myconf="${myconf} $(use_with doc tutorial)"
+	myconf="${myconf} $(use_with gd)"
+	myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))"
+	myconf="${myconf} $(use_with lua)"
+	myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_enable thin-splines)"
+	myconf="${myconf} $(use_enable wxwidgets)"
+	myconf="${myconf} $(use_with X x)"
+	use readline \
+		&& myconf="${myconf} --with-readline=gnu" \
+		|| myconf="${myconf} --with-readline=builtin"
+
+	if has_version virtual/emacs; then
+		emacs="emacs"
+	elif has_version app-xemacs/texinfo; then
+		emacs="xemacs"
+	fi
+
+	econf ${myconf} \
+		DIST_CONTACT="http://bugs.gentoo.org/" \
+		EMACS="${emacs}"
+
+	if use xemacs; then
+		einfo "Configuring gnuplot-mode for XEmacs ..."
+		use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs
+		cd "${S}/lisp-xemacs"
+		econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
+	fi
+
+	if use emacs; then
+		einfo "Configuring gnuplot-mode for GNU Emacs ..."
+		cd "${S}/lisp"
+		econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
+	fi
+}
+
+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 all info || die
+
+	if use xemacs; then
+		cd "${S}/lisp-xemacs"
+		emake || die
+	fi
+
+	if use emacs; then
+		cd "${S}/lisp"
+		emake || die
+	fi
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		cd "${S}/docs"
+		emake pdf || die
+		cd "${S}/tutorial"
+		emake pdf || die
+
+		if use emacs || use xemacs; then
+			cd "${S}/lisp"
+			emake pdf || die
+		fi
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	if use xemacs; then
+		cd "${S}/lisp-xemacs"
+		emake DESTDIR="${D}" install || die
+	fi
+
+	if use emacs; then
+		cd "${S}/lisp"
+		emake DESTDIR="${D}" install || die
+		# info-look* is included with >=emacs-21
+		rm -f "${ED}${SITELISP}/${PN}"/info-look*
+
+		# Gentoo emacs site-lisp configuration
+		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
+		sed '/^;; move/,+3 d' dotemacs >> ${E_SITEFILE} || die
+		elisp-site-file-install ${E_SITEFILE} || die
+	fi
+
+	cd "${S}"
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	if use doc; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo || die
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+		# Manual
+		dodoc docs/gnuplot.pdf
+		# Tutorial
+		dodoc tutorial/{tutorial.dvi,tutorial.pdf}
+		# FAQ
+		dodoc FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+
+	if use emacs || use xemacs; then
+		docinto emacs
+		dodoc lisp/ChangeLog lisp/README
+		use doc && dodoc lisp/gpelcard.pdf
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+
+	einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
+	einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
+	use cairo || einfo "It is available with USE=\"cairo\"."
+
+	if use svga; then
+		echo
+		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
+	if use gd; then
+		echo
+		einfo "For font support in png/jpeg/gif output, you may have to"
+		einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
+		einfo "variables. See the FAQ file in /usr/share/doc/${PF}/"
+		einfo "for more information."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index c1d62c6e2898..76e095ee0beb 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>ulm@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
-    Needed for GIF, JPEG, and PNG image output.</flag>
-  <flag name='thin-splines'>Enable thin plate splines</flag>
-</use>
+	<herd>sci</herd>
+	<maintainer>
+		<email>ulm@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<use>
+		<flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
+    		Needed for GIF, JPEG, and PNG image output.</flag>
+  		<flag name='thin-splines'>Enable thin plate splines</flag>
+	</use>
 </pkgmetadata>