Version bump. Major new features and completely reworked ebuild. Tested with many options, but not all combinations. Thanks for markusle and Joshua Rich for their initial work.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

7 files changed, 568 insertions, 11 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 3f28ff686193..34c153002c9c 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.15 2008/08/07 08:58:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.16 2008/10/21 11:49:25 bicatali Exp $
+
+*plplot-5.9.0 (21 Oct 2008)
+
+  21 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/plplot-5.9.0-cmake.patch, +files/plplot-5.9.0-pdftex.patch,
+  +files/plplot-5.9.0-python.patch, metadata.xml, +plplot-5.9.0.ebuild:
+  Version bump. Major new features and completely reworked ebuild. Tested
+  with many options, but not all combinations. Thanks for markusle and
+  Joshua Rich for their initial work.
 
   07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 9aa992f41077..70f155f7fafd 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -3,14 +3,19 @@ Hash: SHA1
 
 AUX plplot-5.5.1-gcc-3.4-fix.patch 1396 RMD160 8854c2f315a5443cc5c29082a949e2ee359e6746 SHA1 ee321d24c5534bb4a86f9dda17579ae21965ef43 SHA256 1142ad469f6cc6dbf6331de9ceac0967e0128bef26e1ece2bb6b4f200f7e638f
 AUX plplot-5.5.2-macro-fix.patch 534 RMD160 71ffcec74770cab421a4756355f22818032e6e5c SHA1 0c1be25c54c94667371bbe386278960ed6cb4bdb SHA256 4a0d75b9e6d7ffeddfb38dcd58d9e440cde02ec93ce5ee22e48a3379c236874b
+AUX plplot-5.9.0-cmake.patch 14449 RMD160 d3f767d1229bafd6efd2da136260f77b02192cef SHA1 14a8b5d100694f1fc851ef38022d5064bce30b59 SHA256 eab7939ad0f630ff0b704996caa788708099be903ba8304723c981968f6ab685
+AUX plplot-5.9.0-pdftex.patch 3603 RMD160 8ed16124102a4c0ae404de0b0e6475d7f85bc738 SHA1 e8f7e78f1108eeb850184c1dfa62970fe27047b5 SHA256 ebbde652a17b9ec84e09cfd3440a44face1b7fe93c0a04d5dd7c2ade613cd0fa
+AUX plplot-5.9.0-python.patch 283 RMD160 6252e5a37fd79aafc2e6333cc67fe7fddc76e54e SHA1 a7ebf85d462a3abd555d3acee6cfacecc266377e SHA256 25138e47df484955b67cc723ad2ccd3666ab3e9335f0838f82e569ff1e6d2f9a
 DIST plplot-5.5.2.tar.gz 5891255 RMD160 55ea8e7dde5c0542ce8f360228a676049ad7d701 SHA1 72e0830b12d7d50ff9ac5b54e49aa1813a580786 SHA256 267d9c4070b8b6de75590efc24388da670dd5d0039a5dc21ecb803366d14730c
+DIST plplot-5.9.0.tar.gz 5698323 RMD160 46fac543b471ccadd22d6cda6da63108023bb08b SHA1 6473e2ed44c91b10e50a3529e02f4b54541899ca SHA256 742719c2af4a642b9d087d7821a75c6fb4617479cb82cfeeab67a730c23d1231
 EBUILD plplot-5.5.2.ebuild 5150 RMD160 f4566a19c4a0dc8c76fd760396046dec47fde91d SHA1 f874b95ad608a7830f72bb4d5fd775e2dc2cb38a SHA256 56eaae02509aaec912d3baaeb719461dfc9395419d626d0158327dcea06481e6
-MISC ChangeLog 2594 RMD160 56207a10baa82c458e485f96426aabf821e6ab15 SHA1 2589580726ab311abe2de93fbb4d9df6881d0ab5 SHA256 90c77d7392f6aa2e29f01b1fbb1be98a45f3f76e45faa385817630a17acf493a
-MISC metadata.xml 1346 RMD160 067b07e23ea5aad4da991baf9a7f7e9ee4da1b32 SHA1 ab8b314bd2d9d57a088634b5dc4a8557bd8fe1fa SHA256 a0f9e956c0b1ee358560e8c360b0ac03590278d8dae0a070b8189b2ff16366fb
+EBUILD plplot-5.9.0.ebuild 4939 RMD160 b761f4f3c5e02a6a677c1176b9c9e900c3df40f8 SHA1 11ff3984a57fe7b6109236f249dc6aa7197564e3 SHA256 92aac5dc9247f4349b0743974c23ece89cfbff3a8138f5bf9dfb8f1f50c44db0
+MISC ChangeLog 3008 RMD160 e4de8bdf1989991691412de6593fdae5b9e1bc3e SHA1 71b7f792c43a76bc3ce585be8b41c0a217e684f9 SHA256 f889497a0934c225b55045aaea2e26f2c0c3f3feac5151f3da9ffd67971b16ea
+MISC metadata.xml 1571 RMD160 42804113eded364a734364533ce9f5c174abdf32 SHA1 40b7c7d8f73b06e98dd62624a70d00a401399a90 SHA256 890ca757230243c9c835f3528b7b00961d83a3b308ee33c2bc0ddb147d800c2d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiauTEACgkQOeoy/oIi7uyTxQCgjHrmypuGtOpdfUo3FUOxDOS8
-1iwAn2BMipx42bN+G1eIywLimVh5LvS9
-=7d5Z
+iEYEARECAAYFAkj9wc4ACgkQ1ycZbhPLE2DA7gCgnbr3UdW1fjNeN5VTtuqo4/+O
+6ccAn0PVgKDY5dzOtDwROs2FIyBYTnsQ
+=d3aF
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/files/plplot-5.9.0-cmake.patch b/sci-libs/plplot/files/plplot-5.9.0-cmake.patch
new file mode 100644
index 000000000000..4b628e3af98f
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.0-cmake.patch
@@ -0,0 +1,305 @@
+--- plplot-5.9.0.orig/bindings/f95/CMakeLists.txt	2008-02-10 15:54:01.000000000 +0000
++++ plplot-5.9.0/bindings/f95/CMakeLists.txt	2008-07-16 10:53:26.000000000 +0100
+@@ -141,14 +141,30 @@
+ RUNTIME DESTINATION ${BIN_DIR}
+ )
+ 
+-# Yuk! All Makefiles are run from the top level build directory and
+-# so the f90 .mod files end up there rather than in the bindings/f95
+-# directory. Ifort and pgf90 both have a -module command line option to
+-# override this location, but I'm not sure how portable that?
+-install(
+-FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod
+-DESTINATION ${F95_MOD_DIR}
+-)
++if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
++  # Yuk! All Makefiles are run from the top level build directory and
++  # so the f90 .mod files end up there rather than in the bindings/f95
++  # directory. Ifort and pgf90 both have a -module command line option to
++  # override this location, but I'm not sure how portable that?
++  install(
++  FILES
++  ${CMAKE_BINARY_DIR}/plplot.mod
++  ${CMAKE_BINARY_DIR}/plplotp.mod
++  ${CMAKE_BINARY_DIR}/plplot_flt.mod
++  DESTINATION ${F95_MOD_DIR}
++  )
++else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
++  # For the current cvs version of CMake, the module files are created by
++  # default during the library build in the more logical bindings/f95
++  # directory.
++  install(
++  FILES
++  ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod
++  ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod
++  ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod
++  DESTINATION ${F95_MOD_DIR}
++  )
++endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
+ 
+ # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG}
+ if(PKG_CONFIG_EXECUTABLE)
+--- plplot-5.9.0.orig/cmake/modules/cairo.cmake	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/cairo.cmake	2008-07-15 16:25:46.000000000 +0100
+@@ -97,13 +97,7 @@
+       string(REGEX REPLACE ";" " " 
+       cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}"
+       )
+-      # Convert X linker information to preferred CMake form before appending
+-      # it to already converted ${linkflags}
+-      cmake_link_flags(
+-      cairo_X_LINK_FLAGS
+-      "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}"
+-      )
+-      set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS})
++      set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES})
+     else(PLD_xcairo AND X11_COMPILE_FLAGS)
+       message(STATUS 
+        "WARNING: X windows not found. Setting xcairo driver to OFF."
+--- plplot-5.9.0.orig/cmake/modules/CMakeAdaCompiler.cmake.in	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in	2008-07-15 15:47:30.000000000 +0100
+@@ -14,3 +14,4 @@
+ ELSE(UNIX OR MINGW)
+   SET(CMAKE_Ada_OUTPUT_EXTENSION .obj)
+ ENDIF(UNIX OR MINGW)
++SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1)
+--- plplot-5.9.0.orig/cmake/modules/CMakeAdaInformation.cmake	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake	2008-07-15 15:47:54.000000000 +0100
+@@ -41,9 +41,9 @@
+   SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+ ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
+ 
+-IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS)
++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS)
+   SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
+-ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS)
++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS)
+ 
+ IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG)
+   SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) 
+@@ -53,6 +53,10 @@
+   SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
+ ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP)
+ 
++IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG)
++  SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
++ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG)
++
+ # repeat for modules
+ IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS)
+   SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
+@@ -70,6 +74,22 @@
+   SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
+ ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP)
+ 
++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG)
++  SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG})
++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG)
++
++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP)
++  SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP})
++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP)
++
++IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG)
++  SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG})
++ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG)
++
++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH)
++  SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH})
++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH)
++
+ IF(NOT CMAKE_INCLUDE_FLAG_Ada)
+   SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C})
+ ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada)
+@@ -85,7 +105,12 @@
+ 
+ SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
+ 
+-SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING
++SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}")
++# avoid just having a space as the initial value for the cache 
++IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ")
++  SET(CMAKE_Ada_FLAGS_INIT)
++ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ")
++SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING
+      "Flags for Ada compiler.")
+ 
+ INCLUDE(CMakeCommonLanguageInclude)
+--- plplot-5.9.0.orig/cmake/modules/CMakeTestAdaCompiler.cmake	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake	2008-07-15 15:48:05.000000000 +0100
+@@ -17,6 +17,8 @@
+ 
+   FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt
+   "
++# FIXME: This specific location currently needs to be changed whenever the
++# location of the experimental Ada support files is changed.
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE)
+ project(test Ada)
+--- plplot-5.9.0.orig/cmake/modules/pkg-config.cmake	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/pkg-config.cmake	2008-07-15 16:27:07.000000000 +0100
+@@ -20,10 +20,10 @@
+ # Module for determining pkg-config configuration variables related to the
+ # install-tree build of the examples.
+ # Also create useful macros called pkg_check_pkgconfig to emulate the
+-# pkgconfig macro using the pkg_check_modules macro,
+-# cmake_to_pkg_config_link_flags to process CMake link flags into 
++# pkgconfig macro using the pkg_check_modules macro;
++# pkg_config_link_flags to process CMake link flags into 
+ # pkg-config standard form for the configured output *.pc files, and
+-# pkg_config_to_cmake_link_flags to process input link flags delivered
++# cmake_link_flags to process input link flags delivered
+ # by pkg-config into CMake standard form.
+ 
+ # The following variables are set:
+@@ -155,8 +155,10 @@
+     set(${_link_flags_out})
+   else("${_link_flags_in}" STREQUAL ""})
+     #message("(original link flags) = ${_link_flags_in}")
+-    # Convert link flags to a list.
+-    string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}")
++    # Convert link flags to a list.  Note some link flags are blank-delimited
++    # (such as "-framework whatever") so preserve those by splitting into
++    # separate list elements only if the next element starts with a hyphen.
++    string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}")
+     # Extract list of directories from -L options.
+     list(LENGTH _link_flags_list _link_flags_length)
+     math(EXPR _link_flags_length "${_link_flags_length} - 1")
+@@ -164,7 +166,7 @@
+     set(_link_directory_list)
+     foreach(_list_index RANGE ${_link_flags_length})
+       list(GET _link_flags_list ${_list_index} _list_element)
+-      string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element})
++      string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}")
+       if(_list_element STREQUAL "-L${_list_element1}")
+         list(APPEND _index_list ${_list_index})
+         list(APPEND _link_directory_list ${_list_element1})
+@@ -186,7 +188,7 @@
+     set(${_link_flags_out})
+     foreach(_list_index RANGE ${_link_flags_length})
+       list(GET _link_flags_list ${_list_index} _list_element)
+-      string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element})
++      string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}")
+       if(_list_element STREQUAL "-l${_list_element1}")
+         set(_library_pathname "_library_pathname-NOTFOUND")
+         find_library(
+--- plplot-5.9.0.orig/cmake/modules/tcl-related.cmake	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/tcl-related.cmake	2008-07-15 16:55:58.000000000 +0100
+@@ -135,12 +135,7 @@
+     endif(ENABLE_tk AND NOT X11_FOUND)
+     if(ENABLE_tk)
+       set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
+-      set(
+-      TK_LIBRARY
+-      ${TK_LIBRARY}
+-      -L${X11_LIBRARY_DIR}
+-      ${X11_LIBRARIES}
+-      )
++      set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES})
+       message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
+       message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
+     else(ENABLE_tk)
+@@ -157,7 +152,7 @@
+         message(STATUS "Looking for itk library")
+         set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+         foreach(version ${itk_library_versions})
+-          find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY}
++          find_library(ITK_LIBRARY itk${version}
+                        PATH_SUFFIXES itk${version})
+         endforeach(version ${itk_library_versions})
+         if(ITK_LIBRARY)
+--- plplot-5.9.0.orig/cmake/modules/xwin.cmake	2008-02-10 15:53:59.000000000 +0000
++++ plplot-5.9.0/cmake/modules/xwin.cmake	2008-07-15 16:31:23.000000000 +0100
+@@ -30,12 +30,7 @@
+ if(PLD_xwin)
+   if(X11_FOUND)
+     set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}")
+-    # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not
+-    # documented for external use so we may have to replace this
+-    # some day by the appropriate 
+-    # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic.
+-    # But this works for now....
+-    set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}")
++    set(xwin_LINK_FLAGS "${X11_LIBRARIES}")
+     option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF)
+     if(HAVE_PTHREAD)
+       find_package(Threads)
+--- plplot-5.9.0.orig/CMakeLists.txt	2008-02-10 15:54:06.000000000 +0000
++++ plplot-5.9.0/CMakeLists.txt	2008-07-15 16:06:05.000000000 +0100
+@@ -21,6 +21,12 @@
+ 
+ # Version 2.4.5 or above of cmake is required!
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
++# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if
++# the user is using CMake 2.6.0 or newer).
++if(COMMAND  cmake_policy)
++  # empty elements are not ignored in lists.
++  cmake_policy(SET CMP0007 NEW)
++endif(COMMAND  cmake_policy)
+ 
+ # Recommended way to do user overrides of C-related variables, is given at
+ # http://public.kitware.com/pipermail/cmake/2006-July/010334.html.
+--- plplot-5.9.0.orig/examples/f95/CMakeLists.txt	2008-02-10 15:54:08.000000000 +0000
++++ plplot-5.9.0/examples/f95/CMakeLists.txt	2008-07-15 16:04:44.000000000 +0100
+@@ -50,32 +50,43 @@
+ 
+ if(BUILD_TEST)
+   remove_definitions("-DHAVE_CONFIG_H")
+-  # N.B. This is required because it's the location of plplot.mod
+-  # generated as a by-product of building libplplotf95${LIB_TAG}.
+-  include_directories(${CMAKE_BINARY_DIR})
+ 
+-  # Temporary workaround for module handling bug in CMake 2.4.3.  Create a
+-  # file with arbitrary contents called plplot.mod.proxy in top-level
+-  # build tree.  As a temporary measure we use cmake_workaround.f as the
+-  # generator of this file.  (cmake_workaround.f was previously compiled,
+-  # but that is no longer the case.)  Note, once CMake is fixed this comment
+-  # the following configure_file command and cmake_workaround.f should all
+-  # just disappear.
+-  configure_file(
+-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f
+-  ${CMAKE_BINARY_DIR}/plplot.mod.proxy
+-  COPYONLY
+-  )
++  if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
++    # Temporary workaround for module handling bug in CMake 2.4.3.  Create a
++    # file with arbitrary contents called plplot.mod.proxy in top-level
++    # build tree.  As a temporary measure we use cmake_workaround.f as the
++    # generator of this file.  (cmake_workaround.f was previously compiled,
++    # but that is no longer the case.)  Note, once CMake is fixed this comment
++    # the following configure_file command and cmake_workaround.f should all
++    # just disappear.
++    configure_file(
++    ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f
++    ${CMAKE_BINARY_DIR}/plplot.mod.proxy
++    COPYONLY
++    )
++    # The generated module location for 2.4.x CMake is the top-level build
++    # tree.
++    include_directories(${CMAKE_BINARY_DIR})
++  else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
++    # The generated module location for cvs CMake is the build-tree
++    # location where the corresponding library is generated.
++    include_directories(${CMAKE_BINARY_DIR}/bindings/f95)
++  endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
+ endif(BUILD_TEST)
+ foreach(STRING_INDEX ${f95_STRING_INDICES})
+   set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90)
+   if(BUILD_TEST)
+-    add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90)
+-    target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG})
++    # Need unique target name
++    add_executable(x${STRING_INDEX}f95 x${STRING_INDEX}f.f90)
++    set_target_properties(
++    x${STRING_INDEX}f95 PROPERTIES
++    OUTPUT_NAME x${STRING_INDEX}f
++    )
++    target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG})
+   endif(BUILD_TEST)
+ endforeach(STRING_INDEX ${f95_STRING_INDICES})
+ 
+-install(FILES ${f95_SRCS} 
++install(FILES ${f95_SRCS}
+ DESTINATION ${DATA_DIR}/examples/f95
+ )
+ 
diff --git a/sci-libs/plplot/files/plplot-5.9.0-pdftex.patch b/sci-libs/plplot/files/plplot-5.9.0-pdftex.patch
new file mode 100644
index 000000000000..48c9c31f3d5c
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.0-pdftex.patch
@@ -0,0 +1,62 @@
+--- plplot-5.9.0.orig/doc/docbook/src/pdftex.map
++++ plplot-5.9.0/doc/docbook/src/pdftex.map
+@@ -1,31 +1,31 @@
+-cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb
++cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb
+ cmmi10 <cmmi10.pfb
+ cmsy10 <cmsy10.pfb
+ cmsy9 <cmsy9.pfb
+-ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb
+-ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb
+-ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb
+-tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb
+-ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb
+-ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb
+-ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb 
+-ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb
+-ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb
+-ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb
+-ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb
+-tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb
+-ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb
+-ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb
+-ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb
+-ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb
+-ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb
+-ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb
+-ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb
+-ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb
+-ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb
+-ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb
+-ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb
+-ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb
+-ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb
+-ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb
+-ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb
++ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb
++ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb
++ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb
++tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb
++ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb
++ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb
++ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb 
++ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb
++ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb
++ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb
++ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb
++tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb
++ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb
++ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb
++ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb
++ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb
++ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb
++ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb
++ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb
++ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb
++ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb
++ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb
++ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb
++ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb
++ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb
++ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb
++ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb
diff --git a/sci-libs/plplot/files/plplot-5.9.0-python.patch b/sci-libs/plplot/files/plplot-5.9.0-python.patch
new file mode 100644
index 000000000000..863150274f33
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.0-python.patch
@@ -0,0 +1,11 @@
+--- plplot/examples/python/CMakeLists.txt.orig
++++ plplot/examples/python/CMakeLists.txt
+@@ -147,7 +147,7 @@
+ @ONLY
+ )
+ 
+-set(python_location1 ${PYTHON_INSTDIR})
++set(python_location1)
+ set(python_location2)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 997c1ff9b9d2..77b5f45deb31 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -19,10 +19,13 @@
   mathematical symbols.
 </longdescription>
 <use>
-  <flag name='itcl'>Support for <pkg>dev-tcltk/itcl</pkg> bindings</flag>
-  <flag name='jadetex'>Add support for <pkg>app-text/jadetex</pkg>
+  <flag name='ada'>Add bindings for the ADA programming language</flag>
+  <flag name='fortran95'>Add bindings for FORTRAN 95 programming language</flag>
+  <flag name='itcl'>Add bindings for <pkg>dev-tcltk/itcl</pkg></flag>
+  <flag name='jadetex'>Add device for <pkg>app-text/jadetex</pkg>
     (for processing tex files produced by the TeX backend of Jade)</flag>
-  <flag name='octave'>Support for <pkg>sci-mathematics/octave</pkg> bindings
-    </flag>
+  <flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag> 
+  <flag name='qhull'>Add bindings for <pkg>media-libs/qhull</pkg>
+  bindings</flag> 
 </use>
 </pkgmetadata>
diff --git a/sci-libs/plplot/plplot-5.9.0.ebuild b/sci-libs/plplot/plplot-5.9.0.ebuild
new file mode 100644
index 000000000000..5d0702ca1a0d
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.9.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.0.ebuild,v 1.1 2008/10/21 11:49:25 bicatali Exp $
+
+EAPI="2"
+WX_GTK_VER="2.8"
+inherit eutils fortran cmake-utils wxwidgets java-pkg-opt-2
+
+DESCRIPTION="Multi-language scientific plotting library"
+HOMEPAGE="http://plplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ada doc examples fortran fortran95 gd gnome java jpeg gif latex
+	octave pdf perl png python qhull svga tcl threads tk truetype wxwindows X"
+
+RDEPEND="ada? ( virtual/gnat )
+	java? ( >=virtual/jre-1.5 )
+	gd? ( media-libs/gd[jpeg?,png?] )
+	gnome? ( gnome-base/libgnomeui
+			 gnome-base/libgnomeprintui
+			 python? ( dev-python/gnome-python ) )
+	latex? ( virtual/latex-base virtual/ghostscript )
+	octave? ( >=sci-mathematics/octave-3 )
+	pdf? ( media-libs/libharu )
+	perl? ( dev-perl/PDL dev-perl/XML-DOM )
+	python? ( dev-python/numpy )
+	svga? ( media-libs/svgalib )
+	tcl? ( dev-lang/tcl dev-tcltk/itcl )
+	tk? ( dev-lang/tk dev-tcltk/itk )
+	truetype? ( media-libs/freetype
+				media-fonts/freefont-ttf
+				media-libs/lasi
+				gd? ( media-libs/gd[truetype] ) )
+	wxwindows? ( x11-libs/wxGTK:2.8[X] x11-libs/agg )
+	X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
+
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-text/opensp
+		   app-text/jadetex
+		   app-text/docbook2X
+		   app-text/docbook-dsssl-stylesheets
+		   dev-perl/XML-DOM
+		   virtual/latex-base
+		   virtual/ghostscript
+		   sys-apps/texinfo )
+	java? ( >=virtual/jdk-1.5 dev-lang/swig )
+	python? ( dev-lang/swig )
+	qhull? ( media-libs/qhull )"
+
+pkg_setup() {
+	FORTRAN="gfortran ifc g77"
+	use fortran95 && FORTRAN="gfortran ifc"
+	if use fortran || use fortran95; then
+		fortran_pkg_setup
+	fi
+	export FC=${FORTRANC} F77=${FORTRANC}
+}
+
+src_prepare() {
+	# from upstream svn
+	epatch "${FILESDIR}"/${P}-cmake.patch
+	# substitute EC.enc by ec.enc
+	epatch "${FILESDIR}"/${P}-pdftex.patch
+	# path for python independent of python version
+	epatch "${FILESDIR}"/${P}-python.patch
+
+	# remove license
+	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
+	# change default install directories for doc and examples
+	sed -i \
+		-e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
+		{examples,test}/CMakeLists.txt examples/*/CMakeLists.txt || die
+	sed -i \
+		-e 's:${VERSION}::g' \
+		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
+		cmake/modules/instdirs.cmake || die
+	# haru pdf devide does not build with HPDF_SHARED
+	sed -i \
+		-e 's:-DHPDF_SHARED::' \
+		cmake/modules/pdf.cmake || die
+
+	# haru pdf devide does not build with HPDF_SHARED
+	sed -i \
+		-e 's:-DHPDF_SHARED::' \
+		cmake/modules/pdf.cmake || die
+	# default location for docbook crap
+	sed -i \
+		-e 's:xml/declaration:sgml:' \
+		cmake/modules/docbook.cmake || die
+
+	if use wxwindows; then
+		WX_COMPILE=$(${WX_CONFIG} --cxxflags)
+		WX_LIBS=$(${WX_CONFIG} --libs)
+		sed -i \
+			-e "s:-I\${wxWidgets_INCLUDE_DIRS} \${wxWidgets_DEFINITIONS}:${WX_COMPILE}:" \
+			-e "s:\${wxWidgets_LIBRARIES}:\"${WX_LIBS}\":" \
+			cmake/modules/wxwidgets.cmake || die
+	fi
+}
+
+src_configure() {
+	# see http://www.miscdebris.net/plplot_wiki/index.php?title=CMake_options_for_PLplot
+
+	cmake-utils_pld() { _use_me_now PLD "$@" ; }
+
+	# optional ones
+	mycmakeargs="-DDEFAULT_ALL_DEVICES=ON
+		$(cmake-utils_has python numpy)
+		$(cmake-utils_has qhull QHULL)
+		$(cmake-utils_has threads PTHREAD)
+		$(cmake-utils_has truetype FREETYPE)
+		$(cmake-utils_use_enable ada ada)
+		$(cmake-utils_use_enable fortran f77)
+		$(cmake-utils_use_enable fortran95 f95)
+		$(cmake-utils_use_enable java java)
+		$(cmake-utils_use_enable gnome gnome2)
+		$(cmake-utils_use_enable octave octave)
+		$(cmake-utils_use_enable perl pdl)
+		$(cmake-utils_use_enable python python)
+		$(cmake-utils_use_enable tcl tcl)
+		$(cmake-utils_use_enable tcl itcl)
+		$(cmake-utils_use_enable tk tk)
+		$(cmake-utils_use_enable tk itk)
+		$(cmake-utils_use_enable wxwindows wxwidgets)
+		$(cmake-utils_pld pdf pdf)
+		$(cmake-utils_pld latex pstex)
+		$(cmake-utils_pld svga linuxvga)"
+
+	use truetype && mycmakeargs="${mycmakeargs}
+		-DPL_FREETYPE_FONT_PATH:PATH=/usr/share/fonts/freefont-ttf"
+
+	if use python && use gnome; then
+		mycmakeargs="${mycmakeargs}	-DENABLE_pygcw=ON"
+	else
+		mycmakeargs="${mycmakeargs}	-DENABLE_pygcw=OFF"
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# separate doc and normal because doc building crashes with parallel
+	cmake-utils_src_make
+	if use doc; then
+		mycmakeargs="${mycmakeargs}	-DBUILD_DOC=ON"
+		mycmakeargs="${mycmakeargs}	-DHAVE_DB_DTD=ON"
+		mycmakeargs="${mycmakeargs}	-DHAVE_DSSSL_DTD=ON"
+		mycmakeargs="${mycmakeargs}	-DHAVE_HTML_SS=ON"
+		mycmakeargs="${mycmakeargs}	-DHAVE_PRINT_SS=ON"
+		cmake-utils_src_configure
+		cmake-utils_src_make -j1
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use examples || rm -rf "${D}"usr/share/doc/${PF}/examples
+}