Version bump, comprising changes from science overlay.

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

4 files changed, 228 insertions, 6 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 74a8ae00f6f6..9bb13eded3f2 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.135 2010/03/07 20:02:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.136 2010/03/14 14:37:17 ulm Exp $
+
+*gnuplot-4.4.0 (14 Mar 2010)
+
+  14 Mar 2010; Ulrich Mueller <ulm@gentoo.org> +gnuplot-4.4.0.ebuild,
+  metadata.xml:
+  Version bump. This comprises changes from science overlay, thanks to
+  Christoph Junghans <kleiner_otti@gmx.de>. New thin-splines local USE flag.
 
   07 Mar 2010; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.2.6-r1.ebuild:
   Only build-time dependencies are needed with USE=doc.
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 2c6f812fad01..df5a0ca82ae0 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -8,14 +8,16 @@ AUX gnuplot-4.2.5-configure-pkgconfig.patch 484 RMD160 d1d8031382b8062c393fa430e
 AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af30e22e SHA1 337c0b3b329965c01d75decf49a7ef678e3d46a9 SHA256 c6c1b8a6ccc9d8aeaa12d178f5e91653d4f7f5f9c49eae1feb1ec3f7267670e1
 DIST gnuplot-4.2.5-lua-term.patch.bz2 26660 RMD160 981db04276ce51ece9b95076856b9811de872e3d SHA1 845fffa290d66e51ce5924d020a1d9b3bf354986 SHA256 32f39b4eb14e41f22fc911c73adf740e38af0819315ee102449ad4e572ab1b7f
 DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a76 SHA1 d11fdde8218bee98597ee836cbc17e4bf6093b70 SHA256 81fbc2eb6077bd6abfe98c5c82aae14a2c970473ee4c2c37743ff3b1e2aa8e82
+DIST gnuplot-4.4.0.tar.gz 3291622 RMD160 ed15fd44d32b0bf610f52b99e2c36cd160cb08a6 SHA1 04a2eede7b2af8e64144aa8ffede6535b7a043b5 SHA256 00de2c54a05920a5d2dc68f668990b0b84a96105d92a932d91600dd53f156b2a
 EBUILD gnuplot-4.2.6-r1.ebuild 6204 RMD160 3e43bcfdc92da126c8baa002f51b5ea4632dae7b SHA1 9517b1eb59a4f55e71036ef37a1efac8dd1a06ff SHA256 2b37220b8fd1040e2cfcf22a15b616a05dedde80f0c1fcd365c5e95e8a387904
 EBUILD gnuplot-4.2.6.ebuild 5914 RMD160 ef9ec032fc6fbd0e37f40af650253b30c0e22972 SHA1 07bbd67f34458b6352f3ee9e54961863064f0f18 SHA256 21146a73c0073094628393d4aef879b26174d05b43a9a1fd7bd78e5207135a34
-MISC ChangeLog 26347 RMD160 4d306269ec338566782221d53d00c91b1eabbe0f SHA1 e2b10c96ad65d551489d8e460be9ccc42d786d42 SHA256 71c09e65c409f0bdd69b134f02ac2b02b747a69f3d41e26e058645eeb89e7510
-MISC metadata.xml 343 RMD160 a8cddf5ede49461f337f376eeb7e9d188b926224 SHA1 ef9dfc4308245108a90a0e7baa7a28bb71a9eff6 SHA256 e6eb39f1e331569bc6c5b51049fcf7473654d1b513c65be1fbf28ba87ed23a99
+EBUILD gnuplot-4.4.0.ebuild 5806 RMD160 e443be2a624e7e6a7b69e6ef3c68755148a4743d SHA1 8a7dbdcb940fa74fc271207b97b3747c7417d907 SHA256 67a01cd368e6384fddeae846a23b22c52d2fe1c52a1410ef2c1f496262bc6c80
+MISC ChangeLog 26612 RMD160 4b1f39aeef6075ed7e21cbf306c4e07d1f0b91e7 SHA1 8441aff5aca8e82356a55460d2b7e9d01ca0eefa SHA256 c2d4570e36bb545000fb1706150622b55ca256368f2fc2901538a77f583f1d6b
+MISC metadata.xml 404 RMD160 7c05f336a5561bb8b6dfa4ac1f70889c0c6d3f5c SHA1 a8ae16bc80aedbedbfa575b538bf95b71ce4c319 SHA256 dfacaf36a82a2dd67ea22d03f8c6c56bd4bd60588e9187c8a8e0988ae10a3a3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuUBmwACgkQOeoy/oIi7uymXwCeNMJOn9+eTbOKzhiyWG+uoO92
-LBUAoOuctM5m6Uz9j1udiozC0qkdUv/l
-=sael
+iEYEARECAAYFAkuc9MIACgkQOeoy/oIi7uxi8wCeKMxjKTh7q2TaGksW1agdonot
+dYQAoJnpHbSFDl45FeRkT86ARUuxSyKW
+=DM44
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild
new file mode 100644
index 000000000000..ac9586f79cd0
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
+
+EAPI=2
+
+inherit elisp-common 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"
+
+LICENSE="gnuplot GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs"
+RESTRICT="wxwidgets? ( test )"
+
+RDEPEND="!app-emacs/gnuplot-mode
+	cairo? ( x11-libs/cairo
+		x11-libs/pango
+		>=x11-libs/gtk+-2.8 )
+	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 )
+	pdf? ( media-libs/pdflib )
+	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.8 )
+	X? ( x11-libs/libXaw )
+	xemacs? ( app-editors/xemacs
+		app-xemacs/xemacs-base
+		app-xemacs/texinfo )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+GP_VERSION="${PV%.*}"
+E_SITEFILE="50${PN}-gentoo.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	# 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} --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 /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with lua)"
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with plotutils plot /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"
+
+	econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+
+	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="/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="${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 || 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 "${D}${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 "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${D}"/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
+
+	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
+	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 74771480e1cf..c1d62c6e2898 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -8,5 +8,6 @@
 <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>