sci-visualization/gnuplot: Sync with tree and clean up

(Portage version: 2.1.7.17/git/Linux i686)
 (Signed Manifest commit)

10 files changed, 254 insertions, 606 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index e6862ff3b..4d124d3eb 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  -files/gnuplot-4.2.2-disable_texi_generation.patch,
+  -gnuplot-4.4.0_rc1.ebuild, -files/gnuplot-4.4.0_rc1-app-defaults.patch,
+  -files/gnuplot-4.4.0_rc1-disable-texhash.patch,
+  -files/gnuplot-4.4.0_rc1-gentoo-version.patch, gnuplot-4.4.9999.ebuild,
+  gnuplot-4.5.9999.ebuild, metadata.xml:
+  Sync with tree and clean up
+
   06 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
   -files/gnuplot-4.2.3-app-defaults.patch,
   -files/gnuplot-4.2.3-disable-texhash.patch,
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 9d0d5d20c..eb614b8ae 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,20 +1,14 @@
 -----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.4.0_rc1-app-defaults.patch 2651 RMD160 508e5f69923b6f5cee913cdc5bac6c7cda677869 SHA1 cda875c86a4faae596f0b7f243e659c8c03ac4e8 SHA256 4e207e71cb4b5c882d06857dc4f0482982ff3b822aa18bd57ef4d83901a807fc
-AUX gnuplot-4.4.0_rc1-disable-texhash.patch 1023 RMD160 088374701e4512d95050d7c3b46f8e5983bcbf86 SHA1 22ca8ab6ff12028c010dec3be501efa42686c042 SHA256 92bcd6c428c2686b48fc4b8dbca3ccd77d4e6c253c0160dcbc72ab8a18eb0612
-AUX gnuplot-4.4.0_rc1-gentoo-version.patch 3629 RMD160 f312619d725c7e9d0ee4b13762347e01057f50ae SHA1 3b140354e61c5df8bbba560c75749fe4bcdbe876 SHA256 bbb2264ca41910300cba11f45d6b6c65f9bc20c41b7c4c84750524ed1dda65fd
-DIST gnuplot-4.4.0-rc1.tar.gz 3294054 RMD160 262cce576e6d64dd8a54edef0730f4576414456c SHA1 e9c2b99896a652a52d0160e8e2a6406ed861fda4 SHA256 d284ac5f75948e5a6716d26532adaf40e9ed8a205cbdeb75e76999dab07baf14
-EBUILD gnuplot-4.4.0_rc1.ebuild 5941 RMD160 c764ffb8da765dfe8c87491bc9dd4cd7a09c353f SHA1 f76c465c8a9ccc385f4f151be761b79efbca0041 SHA256 801c30fdb3440ff6aa1ebf30244cde5fa866e9af7808c05c9469370674a58482
-EBUILD gnuplot-4.4.9999.ebuild 5706 RMD160 6467849d88d13bf8897d216044064a23c45083a7 SHA1 70d106f7092ec7d06a402d07f24aa00906017709 SHA256 a1443eea75deb4db014578ae42c56fde94c325a70507ba44dd8ce0d356cc80dd
-EBUILD gnuplot-4.5.9999.ebuild 5826 RMD160 f6f7ec0c75bd80f75e3e05b5d737f9a4cba42f55 SHA1 0dc2899bd1d4cb607af40af49a5b0443b5bd264d SHA256 13921f999a7636ec0bbeabd0c2afb815a9b19dfcee02d42d7d175bc722c189fe
-MISC ChangeLog 3116 RMD160 27ad73c1e41e7875ca6f00d03f28a3e653eeea6b SHA1 40fd10b14d3198a0f00090df486bc03109dda217 SHA256 7cd6e431c85624eaba204bb3da9744aad5176642b30c3b9552dbd0b2d32b665d
-MISC metadata.xml 257 RMD160 f2ffbaee54f8534e419eea137c2a4da199b8b06c SHA1 502dbf5dd161bee261a494c5aedd6ee339090cc7 SHA256 f0ff74df1828056b76a2c69ee634fefe487987533698f6d4c2403f20f707b9c1
+EBUILD gnuplot-4.4.9999.ebuild 6096 RMD160 4ce33c38b00494ae1dc0fcc60a9df007955597b1 SHA1 10e375439f337bd975934d03cce4b3d190bf8292 SHA256 75d32158ee16582b2d38cd99404c7ce3b825e5adb0f5fa4f01f36fd1fe0d6fa1
+EBUILD gnuplot-4.5.9999.ebuild 6155 RMD160 2c5ed2fbf7925c4804faa8f61f444b84c4884c1c SHA1 0617d3b17427acdb5a736f6016e75f74e40971c4 SHA256 93491a12da46c57b0c2c0ee5880924eee99c9093aa0f12fa88f08131e3850958
+MISC ChangeLog 3496 RMD160 a750db794b7c321ed689a65600c6cf33f12fc175 SHA1 582362799fc86ae43a0ebd40d0fc2d3d20fb70a2 SHA256 763cc9b9af4cd217d9dc711f2e06f1a04602604f56b4a258307d43380952f51a
+MISC metadata.xml 446 RMD160 3035af42611660e079b6ed2aae0f07163ace06fe SHA1 813fe7587bb177b6885b216bdfa81389e19b5838 SHA256 bb5246e7391bd900d4875ba67979200f114d0cc1be4ac4c83bcf75fe161abdff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuSeigACgkQy0OE/ans1/ljWgCcD4XH9MB1nUtKFuAK2ztlMih5
-1igAnR5v4RSNJoK7YizRk6nGYa460/Jq
-=MM21
+iEYEARECAAYFAkuk+NAACgkQy0OE/ans1/lfUgCff9yq2sf49WNtjEynxrLOtNdO
+7agAn2O7kB5ge81IB5P4DMsaLA55ZvTi
+=3e5+
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
deleted file mode 100644
index 81d9eee90..000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/194216
-Texinfo source is already shipped, so separate preparation not needed
-and error-prone
-
---- docs/Makefile.in	2007-10-30 20:35:47.000000000 +0100
-+++ docs/Makefile.in	2007-10-30 21:57:52.000000000 +0100
-@@ -348,16 +348,6 @@
- gnuplot.info: $(srcdir)/gnuplot.texi
- 	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
- 
--# Thanks to Bruce Ravel for doc2texi.el!
--$(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
--	@echo "Creating texinfo"
--	@if test "$(EMACS)" != no; then \
--	   cd $(srcdir) ;  \
--	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
--	else \
--	   echo "No emacs found - cannot create texinfo file" ; \
--	fi
--
- # this is how to make OS/2 ipfc documentation
- ipf: gnuplot.ipf
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-app-defaults.patch
deleted file mode 100644
index 493411cf5..000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-app-defaults.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://bugs.gentoo.org/219323
-Don't store resource files in deprecated location
-Reported upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
-
-diff -Naur gnuplot-4.4.0-rc1.orig/configure.in gnuplot-4.4.0-rc1/configure.in
---- gnuplot-4.4.0-rc1.orig/configure.in	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/configure.in	2009-12-13 14:17:36.000000000 +0100
-@@ -1024,6 +1024,10 @@
- fi
- AC_SUBST(LISPDIR)
- 
-+dnl Location of application defaults
-+AC_ARG_VAR(appdefaultdir,[Directory for application defaults])
-+test -z "$appdefaultdir" && appdefaultdir='${sysconfdir}/X11/app-defaults'
-+
- dnl Substitute variables
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION_MAJOR)
-diff -Naur gnuplot-4.4.0-rc1.orig/share/Makefile.am gnuplot-4.4.0-rc1/share/Makefile.am
---- gnuplot-4.4.0-rc1.orig/share/Makefile.am	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/share/Makefile.am	2009-12-13 14:17:36.000000000 +0100
-@@ -5,8 +5,6 @@
- 
- SUBDIRS = LaTeX
- 
--appdefaultdir = $(libdir)/X11/app-defaults
--
- APPDEFAULTFILES = Gnuplot
- 
- appdefault_DATA = $(APPDEFAULTFILES)
-diff -Naur gnuplot-4.4.0-rc1.orig/src/Makefile.am gnuplot-4.4.0-rc1/src/Makefile.am
---- gnuplot-4.4.0-rc1.orig/src/Makefile.am	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/src/Makefile.am	2009-12-13 14:20:42.000000000 +0100
-@@ -31,7 +31,7 @@
- transform = @program_transform_name@
- GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT)
- 
--AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\"  -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\"
-+AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\"  -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DAppDefDir=\"$(appdefaultdir)\"
- 
- gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h binary.c \
- breaders.c breaders.h bitmap.c bitmap.h color.c color.h command.c \
-diff -Naur gnuplot-4.4.0-rc1.orig/src/gplt_x11.c gnuplot-4.4.0-rc1/src/gplt_x11.c
---- gnuplot-4.4.0-rc1.orig/src/gplt_x11.c	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/src/gplt_x11.c	2009-12-13 14:17:36.000000000 +0100
-@@ -4852,7 +4852,9 @@
- */
- #define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
- 
-+#ifndef AppDefDir
- #define AppDefDir "/usr/lib/X11/app-defaults"
-+#endif
- #ifndef MAXHOSTNAMELEN
- #define MAXHOSTNAMELEN 64
- #endif
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-disable-texhash.patch b/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-disable-texhash.patch
deleted file mode 100644
index a95087c7c..000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-disable-texhash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur gnuplot-4.4.0-rc1.orig/share/LaTeX/Makefile.am gnuplot-4.4.0-rc1/share/LaTeX/Makefile.am
---- gnuplot-4.4.0-rc1.orig/share/LaTeX/Makefile.am	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/share/LaTeX/Makefile.am	2010-01-08 20:30:20.000000000 +0100
-@@ -11,12 +11,10 @@
- 	  installdir=`kpsexpand ${prefix}/usr/'$$TEXMFLOCAL'/tex/latex/gnuplot |sed "s%^.*share/%$(prefix)/share/%"` ; \
- 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$$installdir ; \
- 	  if [ ! -f $(DESTDIR)$$installdir/gnuplot.cfg ]; then \
--	    $(INSTALL_DATA) $(srcdir)/gnuplot.cfg $(DESTDIR)$$installdir/gnuplot.cfg && \
--	    texhash; \
-+	    $(INSTALL_DATA) $(srcdir)/gnuplot.cfg $(DESTDIR)$$installdir/gnuplot.cfg; \
- 	  fi ; \
- 	  if [ ! -f $(DESTDIR)$$installdir/gnuplot-lua-tikz.sty ]; then \
--	    $(INSTALL_DATA) $(srcdir)/gnuplot-lua-tikz.sty $(DESTDIR)$$installdir/gnuplot-lua-tikz.sty && \
--	    texhash; \
-+	    $(INSTALL_DATA) $(srcdir)/gnuplot-lua-tikz.sty $(DESTDIR)$$installdir/gnuplot-lua-tikz.sty; \
- 	  fi ; \
- 	  fi
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-gentoo-version.patch b/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-gentoo-version.patch
deleted file mode 100644
index 3ae65637b..000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-gentoo-version.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Add special version identification and Gentoo contact information,
-in order to fulfil provisions 2 through 4 of the gnuplot licence.
-
-diff -Naur gnuplot-4.4.0-rc1.orig/docs/gnuplot.doc gnuplot-4.4.0-rc1/docs/gnuplot.doc
---- gnuplot-4.4.0-rc1.orig/docs/gnuplot.doc	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/docs/gnuplot.doc	2009-12-13 14:31:57.000000000 +0100
-@@ -204,6 +204,8 @@
- 
-  Bug reports and code contributions should be uploaded to the trackers at
-            http://sourceforge.net/projects/gnuplot/support
-+ and
-+           http://bugs.gentoo.org/
-  Please check previous bug reports if the bug you want to report has not been
-  already fixed in a newer version of gnuplot.
- 
-diff -Naur gnuplot-4.4.0-rc1.orig/docs/gnuplot.texi gnuplot-4.4.0-rc1/docs/gnuplot.texi
---- gnuplot-4.4.0-rc1.orig/docs/gnuplot.texi	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/docs/gnuplot.texi	2009-12-13 14:31:57.000000000 +0100
-@@ -319,6 +319,11 @@
- @example
-       gnuplot --help
- @end example
-+and
-+@example
-+      http://bugs.gentoo.org/
-+
-+@end example
- 
- See `command line options` for more details.
- 
-diff -Naur gnuplot-4.4.0-rc1.orig/src/plot.c gnuplot-4.4.0-rc1/src/plot.c
---- gnuplot-4.4.0-rc1.orig/src/plot.c	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/src/plot.c	2009-12-13 14:34:38.000000000 +0100
-@@ -374,9 +374,11 @@
- 		    "  -h, --help\n"
- 		    "  -p  --persist\n"
- 		    "  -e  \"command1; command2; ...\"\n"
--		    "gnuplot %s patchlevel %s\n"
--		    "Report bugs to %s\n",
--		    gnuplot_version, gnuplot_patchlevel, bug_report);
-+		    "gnuplot %s patchlevel %s (Gentoo revision %s)\n"
-+		    "Report bugs to <%s>\n"
-+		    "or to <%s>\n",
-+		    gnuplot_version, gnuplot_patchlevel, gentoo_revision,
-+		    gentoo_bugtracker, bug_email);
- 	    return 0;
- 
- 	} else if (!strncmp(argv[i], "-persist", 2) || !strcmp(argv[i], "--persist")) {
-diff -Naur gnuplot-4.4.0-rc1.orig/src/show.c gnuplot-4.4.0-rc1/src/show.c
---- gnuplot-4.4.0-rc1.orig/src/show.c	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/src/show.c	2009-12-13 14:31:57.000000000 +0100
-@@ -1017,7 +1017,7 @@
-     strcpy(fmt, "\
- %s\n\
- %s\t%s\n\
--%s\tVersion %s patchlevel %s\n\
-+%s\tVersion %s patchlevel %s (Gentoo revision %s)\n\
- %s\tlast modified %s\n\
- %s\tSystem: %s %s\n\
- %s\n\
-@@ -1038,7 +1038,7 @@
-     fprintf(fp, fmt,
- 	    p,			/* empty line */
- 	    p, PROGRAM,
--	    p, gnuplot_version, gnuplot_patchlevel,
-+	    p, gnuplot_version, gnuplot_patchlevel, gentoo_revision,
- 	    p, gnuplot_date,
- 	    p, os_name, os_rel,
- 	    p,			/* empty line */
-diff -Naur gnuplot-4.4.0-rc1.orig/src/version.c gnuplot-4.4.0-rc1/src/version.c
---- gnuplot-4.4.0-rc1.orig/src/version.c	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/src/version.c	2009-12-13 14:31:57.000000000 +0100
-@@ -44,6 +44,9 @@
- const char gnuplot_date[] = "Sat Nov 28 14:34:01 PST 2009";
- const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2009";
- 
-+const char gentoo_revision[] = GENTOO_REVISION;
-+const char gentoo_bugtracker[] = "http://bugs.gentoo.org/";
-+
- char *compile_options = (void *)0;	/* Will be loaded at runtime */
- 
- # ifndef FAQ_LOCATION
-diff -Naur gnuplot-4.4.0-rc1.orig/src/version.h gnuplot-4.4.0-rc1/src/version.h
---- gnuplot-4.4.0-rc1.orig/src/version.h	2009-12-13 14:16:41.000000000 +0100
-+++ gnuplot-4.4.0-rc1/src/version.h	2009-12-13 14:31:57.000000000 +0100
-@@ -48,6 +48,9 @@
- extern const char bug_email[];
- extern const char help_email[];
- 
-+extern const char gentoo_revision[];
-+extern const char gentoo_bugtracker[];
-+
- extern char os_name[];
- extern char os_rel[];
- 
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild
deleted file mode 100644
index 8108c1d25..000000000
--- a/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-WX_GTK_VER="2.8"
-
-inherit autotools elisp-common eutils multilib wxwidgets
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-
-LICENSE="gnuplot"
-GP_VERSION="${PV:0:3}"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga wxwidgets X xemacs"
-RESTRICT="wxwidgets? ( test )"
-
-RDEPEND="
-	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	lua? ( >=dev-lang/lua-5.1 )
-	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2[png] )
-	doc? ( dev-tex/picins
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	latex? ( virtual/latex-base
-		lua? ( dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X]
-		>=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )
-	cairo? ( >=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
-
-pkg_setup() {
-	use wxwidgets && need-wxwidgets unicode
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
-	epatch "${FILESDIR}"/${PF}-app-defaults.patch #219323
-	epatch "${FILESDIR}"/${PF}-disable-texhash.patch #201871
-	# Add Gentoo version identification since the licence requires it
-	epatch "${FILESDIR}"/${PF}-gentoo-version.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# See bug #156427.
-	if use latex ; then
-		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}/${GP_VERSION}:" \
-			share/LaTeX/Makefile.in || die "sed kpsexpand removed failed"
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || \
-			die "sed disable of LateX failed"
-	fi
-
-	local myconf="--enable-thin-splines"
-
-	myconf="${myconf} $(use_with X x)"
-	myconf="${myconf} $(use_with svga linux-vga)"
-	myconf="${myconf} $(use_with gd)"
-	myconf="${myconf} $(use_enable wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
-	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"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline=builtin"
-
-	myconf="${myconf} --without-lisp-files"
-
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=emacs
-
-	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
-	EMACS=${TEMACS} \
-	appdefaultdir=/etc/X11/app-defaults/${PN}/${GP_VERSION} \
-		econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# This is a hack to avoid sandbox violations when using the Linux console.
-	# Creating the DVI and PDF tutorials require /dev/svga to build the
-	# example plots.
-	addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake || die "emake failed"
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		cd docs
-		emake pdf || die "emake pdf failed"
-		cd ../tutorial
-		emake pdf || die "emake pdf tutorial failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || \
-			die "econf emacs failed"
-		emake DESTDIR="${D}" install || die "lisp install for emacs failed"
-		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}
-	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 "econf xemacs failed"
-		emake DESTDIR="${D}" install || die "lisp install for xemacs failed"
-		cd ..
-	fi
-
-	dodoc BUGS ChangeLog NEWS PATCHLEVEL PGPKEYS PORTING README* \
-		TODO VERSION
-	use lua && newdoc term/lua/README README-lua
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-
-	if use doc; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}/demo
-		doins demo/*
-		# Manual
-		insinto /usr/share/doc/${PF}/manual
-		doins docs/gnuplot.pdf
-		# Tutorial
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/{tutorial.dvi,tutorial.pdf}
-		# Documentation for making PostScript files
-		insinto /usr/share/doc/${PF}/psdoc
-		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if ! use X; then
-		# see bug 194527
-		rm -rf "${D}/etc/X11"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-
-	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() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index 6d6d30eba..770a8876d 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
 
 EAPI=2
 
-WX_GTK_VER="2.8"
-
-inherit autotools elisp-common multilib wxwidgets cvs
+inherit autotools cvs elisp-common multilib wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -17,92 +15,102 @@ ECVS_BRANCH="branch-4-4-stable"
 ECVS_USER="anonymous"
 ECVS_CVS_OPTIONS="-dP"
 
-LICENSE="gnuplot"
-GP_VERSION="${PV:0:3}"
+LICENSE="gnuplot GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="cairo 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="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
-RDEPEND="
-	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	lua? ( >=dev-lang/lua-5.1 )
+RDEPEND="!app-emacs/gnuplot-mode
+	cairo? ( x11-libs/cairo
+		x11-libs/pango
+		>=x11-libs/gtk+-2.8 )
+	emacs? ( virtual/emacs )
+	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2[png] )
-	doc? ( dev-tex/picins
-		virtual/latex-base
-		app-text/ghostscript-gpl )
 	latex? ( virtual/latex-base
 		lua? ( dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
+	lua? ( dev-lang/lua )
+	pdf? ( media-libs/pdflib )
 	plotutils? ( media-libs/plotutils )
+	readline? ( sys-libs/readline )
+	svga? ( media-libs/svgalib )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X]
-		>=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
+		x11-libs/cairo
+		x11-libs/pango
 		>=x11-libs/gtk+-2.8 )
-	cairo? ( >=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )"
+	X? ( x11-libs/libXaw )
+	xemacs? ( app-editors/xemacs
+		app-xemacs/xemacs-base
+		app-xemacs/texinfo )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base
+		app-text/ghostscript-gpl )"
 
-S="${WORKDIR}/${ECVS_MODULE}"
+S="${WORKDIR}/${PN}"
+GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="/usr/share/texmf-site"
 
-pkg_setup() {
-	use wxwidgets && need-wxwidgets unicode
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
 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"
+			die "make -f Makefile.am.in Makefile.am in $dir failed"
 	done
 
-	# Add Gentoo version identification since the licence requires it
-	sed -i "s/$/ (Gentoo revision ${PR})/" PATCHLEVEL
+	# 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() {
-	local myconf="--enable-thin-splines"
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
 
-	myconf="${myconf} $(use_with latex)"
-	myconf="${myconf} $(use_with X x)"
-	myconf="${myconf} $(use_with svga linux-vga)"
+	if use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
+	local myconf
+	myconf="${myconf} --without-lisp-files"
+	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
+	myconf="${myconf} $(use_with cairo)"
+	myconf="${myconf} $(use_with doc tutorial)"
 	myconf="${myconf} $(use_with gd)"
-	myconf="${myconf} $(use_enable wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
 	myconf="${myconf} $(use_with lua)"
-	myconf="${myconf} $(use_with doc tutorial)"
-
-	use latex && myconf="${myconf} --with-texdir=${TEXMF}/${PN}/${GP_VERSION}"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
-		--with-xmi=/usr/$(get_libdir)" \
-		|| myconf="${myconf} --without-ggi"
-
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_enable thin-splines)"
+	myconf="${myconf} $(use_enable wxwidgets)"
+	myconf="${myconf} $(use_with X x)"
 	use readline \
 		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
-	myconf="${myconf} --without-lisp-files"
+	econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+
+	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
 
-	#we do the (x)emacs econf in src_install, also solves bug #194216
-	EMACS=no \
-	DIST_CONTACT="<http://bugs.gentoo.org>" \
-		econf ${myconf} || die "econf failed"
+	if use emacs; then
+		einfo "Configuring gnuplot-mode for GNU Emacs ..."
+		cd "${S}/lisp"
+		econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs
+	fi
 }
 
 src_compile() {
@@ -114,66 +122,80 @@ src_compile() {
 	# example plots.
 	addwrite /dev/svga:/dev/mouse:/dev/tts/0
 
-	emake || die "emake failed"
+	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
-		emake pdf || die "emake pdf failed"
-		cd ../tutorial
-		emake pdf || die "emake pdf tutorial failed"
+		cd "${S}/docs"
+		emake pdf || die
+		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 "emake install failed"
+	emake DESTDIR="${D}" install || die
+
+	if use xemacs; then
+		cd "${S}/lisp-xemacs"
+		emake DESTDIR="${D}" install || die
+	fi
 
 	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || \
-			die "econf emacs failed"
-		emake DESTDIR="${D}" install || die "lisp install for emacs failed"
-		emake clean
-		cd ..
+		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 -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}
-	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 "econf xemacs failed"
-		emake DESTDIR="${D}" install || die "lisp install for xemacs failed"
-		cd ..
+		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
 
-	dodoc BUGS ChangeLog NEWS PATCHLEVEL PGPKEYS PORTING README* \
-		TODO VERSION
-	use lua && newdoc term/lua/README README-lua
+	cd "${S}"
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
 
 	if use doc; then
 		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}/demo
-		doins demo/*
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo || die
+		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
 		# 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}
+		# FAQ
+		dodoc FAQ.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 emacs || use xemacs; then
+		docinto emacs
+		dodoc lisp/ChangeLog lisp/README
+		use doc && dodoc lisp/gpelcard.pdf
 	fi
 }
 
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index bac1db4bd..879865b82 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
 
 EAPI=2
 
-WX_GTK_VER="2.8"
-
-inherit autotools elisp-common multilib wxwidgets cvs
+inherit autotools cvs elisp-common multilib wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -17,96 +15,106 @@ ECVS_BRANCH="HEAD"
 ECVS_USER="anonymous"
 ECVS_CVS_OPTIONS="-dP"
 
-LICENSE="gnuplot"
-GP_VERSION="${PV:0:3}"
+LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils qt4 readline svga wxwidgets X xemacs"
+IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
-RDEPEND="
-	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	lua? ( >=dev-lang/lua-5.1 )
+RDEPEND="!app-emacs/gnuplot-mode
+	cairo? ( x11-libs/cairo
+		x11-libs/pango
+		>=x11-libs/gtk+-2.8 )
+	emacs? ( virtual/emacs )
+	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2[png] )
-	doc? ( dev-tex/picins
-		virtual/latex-base
-		app-text/ghostscript-gpl )
 	latex? ( virtual/latex-base
 		lua? ( dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
+	lua? ( dev-lang/lua )
+	pdf? ( media-libs/pdflib )
 	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X]
-		>=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )
-	cairo? ( >=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )
 	qt4? ( >=x11-libs/qt-core-4.5
 		>=x11-libs/qt-gui-4.5
-		>=x11-libs/qt-svg-4.5 )"
+		>=x11-libs/qt-svg-4.5 )
+	readline? ( sys-libs/readline )
+	svga? ( media-libs/svgalib )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X]
+		x11-libs/cairo
+		x11-libs/pango
+		>=x11-libs/gtk+-2.8 )
+	X? ( x11-libs/libXaw )
+	xemacs? ( app-editors/xemacs
+		app-xemacs/xemacs-base
+		app-xemacs/texinfo )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base
+		app-text/ghostscript-gpl )"
 
-S="${WORKDIR}/${ECVS_MODULE}"
+S="${WORKDIR}/${PN}"
+GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="/usr/share/texmf-site"
 
-pkg_setup() {
-	use wxwidgets && need-wxwidgets unicode
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
 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"
+			die "make -f Makefile.am.in Makefile.am in $dir failed"
 	done
 
-	# Add Gentoo version identification since the licence requires it
-	sed -i "s/$/ (Gentoo revision ${PR})/" PATCHLEVEL
+	# 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() {
-	local myconf="--enable-thin-splines"
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
 
-	myconf="${myconf} $(use_with latex)"
-	myconf="${myconf} $(use_with X x)"
-	myconf="${myconf} $(use_with svga linux-vga)"
+	if use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
+	local myconf
+	myconf="${myconf} --without-lisp-files"
+	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
+	myconf="${myconf} $(use_with cairo)"
+	myconf="${myconf} $(use_with doc tutorial)"
 	myconf="${myconf} $(use_with gd)"
-	myconf="${myconf} $(use_enable wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
 	myconf="${myconf} $(use_with lua)"
-	myconf="${myconf} $(use_with doc tutorial)"
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_enable thin-splines)"
+	myconf="${myconf} $(use_enable wxwidgets)"
+	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_enable qt4 qt)"
-
-	use latex && myconf="${myconf} --with-texdir=${TEXMF}/${PN}/${GP_VERSION}"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
-		--with-xmi=/usr/$(get_libdir)" \
-		|| myconf="${myconf} --without-ggi"
-
 	use readline \
 		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
-	myconf="${myconf} --without-lisp-files"
+	econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
 
-	#we do the (x)emacs econf in src_install, also solves bug #194216
-	EMACS=no \
-	DIST_CONTACT="<http://bugs.gentoo.org>" \
-		econf ${myconf} || die "econf failed"
+	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
+
+	if use emacs; then
+		einfo "Configuring gnuplot-mode for GNU Emacs ..."
+		cd "${S}/lisp"
+		econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs
+	fi
 }
 
 src_compile() {
@@ -118,66 +126,80 @@ src_compile() {
 	# example plots.
 	addwrite /dev/svga:/dev/mouse:/dev/tts/0
 
-	emake || die "emake failed"
+	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
-		emake pdf || die "emake pdf failed"
-		cd ../tutorial
-		emake pdf || die "emake pdf tutorial failed"
+		cd "${S}/docs"
+		emake pdf || die
+		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 "emake install failed"
+	emake DESTDIR="${D}" install || die
+
+	if use xemacs; then
+		cd "${S}/lisp-xemacs"
+		emake DESTDIR="${D}" install || die
+	fi
 
 	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || \
-			die "econf emacs failed"
-		emake DESTDIR="${D}" install || die "lisp install for emacs failed"
-		emake clean
-		cd ..
+		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 -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}
+		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
 
-	if use xemacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for XEmacs..."
-		EMACS="xemacs" \
-			econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" || \
-				die "econf xemacs failed"
-		emake DESTDIR="${D}" install || die "lisp install for xemacs failed"
-		cd ..
-	fi
-
-	dodoc BUGS ChangeLog NEWS PATCHLEVEL PGPKEYS PORTING README* \
-		TODO VERSION
-	use lua && newdoc term/lua/README README-lua
+	cd "${S}"
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
 
 	if use doc; then
 		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}/demo
-		doins demo/*
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo || die
+		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
 		# 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}
+		# FAQ
+		dodoc FAQ.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 emacs || use xemacs; then
+		docinto emacs
+		dodoc lisp/ChangeLog lisp/README
+		use doc && dodoc lisp/gpelcard.pdf
 	fi
 }
 
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 034ee26de..fa883bcb1 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -6,4 +6,9 @@
 		<email>kleiner_otti@gmx.de</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+<use>
+  <flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
+    Needed for GIF, JPEG, and PNG image output.</flag>
+  <flag name='thin-splines'>Enable thin plate splines</flag>
+</use>
 </pkgmetadata>