Version bump

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

7 files changed, 980 insertions, 52 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 9b40baa32c11..fbc3c0a1e9dd 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/plplot
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.53 2013/11/16 08:28:49 dirtyepic Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.54 2014/01/16 00:49:50 bicatali Exp $
+
+*plplot-5.9.11 (16 Jan 2014)
+
+  16 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/plplot-5.9.11-config.patch, +files/plplot-5.9.11-multiarch.patch,
+  +files/plplot-5.9.11-ocaml.patch, +files/plplot-5.9.11-octave.patch,
+  +plplot-5.9.11.ebuild, -plplot-5.9.9-r1.ebuild, metadata.xml:
+  Version bump
 
   16 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> plplot-5.9.9-r1.ebuild,
   plplot-5.9.9-r2.ebuild, plplot-5.9.10-r1.ebuild:
diff --git a/sci-libs/plplot/files/plplot-5.9.11-config.patch b/sci-libs/plplot/files/plplot-5.9.11-config.patch
new file mode 100644
index 000000000000..3bbbd6c4754b
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.11-config.patch
@@ -0,0 +1,769 @@
+Index: scripts/style_source.sh
+===================================================================
+--- scripts/style_source.sh	(revision 12913)
++++ scripts/style_source.sh	(working copy)
+@@ -193,7 +193,7 @@
+ 
+ export csource_LIST
+ # Top level directory.
+-csource_LIST="config.h.in"
++csource_LIST="plplot_config.h.in"
+ 
+ # src directory
+ csource_LIST="$csource_LIST src/*.[ch]"
+Index: doc/Doxyfile.in
+===================================================================
+--- doc/Doxyfile.in	(revision 12913)
++++ doc/Doxyfile.in	(working copy)
+@@ -660,7 +660,7 @@
+                          "@CMAKE_SOURCE_DIR@/drivers" \
+                          "@CMAKE_SOURCE_DIR@/bindings" \
+                          "@CMAKE_SOURCE_DIR@/include" \
+-                         "@CMAKE_BINARY_DIR@/config.h" \
++                         "@CMAKE_BINARY_DIR@/plplot_config.h" \
+                          "@CMAKE_BINARY_DIR@/lib" \
+                          "@CMAKE_BINARY_DIR@/bindings" \
+                          "@CMAKE_BINARY_DIR@/include"
+Index: doc/CMakeLists.txt
+===================================================================
+--- doc/CMakeLists.txt	(revision 12913)
++++ doc/CMakeLists.txt	(working copy)
+@@ -60,7 +60,7 @@
+   endforeach(directory ${doxygen_directories})
+   # Must append one specific configured file to be consistent with
+   # the INPUT parameter in Doxyfile(.in).
+-  list(APPEND doxygen_globs ${CMAKE_BINARY_DIR}/config.h)
++  list(APPEND doxygen_globs ${CMAKE_BINARY_DIR}/plplot_config.h)
+   #message(STATUS "DEBUG: doxygen_globs = ${doxygen_globs}")
+ 
+   # RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} works (because that is the
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 12913)
++++ CMakeLists.txt	(working copy)
+@@ -121,10 +121,10 @@
+   )
+ 
+ configure_file(
+-  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/config.h
++  ${CMAKE_CURRENT_SOURCE_DIR}/plplot_config.h.in
++  ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
+   )
+-# Allow access to the generated config.h for this build.
++# Allow access to the generated plplot_config.h for this build.
+ add_definitions("-DHAVE_CONFIG_H")
+ # Install top-level files
+ 
+Index: include/plConfig.h.in
+===================================================================
+--- include/plConfig.h.in	(revision 12913)
++++ include/plConfig.h.in	(working copy)
+@@ -5,7 +5,7 @@
+ //  IFS, University of Texas at Austin
+ //  18-Jul-1994
+ //
+-//  Copyright (C) 2004, 2006, 2007, 2008, 2009  Alan W. Irwin
++//  Copyright (C) 2004-2013  Alan W. Irwin
+ //  Copyright (C) 2004  Rafael Laboissiere
+ //  Copyright (C) 2004  Joao Cardoso
+ //
+@@ -24,33 +24,28 @@
+ //  You should have received a copy of the GNU Library General Public License
+ //  along with PLplot; if not, write to the Free Software
+ //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-//
+-//
+ 
+ // Configured (by CMake) macros for PLplot that are required for the
+-// core build and the build of the installed
+-// examples (and presumably any user applications).  Therefore, the
+-// configured plConfig.h should be installed.  In contrast,
+-// config.h.cmake (note, plConfig.h #includes config.h for
+-// the core build because HAVE_CONFIG_H is #defined in that case)
+-// contains configured macros that are only required for the core
+-// build.  Therefore, in contrast to plConfig.h, config.h should not
+-// be installed.
++// core build and the build of the installed examples (and presumably
++// any user applications).  Therefore, the configured plConfig.h
++// should be installed.  In contrast, plplot_config.h.in (note,
++// plConfig.h #includes plplot_config.h for the core build because
++// HAVE_CONFIG_H is #defined in that case) contains configured macros
++// that are only required for the core build.  Therefore, in contrast
++// to plConfig.h, plplot_config.h should not be installed.
+ //
+ // Maintenance issue: in makes no sense to configure duplicate macros
+-// for both config.h and plConfig.h.  Therefore, when adding a macro
++// for both plplot_config.h and plConfig.h.  Therefore, when adding a macro
+ // decide which file to put it in depending on whether the result is
+ // needed for the installed examples build or not.  Furthermore, move
+ // configured macros from one file to the other as needed depending on
+ // that criterion, but do not copy them.
+-//
+-//
+ 
+ #ifndef __PLCONFIG_H__
+ #define __PLCONFIG_H__
+ 
+ #ifdef HAVE_CONFIG_H
+-#  include <config.h>
++#  include <plplot_config.h>
+ #endif
+ 
+ // Define if you have c++ accessible stdint.h
+Index: config.h.in
+===================================================================
+--- config.h.in	(revision 12913)
++++ config.h.in	(working copy)
+@@ -1,311 +0,0 @@
+-// Configured (by CMake) macros for PLplot that are required for the
+-// core build but _not_ required for the build of the installed
+-// examples (and presumably any user applications).  Therefore, the
+-// configured config.h should not be installed.  In contrast,
+-// include/plConfig.h.cmake (note, plConfig.h #includes config.h for
+-// the core build because HAVE_CONFIG_H is #defined in that case)
+-// contains configured macros that are required for the core build,
+-// installed examples build, and build of user applications.
+-// Therefore, in contrast to config.h, plConfig.h should be installed.
+-//
+-// Maintenance issue: in makes no sense to configure duplicate macros
+-// for both config.h and plConfig.h.  Therefore, when adding a macro
+-// decide which file to put it in depending on whether the result is
+-// needed for the installed examples build or not.  Furthermore, move
+-// configured macros from one file to the other as needed depending on
+-// that criterion, but do not copy them.
+-//
+-//
+-
+-// Location of executables
+-#define BIN_DIR                  "@BIN_DIR@"
+-
+-// Location of Build tree
+-#define BUILD_DIR                "@BUILD_DIR@"
+-
+-// Location of package data files
+-#define DATA_DIR                 "@DATA_DIR@"
+-
+-// Location of dynamically loaded drivers
+-#define DRV_DIR                  "@DRV_DIR@"
+-
+-// Name of the default cmap0 palette to use
+-#define PL_DEFAULT_CMAP0_FILE    "@DEFAULT_CMAP0_FILE@"
+-
+-// Name of the default cmap1 palette to use
+-#define PL_DEFAULT_CMAP1_FILE    "@DEFAULT_CMAP1_FILE@"
+-
+-// Define if support for deprecated plplot functions should be compiled
+-#cmakedefine PL_DEPRECATED
+-
+-// Define if there is support for dynamically loaded drivers
+-#cmakedefine ENABLE_DYNDRIVERS
+-
+-// Define to 1 if you have the <cmath> header file.
+-#cmakedefine HAVE_CMATH 1
+-
+-// Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+-//
+-#cmakedefine HAVE_DIRENT_H 1
+-
+-// Define to 1 if you have the <dlfcn.h> header file.
+-#cmakedefine HAVE_DLFCN_H 1
+-
+-// Define if [freetype] is available
+-#cmakedefine PL_HAVE_FREETYPE
+-
+-// Define if [shapelib] is available
+-#cmakedefine HAVE_SHAPELIB
+-
+-// Define if [agg] is available
+-#cmakedefine HAVE_AGG
+-
+-// Define to 1 if you have the <glib.h> header file.
+-#cmakedefine HAVE_GLIB_H 1
+-
+-// Define to 1 if you have the <glib-object.h> header file.
+-#cmakedefine HAVE_GLIB_OBJECT_H 1
+-
+-// Define to 1 if you have the <gtk/gtk.h> header file.
+-#cmakedefine HAVE_GTK_GTK_H 1
+-
+-// Define to 1 if you have the <inttypes.h> header file.
+-#cmakedefine HAVE_INTTYPES_H 1
+-
+-// Define if [incr], [Tcl] is available
+-#cmakedefine HAVE_ITCL
+-
+-// Define to 1 if you have the <itclDecls.h> header file.
+-#cmakedefine HAVE_ITCLDECLS_H 1
+-
+-// Define if Tk is available
+-#cmakedefine ENABLE_tk
+-
+-// Define if [incr], [Tk] is available
+-#cmakedefine HAVE_ITK
+-
+-// Define to 1 if you have the <jni.h> header file.
+-#cmakedefine HAVE_JNI_H 1
+-
+-// Define to 1 if you have the <libart_lgpl/libart.h> header file.
+-#cmakedefine HAVE_LIBART_LGPL_LIBART_H 1
+-
+-// Define to 1 if you have the <libgnomecanvas/libgnomecanvas.h> header file.
+-//
+-#cmakedefine HAVE_LIBGNOMECANVAS_LIBGNOMECANVAS_H 1
+-
+-// Define to 1 if you have the <libgnomeprint/gnome-print.h> header file.
+-#cmakedefine HAVE_LIBGNOMEPRINT_GNOME_PRINT_H 1
+-
+-// Define if libunicode is available
+-#cmakedefine HAVE_LIBUNICODE
+-
+-// Define to 1 if you have the <math.h> header file.
+-#cmakedefine HAVE_MATH_H 1
+-
+-// Define to 1 if you have the <memory.h> header file.
+-#cmakedefine HAVE_MEMORY_H 1
+-
+-// Define to 1 if the function mkstemp is available.
+-#cmakedefine PL_HAVE_MKSTEMP 1
+-
+-// Define to 1 if the function mkdtemp is available.
+-#cmakedefine PL_HAVE_MKDTEMP 1
+-
+-// Define to 1 if the function mkfifo is available.
+-#cmakedefine PL_HAVE_MKFIFO 1
+-
+-// Define to 1 if you have the <ndir.h> header file, and it defines `DIR'.
+-#cmakedefine HAVE_NDIR_H 1
+-
+-// Define if libpango is available
+-#cmakedefine HAVE_PANGO
+-
+-// Define if popen is available
+-#cmakedefine HAVE_POPEN
+-
+-// Define if _NSGetArgc is available
+-#cmakedefine HAVE_NSGETARGC
+-
+-// Define if pthreads is available
+-#cmakedefine PL_HAVE_PTHREAD
+-
+-// Define if Qhull is available
+-#cmakedefine PL_HAVE_QHULL
+-
+-// Define to 1 if you have the <stdlib.h> header file.
+-#cmakedefine HAVE_STDLIB_H 1
+-
+-// Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+-//
+-#cmakedefine HAVE_SYS_DIR_H 1
+-
+-// Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+-//
+-#cmakedefine HAVE_SYS_NDIR_H 1
+-
+-// Define to 1 if you have the <sys/stat.h> header file.
+-#cmakedefine HAVE_SYS_STAT_H 1
+-
+-// Define to 1 if you have the <sys/types.h> header file.
+-#cmakedefine HAVE_SYS_TYPES_H 1
+-
+-// Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible.
+-#cmakedefine HAVE_SYS_WAIT_H 1
+-
+-// Define to 1 if you have the <termios.h> header file.
+-#cmakedefine HAVE_TERMIOS_H 1
+-
+-// Define to 1 if you have the <crt_externs.h> header file.
+-#cmakedefine HAVE_CRT_EXTERNS_H 1
+-
+-// Define to 1 if the function unlink is available
+-#cmakedefine PL_HAVE_UNLINK 1
+-
+-// Define to 1 if you have the `vfork' function.
+-#cmakedefine HAVE_VFORK 1
+-
+-// Define to 1 if you have the <vfork.h> header file.
+-#cmakedefine HAVE_VFORK_H 1
+-
+-// Include sys/type.h if needed
+-#cmakedefine NEED_SYS_TYPE_H
+-
+-// Name of package
+-#define PACKAGE    "@PACKAGE@"
+-
+-// Define if the win32 ltdl implementation should be used
+-#cmakedefine LTDL_WIN32
+-
+-// Portable definition for PTHREAD_MUTEX_RECURSIVE
+-#define PLPLOT_MUTEX_RECURSIVE             @PLPLOT_MUTEX_RECURSIVE@
+-
+-// Directory containing fonts that are accessible from freetype
+-#define PL_FREETYPE_FONT_DIR               "@PL_FREETYPE_FONT_DIR@"
+-
+-// MONO font accessible from freetype
+-#define PL_FREETYPE_MONO                   "@PL_FREETYPE_MONO@"
+-
+-// MONO_BOLD font accessible from freetype
+-#define PL_FREETYPE_MONO_BOLD              "@PL_FREETYPE_MONO_BOLD@"
+-
+-// MONO_BOLD_ITALIC font accessible from freetype
+-#define PL_FREETYPE_MONO_BOLD_ITALIC       "@PL_FREETYPE_MONO_BOLD_ITALIC@"
+-
+-// MONO_BOLD_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_MONO_BOLD_OBLIQUE      "@PL_FREETYPE_MONO_BOLD_OBLIQUE@"
+-
+-// MONO_ITALIC font accessible from freetype
+-#define PL_FREETYPE_MONO_ITALIC            "@PL_FREETYPE_MONO_ITALIC@"
+-
+-// MONO_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_MONO_OBLIQUE           "@PL_FREETYPE_MONO_OBLIQUE@"
+-
+-// SANS font accessible from freetype
+-#define PL_FREETYPE_SANS                   "@PL_FREETYPE_SANS@"
+-
+-// SANS_BOLD font accessible from freetype
+-#define PL_FREETYPE_SANS_BOLD              "@PL_FREETYPE_SANS_BOLD@"
+-
+-// SANS_BOLD_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SANS_BOLD_ITALIC       "@PL_FREETYPE_SANS_BOLD_ITALIC@"
+-
+-// SANS_BOLD_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SANS_BOLD_OBLIQUE      "@PL_FREETYPE_SANS_BOLD_OBLIQUE@"
+-
+-// SANS_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SANS_ITALIC            "@PL_FREETYPE_SANS_ITALIC@"
+-
+-// SANS_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SANS_OBLIQUE           "@PL_FREETYPE_SANS_OBLIQUE@"
+-
+-// SCRIPT font accessible from freetype
+-#define PL_FREETYPE_SCRIPT                 "@PL_FREETYPE_SCRIPT@"
+-
+-// SCRIPT_BOLD font accessible from freetype
+-#define PL_FREETYPE_SCRIPT_BOLD            "@PL_FREETYPE_SCRIPT_BOLD@"
+-
+-// SCRIPT_BOLD_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SCRIPT_BOLD_ITALIC     "@PL_FREETYPE_SCRIPT_BOLD_ITALIC@"
+-
+-// SCRIPT_BOLD_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SCRIPT_BOLD_OBLIQUE    "@PL_FREETYPE_SCRIPT_BOLD_OBLIQUE@"
+-
+-// SCRIPT_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SCRIPT_ITALIC          "@PL_FREETYPE_SCRIPT_ITALIC@"
+-
+-// SCRIPT_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SCRIPT_OBLIQUE         "@PL_FREETYPE_SCRIPT_OBLIQUE@"
+-
+-// SERIF font accessible from freetype
+-#define PL_FREETYPE_SERIF                  "@PL_FREETYPE_SERIF@"
+-
+-// SERIF_BOLD font accessible from freetype
+-#define PL_FREETYPE_SERIF_BOLD             "@PL_FREETYPE_SERIF_BOLD@"
+-
+-// SERIF_BOLD_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SERIF_BOLD_ITALIC      "@PL_FREETYPE_SERIF_BOLD_ITALIC@"
+-
+-// SERIF_BOLD_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SERIF_BOLD_OBLIQUE     "@PL_FREETYPE_SERIF_BOLD_OBLIQUE@"
+-
+-// SERIF_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SERIF_ITALIC           "@PL_FREETYPE_SERIF_ITALIC@"
+-
+-// SERIF_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SERIF_OBLIQUE          "@PL_FREETYPE_SERIF_OBLIQUE@"
+-
+-// Symbol font accessible from freetype
+-#define PL_FREETYPE_SYMBOL                 "@PL_FREETYPE_SYMBOL@"
+-
+-// SYMBOL_BOLD font accessible from freetype
+-#define PL_FREETYPE_SYMBOL_BOLD            "@PL_FREETYPE_SYMBOL_BOLD@"
+-
+-// SYMBOL_BOLD_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SYMBOL_BOLD_ITALIC     "@PL_FREETYPE_SYMBOL_BOLD_ITALIC@"
+-
+-// SYMBOL_BOLD_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SYMBOL_BOLD_OBLIQUE    "@PL_FREETYPE_SYMBOL_BOLD_OBLIQUE@"
+-
+-// SYMBOL_ITALIC font accessible from freetype
+-#define PL_FREETYPE_SYMBOL_ITALIC          "@PL_FREETYPE_SYMBOL_ITALIC@"
+-
+-// SYMBOL_OBLIQUE font accessible from freetype
+-#define PL_FREETYPE_SYMBOL_OBLIQUE         "@PL_FREETYPE_SYMBOL_OBLIQUE@"
+-
+-// Define as the return type of signal handlers (`int' or `void').
+-#define RETSIGTYPE                         @RETSIGTYPE@
+-
+-// Location of Source tree
+-#define SOURCE_DIR                         "@SOURCE_DIR@"
+-
+-// Define to 1 if you have the ANSI C header files.
+-#cmakedefine STDC_HEADERS 1
+-
+-// Overall PLplot version number
+-#define PLPLOT_VERSION             "@PLPLOT_VERSION@"
+-
+-// Location of Tcl stuff
+-#define TCL_DIR                    "@TCL_DIR@"
+-// Consistent package versions for Itcl and friends found by PLplot
+-// If PLplot could not find consistent values these are set to 0.0.0
+-#define PLPLOT_ITCL_VERSION        "@PLPLOT_ITCL_VERSION@"
+-#define PLPLOT_ITK_VERSION         "@PLPLOT_ITK_VERSION@"
+-#define PLPLOT_IWIDGETS_VERSION    "@PLPLOT_IWIDGETS_VERSION@"
+-
+-// Define if csa is desired
+-#cmakedefine WITH_CSA
+-
+-// Define if want to use general fill_intersection_polygon approach
+-// rather than the traditional code to fill the intersection of a polygon with
+-// the clipping limits.
+-#cmakedefine USE_FILL_INTERSECTION_POLYGON
+-
+-// Define to `char *' if <sys/types.h> does not define.
+-#cmakedefine caddr_t
+-
+-// Define to `int' if <sys/types.h> does not define.
+-#cmakedefine pid_t
+-
+-// Define as `fork' if `vfork' does not work.
+-#cmakedefine vfork
+Index: drivers/plplotcanvas-hacktext.c
+===================================================================
+--- drivers/plplotcanvas-hacktext.c	(revision 12913)
++++ drivers/plplotcanvas-hacktext.c	(working copy)
+@@ -31,7 +31,7 @@
+ // FIXME: TODO: Clipping
+ //
+ 
+-#include <config.h>
++#include <plplot_config.h>
+ 
+ #include <math.h>
+ #include <string.h>
+Index: plplot_config.h.in
+===================================================================
+--- plplot_config.h.in	(revision 0)
++++ plplot_config.h.in	(revision 12914)
+@@ -0,0 +1,311 @@
++// Configured (by CMake) macros for PLplot that are required for the
++// core build but _not_ required for the build of the installed
++// examples (and presumably any user applications).  Therefore, the
++// configured plplot_config.h should not be installed.  In contrast,
++// include/plConfig.h.in (note, the configured plConfig.h result
++// #includes plplot_config.h for the core build because HAVE_CONFIG_H
++// is #defined in that case) contains configured macros that are
++// required for the core build, installed examples build, and build of
++// user applications.  Therefore, in contrast to plplot_config.h,
++// plConfig.h should be installed.
++//
++// Maintenance issue: in makes no sense to configure duplicate macros
++// for both plplot_config.h and plConfig.h.  Therefore, when adding a macro
++// decide which file to put it in depending on whether the result is
++// needed for the installed examples build or not.  Furthermore, move
++// configured macros from one file to the other as needed depending on
++// that criterion, but do not copy them.
++//
++
++// Location of executables
++#define BIN_DIR                  "@BIN_DIR@"
++
++// Location of Build tree
++#define BUILD_DIR                "@BUILD_DIR@"
++
++// Location of package data files
++#define DATA_DIR                 "@DATA_DIR@"
++
++// Location of dynamically loaded drivers
++#define DRV_DIR                  "@DRV_DIR@"
++
++// Name of the default cmap0 palette to use
++#define PL_DEFAULT_CMAP0_FILE    "@DEFAULT_CMAP0_FILE@"
++
++// Name of the default cmap1 palette to use
++#define PL_DEFAULT_CMAP1_FILE    "@DEFAULT_CMAP1_FILE@"
++
++// Define if support for deprecated plplot functions should be compiled
++#cmakedefine PL_DEPRECATED
++
++// Define if there is support for dynamically loaded drivers
++#cmakedefine ENABLE_DYNDRIVERS
++
++// Define to 1 if you have the <cmath> header file.
++#cmakedefine HAVE_CMATH 1
++
++// Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
++//
++#cmakedefine HAVE_DIRENT_H 1
++
++// Define to 1 if you have the <dlfcn.h> header file.
++#cmakedefine HAVE_DLFCN_H 1
++
++// Define if [freetype] is available
++#cmakedefine PL_HAVE_FREETYPE
++
++// Define if [shapelib] is available
++#cmakedefine HAVE_SHAPELIB
++
++// Define if [agg] is available
++#cmakedefine HAVE_AGG
++
++// Define to 1 if you have the <glib.h> header file.
++#cmakedefine HAVE_GLIB_H 1
++
++// Define to 1 if you have the <glib-object.h> header file.
++#cmakedefine HAVE_GLIB_OBJECT_H 1
++
++// Define to 1 if you have the <gtk/gtk.h> header file.
++#cmakedefine HAVE_GTK_GTK_H 1
++
++// Define to 1 if you have the <inttypes.h> header file.
++#cmakedefine HAVE_INTTYPES_H 1
++
++// Define if [incr], [Tcl] is available
++#cmakedefine HAVE_ITCL
++
++// Define to 1 if you have the <itclDecls.h> header file.
++#cmakedefine HAVE_ITCLDECLS_H 1
++
++// Define if Tk is available
++#cmakedefine ENABLE_tk
++
++// Define if [incr], [Tk] is available
++#cmakedefine HAVE_ITK
++
++// Define to 1 if you have the <jni.h> header file.
++#cmakedefine HAVE_JNI_H 1
++
++// Define to 1 if you have the <libart_lgpl/libart.h> header file.
++#cmakedefine HAVE_LIBART_LGPL_LIBART_H 1
++
++// Define to 1 if you have the <libgnomecanvas/libgnomecanvas.h> header file.
++//
++#cmakedefine HAVE_LIBGNOMECANVAS_LIBGNOMECANVAS_H 1
++
++// Define to 1 if you have the <libgnomeprint/gnome-print.h> header file.
++#cmakedefine HAVE_LIBGNOMEPRINT_GNOME_PRINT_H 1
++
++// Define if libunicode is available
++#cmakedefine HAVE_LIBUNICODE
++
++// Define to 1 if you have the <math.h> header file.
++#cmakedefine HAVE_MATH_H 1
++
++// Define to 1 if you have the <memory.h> header file.
++#cmakedefine HAVE_MEMORY_H 1
++
++// Define to 1 if the function mkstemp is available.
++#cmakedefine PL_HAVE_MKSTEMP 1
++
++// Define to 1 if the function mkdtemp is available.
++#cmakedefine PL_HAVE_MKDTEMP 1
++
++// Define to 1 if the function mkfifo is available.
++#cmakedefine PL_HAVE_MKFIFO 1
++
++// Define to 1 if you have the <ndir.h> header file, and it defines `DIR'.
++#cmakedefine HAVE_NDIR_H 1
++
++// Define if libpango is available
++#cmakedefine HAVE_PANGO
++
++// Define if popen is available
++#cmakedefine HAVE_POPEN
++
++// Define if _NSGetArgc is available
++#cmakedefine HAVE_NSGETARGC
++
++// Define if pthreads is available
++#cmakedefine PL_HAVE_PTHREAD
++
++// Define if Qhull is available
++#cmakedefine PL_HAVE_QHULL
++
++// Define to 1 if you have the <stdlib.h> header file.
++#cmakedefine HAVE_STDLIB_H 1
++
++// Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
++//
++#cmakedefine HAVE_SYS_DIR_H 1
++
++// Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
++//
++#cmakedefine HAVE_SYS_NDIR_H 1
++
++// Define to 1 if you have the <sys/stat.h> header file.
++#cmakedefine HAVE_SYS_STAT_H 1
++
++// Define to 1 if you have the <sys/types.h> header file.
++#cmakedefine HAVE_SYS_TYPES_H 1
++
++// Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible.
++#cmakedefine HAVE_SYS_WAIT_H 1
++
++// Define to 1 if you have the <termios.h> header file.
++#cmakedefine HAVE_TERMIOS_H 1
++
++// Define to 1 if you have the <crt_externs.h> header file.
++#cmakedefine HAVE_CRT_EXTERNS_H 1
++
++// Define to 1 if the function unlink is available
++#cmakedefine PL_HAVE_UNLINK 1
++
++// Define to 1 if you have the `vfork' function.
++#cmakedefine HAVE_VFORK 1
++
++// Define to 1 if you have the <vfork.h> header file.
++#cmakedefine HAVE_VFORK_H 1
++
++// Include sys/type.h if needed
++#cmakedefine NEED_SYS_TYPE_H
++
++// Name of package
++#define PACKAGE    "@PACKAGE@"
++
++// Define if the win32 ltdl implementation should be used
++#cmakedefine LTDL_WIN32
++
++// Portable definition for PTHREAD_MUTEX_RECURSIVE
++#define PLPLOT_MUTEX_RECURSIVE             @PLPLOT_MUTEX_RECURSIVE@
++
++// Directory containing fonts that are accessible from freetype
++#define PL_FREETYPE_FONT_DIR               "@PL_FREETYPE_FONT_DIR@"
++
++// MONO font accessible from freetype
++#define PL_FREETYPE_MONO                   "@PL_FREETYPE_MONO@"
++
++// MONO_BOLD font accessible from freetype
++#define PL_FREETYPE_MONO_BOLD              "@PL_FREETYPE_MONO_BOLD@"
++
++// MONO_BOLD_ITALIC font accessible from freetype
++#define PL_FREETYPE_MONO_BOLD_ITALIC       "@PL_FREETYPE_MONO_BOLD_ITALIC@"
++
++// MONO_BOLD_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_MONO_BOLD_OBLIQUE      "@PL_FREETYPE_MONO_BOLD_OBLIQUE@"
++
++// MONO_ITALIC font accessible from freetype
++#define PL_FREETYPE_MONO_ITALIC            "@PL_FREETYPE_MONO_ITALIC@"
++
++// MONO_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_MONO_OBLIQUE           "@PL_FREETYPE_MONO_OBLIQUE@"
++
++// SANS font accessible from freetype
++#define PL_FREETYPE_SANS                   "@PL_FREETYPE_SANS@"
++
++// SANS_BOLD font accessible from freetype
++#define PL_FREETYPE_SANS_BOLD              "@PL_FREETYPE_SANS_BOLD@"
++
++// SANS_BOLD_ITALIC font accessible from freetype
++#define PL_FREETYPE_SANS_BOLD_ITALIC       "@PL_FREETYPE_SANS_BOLD_ITALIC@"
++
++// SANS_BOLD_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SANS_BOLD_OBLIQUE      "@PL_FREETYPE_SANS_BOLD_OBLIQUE@"
++
++// SANS_ITALIC font accessible from freetype
++#define PL_FREETYPE_SANS_ITALIC            "@PL_FREETYPE_SANS_ITALIC@"
++
++// SANS_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SANS_OBLIQUE           "@PL_FREETYPE_SANS_OBLIQUE@"
++
++// SCRIPT font accessible from freetype
++#define PL_FREETYPE_SCRIPT                 "@PL_FREETYPE_SCRIPT@"
++
++// SCRIPT_BOLD font accessible from freetype
++#define PL_FREETYPE_SCRIPT_BOLD            "@PL_FREETYPE_SCRIPT_BOLD@"
++
++// SCRIPT_BOLD_ITALIC font accessible from freetype
++#define PL_FREETYPE_SCRIPT_BOLD_ITALIC     "@PL_FREETYPE_SCRIPT_BOLD_ITALIC@"
++
++// SCRIPT_BOLD_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SCRIPT_BOLD_OBLIQUE    "@PL_FREETYPE_SCRIPT_BOLD_OBLIQUE@"
++
++// SCRIPT_ITALIC font accessible from freetype
++#define PL_FREETYPE_SCRIPT_ITALIC          "@PL_FREETYPE_SCRIPT_ITALIC@"
++
++// SCRIPT_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SCRIPT_OBLIQUE         "@PL_FREETYPE_SCRIPT_OBLIQUE@"
++
++// SERIF font accessible from freetype
++#define PL_FREETYPE_SERIF                  "@PL_FREETYPE_SERIF@"
++
++// SERIF_BOLD font accessible from freetype
++#define PL_FREETYPE_SERIF_BOLD             "@PL_FREETYPE_SERIF_BOLD@"
++
++// SERIF_BOLD_ITALIC font accessible from freetype
++#define PL_FREETYPE_SERIF_BOLD_ITALIC      "@PL_FREETYPE_SERIF_BOLD_ITALIC@"
++
++// SERIF_BOLD_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SERIF_BOLD_OBLIQUE     "@PL_FREETYPE_SERIF_BOLD_OBLIQUE@"
++
++// SERIF_ITALIC font accessible from freetype
++#define PL_FREETYPE_SERIF_ITALIC           "@PL_FREETYPE_SERIF_ITALIC@"
++
++// SERIF_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SERIF_OBLIQUE          "@PL_FREETYPE_SERIF_OBLIQUE@"
++
++// Symbol font accessible from freetype
++#define PL_FREETYPE_SYMBOL                 "@PL_FREETYPE_SYMBOL@"
++
++// SYMBOL_BOLD font accessible from freetype
++#define PL_FREETYPE_SYMBOL_BOLD            "@PL_FREETYPE_SYMBOL_BOLD@"
++
++// SYMBOL_BOLD_ITALIC font accessible from freetype
++#define PL_FREETYPE_SYMBOL_BOLD_ITALIC     "@PL_FREETYPE_SYMBOL_BOLD_ITALIC@"
++
++// SYMBOL_BOLD_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SYMBOL_BOLD_OBLIQUE    "@PL_FREETYPE_SYMBOL_BOLD_OBLIQUE@"
++
++// SYMBOL_ITALIC font accessible from freetype
++#define PL_FREETYPE_SYMBOL_ITALIC          "@PL_FREETYPE_SYMBOL_ITALIC@"
++
++// SYMBOL_OBLIQUE font accessible from freetype
++#define PL_FREETYPE_SYMBOL_OBLIQUE         "@PL_FREETYPE_SYMBOL_OBLIQUE@"
++
++// Define as the return type of signal handlers (`int' or `void').
++#define RETSIGTYPE                         @RETSIGTYPE@
++
++// Location of Source tree
++#define SOURCE_DIR                         "@SOURCE_DIR@"
++
++// Define to 1 if you have the ANSI C header files.
++#cmakedefine STDC_HEADERS 1
++
++// Overall PLplot version number
++#define PLPLOT_VERSION             "@PLPLOT_VERSION@"
++
++// Location of Tcl stuff
++#define TCL_DIR                    "@TCL_DIR@"
++// Consistent package versions for Itcl and friends found by PLplot
++// If PLplot could not find consistent values these are set to 0.0.0
++#define PLPLOT_ITCL_VERSION        "@PLPLOT_ITCL_VERSION@"
++#define PLPLOT_ITK_VERSION         "@PLPLOT_ITK_VERSION@"
++#define PLPLOT_IWIDGETS_VERSION    "@PLPLOT_IWIDGETS_VERSION@"
++
++// Define if csa is desired
++#cmakedefine WITH_CSA
++
++// Define if want to use general fill_intersection_polygon approach
++// rather than the traditional code to fill the intersection of a polygon with
++// the clipping limits.
++#cmakedefine USE_FILL_INTERSECTION_POLYGON
++
++// Define to `char *' if <sys/types.h> does not define.
++#cmakedefine caddr_t
++
++// Define to `int' if <sys/types.h> does not define.
++#cmakedefine pid_t
++
++// Define as `fork' if `vfork' does not work.
++#cmakedefine vfork
+
+Property changes on: plplot_config.h.in
+___________________________________________________________________
+Added: svn:keywords
+## -0,0 +1 ##
++Author Date Id Revision
+\ No newline at end of property
+Added: svn:eol-style
+## -0,0 +1 ##
++native
+\ No newline at end of property
diff --git a/sci-libs/plplot/files/plplot-5.9.11-multiarch.patch b/sci-libs/plplot/files/plplot-5.9.11-multiarch.patch
new file mode 100644
index 000000000000..8f4512b976fc
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.11-multiarch.patch
@@ -0,0 +1,50 @@
+diff -up plplot-5.9.11/examples/c++/Makefile.examples.in.multiarch plplot-5.9.11/examples/c++/Makefile.examples.in
+--- plplot-5.9.11/examples/c++/Makefile.examples.in.multiarch	2013-04-24 14:36:28.000000000 -0600
++++ plplot-5.9.11/examples/c++/Makefile.examples.in	2013-12-29 19:48:17.574496673 -0700
+@@ -25,10 +25,7 @@ CXX = @CXX@
+ EXEEXT = @EXEEXT@
+ 
+ LIB_TAG = @LIB_TAG@
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-RPATHCMD = @RPATHCMD@
+ @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
+-@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@
+ 
+ @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
+ @wxwidgets_true@	wxPLplotDemo$(EXEEXT)
+diff -up plplot-5.9.11/examples/c/Makefile.examples.in.multiarch plplot-5.9.11/examples/c/Makefile.examples.in
+--- plplot-5.9.11/examples/c/Makefile.examples.in.multiarch	2012-01-05 06:59:36.000000000 -0700
++++ plplot-5.9.11/examples/c/Makefile.examples.in	2013-12-29 19:48:17.574496673 -0700
+@@ -25,8 +25,6 @@ CC = @CC@
+ EXEEXT = @EXEEXT@
+ 
+ LIB_TAG = @LIB_TAG@
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-RPATHCMD = @RPATHCMD@
+ 
+ @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
+ @gcw_true@		 plplotcanvas_demo$(EXEEXT) \
+diff -up plplot-5.9.11/examples/f95/Makefile.examples.in.multiarch plplot-5.9.11/examples/f95/Makefile.examples.in
+--- plplot-5.9.11/examples/f95/Makefile.examples.in.multiarch	2012-02-19 11:33:33.000000000 -0700
++++ plplot-5.9.11/examples/f95/Makefile.examples.in	2013-12-29 19:48:20.960557580 -0700
+@@ -25,8 +25,6 @@ F95 = @FC@
+ EXEEXT = @EXEEXT@
+ 
+ LIB_TAG = @LIB_TAG@
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-RPATHCMD = @RPATHCMD@
+ 
+ EXECUTABLES_list = \
+ 		 x00f$(EXEEXT) \
+diff -up plplot-5.9.11/examples/tk/Makefile.examples.in.multiarch plplot-5.9.11/examples/tk/Makefile.examples.in
+--- plplot-5.9.11/examples/tk/Makefile.examples.in.multiarch	2013-12-29 19:48:20.961557593 -0700
++++ plplot-5.9.11/examples/tk/Makefile.examples.in	2013-12-29 19:49:19.876587409 -0700
+@@ -24,8 +24,6 @@ CC = @CC@
+ EXEEXT = @EXEEXT@
+ 
+ LIB_TAG = @LIB_TAG@
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
+ 
+ EXECUTABLES_list = xtk01$(EXEEXT)
+ # Second and fourth examples depend on itk.
diff --git a/sci-libs/plplot/files/plplot-5.9.11-ocaml.patch b/sci-libs/plplot/files/plplot-5.9.11-ocaml.patch
new file mode 100644
index 000000000000..c10710c2e653
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.11-ocaml.patch
@@ -0,0 +1,34 @@
+diff -up plplot-5.9.10/bindings/ocaml/CMakeLists.txt.ocaml plplot-5.9.10/bindings/ocaml/CMakeLists.txt
+--- plplot-5.9.10/bindings/ocaml/CMakeLists.txt.ocaml	2013-09-28 10:52:20.000000000 -0600
++++ plplot-5.9.10/bindings/ocaml/CMakeLists.txt	2013-10-24 09:35:47.093185622 -0600
+@@ -155,11 +155,11 @@ if(ENABLE_ocaml)
+     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
+     )
+ 
+-  # ocamlc -a -custom builds a *.cma library from *.cmo
++  # ocamlc -a builds a *.cma library from *.cmo
+   add_custom_command(
+     OUTPUT
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
+-    COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
++    COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
+     DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
+diff -up plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt
+--- plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt.ocaml	2011-10-19 16:46:13.000000000 -0600
++++ plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt	2013-10-24 09:45:36.884193889 -0600
+@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
+     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
+     )
+ 
+-  # ocamlc -a -custom builds a *.cma library from *.cmo
++  # ocamlc -a builds a *.cma library from *.cmo
+   add_custom_command(
+     OUTPUT
+     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma
+-    COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src
++    COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src
+     DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/sci-libs/plplot/files/plplot-5.9.11-octave.patch b/sci-libs/plplot/files/plplot-5.9.11-octave.patch
new file mode 100644
index 000000000000..f21b4d2c4f8e
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.11-octave.patch
@@ -0,0 +1,12 @@
+diff -up plplot-5.9.9/plplot_test/test_octave.sh.in.octave plplot-5.9.9/plplot_test/test_octave.sh.in
+--- plplot-5.9.9/plplot_test/test_octave.sh.in.octave	2011-10-12 18:43:01.000000000 -0600
++++ plplot-5.9.9/plplot_test/test_octave.sh.in	2012-01-16 08:29:46.551852247 -0700
+@@ -35,7 +35,7 @@ echo "$TOPDIR"
+ export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
+ 
+ # Launch an Octave script that exercises all the demos
+-$octave -f -q -p "$octavedir" <<EOF 2> test.error
++$octave -f -q $octaveopts -p "$octavedir" <<EOF 2> test.error
+ 
+ # Check verbose_test variable
+ if (strcmp(getenv("verbose_test"),"on") == 1)
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index c6cb1ea7cb53..7b67d268d00c 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -18,7 +18,9 @@
 <use>
   <flag name="ada">Add bindings for the ADA programming language</flag>
   <flag name="dynamic">Build with dynamic drivers</flag>
-  <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
+  <flag name="octave">Add bindings for
+  <pkg>sci-mathematics/octave</pkg></flag>
+  <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag>
   <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
   <flag name="shapefile">Enable support for ESRI shapefiles</flag>
 </use>
diff --git a/sci-libs/plplot/plplot-5.9.9-r1.ebuild b/sci-libs/plplot/plplot-5.9.11.ebuild
index 68b60a3cfe56..0c70d4c1caf3 100644
--- a/sci-libs/plplot/plplot-5.9.9-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.9.11.ebuild
@@ -1,83 +1,119 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r1.ebuild,v 1.11 2013/11/16 08:28:48 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.11.ebuild,v 1.1 2014/01/16 00:49:50 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2"
 FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils fortran-2 cmake-utils python toolchain-funcs virtualx \
-	wxwidgets java-pkg-opt-2 multilib
+inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
+	virtualx wxwidgets java-pkg-opt-2 multilib
 
 DESCRIPTION="Multi-language scientific plotting library"
 HOMEPAGE="http://plplot.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
-SLOT="0"
+SLOT="0/12"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ada cairo cxx doc dynamic examples fortran gd java jpeg latex lua
-	  ocaml octave pdf perl png python qhull qt4 svg tcl test threads tk
-	  truetype wxwidgets X"
+IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
+	ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
+	threads tk truetype wxwidgets X"
 
 RDEPEND="
 	ada? ( virtual/gnat )
 	cairo? ( x11-libs/cairo[svg?,X?] )
 	java? ( >=virtual/jre-1.5 )
 	gd? ( media-libs/gd[jpeg?,png?] )
-	latex? ( virtual/latex-base app-text/ghostscript-gpl )
+	latex? (
+		app-text/ghostscript-gpl
+		virtual/latex-base
+	)
 	lua? ( dev-lang/lua )
 	ocaml? (
 		dev-lang/ocaml
 		dev-ml/camlidl
-		cairo? ( dev-ml/cairo-ocaml[gtk] ) )
+		cairo? ( dev-ml/cairo-ocaml[gtk] )
+	)
 	octave? ( sci-mathematics/octave )
 	pdf? ( media-libs/libharu )
-	perl? ( dev-perl/PDL dev-perl/XML-DOM )
+	pdl? (
+		dev-perl/PDL
+		dev-perl/XML-DOM
+	)
 	python? (
-		dev-python/numpy
-		qt4? ( dev-python/PyQt4 ) )
+		dev-python/numpy[${PYTHON_USEDEP}]
+		qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+	)
 	qhull? ( media-libs/qhull )
 	qt4? (
 		dev-qt/qtgui:4
-		dev-qt/qtsvg:4 )
-	tcl? ( dev-lang/tcl dev-tcltk/itcl
-		tk? ( dev-lang/tk dev-tcltk/itk ) )
+		dev-qt/qtsvg:4
+	)
+	shapefile? ( sci-libs/shapelib )
+	tcl? (
+		dev-lang/tcl
+		dev-tcltk/itcl
+		tk? (
+			dev-lang/tk
+			dev-tcltk/itk
+		)
+	)
 	truetype? (
-				media-fonts/freefont
-				media-libs/lasi
-				gd? ( media-libs/gd[truetype] ) )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
-	X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
+		media-fonts/freefont
+		media-libs/lasi
+		gd? ( media-libs/gd[truetype] )
+	)
+	wxwidgets? (
+		x11-libs/wxGTK:2.8[X]
+		x11-libs/agg[truetype?]
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+	)"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.5 dev-lang/swig )
+	java? (
+		>=virtual/jdk-1.5
+		dev-lang/swig
+	)
 	ocaml? ( dev-ml/findlib )
 	python? ( dev-lang/swig )
-	test? ( media-fonts/font-misc-misc
-			media-fonts/font-cursor-misc )"
-REQUIRED_USE="test? ( latex )"
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+	)"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.6-python.patch
+	"${FILESDIR}"/${PN}-5.9.11-ocaml.patch
+	"${FILESDIR}"/${PN}-5.9.11-octave.patch
+	"${FILESDIR}"/${PN}-5.9.11-multiarch.patch
+	"${FILESDIR}"/${PN}-5.9.11-config.patch
+)
 
 pkg_setup() {
-	use python && python_set_active_version 2
+	use python && python-single-r1_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tk86.patch
-	# path for python independent of python version
-	epatch "${FILESDIR}"/${PN}-5.9.6-python.patch
-	# test with pdf assumes a modified bundled libharu
-	epatch "${FILESDIR}"/${PN}-5.9.9-no-pdftest.patch
-	# gentoo bug #419743 fixed upstream
-	epatch "${FILESDIR}"/${PN}-5.9.9-CMakeLists.txt.patch
-
+	cmake-utils_src_prepare
 	# avoid installing license
 	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
-
+	# prexify hard-coded /usr/include in cmake modules
+	sed -i \
+		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		cmake/modules/*.cmake || die
 	# change default install directories for doc and examples
 	sed -i \
 		-e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
@@ -90,12 +126,19 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	# don't build doc, it brings a whole lot of horrible dependencies
+	local mycmakeargs=(
 		-DDEFAULT_ALL_DEVICES=ON
 		-DTEST_DYNDRIVERS=OFF
 		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_d=OFF
+		-DBUILD_DVI=OFF
+		-DDOX_DOC=OFF
+		-DBUILD_DOC=OFF
+		$(cmake-utils_use doc PREBUILT_DOC)
 		$(cmake-utils_use_build test)
-		$(cmake-utils_use_has python numpy)
+		$(cmake-utils_use_has python NUMPY)
+		$(cmake-utils_use_has shapefile SHAPELIB)
 		$(cmake-utils_use_with truetype FREETYPE)
 		$(cmake-utils_use_enable ada)
 		$(cmake-utils_use_enable cxx)
@@ -105,7 +148,7 @@ src_configure() {
 		$(cmake-utils_use_enable lua)
 		$(cmake-utils_use_enable ocaml)
 		$(cmake-utils_use_enable octave)
-		$(cmake-utils_use_enable perl pdl)
+		$(cmake-utils_use_enable pdl)
 		$(cmake-utils_use_enable python)
 		$(cmake-utils_use_enable qt4 qt)
 		$(cmake-utils_use_enable tcl)
@@ -147,7 +190,6 @@ src_configure() {
 		$(cmake-utils_use truetype PLD_psttf)
 		$(cmake-utils_use svg PLD_svg)
 		$(cmake-utils_use wxwidgets PLD_wxpng)
-		$(cmake-utils_use test PLD_ps)
 		$(cmake-utils_use wxwidgets PLD_wxwidgets)
 		$(cmake-utils_use X PLD_xwin)
 	)
@@ -160,9 +202,16 @@ src_configure() {
 	use truetype && mycmakeargs+=(
 		-DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
 	)
+	use shapefile && mycmakeargs+=(
+		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
+	)
+	use ocaml && mycmakeargs+=(
+		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
+	)
+	use python && mycmakeargs+=(
+		$(cmake-utils_use_enable qt4 pyqt4)
+	)
 
-	use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) )
-	use doc && mycmakeargs+=( -DPREBUILT_DOC=ON )
 	cmake-utils_src_configure
 
 	# clean up bloated pkg-config files (help linking properly on prefix)
@@ -170,21 +219,25 @@ src_configure() {
 		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
 		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
 		-e "s:${LDFLAGS}::g" \
-		"${CMAKE_BUILD_DIR}"/pkgcfg/*pc || die
+		"${BUILD_DIR}"/pkgcfg/*pc || die
 }
 
 src_test() {
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null
 	Xemake test || die "tests failed"
 	popd > /dev/null
 }
 
 src_install() {
 	cmake-utils_src_install
-	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
 	if use java; then
-		rm -rf "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni
-		java-pkg_dojar "${CMAKE_BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_doso "${CMAKE_BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
+		rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni  || die
+		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
+		java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
 	fi
 }