Forward port some changes from the 4.4 ebuild.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 44 insertions, 36 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/Manifest b/sci-visualization/gnuplot/Manifest
index f0059ebd198e..7cc51ce9aa52 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,18 +7,24 @@ DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc
 DIST gnuplot-4.4.4.tar.gz 3328278 RMD160 7e1d039c05c46fa38b53a3c4afbd328509da901d SHA1 d4f143eade1f8d8b27be44cbda431d37a71c6a31 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd
 DIST gnuplot-4.6.rc1.tar.gz 5018714 RMD160 96d44d5e0f7c8ac5b317b0b1851a2d0a0df4bd07 SHA1 41a4a4b83c7005d9d2b997e534d858a111791fc1 SHA256 e906f7276e76f6c8f119c7c731000ff6694a2dbf11571d531a1f2706f0ffdbd2
 EBUILD gnuplot-4.4.3-r1.ebuild 6822 RMD160 16cf62476b3ee217ddcda45c82e26977ad87c119 SHA1 405efe0aa3edf3e210324fcf36f7a67ac0389490 SHA256 46f55e88250d46f1f309a583ac982a4ee00e5128401e894a527c2b4355260f58
-EBUILD gnuplot-4.4.4-r1.ebuild 6626 RMD160 de93410aaec6229a14d12ddfad9ef2f4217cb9af SHA1 edea04b773835c5f62f7dc80a19552f9a4cd4f64 SHA256 a10056ac1a0f794efcd19777e29e09a5e258b8ef6f9cb36bdb4ca2ffeb39efdb
-EBUILD gnuplot-4.6_rc1.ebuild 6903 RMD160 414407d5bda11c6b2732e87198bb8c1449f7d8bd SHA1 d54b9325cba3f8aae02b5fd139953f50743ef431 SHA256 a2f8229eb10f05403070eb625d4baa6b8c99c4b37340a08e6a866c9fb1011a7a
-MISC ChangeLog 31821 RMD160 504c2a76834e0a18c267aa20659cb762d29637bd SHA1 f5e015c8d7125cac64989ad80f0bfb69aeae7fad SHA256 2084d0dfdd52a8ea1d0a4f2396f423c28506dbbc2d3cd5d769bae443e68a1e16
+EBUILD gnuplot-4.4.4-r1.ebuild 6625 RMD160 88ed061452ba291dca14c7aad7b039689a2761e6 SHA1 1bfa96757237af49d04094a4b897bd4b248ec1ee SHA256 0ffd244375c8e4727b105028348d578a79dbe985266c6d0644e7dec963bb47cc
+EBUILD gnuplot-4.6_rc1.ebuild 6959 RMD160 1465ab9a55b0b6a50ebb8fe3d18bed33368881ca SHA1 3c747a1629ea07302e0b4c9edb7b5bb21fccd29e SHA256 72f526b7c4e7669f8091fb533cc4f5f188f7527a7867fae6dd873905ee1d42f3
+MISC ChangeLog 31939 RMD160 10aeb2c23a130c89b1e76be8e62e766c92be20b1 SHA1 347d13ab74aa64b64209e8d0ea586e2342abab4c SHA256 2cda211715c14c12e1b70bd093d0611e6458a4259e15ecece75739514c24c869
 MISC metadata.xml 827 RMD160 e6b9c60a2d8ad33c3ed2c649ead9e836b1a54fdb SHA1 23524656ce50cf1b1b44fda522c79c6ce78afa1b SHA256 d98221cb62667b8e7eaafa41b3a89be5bf2b9fbfc958b3adde99150839403ea5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPIhSoAAoJEOeBhlrCAAWGwHoH/jd3PG+PV8FgjUAgl8FVlisG
-8SNyxpwxtAMJjns7YdqF6le9QQVBl8DzUyZjGTvkYy85611v6H6ex40ya3dIorD4
-V0/t/sQgdg0UjJbK7b6iTBxcFKq55pUNKIPXVX+kKnXh/CwDo4zplrsVmoPv2ehu
-yUWq/5xkxCTzp2IJiofbmZBsClzp47AzseEKyUyGnJKUD7yitWAlkglHKfn+ITdg
-+bfu2k4gtaLzJ1eX1dU5Aged/H5gaMCFRLN4n0xIFQAidC1jboLyF6cAjkkOoW6I
-lDWA4+lfdHD6+ACnYZ0d8OSib9OPg3l1qfEA6OCitGWVwvsxtkYar5I0t4dfSQ4=
-=SPLf
+iQIcBAEBAgAGBQJPIqjMAAoJEDxpGckxwJCBStsP/RDSHviZcghrXQjCUAt9+YlP
+mkHvPbj0RrePr8wRKmDPnJMOW+a4Nh3F0eTYlqdf+T25JP10C5Gcq/r+shucgxRW
+OVhrj6mDsBR0X3KFqQBzMkf0gKMDSTlaOydkDDYxc87qKw2FUEkHgBKOsubzdLS9
+l1wuExJCQkPLyhIubhUEMF0VzHKfSxfWtkwMa/a3n9TgqtP00DOyE0Iyl0T3sLV7
+rklJROwiWuuL/vg3JbAKZS4xCMhKgppjOoc/Ughjp/6mQo44Gkb7NJ4A7hW24vl2
+gk36ax2+Qogo/1f6MrAODSm3VbrBY2UJvDoeaFkuMnShtSvaTjhZesqtVCakmQLo
+xfaYO1KEcFLRKGwBxkQV/3t7xszOINkdnGmwsfR5cCNdgBYKEWm5ddubpEu9szZt
+Oauu6B/pjVIy/2B50s16zQGOjF/eB6/hWLychw1J37ySzbW1eSbsECi8Zd0kuus6
+7feyJJ5dcLTV/zKsRnaxf+geeCgionEa7PP8kdBgovdYNyEnGvm0G7jzS4mnfUOv
+0gtm25xAeFHJVUZ4bgfkqv1A12z8f/k4EzZZNcUd8+BffEtht9fSJ7BAdp+exZS0
+3xy460JU0qLa+E2TGnRsMD7PZHj21HuIAenQUvl965pcyJjovKq353sHMomCs59R
+9rXFKgCmd/xj2k0V+1MN
+=2Y1e
 -----END PGP SIGNATURE-----
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
 }