Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci:
  [sci-visualization/gnuplot] sync with tree and bug #366129#c11

4 files changed, 307 insertions, 30 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 3f06e4702..d13a5c094 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gnuplot-4.4.3-r1 (08 May 2011)
+
+  08 May 2011; Christoph Junghans <ottxor@gentoo.org> +gnuplot-4.4.3-r1.ebuild,
+  gnuplot-4.4.9999.ebuild:
+  sync with tree and bug #366129#c11
+
   23 Feb 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.5.9999.ebuild:
   updated deps
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 2de689cad..bbe4f5931 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gnuplot-4.4.9999.ebuild 6083 RMD160 944f1c43914001a5c99a0419f035db909eecc8f0 SHA1 2a954d14cbc90cc05d7d8f0476209c01e6ca2054 SHA256 86e09b3a58b3f02caaf27b04cad3768d22d340630a93c22901d8caa3685d2531
+DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc4 SHA1 a4d315b9288739e3cbaa04d8ddda7861b4009bd4 SHA256 6faa236ed5c744f34a9ac58ef89dab6177a15c5835dc3644a0a12779439426e6
+EBUILD gnuplot-4.4.3-r1.ebuild 6720 RMD160 09d192b4085df09adeb4ad66b5de2eb7b31eefbc SHA1 66173b65314a771779ea89ee80c29bb0337b6559 SHA256 5e6c8ec4a074f61fab73f5c0a4de88baca921d30972d752e4f71b1bce8078e26
+EBUILD gnuplot-4.4.9999.ebuild 6720 RMD160 09d192b4085df09adeb4ad66b5de2eb7b31eefbc SHA1 66173b65314a771779ea89ee80c29bb0337b6559 SHA256 5e6c8ec4a074f61fab73f5c0a4de88baca921d30972d752e4f71b1bce8078e26
 EBUILD gnuplot-4.5.9999.ebuild 6210 RMD160 48f1802893668c580bda6d27c9f4c27fc62ca794 SHA1 b1a5251653293bf360f783e33e67a26683470e88 SHA256 d9e35d9fd5f797fa22b8574f31c85bed907f012c615c282dd028a6c2fd1a0056
-MISC ChangeLog 3738 RMD160 2c109f613ceb597b4a7bb838eaae9ef423fe3dff SHA1 63870cd5a4895c3699b13f3749b670576d80c01b SHA256 99561e52130718f3728e5b687e6e87e9d5ba4e48b2429d1d2e56af3ea30c09ca
+MISC ChangeLog 3916 RMD160 e75199642509dbcc5aeebe4507d24dbbefb228b2 SHA1 09f8a2783927c7b6f9088cf79f3995e792c1115b SHA256 d8a07bc91162433e614dcaf9c291be7070cdb7eb7f801485ec54aa111ee90cf7
 MISC metadata.xml 558 RMD160 38403f46dbda503120e268b33e00d9e2d80417b4 SHA1 71ccd940653854f1bc2adadd2db8d17ad52eb911 SHA256 69317d2d81295354baf28dd54c2de54a96a56a804ff79ea5f7085b7d9c0176e6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNZWYeAAoJEOeBhlrCAAWGpe8IAItvLE1YZCki5pXQMGf2AZse
-Gk/bCgYRlGAE8ig0q1g02FzuQYucFZaFU1ZztNQ/N68gwjPtAwzc/aY8Uf/cHWKo
-UPMRZugMrKHJ7f6HLmXLftGW2TTNg8YldaG15kzgn+mdoeQNnIuL6r54STcnv3g4
-d2SEtu0RyK6YoZLaffSVf0tNpzUkWIWooOjFrUJM+H/AC4cUD5/1RMsnfEIzNkbo
-SVzTflbnd6bjPNVCOm3Y/SnJSNONDz8fWm6GAmDo48Lhm4RPsGt8zExniQhAgvmV
-cttEkRZJdUdSUhUqe1HRWwCxBkRsDTxoOXSQ95rK0GKNe7OPnFLfScSNmKIGx9w=
-=eOxd
+iQEcBAEBAgAGBQJNxq0VAAoJEOeBhlrCAAWGf5kIAJc+k5oLGtQAs0plxPCTVK6o
+wvamBgCRgjFFC+kr1nau1R/keHjx/rkWBvSsvB/xCG5xxoncFM432sAvOJ2YTucR
+UkCR9oJkRGdAyVAdXJCZV8MLZXJbwPVJhalmz0CHqVBDDefodaddqCUZF/QXRyZG
+vXZEudCmHkQKs01zHXFftBW0vh5Tzq5XR4QYuybz1rluQjRK56c6jyHKk4sn60gp
+iUvSu8Ux/rspzUjG+Ws77i/ya3g/2EpOJbuCpA8Ru6Eaqy0yrQ5ABJyiU5xt76jE
+aKQP4O8OVWZc+tRQsoUf3RWN0ppe7NODXtRe0dsQw8ZzA2LietCslVVm6SGmJ5A=
+=PkJy
 -----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 000000000..be4fc1caf
--- /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: $
+
+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/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index 9c29c6190..be4fc1caf 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -4,16 +4,24 @@
 
 EAPI=3
 
-inherit autotools cvs elisp-common multilib wxwidgets
+inherit elisp-common multilib wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
 
-ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-ECVS_MODULE="gnuplot"
-ECVS_BRANCH="branch-4-4-stable"
-ECVS_USER="anonymous"
-ECVS_CVS_OPTIONS="-dP"
+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"
@@ -38,33 +46,35 @@ RDEPEND="!app-emacs/gnuplot-mode
 	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		x11-libs/cairo
 		x11-libs/pango
-		>=x11-libs/gtk+-2.8:2 )
+		x11-libs/gtk+:2 )
 	X? ( x11-libs/libXaw )
 	xemacs? ( app-editors/xemacs
-		app-xemacs/xemacs-base
-		app-xemacs/texinfo )"
+		app-xemacs/xemacs-base )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( virtual/latex-base
-		app-text/ghostscript-gpl )"
+		app-text/ghostscript-gpl )
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )
+	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${MY_P}"
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
-	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
+	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
-
-	eautoreconf
 }
 
 src_configure() {
@@ -96,7 +106,15 @@ src_configure() {
 		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
-	econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+	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 ..."
@@ -121,7 +139,7 @@ src_compile() {
 	# example plots.
 	addwrite /dev/svga:/dev/mouse:/dev/tts/0
 
-	emake || die
+	emake all info || die
 
 	if use xemacs; then
 		cd "${S}/lisp-xemacs"
@@ -202,7 +220,12 @@ 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."