diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-26 21:25:28 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-26 21:25:28 +0000 |
commit | d6842bb022a6f7c8fbefefb04c0f5e8da05331eb (patch) | |
tree | 5efe6d187be04e5e5f4c8d204078872b503515c3 /sci-libs/plplot | |
parent | Added dev-haskell/hinotify-0.3 (diff) | |
download | historical-d6842bb022a6f7c8fbefefb04c0f5e8da05331eb.tar.gz historical-d6842bb022a6f7c8fbefefb04c0f5e8da05331eb.tar.bz2 historical-d6842bb022a6f7c8fbefefb04c0f5e8da05331eb.zip |
Delete older ebuild.
Diffstat (limited to 'sci-libs/plplot')
-rw-r--r-- | sci-libs/plplot/Manifest | 6 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch | 24 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch | 12 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.0-cmake.patch | 305 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.0-pdftex.patch | 62 | ||||
-rw-r--r-- | sci-libs/plplot/plplot-5.5.2.ebuild | 167 |
6 files changed, 0 insertions, 576 deletions
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index b6d49e9b9e4a..fc088f712123 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,12 +1,6 @@ -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.2.tar.gz 6666641 RMD160 b134b99a40b320d2e03601191aefa8967701acf8 SHA1 271b7792e547f71ae7123b4bef10d92720fb7e5c SHA256 6aa22f1c7b210f819d54e761a6df573038d961c99183bcdc59c7a92d4cf72587 DIST plplot-5.9.5.tar.gz 7071486 RMD160 75f21ad12fbe952c964e0a9b3d298a4f059157c2 SHA1 f24d096238398b5519427145f0134ce1c180f0e8 SHA256 094cdfa1fced0cf86a52fdc3dae062a120f025ac271ddc3676a3fba7134538c3 -EBUILD plplot-5.5.2.ebuild 5110 RMD160 0aee02da523764ce383777ee9f2baf6079cbfc7f SHA1 e1328f9757f4714c2cb4c3fc195b1f3782628b88 SHA256 ac176d75bf27bed98ca7f7b1e1607723bdbb87db27267b9d7bae698005595361 EBUILD plplot-5.9.2.ebuild 5027 RMD160 53bb02f1d2069f5473bb339908749bdd8034f20b SHA1 8ec7fc7d81380cf334a4ef461d3e05b189ec78f1 SHA256 ef495930a873f8d61d00211d2d46cae48996da508723672e8f71dac761927d91 EBUILD plplot-5.9.5.ebuild 5043 RMD160 9dba851d177ede8963f5db38ce9d48a5ef83e8ac SHA1 e4cb42c04f1afb6fbbafa3151bb941dc00378676 SHA256 b69beb0da7706db6ada297aa3026aaa273182c830493f279463f3d0d9cb50f83 MISC ChangeLog 4350 RMD160 b3efb9c6eb736a4f3a0392d879d67737c06e5903 SHA1 3ed9f3c1765e1447e1b79c9b5587e26924abb4a2 SHA256 42d36a3cf38d464acb53791741639aae92872842e3184ecaae26ca84abe5cb3e diff --git a/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch b/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch deleted file mode 100644 index 9f3af76e35a6..000000000000 --- a/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN bindings/octave/Makefile.am bindings/octave/Makefile.am ---- bindings/octave/Makefile.am 2004-09-07 17:00:47.000000000 +0100 -+++ bindings/octave/Makefile.am 2005-04-08 20:17:02.000000000 +0100 -@@ -75,7 +75,7 @@ - plplot_octave.cc tmp_stub: plplot_octave.h - $(PERL) $(MATWRAP) -language octave -o plplot_octave.cc -stub tmp_stub \ - -cpp_ignore $(srcdir) -cpp_ignore plplot_octave_rej.h -cpp $(CC) \ -- -E -I$(srcdir) -C plplot_octave.h -+ -D__builtin_va_list=void -E -I$(srcdir) -C plplot_octave.h - mv -f plplot_octave.cc tmp_plplot_octave.cc - sed 's/ string / std::string /' tmp_plplot_octave.cc > plplot_octave.cc - -diff -ruN bindings/octave/Makefile.in bindings/octave/Makefile.in ---- bindings/octave/Makefile.in 2005-04-04 15:54:31.000000000 +0100 -+++ bindings/octave/Makefile.in 2005-04-08 20:17:24.000000000 +0100 -@@ -920,7 +920,7 @@ - @enable_octave_TRUE@plplot_octave.cc tmp_stub: plplot_octave.h - @enable_octave_TRUE@ $(PERL) $(MATWRAP) -language octave -o plplot_octave.cc -stub tmp_stub \ - @enable_octave_TRUE@ -cpp_ignore $(srcdir) -cpp_ignore plplot_octave_rej.h -cpp $(CC) \ --@enable_octave_TRUE@ -E -I$(srcdir) -C plplot_octave.h -+@enable_octave_TRUE@ -D__builtin_va_list=void -E -I$(srcdir) -C plplot_octave.h - @enable_octave_TRUE@ mv -f plplot_octave.cc tmp_plplot_octave.cc - @enable_octave_TRUE@ sed 's/ string / std::string /' tmp_plplot_octave.cc > plplot_octave.cc - diff --git a/sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch b/sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch deleted file mode 100644 index 7e97070a3280..000000000000 --- a/sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur plplot-5.5.2/drivers/gd.c plplot-5.5.2.new/drivers/gd.c ---- plplot-5.5.2/drivers/gd.c 2005-03-07 16:33:42.000000000 -0500 -+++ plplot-5.5.2.new/drivers/gd.c 2007-08-13 15:30:09.000000000 -0400 -@@ -137,7 +137,7 @@ - "png:PNG file:0:gd:39:png\n"; - #else - #if defined(PLD_png) && defined(PLD_gif) -- char* plD_DEVICE_INFO_gd = "png:PNG file:0:gd:39:png\n"; -+ char* plD_DEVICE_INFO_gd = "png:PNG file:0:gd:39:png\n" - "gif:GIF file:0:gd:47:gif"; - #else - diff --git a/sci-libs/plplot/files/plplot-5.9.0-cmake.patch b/sci-libs/plplot/files/plplot-5.9.0-cmake.patch deleted file mode 100644 index 4b628e3af98f..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.0-cmake.patch +++ /dev/null @@ -1,305 +0,0 @@ ---- 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 deleted file mode 100644 index 48c9c31f3d5c..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.0-pdftex.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- 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/plplot-5.5.2.ebuild b/sci-libs/plplot/plplot-5.5.2.ebuild deleted file mode 100644 index 9fdb9db7a82f..000000000000 --- a/sci-libs/plplot/plplot-5.5.2.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.14 2009/09/23 20:08:48 patrick Exp $ - -inherit eutils fortran - -# Known problems with this ebuild: -# - No support for libqhull. -# - No documentation building - although prebuilt docs are in the tarball. - -DESCRIPTION="A Scientific Plotting Library" -HOMEPAGE="http://plplot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc" -IUSE="X debug doc fortran itcl java jpeg octave png python tk jadetex truetype" - -RDEPEND=" dev-lang/perl - python? ( dev-python/numeric ) - java? ( virtual/jre ) - jadetex? ( app-text/jadetex ) - octave? ( sci-mathematics/octave ) - jpeg? ( media-libs/gd ) - png? ( media-libs/gd ) - truetype? ( media-libs/freetype ) - X? ( x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - tk? ( dev-lang/tk - itcl? ( dev-tcltk/itcl ) - ) - )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - virtual/man - app-text/opensp - java? ( virtual/jdk ) - X? ( x11-proto/xproto ) - doc? ( sys-apps/texinfo )" - # Optional support for libqhull (currently doesn't work). - # qhull? ( media-libs/qhull ) - -pkg_setup() { - FORTRAN="gfortran g77 ifc" - use fortran && fortran_pkg_setup -} - -src_unpack() { - unpack ${A} - cd "${S}" - # Fix compilation problems on GCC 3.4 and the octave - # bindings, thanks to the patch from Debian's BTS bug 274359. - epatch "${FILESDIR}"/${PN}-5.5.1-gcc-3.4-fix.patch - epatch "${FILESDIR}"/${P}-macro-fix.patch - - # properly detect octave 2.9.x - sed -e "s:filepath:filedir:" \ - -e "s:plplot_octave$:plplot/octave:" \ - -i configure \ - || die "Failed to make configure octave 2.9.x aware" -} - -src_compile() { - # Doesn't compile with j > 1. - MAKEOPTS="${MAKEOPTS} -e -j1" - - local EXTRA_CONF - - # Export DATA_DIR and DOC_DIR so that configure uses correct install path - EXTRA_CONF="${EXTRA_CONF} DATA_DIR=\"/usr/share/${PN}\"" - EXTRA_CONF="${EXTRA_CONF} DOC_DIR=\"/usr/share/doc/${PF}\"" - - # Use pkg-config - EXTRA_CONF="${EXTRA_CONF} --with-pkg-config" - - # Compilation options (debug, documentation). - EXTRA_CONF="${EXTRA_CONF} $(use_with debug)" - # Documentation building doesn't work. - # The xml catalogs are not found. -# if use doc; then -# EXTRA_CONF="${EXTRA_CONF} --enable-builddoc \ -# --with-xml-declaration=/usr/share/sgml/xml.dcl \ -# --with-sgml-catalogs=/etc/sgml/catalog:/usr/share/sgml/docbook/sgml-dtd-4.2/catalog:/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd:/usr/share/sgml/docbook/sgml-dtd-4.2/docbookx.dtd" -# EXTRA_CONF="${EXTRA_CONF} --with-db2x_texixml=/usr/bin/db2x_texixml.pl --with-db2x_xsltproc=/usr/bin/db2x_xsltproc.pl" -# else -# EXTRA_CONF="${EXTRA_CONF} --disable-builddoc" -# fi - EXTRA_CONF="${EXTRA_CONF} --disable-builddoc" - - # Language bindings. - EXTRA_CONF="${EXTRA_CONF} $(use_enable python)" - EXTRA_CONF="${EXTRA_CONF} $(use_enable java)" - EXTRA_CONF="${EXTRA_CONF} $(use_enable octave)" - if use fortran; then - EXTRA_CONF="${EXTRA_CONF} --enable-f77" - else - EXTRA_CONF="${EXTRA_CONF} --disable-f77" - fi - - # Device drivers. - EXTRA_CONF="${EXTRA_CONF} $(use_enable jpeg)" - EXTRA_CONF="${EXTRA_CONF} $(use_enable png)" - EXTRA_CONF="${EXTRA_CONF} $(use_enable jadetex pstex)" - # Dynamic driver loading causes segfaults. - EXTRA_CONF="${EXTRA_CONF} --disable-dyndrivers" - # The linuxvga driver doesn't compile. - EXTRA_CONF="${EXTRA_CONF} --disable-linuxvga" - - # Support for optional libraries. - EXTRA_CONF="${EXTRA_CONF} $(use_with truetype freetype)" - # Support for libqhull doesn't work. The configure script - # doesn't find the lib. - # EXTRA_CONF="${EXTRA_CONF} $(use_with qhull)" - EXTRA_CONF="${EXTRA_CONF} --without-qhull" - - # Additional X-dependent language bindings and device drivers. - if use X; then - EXTRA_CONF="${EXTRA_CONF} --with-x" - if use tk; then - EXTRA_CONF="${EXTRA_CONF} --enable-tcl" - EXTRA_CONF="${EXTRA_CONF} $(use_enable itcl)" - else - EXTRA_CONF="${EXTRA_CONF} --disable-tcl" - EXTRA_CONF="${EXTRA_CONF} --disable-tk" - EXTRA_CONF="${EXTRA_CONF} --disable-itcl" - fi - EXTRA_CONF="${EXTRA_CONF} --disable-gnome" - else - EXTRA_CONF="${EXTRA_CONF} --without-x" - EXTRA_CONF="${EXTRA_CONF} --disable-tcl" - EXTRA_CONF="${EXTRA_CONF} --disable-itcl" - EXTRA_CONF="${EXTRA_CONF} --disable-gnome" - fi - - econf ${EXTRA_CONF} || die - emake || die "make step failed." -} - -src_install() { - - # A little sed magic to make some of the docs install to the right place - sed -i -e "s|\$(datadir)/doc/plplot|/usr/share/doc/${PF}|" Makefile || \ - die "sed replacement of docs dir failed." - - make install DESTDIR="${D}" || die "make install step failed." - - # To match the Gentoo FSH. - if use java; then - mv "${D}"/usr/lib/java/plplot "${D}"/usr/share/${PN}/lib - rm -r "${D}"/usr/lib/java - fi - - # Fix permissions and gzip the basic documentation. - chmod 644 "${D}"/usr/share/doc/${PF}/* - gzip "${D}"/usr/share/doc/${PF}/* - # Install prebuilt documentation. - if use doc; then - cd doc/docbook/src/ - dohtml *.html - doinfo plplotdoc.info - insinto /usr/share/doc/${PF} - doins ${P}.pdf - fi -} |