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.
Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 98 insertions, 143 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/Manifest b/sci-visualization/gnuplot/Manifest
index 6102484c78ee..35bd5e076409 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnuplot-4.2.2-disable_texi_generation.patch 763 RMD160 99368c05fe2907f445a49b4d0be782f0384f319e SHA1 17723d5e5a12eef274b6f9216c9a9cbbe05cba1e SHA256 87a3bed1e3be244a511f1cbeb9852484da59decdae75635ae900fbafe5db02f6
 AUX gnuplot-4.2.3-app-defaults.patch 2097 RMD160 d0764b54424cfec60b22e498b8624801559e3526 SHA1 bac7dd281e679a6c638f7ba1b211e13443221486 SHA256 91cab9715e99c5e394ac6e08f17ef8063d3f0b574e0404fc5e6b643b26fddaf3
 AUX gnuplot-4.2.3-disable-texhash.patch 677 RMD160 b299c7425e735ebad6afa1e2d154190fb2f3fdf8 SHA1 6e5f25a0283b2dd887738d8caee7c92d1905b1cc SHA256 af25fded8998eb48ea0b89f9ce0d5322721088c2b69a360ec7928a7f6115873e
-AUX gnuplot-4.2.5-colorbox_accounting.patch 2925 RMD160 d34fd681bc9a17de6d612fe23df35f3963e3e1f3 SHA1 f2d16c98a733b801932c558481411101ca7a3c3b SHA256 6456dd2ff7baaa6c938ee33c7ebc62e00568049f76c219d3f4403d1c7ef3a38f
 AUX gnuplot-4.2.5-configure-pkgconfig.patch 484 RMD160 d1d8031382b8062c393fa430eb69f74f68d93c64 SHA1 e749dbd1cf8047a6274182cc0e2317d3f1b09a2e SHA256 58d0c0106337c5f48ad2f75671566556c055eb58ee016c4a125dbc6fd434d1b6
 AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af30e22e SHA1 337c0b3b329965c01d75decf49a7ef678e3d46a9 SHA256 c6c1b8a6ccc9d8aeaa12d178f5e91653d4f7f5f9c49eae1feb1ec3f7267670e1
 DIST gnuplot-4.2.5-lua-term.patch.bz2 26660 RMD160 981db04276ce51ece9b95076856b9811de872e3d SHA1 845fffa290d66e51ce5924d020a1d9b3bf354986 SHA256 32f39b4eb14e41f22fc911c73adf740e38af0819315ee102449ad4e572ab1b7f
-DIST gnuplot-4.2.5.tar.gz 2873303 RMD160 79ab74627d66c2eff6d69276c1556acca89ec6dd SHA1 e7ad6afc1ca7b39a512a18f2dc6f2bcda9bf9128 SHA256 89477ede06ca5a6cc814e123babadeda75bc52d89b078b92b79fba957caf11f8
 DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a76 SHA1 d11fdde8218bee98597ee836cbc17e4bf6093b70 SHA256 81fbc2eb6077bd6abfe98c5c82aae14a2c970473ee4c2c37743ff3b1e2aa8e82
-EBUILD gnuplot-4.2.5-r1.ebuild 5696 RMD160 db5e09776f05507d03aa7e3863d4ea8329761210 SHA1 8b417276ed5bae01b73f4968dd4fe1bdcee4346e SHA256 f6ba531e74a7113e69d29c1be56b4c8e5e19b9fa2afab678547227025cc30bd5
+EBUILD gnuplot-4.2.6-r1.ebuild 6204 RMD160 b99cd3e44075ede1741d27e07ad1f6a9f527443b SHA1 fe0bd17560d0df4811eda2868bf68ac63b363fdd SHA256 379e1eb4d9916b4f477e4fd06ae140df22602e32b3b7e540d95f9bed0179feeb
 EBUILD gnuplot-4.2.6.ebuild 5914 RMD160 ef9ec032fc6fbd0e37f40af650253b30c0e22972 SHA1 07bbd67f34458b6352f3ee9e54961863064f0f18 SHA256 21146a73c0073094628393d4aef879b26174d05b43a9a1fd7bd78e5207135a34
-MISC ChangeLog 25815 RMD160 b66520afb2f8024acc495a3a363d8b6d1413f9b5 SHA1 14546494c0e150c92e4f08eff1b1b02ceccdadbc SHA256 36e94219e764fefaa2d2e1cec6c6d9d20c1f55a46f53f8a98a2275148dcb4f78
+MISC ChangeLog 26218 RMD160 de36b84178dad974ef0cd81d3c58172c7214e4ff SHA1 f13d68db5504ea6aaab64396f635dbe8a55d85b6 SHA256 9256f39e4e0906c1a8b0d3d665e623318af08e5af7869514486a6900ee2c77bd
 MISC metadata.xml 343 RMD160 a8cddf5ede49461f337f376eeb7e9d188b926224 SHA1 ef9dfc4308245108a90a0e7baa7a28bb71a9eff6 SHA256 e6eb39f1e331569bc6c5b51049fcf7473654d1b513c65be1fbf28ba87ed23a99
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuHqaQACgkQOeoy/oIi7uyLiACfTcLsyrIFlB2/B28uznMH22xp
+xMAAoMKpE2JGx5au2CVAG1yWAoqM5I+a
+=+1xk
+-----END PGP SIGNATURE-----
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() {