sci-visualization/gnuplot added multislot support

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

12 files changed, 586 insertions, 40 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 3fc8e66d3..82ce1b7c1 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,7 +1,18 @@
 # ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gnuplot-4.2.6-r1 (10 Jan 2010)
+
+  10 Jan 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  +files/gnuplot-4.2.3-app-defaults.patch,
+  +files/gnuplot-4.2.5-colorbox_accounting.patch,
+  +files/gnuplot-4.2.5-configure-pkgconfig.patch, +gnuplot-4.2.6-r1.ebuild,
+  gnuplot-4.4.0_rc1.ebuild, +files/gnuplot-4.4.0_rc1-disable-texhash.patch,
+  gnuplot-4.5.9999.ebuild, files/gnuplot-4.5.9999-app-defaults.patch,
+  +files/gnuplot-gentoo-version.patch:
+  added multislot support
+
 *gnuplot-4.4.0_rc1 (13 Dec 2009)
 
   13 Dec 2009; Christoph Junghans <kleiner_otti@gmx.de>
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 51bdd1ebe..e8dac7b3e 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -2,20 +2,28 @@
 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-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
-AUX gnuplot-4.5.9999-app-defaults.patch 2239 RMD160 a0a8a2152d6b168c0e6188e53a332bc00617a4e4 SHA1 c16852541488e952e99944f260002458fe9cec23 SHA256 a32cb28122d90f817472f73cc24ba9f39a6407a00ed2e5ae7bd6a671dc56020c
+AUX gnuplot-4.5.9999-app-defaults.patch 2321 RMD160 1649523b3e333205188a22ddc3440d8c1acdd14f SHA1 3442923940669349126cbac3e672e1c1f4bd1494 SHA256 a3e6df911213699b8fb2424a66a1829d62addcd7413dbcc976fea8817f593736
 AUX gnuplot-4.5.9999-gentoo-version.patch 2768 RMD160 509c8fbd2b25dfd23acb5dd197d9ccff953c8e62 SHA1 c49276d83c260273bf531aab6c53e095f5047a8e SHA256 4aae78fa9d322a7579ea9951cff39d2ed684ab2dd3d67c28032ad15ec076c411
+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.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a76 SHA1 d11fdde8218bee98597ee836cbc17e4bf6093b70 SHA256 81fbc2eb6077bd6abfe98c5c82aae14a2c970473ee4c2c37743ff3b1e2aa8e82
 DIST gnuplot-4.4.0-rc1.tar.gz 3294054 RMD160 262cce576e6d64dd8a54edef0730f4576414456c SHA1 e9c2b99896a652a52d0160e8e2a6406ed861fda4 SHA256 d284ac5f75948e5a6716d26532adaf40e9ed8a205cbdeb75e76999dab07baf14
-EBUILD gnuplot-4.4.0_rc1.ebuild 5484 RMD160 06b258a0c11d63ba81f3273fa3787bc1b4ed8332 SHA1 cf4c99249701adb48d3455e9a6427c2ed6515186 SHA256 147d99169be0f81b5d4004d583182fad4cadb88be65ae12ff4868fbc4c785509
-EBUILD gnuplot-4.5.9999.ebuild 5842 RMD160 56ab983f010783fb89fbbf41ff851ff7f6e8dff0 SHA1 5d5697ece0395338f2877e988b02ca5ea199d706 SHA256 03320fea08d200529657749ad54d6355c9986614935afc7217a6f5ca46941d9e
-MISC ChangeLog 1013 RMD160 60320c4a2ea8f5aca591cfb00e40b0a040569fc7 SHA1 6286d3549cb4b6434769bcef656a599e13f9ec14 SHA256 5f1c91c71187f1fa90fad5dd34d4a49f1f990a5cad0752f2e63924ab1d06ac52
-MISC metadata.xml 257 RMD160 f2ffbaee54f8534e419eea137c2a4da199b8b06c SHA1 502dbf5dd161bee261a494c5aedd6ee339090cc7 SHA256 f0ff74df1828056b76a2c69ee634fefe487987533698f6d4c2403f20f707b9c1
+EBUILD gnuplot-4.2.6-r1.ebuild 6759 RMD160 275215d9a4cb357f25ae0819d4437d9cef9c269e SHA1 4b8203e550b5a725946b2ee266b9e556010f4ba2 SHA256 4d9e91516f590df8772acfee2b29c5c1be139209a8e701fe49c9548134a03940
+EBUILD gnuplot-4.4.0_rc1.ebuild 6537 RMD160 017cafe1bd495ebb6f2fd1e0dd28af25d5dcda6e SHA1 fc26c3cdefd8d786c912d40c6654c7db77834615 SHA256 e4a165db3f4147e4fd7e682124818e01ef17de55f21eee7f43ecf495b10ff6ec
+EBUILD gnuplot-4.5.9999.ebuild 6915 RMD160 68c132d7788baf3571750b78f8cdb5301d3903d2 SHA1 9428d0f928a32794c4604d49cf7fa16275db557d SHA256 2bc8553a2ddfb89e9658bedad6506e2705ada8f0e0521b612304695ee4086a77
+MISC ChangeLog 1483 RMD160 b5ea20b709b90a998a6cfbe4aa77264263788f10 SHA1 8596f47cd30d6d9ba02a6c67d2e0e3b348707b44 SHA256 ee10bf1e0ee5204af606ec35b781d620544ba8833466e4a8c8511a331b24ca98
+MISC metadata.xml 349 RMD160 87a767ce8e90a00d852a98474ba4613ec1311796 SHA1 d4de5b0b36dac3911669ae23a080982f0986d273 SHA256 70b5b4315995c437de4e5b0434d5f2034fbd35975be71ecc2782cffee5be16a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksk9U4ACgkQy0OE/ans1/lyOgCeNjvgqHETps7K9wnoWoHhJJJU
-gw0AniJbHx+8FLpH4ZY7CQbrVlA7ZOnS
-=giVE
+iEYEARECAAYFAktJ2UsACgkQy0OE/ans1/kOpgCfdsgT8d9Hq4ZI9AbMc+9IssKP
+AY8Anj8YvPP/+wjJjMZQdgcKMT1ds/2P
+=rll1
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
new file mode 100644
index 000000000..16e1b0122
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
@@ -0,0 +1,54 @@
+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
+
+--- gnuplot-4.2.3-orig/configure.in	2008-03-04 19:36:53.000000000 +0100
++++ gnuplot-4.2.3/configure.in	2008-04-26 11:44:59.000000000 +0200
+@@ -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)
+--- gnuplot-4.2.3-orig/share/Makefile.am	2008-03-05 04:38:59.000000000 +0100
++++ gnuplot-4.2.3/share/Makefile.am	2008-04-26 11:44:59.000000000 +0200
+@@ -5,8 +5,6 @@
+ 
+ SUBDIRS = LaTeX
+ 
+-appdefaultdir = $(libdir)/X11/app-defaults
+-
+ APPDEFAULTFILES = Gnuplot
+ 
+ appdefault_DATA = $(APPDEFAULTFILES)
+--- gnuplot-4.2.3-orig/src/Makefile.am	2007-08-26 19:50:20.000000000 +0200
++++ gnuplot-4.2.3/src/Makefile.am	2008-04-26 11:44:59.000000000 +0200
+@@ -25,7 +25,10 @@
+ noinst_PROGRAMS = bf_test
+ 
+ XLIBS = @LIBRARIES_FOR_X@
+-AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\"
++AM_CPPFLAGS = -I../term -I$(top_srcdir)/term \
++ -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" \
++ -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DAppDefDir=\"$(appdefaultdir)\" \
++ -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\"
+ 
+ gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h \
+ breaders.c breaders.h bitmap.c bitmap.h color.c color.h command.c \
+--- gnuplot-4.2.3-orig/src/gplt_x11.c	2007-12-10 00:55:27.000000000 +0100
++++ gnuplot-4.2.3/src/gplt_x11.c	2008-04-26 11:45:18.000000000 +0200
+@@ -4787,7 +4787,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.2.5-colorbox_accounting.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.5-colorbox_accounting.patch
new file mode 100644
index 000000000..126d80b5a
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.5-colorbox_accounting.patch
@@ -0,0 +1,81 @@
+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/files/gnuplot-4.2.5-configure-pkgconfig.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch
new file mode 100644
index 000000000..7089de6a1
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/233475#c9
+Fix build issue with USE=wxwindows
+Patch from upstream (did not make it into gnuplot-4.2.5)
+
+--- configure.in	8 May 2007 22:42:53 -0000	1.219
++++ configure.in	16 Jul 2007 21:58:43 -0000	1.220
+@@ -853,6 +853,10 @@
+   cp ${srcdir}/tutorial/eg3.dat tutorial
+ fi
+ 
++dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
++dnl PKG_CHECK_MODULES may not happen
++PKG_PROG_PKG_CONFIG
++
+ dnl  wxWidgets terminal
+ 
+ dnl wxWidgets terminal needs C++
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
new file mode 100644
index 000000000..a95087c7c
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.4.0_rc1-disable-texhash.patch
@@ -0,0 +1,18 @@
+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.5.9999-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-app-defaults.patch
index 650858e30..ee2caea19 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.5.9999-app-defaults.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-app-defaults.patch
@@ -4,7 +4,7 @@ Reported upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1953
 
 --- gnuplot-orig/configure.in	2008-03-04 19:36:53.000000000 +0100
 +++ gnuplot/configure.in	2008-04-26 11:44:59.000000000 +0200
-@@ -1026,6 +1026,10 @@
+@@ -1116,6 +1116,10 @@
  fi
  AC_SUBST(LISPDIR)
  
@@ -32,14 +32,14 @@ Reported upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1953
  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)\"
+-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)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_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)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_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 \
 --- gnuplot-orig/src/gplt_x11.c	2007-12-10 00:55:27.000000000 +0100
 +++ gnuplot/src/gplt_x11.c	2008-04-26 11:45:18.000000000 +0200
-@@ -4851,7 +4851,9 @@
+@@ -4852,7 +4852,9 @@
  */
  #define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
  
diff --git a/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch b/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
new file mode 100644
index 000000000..b1a530a7d
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
@@ -0,0 +1,76 @@
+Add special version identification and Gentoo contact information,
+in order to fulfil provisions 2 through 4 of the gnuplot licence.
+
+--- gnuplot-orig/src/plot.c
++++ gnuplot/src/plot.c
+@@ -383,9 +383,11 @@
+ 		    "  -V, --version\n"
+ 		    "  -h, --help\n"
+ 		    "  -e  \"command1; command2; ...\"\n"
+-		    "gnuplot %s patchlevel %s\n"
+-		    "Report bugs to %s\n",
+-		    gnuplot_version, gnuplot_patchlevel, bug_email);
++		    "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;
+ 	}
+     }
+--- gnuplot-orig/src/show.c
++++ gnuplot/src/show.c
+@@ -1052,7 +1052,7 @@
+ 
+     fprintf(fp, "%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\
+@@ -1063,10 +1063,11 @@
+ %s\tThe gnuplot FAQ is available from %s\n\
+ %s\n\
+ %s\tSend bug reports and suggestions to <%s>\n\
++%s\tor to <%s>\n\
+ %s\n",
+ 	    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 */
+@@ -1076,6 +1077,7 @@
+ 	    p,			/* Type `help` */
+ 	    p, faq_location,
+ 	    p,			/* empty line */
++	    p, gentoo_bugtracker,
+ 	    p, bug_email,
+ 	    p);			/* empty line */
+ 
+--- gnuplot-orig/src/version.c
++++ gnuplot/src/version.c
+@@ -46,6 +46,9 @@
+ 
+ const char faq_location[] = FAQ_LOCATION;
+ 
++const char gentoo_revision[] = GENTOO_REVISION;
++const char gentoo_bugtracker[] = "http://bugs.gentoo.org/";
++
+ char *compile_options = (void *)0;	/* Will be loaded at runtime */
+ 
+ #define RELEASE_VERSION 1
+--- gnuplot-orig/src/version.h
++++ gnuplot/src/version.h
+@@ -47,6 +47,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.2.6-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
new file mode 100644
index 000000000..08d4293d3
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
@@ -0,0 +1,226 @@
+# 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
+	mirror://gentoo/${PN}-4.2.5-lua-term.patch.bz2"
+
+LICENSE="gnuplot"
+GP_VERSION="${PV:0:3}"
+use multislot && SLOT="${PV:0:3}" || SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc emacs +gd ggi latex lua multislot pdf plotutils readline svga wxwidgets X xemacs"
+RESTRICT="wxwidgets? ( test )"
+
+RDEPEND="
+	multislot? ( !!<=sci-visualization/gnuplot-4.2.6
+		!!sci-visualization/gnuplot[-mutlislot]
+		app-admin/eselect-gnuplot )
+	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? ( 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 )"
+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}"/${PN}-4.2.3-app-defaults.patch #219323
+	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
+	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
+
+	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
+
+	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"
+	use multislot && myconf="${myconf} --program-suffix='-${GP_VERSION}'"
+
+	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
+
+	if use latex && use lua; then
+		# install style file in an (additional) place where TeX can find it
+		insinto "${TEXMF}/tex/latex/${PN}/${GP_VERSION}"
+		doins term/lua/gnuplot-lua-tikz.sty || die
+	fi
+
+	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* \
+		TODO VERSION
+	use lua && newdoc term/lua/README README-lua
+	newdoc term/PostScript/README README-ps
+
+	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
+	use multislot && \
+	  mv "${D}/usr/share/info/gnuplot.info" "${D}/usr/share/info/gnuplot-${GP_VERSION}.info"
+}
+
+pkg_postinst() {
+	use multislot && eselect gnuplot update --if-unset --no-texupdate
+	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() {
+	#in the case that we uninstall the last multislot version 
+	if use multislot; then
+		#rm symlinks
+		has_version sci-visualization/gnuplot || eselect gnuplot update	--no-texupdate
+	fi
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild
index caa964bc2..ff0777b13 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,12 +15,16 @@ HOMEPAGE="http://www.gnuplot.info/"
 SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 
 LICENSE="gnuplot"
-SLOT="0"
+GP_VERSION="${PV:0:3}"
+use multislot && SLOT="${PV:0:3}" || SLOT="0"
 KEYWORDS="~x86"
-IUSE="cairo doc emacs gd ggi latex lua pdf plotutils readline svga wxwidgets X xemacs"
+IUSE="cairo doc emacs +gd ggi latex lua multislot pdf plotutils readline svga wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="
+	multislot? ( !!<=sci-visualization/gnuplot-4.2.6
+		!!sci-visualization/gnuplot[-mutlislot]
+		app-admin/eselect-gnuplot )
 	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
 	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
 	pdf? ( media-libs/pdflib )
@@ -37,7 +41,7 @@ RDEPEND="
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( x11-libs/wxGTK:2.8
+	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		>=x11-libs/cairo-0.9
 		>=x11-libs/pango-1.10.3
 		>=x11-libs/gtk+-2.8 )
@@ -52,14 +56,14 @@ 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 i
 	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
 	epatch "${FILESDIR}"/${PF}-app-defaults.patch #219323
-	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
+	epatch "${FILESDIR}"/${PF}-disable-texhash.patch #201871
 	# Add Gentoo version identification since the licence requires it
 	epatch "${FILESDIR}"/${PF}-gentoo-version.patch
 
@@ -67,9 +71,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# See bug #156427, kpsexpand is part of texlive-core
+	# See bug #156427.
 	if use latex ; then
-		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
+		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}/${GP_VERSION}:" \
 			share/LaTeX/Makefile.in || die "sed kpsexpand removed failed"
 	else
 		sed -i \
@@ -77,7 +81,7 @@ src_configure() {
 			die "sed disable of LateX failed"
 	fi
 
-	local myconf="--with-gihdir=/usr/share/${PN}/gih --enable-thin-splines"
+	local myconf="--enable-thin-splines"
 
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with svga linux-vga)"
@@ -94,10 +98,11 @@ src_configure() {
 		|| myconf="${myconf} --without-ggi"
 
 	use readline \
-		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
+		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
 	myconf="${myconf} --without-lisp-files"
+	use multislot && myconf="${myconf} --program-suffix='-${GP_VERSION}'"
 
 	TEMACS=no
 	use xemacs && TEMACS=xemacs
@@ -105,6 +110,7 @@ src_configure() {
 
 	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
 	EMACS=${TEMACS} \
+	appdefaultdir=/etc/X11/app-defaults/${PN}/${GP_VERSION} \
 		econf ${myconf} || die "econf failed"
 }
 
@@ -119,7 +125,9 @@ src_compile() {
 
 	emake || die "emake failed"
 
-	if use doc ; then
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
 		cd docs
 		emake pdf || die "emake pdf failed"
 		cd ../tutorial
@@ -159,10 +167,12 @@ src_install () {
 	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}/demo
+		insinto /usr/share/${PN}/${GP_VERSION}/demo
 		doins demo/*
 		# Manual
 		insinto /usr/share/doc/${PF}/manual
@@ -177,23 +187,38 @@ src_install () {
 
 	if ! use X; then
 		# see bug 194527
-		rm -rf "${D}/usr/$(get_libdir)/X11"
+		rm -rf "${D}/etc/X11"
 	fi
+	use multislot && \
+	  mv "${D}/usr/share/info/gnuplot.info" "${D}/usr/share/info/gnuplot-${GP_VERSION}.info"
 }
 
 pkg_postinst() {
+	use multislot && eselect gnuplot update --if-unset --no-texupdate
 	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() {
+	#in the case that we uninstall the last multislot version 
+	if use multislot; then
+		#rm symlinks
+		has_version sci-visualization/gnuplot || eselect gnuplot update	--no-texupdate
+	fi
 	use emacs && elisp-site-regen
 	use latex && texmf-update
 }
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index d534fa8ac..7f9749ae0 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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 cvs
@@ -16,12 +17,16 @@ ECVS_USER="anonymous"
 ECVS_CVS_OPTIONS="-dP"
 
 LICENSE="gnuplot"
-SLOT="0"
+GP_VERSION="${PV:0:3}"
+use multislot && SLOT="${PV:0:3}" || SLOT="0"
 KEYWORDS="~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 multislot pdf plotutils qt4 readline svga wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="
+	multislot? ( !!<=sci-visualization/gnuplot-4.2.6
+		!!sci-visualization/gnuplot[-mutlislot]
+		app-admin/eselect-gnuplot )
 	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
 	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
 	pdf? ( media-libs/pdflib )
@@ -38,7 +43,7 @@ RDEPEND="
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( x11-libs/wxGTK:2.8
+	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		>=x11-libs/cairo-0.9
 		>=x11-libs/pango-1.10.3
 		>=x11-libs/gtk+-2.8 )
@@ -56,6 +61,7 @@ E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="/usr/share/texmf-site"
 
 pkg_setup() {
+	use wxwidgets && need-wxwidgets unicode
 	use wxwidgets && wxwidgets_pkg_setup
 }
 
@@ -63,7 +69,7 @@ src_prepare() {
 	local i
 	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
 	epatch "${FILESDIR}"/${PF}-app-defaults.patch #219323
-	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
+	epatch "${FILESDIR}"/${PN}-4.4.0_rc1-disable-texhash.patch #201871
 	# Add Gentoo version identification since the licence requires it
 	epatch "${FILESDIR}"/${PF}-gentoo-version.patch
 
@@ -77,9 +83,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# See bug #156427, kpsexpand is part of texlive-core
+	# See bug #156427.
 	if use latex ; then
-		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
+		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}/${GP_VERSION}:" \
 			share/LaTeX/Makefile.in || die "sed kpsexpand removed failed"
 	else
 		sed -i \
@@ -87,7 +93,7 @@ src_configure() {
 			die "sed disable of LateX failed"
 	fi
 
-	local myconf="--with-gihdir=/usr/share/${PN}/gih --enable-thin-splines"
+	local myconf="--enable-thin-splines"
 
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with svga linux-vga)"
@@ -105,10 +111,11 @@ src_configure() {
 		|| myconf="${myconf} --without-ggi"
 
 	use readline \
-		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
+		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
 	myconf="${myconf} --without-lisp-files"
+	use multislot && myconf="${myconf} --program-suffix='-${GP_VERSION}'"
 
 	TEMACS=no
 	use xemacs && TEMACS=xemacs
@@ -116,6 +123,7 @@ src_configure() {
 
 	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
 	EMACS=${TEMACS} \
+	appdefaultdir=/etc/X11/app-defaults/${PN}/${GP_VERSION} \
 		econf ${myconf} || die "econf failed"
 }
 
@@ -130,7 +138,9 @@ src_compile() {
 
 	emake || die "emake failed"
 
-	if use doc ; then
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
 		cd docs
 		emake pdf || die "emake pdf failed"
 		cd ../tutorial
@@ -170,10 +180,12 @@ src_install () {
 	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}/demo
+		insinto /usr/share/${PN}/${GP_VERSION}/demo
 		doins demo/*
 		# Manual
 		insinto /usr/share/doc/${PF}/manual
@@ -188,23 +200,38 @@ src_install () {
 
 	if ! use X; then
 		# see bug 194527
-		rm -rf "${D}/usr/$(get_libdir)/X11"
+		rm -rf "${D}/etc/X11"
 	fi
+	use multislot && \
+	  mv "${D}/usr/share/info/gnuplot.info" "${D}/usr/share/info/gnuplot-${GP_VERSION}.info"
 }
 
 pkg_postinst() {
+	use multislot && eselect gnuplot update --if-unset --no-texupdate
 	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() {
+	#in the case that we uninstall the last multislot version 
+	if use multislot; then
+		#rm symlinks
+		has_version sci-visualization/gnuplot || eselect gnuplot update	--no-texupdate
+	fi
 	use emacs && elisp-site-regen
 	use latex && texmf-update
 }
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 034ee26de..48877f6a0 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -6,4 +6,7 @@
 		<email>kleiner_otti@gmx.de</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<use>
+		<flag name='multislot'>Allow for SLOTs to include multiple versions</flag>
+	</use>
 </pkgmetadata>