Removing the plplot_config patch since it creates more problems than it solves (bug #498234)

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 15 insertions, 778 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index fbc3c0a1e9dd..9274db025c15 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/plplot
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.55 2014/01/17 20:17:24 bicatali Exp $
+
+*plplot-5.9.11-r1 (17 Jan 2014)
+
+  17 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> +plplot-5.9.11-r1.ebuild,
+  -files/plplot-5.9.11-config.patch, -plplot-5.9.11.ebuild:
+  Removing the plplot_config patch since it creates more problems than it solves
+  (bug #498234)
 
 *plplot-5.9.11 (16 Jan 2014)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 680c94073e38..98a4cb3cd90e 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -5,7 +5,6 @@ AUX plplot-5.9.10-haru.patch 1147 SHA256 2d4484b62a14a5bf008f905cc94bb31ec035f97
 AUX plplot-5.9.10-itcltk.patch 1530 SHA256 a087564ceb9cb37513664cd0d29bd97e49de0b7f5a60323333a92f722ef70f4f SHA512 bfe835adb7fc403a0376699f187dce5ebb2f39336e675438940960f4def049d1660853961019699d2a8bb5f4539d877b051062b738e3d1469beea3d2b5f667c3 WHIRLPOOL b55b076c56b86e34971d0debd8b611c4b2027c701486258fcbbc7728e7a617178631ed73b94004c863fd47010d8b86b82688a7d9460a2ca3e9c2650ae095b961
 AUX plplot-5.9.10-tcl86.patch 2841 SHA256 1eaabcb012b6dea413a0cab7cacc5d6f7e65c98bf1a8ead9acbb32df182a34d7 SHA512 42a6e3e7090de856338ee9b021179b5045305d8fbd6b814fe661fc7adb058524757b092cee917d8838158f9e9c2db0c132a3138bc4605113bd41a4298cae5426 WHIRLPOOL 5a3e2b401bfdd32bb4395caee77ee210d5f0f4d72a5a401de4067f218729da492db9c88b9784c799c098463d89402d0aa02c83dbf50d76497585ae1c32615a09
 AUX plplot-5.9.10-tcltk.patch 3399 SHA256 34feb86557ee6082455e2127b8e78d8ef8b42d2ed037bced23ade7559fe5f8fb SHA512 4e7007439081f7f87b5ac62514ad3cd84ec678980e8d841c0a38713462a94dd91624d136dfdff23eff9ea0b9f4b8538acdbc09c4ad06bd599238512f3db36510 WHIRLPOOL 2409b1d956f2413bbf3ec8c576080e4b95df46dfe82738ebe68833ff1bc96f39f40ea37c7bd3416c76f876cfad7ce2e9efae321f80dbfe9ab8ac20ce9fa5b832
-AUX plplot-5.9.11-config.patch 27125 SHA256 39599e872a01e08b41c1d097ec653687e401f2684accc0962a03b9def91a594c SHA512 99d095044ea65cdc1cbf3d208426f2f1ea74a38c687bb7a8354080e7aaa45392daeb6a7332e7fd3e0606766fede966fb46743275ffc5cc646f7e2ac40c5bbea9 WHIRLPOOL 229453deb354d1924ed51d4bb1fee7f0b3696aab3978a3892510821f4957d737d50e1d2c23b7fdc24569d118467b23f3492a866d3c3df495232f85985f51c4a4
 AUX plplot-5.9.11-multiarch.patch 2150 SHA256 8100cdcb843c2d52a663434c481e804e4db22e319a1d6b69c0cfdc6938c70648 SHA512 c638a5bdba7d29d76fdf5c96415d56718dea162c1a03bf4f0180c12d8d8bf26603f628de4ec130403234a5a8e349630bed6d17e53a13fa6faf921da402869da9 WHIRLPOOL b88727e63940505512906886739f0aad7561b3659112bcf03b9ad25b8640a244a60acc69e5f355636c5dd876fc76db2043dafe399669f28b2eb0cbfc3e801d11
 AUX plplot-5.9.11-ocaml.patch 2829 SHA256 f355a3af4862133438a90c2b923dfedbce5b3311d2b38736a5cea998ec3fc1e0 SHA512 26d739d0cc3f3b8227de9fdfbb6a7cbfdca6daff6515b1b91571316abc2d057eac953951ad9bb7b0fd2b28d8e220836c5da652e19170ed8401a9b3946b39c34a WHIRLPOOL 7202a6f0d54510bfb46fcf8411014170f407526ed9bb2b14b19269ff66ffbe9a1a597751cb8ab63e2d98f73f9408bb4d8df961d9b2d5d188aba5f8005cff4153
 AUX plplot-5.9.11-octave.patch 633 SHA256 672f25cc93722d8116fb45853939b0e0b3cefa75b57ff87f2a8439c97723393e SHA512 c3832d531425cea20aa436cb757ed7bfd30bdc44a4d5cc11cf9a5e5fc7109897cc10748ce780de53232b63cd67d00c1cd2d9f62ef6d378d0f814182d1beb10e2 WHIRLPOOL 96ce5a919a944a833c3febc5b6932376ee32f764709470a405d73f691b2125f76ddb8b99b6ede13a19e9ee996d2ea226e0f4a8c299b174dd9f83b9e9a4aa7a7d
@@ -17,14 +16,14 @@ DIST plplot-5.9.10.tar.gz 15215720 SHA256 6be3e20d6992cb2afd132a00cbc812aa5db170
 DIST plplot-5.9.11.tar.gz 14586326 SHA256 77383e44ffda2361199b40b8cf25f88ac012eff5c6a7468e80b112c8fd4793b3 SHA512 da95b76bf255c600d662b43555f003237ff2e310276e61c57854b4077f3f71a5847f931a9fba188a94c7b76656782cb22493a060b0aa1f2338107fd3f2cd01a0 WHIRLPOOL 2666822923b9f578df84f00dbe44d8b0549528f42d4f533e931190efda68b1b14a56428df7fac0c8979060e10e3d8ce12e232117ad7b93e080da2650a5531f4e
 DIST plplot-5.9.9.tar.gz 13778554 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d SHA512 ad46d40fbfecdf9b8d9e6f1e9da986716b07f88a91ad78f14498bd83acb0186c984b6b5079564046cfedfd1010692d0e7d3c3ce8831b3d1c825c8db335d4c7f1 WHIRLPOOL 3da257b0d0db87f46fd950e32d7bf22ef25b27d7334113fc2b0e5219fdb1d3462a425ff02550ee907fd105041d35f30b22b2b1b39649a13568d3f04f51525664
 EBUILD plplot-5.9.10-r1.ebuild 6400 SHA256 520e3bf00ac36d9e0de31c68fcdce6baa76f8cfa212f5ebd530848b49cce81f4 SHA512 fa0233ba3b7ee32e2f5c5cfea4ab02b2d022f1a30d37c57c4920c95b83854dfccff1b083b9dcc907f48579ea676ff7d10e6a255519a86a1133080e3f919fc014 WHIRLPOOL cfdb3631e2e87aae1dee01d55844fbe91a47c013445e3590b21aa0af792c087a36f0ce34d77f8c927269840827bcd35bb4bc71fae523e13fa95697c866db377e
-EBUILD plplot-5.9.11.ebuild 6603 SHA256 509d237e294a4d1257ff327c32ac698c1d0cef03c2154cd5b578815556d17fb2 SHA512 f0b77ebaf04346751daa5fca9632f06088c5421ebd52d77a3ee9cb67938a920bd3e15b395a3cc750aa28646660bb7792a07c25d0db60f95238bfd6f3f69c0557 WHIRLPOOL ca69004a1e311851101a4fde8889225f649c55f64471069384e64aff880dc1a91f8331ae786e62f00d1c8d9e6751d2254809ff7b86efa52f6f1e073f4a2e9b25
+EBUILD plplot-5.9.11-r1.ebuild 6607 SHA256 bec389be210e8be7266db3ea142dd79c33e52eadbf7e9368845d6be4a98bbfb5 SHA512 918d56d9ac05d0b3f4f9811b6eb19da1fff5ce7d58650abd75675a0c2f803afea18a495606cbf507f66f0d3b95294bc1b2c53bdb174adfcddb55549b68d982d5 WHIRLPOOL a879916044e779ed1e7b7c62b248d2cd1ee4d5a090d6238c4742cac563885405116716b439229e40a731bd4595e6da5fa2a52c72b04bb3ea10c9e3429de550d3
 EBUILD plplot-5.9.9-r2.ebuild 5923 SHA256 d6e2f4e478bbdb0e993dcae4516c5988a73eeb5ada74e20257d429d1c92c1d75 SHA512 a9b4826e8f0c8219c4159873bf395067bf692c547d062796ea3db87fb178b1c1203e83ff82df5719ba2cf1fd38bc760cbc912eef6efc68d8283c9c98acf5a902 WHIRLPOOL d1d2d5ab9501e63cd6ce3c248ddea46adb4a45053d602f68475f7be0c902b216ac5bddd61149e9f41740be63ac6567193582a60931a512d54d8f3fd60dff70c1
-MISC ChangeLog 9969 SHA256 95e8abd3583f86574d308505547d2f35d3a6bdaf1f7e831120972c6a48bd661f SHA512 b89306a62345fb5d92fcb623cb41bd695cc06dcd75abafddfd3a895327295b24545519ef85c0920424581ddad95ca74e27a337df8d164b006864c3a0823c3ac3 WHIRLPOOL 162e35368ffbf4c4321f248d9164b0cfea18c34b7fd61e6a2d9a019698ca7974002404009f8ec8581983e6fd7ab05b9e698aaea5ecfa9ac6e25831b0e63f810f
+MISC ChangeLog 10241 SHA256 216a17110af84fb076b7862a3a6aa0641a47dcc885bf6378dc9e3d00214ec9e9 SHA512 0371c0a780a0c9cb2c45262839f06c142c19d40b70cbbf7bf82d52d59dac32020ed2e364ba346231402817d37896b9891f781869862b53a3dd63f1dd9d84c22a WHIRLPOOL aabdad5a0da26ffeedddd9c0ae8e5299d4a1fb30a563b4dc66b0c023d361f90f862df1e8080abf6f9fd275d81edf5fcdf5057d7d7b350ace74664d47bc5cd868
 MISC metadata.xml 1409 SHA256 9fe1c36eb5beb07262c2814c2ff0aa16c18c69fbb091641608f5ac9b90630d99 SHA512 338034d611f0b7fff5fdcfadb76488b25326f00df739c3ce58ca59b67c6fb8738bde9ceb88bf990de77364b938c2c33c5a1e56ca7ae69d910f6eac673ce4d651 WHIRLPOOL 7c81f05237517c0048cc4d4cb91a289d59b84c0923f17f8ca8bf9faf40cdb69c304fa37f63efbe63bfcfad26f5f2da9e884e1e94426eae4df99fcbba45a76c92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLXLLIACgkQ1ycZbhPLE2DyIgCgjF5oUwnG9DWUtdfDeZc0gx6d
-Q4QAmwRjfzWtR12JumjICJ+bra5+TN+3
-=+g1+
+iEYEAREIAAYFAlLZj9oACgkQ1ycZbhPLE2AeVACeNxF9xPRMywTAOxjymhefnPYz
+e6oAoJTqnm6M/wW6fEd6AnFgrbUTmVDi
+=+Jlq
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/files/plplot-5.9.11-config.patch b/sci-libs/plplot/files/plplot-5.9.11-config.patch
deleted file mode 100644
index 3bbbd6c4754b..000000000000
--- a/sci-libs/plplot/files/plplot-5.9.11-config.patch
+++ /dev/null
@@ -1,769 +0,0 @@
-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/plplot-5.9.11.ebuild b/sci-libs/plplot/plplot-5.9.11-r1.ebuild
index 0c70d4c1caf3..4db95d2fde83 100644
--- a/sci-libs/plplot/plplot-5.9.11.ebuild
+++ b/sci-libs/plplot/plplot-5.9.11-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.1 2014/01/16 00:49:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.11-r1.ebuild,v 1.1 2014/01/17 20:17:24 bicatali Exp $
 
 EAPI=5
 
@@ -96,8 +96,8 @@ PATCHES=(
 	"${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
 )
+#	"${FILESDIR}"/${PN}-5.9.11-config.patch
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup