Forward port some changes from the 4.4 ebuild.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 27 insertions, 25 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index c3d492dc1883..05f5e797a40b 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.173 2012/01/27 03:06:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.174 2012/01/27 13:37:33 ulm Exp $
+
+  27 Jan 2012; Ulrich Müller <ulm@gentoo.org> gnuplot-4.6_rc1.ebuild:
+  Forward port some changes from the 4.4 ebuild.
 
 *gnuplot-4.6_rc1 (27 Jan 2012)
 
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
index 8590f6904dcf..71547f5fb8e4 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r1.ebuild,v 1.1 2011/12/28 10:34:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild,v 1.2 2012/01/27 13:37:33 ulm Exp $
 
 EAPI=4
 
@@ -27,6 +27,7 @@ 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 examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
+RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="
 	cairo? (
@@ -61,8 +62,6 @@ DEPEND="${RDEPEND}
 		app-text/ghostscript-gpl )
 	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
-RESTRICT="wxwidgets? ( test )"
-
 S="${WORKDIR}/${MY_P}"
 
 GP_VERSION="${PV%.*}"
diff --git a/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
index 85e5c1650d37..7e450c82bbd0 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.1 2012/01/27 03:06:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.2 2012/01/27 13:37:33 ulm Exp $
 
 EAPI=4
 
@@ -61,9 +61,15 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? (
 		virtual/latex-base
+		dev-texlive/texlive-latexextra
 		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )
-	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+
+if [[ -z ${PV%%*9999} ]]; then
+	# The live ebuild always needs an Emacs for building of gnuplot.texi
+	DEPEND="${DEPEND}
+		!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+fi
 
 S="${WORKDIR}/${MY_P}"
 
@@ -116,15 +122,9 @@ src_configure() {
 		&& 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}"
+		EMACS=$(usev emacs || usev xemacs || echo no)
 
 	if use xemacs; then
 		einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -232,23 +232,23 @@ 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\"."
+	elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
+	elog "details. You can use the \"pdfcairo\" terminal for PDF output."
+	use cairo || elog "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\"."
+		elog "In order to enable ordinary users to use SVGA console graphics"
+		elog "gnuplot needs to be set up as setuid root. Please note that"
+		elog "this is usually considered to be a security hazard."
+		elog "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."
+		elog "For font support in png/jpeg/gif output, you may have to"
+		elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
+		elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
+		elog "for more information."
 	fi
 }