[gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/

[Christoph Junghans]

commit:     f71bb2df52c781cb3eb58a955316dc8bb9fe43a9
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 13:09:13 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat May 28 13:09:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f71bb2df

[sci-visualization/gnuplot] sync with tree

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-visualization/gnuplot/ChangeLog               |    3 +
 sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild |   62 ++++++++++++++-------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 127125b..2f2be4a 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 May 2011; Christoph Junghans <ottxor@g.o> gnuplot-4.5.9999.ebuild:
+  sync with tree
+
   28 May 2011; Christoph Junghans <ottxor@g.o> -gnuplot-4.4.3-r1.ebuild,
   metadata.xml:
   InCVS

diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index d414079..3898887 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.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="HEAD"
-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="HEAD"
+	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"
@@ -40,34 +48,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 )
-	virtual/emacs"
+	!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() {
@@ -100,7 +109,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 ..."
@@ -125,7 +142,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"
@@ -206,7 +223,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."