Move code for configuration and compilation of Emacs and XEmacs modes to

proper functions. Fix LICENSE, Emacs support files are released under GPL-2.
Use dodoc to install documentation. Other minor fixes. Remove old.
(Portage version: 2.2_rc63/cvs/Linux i686)

3 files changed, 86 insertions, 139 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 04f4343e8ab4..abdd670bb8d6 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.133 2009/12/31 17:43:49 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.134 2010/02/26 10:59:24 ulm Exp $
+
+*gnuplot-4.2.6-r1 (26 Feb 2010)
+
+  26 Feb 2010; Ulrich Mueller <ulm@gentoo.org> -gnuplot-4.2.5-r1.ebuild,
+  -files/gnuplot-4.2.5-colorbox_accounting.patch, +gnuplot-4.2.6-r1.ebuild:
+  Move code for configuration and compilation of Emacs and XEmacs modes to
+  proper functions. Fix LICENSE, Emacs support files are released under GPL-2.
+  Use dodoc to install documentation. Other minor fixes. Remove old.
 
   31 Dec 2009; Brent Baude <ranger@gentoo.org> gnuplot-4.2.6.ebuild:
   Marking gnuplot-4.2.6 ppc64 for bug 288967
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.5-colorbox_accounting.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.5-colorbox_accounting.patch
deleted file mode 100644
index 126d80b5ad31..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.5-colorbox_accounting.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-http://bugs.gentoo.org/274693
-Solves: "cb axis range undefined or overflow" error after fit
-Fix from upstream: https://sourceforge.net/tracker/?func=detail&atid=102055&aid=2808641&group_id=2055
-
---- gnuplot42/src/pm3d.c	2009-03-24 09:04:10.000000000 -0700
-+++ test42/src/pm3d.c	2009-06-18 16:45:36.000000000 -0700
-@@ -65,7 +65,6 @@ static quadrangle* quadrangles = (quadra
- 
- /* Internal prototypes for this module */
- static TBOOLEAN plot_has_palette;
--static TBOOLEAN plot_wants_colorbox;
- static double geomean4 __PROTO((double, double, double, double));
- static double median4 __PROTO((double, double, double, double));
- static void pm3d_plot __PROTO((struct surface_points *, int));
-@@ -1020,10 +1019,8 @@ set_plot_with_palette(int plot_num, int 
-     struct curve_points *this_2dplot = first_plot;
-     int surface = 0;
-     struct text_label *this_label = first_label;
--    TBOOLEAN want_palette_but_not_colorbox = FALSE;
- 
-     plot_has_palette = TRUE;
--    plot_wants_colorbox = TRUE;
-     /* Is pm3d switched on globally? */
-     if (pm3d.implicit == PM3D_IMPLICIT)
- 	return;
-@@ -1035,18 +1032,12 @@ set_plot_with_palette(int plot_num, int 
- 	    if (this_2dplot->plot_style == IMAGE)
- 		return;
- #endif
--	    if (this_2dplot->lp_properties.use_palette) {
--		if (this_2dplot->lp_properties.pm3d_color.type <= TC_RGB)
--		    want_palette_but_not_colorbox = TRUE;
--		    /* don't return yet -- decide later whether showing color box is desirable */
--		else
--		    return;
--	    }
--#ifdef EAM_DATASTRINGS
--	    if (this_2dplot->labels &&
--		this_2dplot->labels->textcolor.type >= TC_CB)
-+	    if (this_2dplot->lp_properties.use_palette
-+	    &&  this_2dplot->lp_properties.pm3d_color.type > TC_RGB)
-+		return;
-+	    if (this_2dplot->labels
-+	    &&  this_2dplot->labels->textcolor.type >= TC_CB)
- 		return;
--#endif
- 	    this_2dplot = this_2dplot->next;
- 	}
-     }
-@@ -1064,8 +1055,8 @@ set_plot_with_palette(int plot_num, int 
- 	    if (this_3dplot->lp_properties.use_palette) {
- 	        int type = this_3dplot->lp_properties.pm3d_color.type;
- 		if (type == TC_LT || type == TC_LINESTYLE || type == TC_RGB)
--		    want_palette_but_not_colorbox = TRUE;
--		    /* don't return yet -- decide later whether showing color box is desirable */
-+		    /* don't return yet */
-+		    ;
- 		else
- 		    /* TC_DEFAULT: splot x with line|lp|dot palette */
- 		    return;
-@@ -1097,9 +1088,7 @@ set_plot_with_palette(int plot_num, int 
- #undef TC_USES_PALETTE
- 
-     /* Palette with continuous colors is not used. */
--    if (want_palette_but_not_colorbox == FALSE)
--	plot_has_palette = FALSE; /* otherwise it stays TRUE */
--    plot_wants_colorbox = FALSE;
-+    plot_has_palette = FALSE; /* otherwise it stays TRUE */
- }
- 
- TBOOLEAN
-@@ -1111,6 +1100,6 @@ is_plot_with_palette()
- TBOOLEAN
- is_plot_with_colorbox()
- {
--    return plot_wants_colorbox;
-+    return plot_has_palette && (color_box.where != SMCOLOR_BOX_NO);
- }
- 
-
- 	  	 
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
index a672b053a28b..b1ed67d7a25b 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.2.5-r1.ebuild,v 1.12 2009/12/26 17:46:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.1 2010/02/26 10:59:24 ulm Exp $
 
 EAPI=2
 
 inherit autotools elisp-common eutils multilib wxwidgets
 
-MY_P="${P/_/.}"
-
+MY_P="${P/_/-}"
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
 SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
-	mirror://gentoo/${P}-lua-term.patch.bz2"
+	mirror://gentoo/${PN}-4.2.5-lua-term.patch.bz2"
 
-LICENSE="gnuplot"
+LICENSE="gnuplot GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="doc emacs gd ggi latex lua pdf plotutils readline svga wxwidgets X xemacs"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc emacs +gd ggi latex lua pdf plotutils readline svga wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="
@@ -50,9 +49,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
 	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch #219323
 	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
-	epatch "${WORKDIR}"/${P}-lua-term.patch #233475
-	epatch "${FILESDIR}"/${P}-configure-pkgconfig.patch #233475 c9
-	epatch "${FILESDIR}"/${P}-colorbox_accounting.patch #274693
+	epatch "${WORKDIR}"/${PN}-4.2.5-lua-term.patch #233475
+	epatch "${FILESDIR}"/${PN}-4.2.5-configure-pkgconfig.patch #233475 c9
 	# Add Gentoo version identification since the licence requires it
 	epatch "${FILESDIR}"/${PN}-gentoo-version.patch
 
@@ -74,8 +72,8 @@ src_configure() {
 		need-wxwidgets unicode
 	fi
 
-	local myconf="--with-gihdir=/usr/share/${PN}/gih"
-
+	local myconf
+	myconf="--with-gihdir=/usr/share/${PN}/gih --without-lisp-files"
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_with gd)"
@@ -84,25 +82,27 @@ src_configure() {
 	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
 	myconf="${myconf} $(use_with lua)"
 	myconf="${myconf} $(use_with doc tutorial)"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
-		--with-xmi=/usr/$(get_libdir)" \
-		|| myconf="${myconf} --without-ggi"
+	myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
 
 	use readline \
 		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
-		|| myconf="${myconf} --with-readline"
+		|| myconf="${myconf} --with-readline=builtin"
 
-	myconf="${myconf} --without-lisp-files"
+	econf ${myconf} CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\""
 
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=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="/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
+	fi
 
-	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
-	EMACS=${TEMACS} \
-		econf ${myconf} || die
+	if use emacs; then
+		einfo "Configuring gnuplot-mode for GNU Emacs ..."
+		cd "${S}/lisp"
+		econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs
+	fi
 }
 
 src_compile() {
@@ -116,43 +116,57 @@ src_compile() {
 
 	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 docs
+		cd "${S}/docs"
 		emake pdf || die
-		cd ../tutorial
+		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 emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
-		emake DESTDIR="${D}" install || die
-		emake clean
-		cd ..
-
-		# Gentoo emacs site-lisp configuration
-		echo -e "\n;;; ${PN} site-lisp configuration\n" > ${E_SITEFILE}
-		echo -e "(add-to-list 'load-path \"@SITELISP@\")\n" >> ${E_SITEFILE}
-		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE}
-		elisp-site-file-install ${E_SITEFILE}
+	if ! use X; then
+		# see bug 194527
+		rm -rf "${D}/usr/$(get_libdir)/X11"
 	fi
 
 	if use xemacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for XEmacs..."
-		EMACS="xemacs" \
-			econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" || die
+		cd "${S}/lisp-xemacs"
 		emake DESTDIR="${D}" install || die
-		cd ..
 	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}"
 	if use latex && use lua; then
 		# install style file in an (additional) place where TeX can find it
 		insinto "${TEXMF}/tex/latex/${PN}"
@@ -168,19 +182,18 @@ src_install () {
 		insinto /usr/share/${PN}/demo
 		doins demo/*
 		# Manual
-		insinto /usr/share/doc/${PF}/manual
-		doins docs/gnuplot.pdf
+		dodoc docs/gnuplot.pdf
 		# Tutorial
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/{tutorial.dvi,tutorial.pdf}
+		dodoc tutorial/{tutorial.dvi,tutorial.pdf}
 		# Documentation for making PostScript files
-		insinto /usr/share/doc/${PF}/psdoc
-		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
 	fi
 
-	if ! use X; then
-		# see bug 194527
-		rm -rf "${D}/usr/$(get_libdir)/X11"
+	if use xemacs || use emacs; then
+		docinto emacs
+		dodoc lisp/ChangeLog lisp/README
+		use doc && dodoc lisp/gpelcard.pdf
 	fi
 }
 
@@ -188,12 +201,19 @@ pkg_postinst() {
 	use emacs && elisp-site-regen
 	use latex && texmf-update
 
-	if use svga ; then
+	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() {