From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
Date: Fri, 25 Nov 2016 18:57:06 +0000 (UTC) [thread overview]
Message-ID: <1480100194.dad2fef9431da5d53012fdab9a3a37ab64234a23.pacho@gentoo> (raw)
commit: dad2fef9431da5d53012fdab9a3a37ab64234a23
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 18:52:18 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 18:56:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad2fef9
sci-libs/plplot: Drop old
Package-Manager: portage-2.3.2
sci-libs/plplot/Manifest | 2 -
sci-libs/plplot/files/plplot-5.10.0-cmake.patch | 18 --
.../plplot/files/plplot-5.10.0-have-config-h.patch | 117 ----------
.../plplot/files/plplot-5.9.11-multiarch.patch | 50 -----
sci-libs/plplot/files/plplot-5.9.11-ocaml.patch | 34 ---
sci-libs/plplot/files/plplot-5.9.11-octave.patch | 12 -
sci-libs/plplot/plplot-5.10.0-r1.ebuild | 244 --------------------
sci-libs/plplot/plplot-5.11.0-r1.ebuild | 248 --------------------
sci-libs/plplot/plplot-5.11.1.ebuild | 249 ---------------------
9 files changed, 974 deletions(-)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 022e61d..f31d3e9 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,3 +1 @@
-DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 SHA512 92a1880dc544694a19aa5a3f6f592df5b63ea65827f11804f0b1bdb1d123546abb213c1af4950c18b50e0e0fb9b40bb3311e7f21e681237df6008fee9873b11e WHIRLPOOL 52b726925a6fa89e2e097a1a7578b8b0004bfac6a841019144785861a467e4d7c812bf4301e7a747d2edab47ef5b0d481c7732f5b0c9b4ff5dae6be6cd3e17ba
-DIST plplot-5.11.0.tar.gz 15892751 SHA256 bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e SHA512 048157b95f65858d97ca6dba15d45dcdaee11892076a949cc3de8536abcaeca88eb8fa43a0520deffeee55eba43ef8cdf86b748a1e74b86d0340b995461d704d WHIRLPOOL 904061ad556856cb2386925dc9c907a12d753de32546023c867ce77498435a0b501d36f06ca08d85adcd15cb3b93b0192fb8a58036b8faa6ce2d2b23d2cc8e43
DIST plplot-5.11.1.tar.gz 15445404 SHA256 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd WHIRLPOOL 21e11c496b89060d00c9b0e513a0fb4833713f021d1fa63ea9210198713324e6efc3a1a28a218a75acd1fa5752ee4058465575481c27cfaec1cb91c52db40864
diff --git a/sci-libs/plplot/files/plplot-5.10.0-cmake.patch b/sci-libs/plplot/files/plplot-5.10.0-cmake.patch
deleted file mode 100644
index dbb0f82..00000000
--- a/sci-libs/plplot/files/plplot-5.10.0-cmake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
-index 3f842aa..4d269bd 100644
---- a/cmake/modules/pkg-config.cmake
-+++ b/cmake/modules/pkg-config.cmake
-@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v
- set(_xprefix ${_prefix})
- endif(FORCE_EXTERNAL_STATIC)
-
-- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ if(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ else(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+ endif(CMAKE_VERSION VERSION_LESS "3.1")
-+
- if(${_prefix}_FOUND)
- cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
- # If libraries cannot be not found, then that is equivalent to whole
diff --git a/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch b/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch
deleted file mode 100644
index 0687224..00000000
--- a/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Apply upstream patch https://sourceforge.net/p/plplot/bugs/146/
-to fix conflicting macros in installed header files.
-
-diff -Nur plplot-5.10.0.orig/CMakeLists.txt plplot-5.10.0/CMakeLists.txt
---- plplot-5.10.0.orig/CMakeLists.txt 2014-04-07 09:51:53.732857993 -0700
-+++ plplot-5.10.0/CMakeLists.txt 2014-04-07 09:54:03.739699328 -0700
-@@ -125,7 +125,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
- )
- # Allow access to the generated plplot_config.h for this build.
--add_definitions("-DHAVE_CONFIG_H")
-+add_definitions("-DPLPLOT_HAVE_CONFIG_H")
- # Install top-level files
-
- # Enable testing framework for examples
-diff -Nur plplot-5.10.0.orig/bindings/ocaml/CMakeLists.txt plplot-5.10.0/bindings/ocaml/CMakeLists.txt
---- plplot-5.10.0.orig/bindings/ocaml/CMakeLists.txt 2014-04-07 09:51:53.629857267 -0700
-+++ plplot-5.10.0/bindings/ocaml/CMakeLists.txt 2014-04-07 09:54:03.934700592 -0700
-@@ -99,7 +99,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so
- ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
- COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
-- COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
-+ COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
- COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
-diff -Nur plplot-5.10.0.orig/bindings/ocaml/plcairo/CMakeLists.txt plplot-5.10.0/bindings/ocaml/plcairo/CMakeLists.txt
---- plplot-5.10.0.orig/bindings/ocaml/plcairo/CMakeLists.txt 2014-04-07 09:51:53.629857267 -0700
-+++ plplot-5.10.0/bindings/ocaml/plcairo/CMakeLists.txt 2014-04-07 09:54:03.934700592 -0700
-@@ -36,7 +36,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
- ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so
- ${CMAKE_CURRENT_BINARY_DIR}/libplcairo_stubs.a
-- COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
-+ COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
- COMMAND ${OCAMLMKLIB} -o plcairo_stubs ${CAIRO_LINK_FLAGS_LIST} -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
-diff -Nur plplot-5.10.0.orig/doc/doxygen/html/plConfig_8h_source.html plplot-5.10.0/doc/doxygen/html/plConfig_8h_source.html
---- plplot-5.10.0.orig/doc/doxygen/html/plConfig_8h_source.html 2014-04-07 09:51:53.712857853 -0700
-+++ plplot-5.10.0/doc/doxygen/html/plConfig_8h_source.html 2014-04-07 09:54:03.935700600 -0700
-@@ -136,7 +136,7 @@
- <div class="line"><a name="l00030"></a><span class="lineno"> 30</span> <span class="comment">// any user applications). Therefore, the configured plConfig.h</span></div>
- <div class="line"><a name="l00031"></a><span class="lineno"> 31</span> <span class="comment">// should be installed. In contrast, plplot_config.h.in (note,</span></div>
- <div class="line"><a name="l00032"></a><span class="lineno"> 32</span> <span class="comment">// plConfig.h #includes plplot_config.h for the core build because</span></div>
--<div class="line"><a name="l00033"></a><span class="lineno"> 33</span> <span class="comment">// HAVE_CONFIG_H is #defined in that case) contains configured macros</span></div>
-+<div class="line"><a name="l00033"></a><span class="lineno"> 33</span> <span class="comment">// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros</span></div>
- <div class="line"><a name="l00034"></a><span class="lineno"> 34</span> <span class="comment">// that are only required for the core build. Therefore, in contrast</span></div>
- <div class="line"><a name="l00035"></a><span class="lineno"> 35</span> <span class="comment">// to plConfig.h, plplot_config.h should not be installed.</span></div>
- <div class="line"><a name="l00036"></a><span class="lineno"> 36</span> <span class="comment">//</span></div>
-@@ -150,7 +150,7 @@
- <div class="line"><a name="l00044"></a><span class="lineno"> 44</span> <span class="preprocessor">#ifndef __PLCONFIG_H__</span></div>
- <div class="line"><a name="l00045"></a><span class="lineno"> 45</span> <span class="preprocessor"></span><span class="preprocessor">#define __PLCONFIG_H__</span></div>
- <div class="line"><a name="l00046"></a><span class="lineno"> 46</span> <span class="preprocessor"></span></div>
--<div class="line"><a name="l00047"></a><span class="lineno"> 47</span> <span class="preprocessor">#ifdef HAVE_CONFIG_H</span></div>
-+<div class="line"><a name="l00047"></a><span class="lineno"> 47</span> <span class="preprocessor">#ifdef PLPLOT_HAVE_CONFIG_H</span></div>
- <div class="line"><a name="l00048"></a><span class="lineno"> 48</span> <span class="preprocessor"></span><span class="preprocessor"># include <<a class="code" href="plplot__config_8h.html">plplot_config.h</a>></span></div>
- <div class="line"><a name="l00049"></a><span class="lineno"> 49</span> <span class="preprocessor">#endif</span></div>
- <div class="line"><a name="l00050"></a><span class="lineno"> 50</span> <span class="preprocessor"></span></div>
-diff -Nur plplot-5.10.0.orig/doc/doxygen/html/plplot__config_8h_source.html plplot-5.10.0/doc/doxygen/html/plplot__config_8h_source.html
---- plplot-5.10.0.orig/doc/doxygen/html/plplot__config_8h_source.html 2014-04-07 09:51:53.708857825 -0700
-+++ plplot-5.10.0/doc/doxygen/html/plplot__config_8h_source.html 2014-04-07 09:54:03.935700600 -0700
-@@ -109,7 +109,7 @@
- <div class="line"><a name="l00003"></a><span class="lineno"> 3</span> <span class="comment">// examples (and presumably any user applications). Therefore, the</span></div>
- <div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="comment">// configured plplot_config.h should not be installed. In contrast,</span></div>
- <div class="line"><a name="l00005"></a><span class="lineno"> 5</span> <span class="comment">// include/plConfig.h.in (note, the configured plConfig.h result</span></div>
--<div class="line"><a name="l00006"></a><span class="lineno"> 6</span> <span class="comment">// #includes plplot_config.h for the core build because HAVE_CONFIG_H</span></div>
-+<div class="line"><a name="l00006"></a><span class="lineno"> 6</span> <span class="comment">// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H</span></div>
- <div class="line"><a name="l00007"></a><span class="lineno"> 7</span> <span class="comment">// is #defined in that case) contains configured macros that are</span></div>
- <div class="line"><a name="l00008"></a><span class="lineno"> 8</span> <span class="comment">// required for the core build, installed examples build, and build of</span></div>
- <div class="line"><a name="l00009"></a><span class="lineno"> 9</span> <span class="comment">// user applications. Therefore, in contrast to plplot_config.h,</span></div>
-diff -Nur plplot-5.10.0.orig/examples/CMakeLists.txt plplot-5.10.0/examples/CMakeLists.txt
---- plplot-5.10.0.orig/examples/CMakeLists.txt 2014-04-07 09:51:53.610857133 -0700
-+++ plplot-5.10.0/examples/CMakeLists.txt 2014-04-07 09:54:03.938700634 -0700
-@@ -414,7 +414,7 @@
- endif(CORE_BUILD)
-
- if(CORE_BUILD AND BUILD_TEST)
-- remove_definitions("-DHAVE_CONFIG_H")
-+ remove_definitions("-DPLPLOT_HAVE_CONFIG_H")
- endif(CORE_BUILD AND BUILD_TEST)
-
- # Decide on device to be used for generic interactive tests.
-diff -Nur plplot-5.10.0.orig/include/plConfig.h.in plplot-5.10.0/include/plConfig.h.in
---- plplot-5.10.0.orig/include/plConfig.h.in 2014-04-07 09:51:53.616857175 -0700
-+++ plplot-5.10.0/include/plConfig.h.in 2014-04-07 09:54:03.938700634 -0700
-@@ -30,7 +30,7 @@
- // 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
-+// PLPLOT_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.
- //
-@@ -44,7 +44,7 @@
- #ifndef __PLCONFIG_H__
- #define __PLCONFIG_H__
-
--#ifdef HAVE_CONFIG_H
-+#ifdef PLPLOT_HAVE_CONFIG_H
- # include <plplot_config.h>
- #endif
-
-diff -Nur plplot-5.10.0.orig/plplot_config.h.in plplot-5.10.0/plplot_config.h.in
---- plplot-5.10.0.orig/plplot_config.h.in 2014-04-07 09:51:53.732857993 -0700
-+++ plplot-5.10.0/plplot_config.h.in 2014-04-07 09:54:03.938700634 -0700
-@@ -3,7 +3,7 @@
- // 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
-+// #includes plplot_config.h for the core build because PLPLOT_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,
diff --git a/sci-libs/plplot/files/plplot-5.9.11-multiarch.patch b/sci-libs/plplot/files/plplot-5.9.11-multiarch.patch
deleted file mode 100644
index 8f4512b..00000000
--- a/sci-libs/plplot/files/plplot-5.9.11-multiarch.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up plplot-5.9.11/examples/c++/Makefile.examples.in.multiarch plplot-5.9.11/examples/c++/Makefile.examples.in
---- plplot-5.9.11/examples/c++/Makefile.examples.in.multiarch 2013-04-24 14:36:28.000000000 -0600
-+++ plplot-5.9.11/examples/c++/Makefile.examples.in 2013-12-29 19:48:17.574496673 -0700
-@@ -25,10 +25,7 @@ CXX = @CXX@
- EXEEXT = @EXEEXT@
-
- LIB_TAG = @LIB_TAG@
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
- @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
--@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@
-
- @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
- @wxwidgets_true@ wxPLplotDemo$(EXEEXT)
-diff -up plplot-5.9.11/examples/c/Makefile.examples.in.multiarch plplot-5.9.11/examples/c/Makefile.examples.in
---- plplot-5.9.11/examples/c/Makefile.examples.in.multiarch 2012-01-05 06:59:36.000000000 -0700
-+++ plplot-5.9.11/examples/c/Makefile.examples.in 2013-12-29 19:48:17.574496673 -0700
-@@ -25,8 +25,6 @@ CC = @CC@
- EXEEXT = @EXEEXT@
-
- LIB_TAG = @LIB_TAG@
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
-
- @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
- @gcw_true@ plplotcanvas_demo$(EXEEXT) \
-diff -up plplot-5.9.11/examples/f95/Makefile.examples.in.multiarch plplot-5.9.11/examples/f95/Makefile.examples.in
---- plplot-5.9.11/examples/f95/Makefile.examples.in.multiarch 2012-02-19 11:33:33.000000000 -0700
-+++ plplot-5.9.11/examples/f95/Makefile.examples.in 2013-12-29 19:48:20.960557580 -0700
-@@ -25,8 +25,6 @@ F95 = @FC@
- EXEEXT = @EXEEXT@
-
- LIB_TAG = @LIB_TAG@
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
-
- EXECUTABLES_list = \
- x00f$(EXEEXT) \
-diff -up plplot-5.9.11/examples/tk/Makefile.examples.in.multiarch plplot-5.9.11/examples/tk/Makefile.examples.in
---- plplot-5.9.11/examples/tk/Makefile.examples.in.multiarch 2013-12-29 19:48:20.961557593 -0700
-+++ plplot-5.9.11/examples/tk/Makefile.examples.in 2013-12-29 19:49:19.876587409 -0700
-@@ -24,8 +24,6 @@ CC = @CC@
- EXEEXT = @EXEEXT@
-
- LIB_TAG = @LIB_TAG@
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
-
- EXECUTABLES_list = xtk01$(EXEEXT)
- # Second and fourth examples depend on itk.
diff --git a/sci-libs/plplot/files/plplot-5.9.11-ocaml.patch b/sci-libs/plplot/files/plplot-5.9.11-ocaml.patch
deleted file mode 100644
index c10710c..00000000
--- a/sci-libs/plplot/files/plplot-5.9.11-ocaml.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up plplot-5.9.10/bindings/ocaml/CMakeLists.txt.ocaml plplot-5.9.10/bindings/ocaml/CMakeLists.txt
---- plplot-5.9.10/bindings/ocaml/CMakeLists.txt.ocaml 2013-09-28 10:52:20.000000000 -0600
-+++ plplot-5.9.10/bindings/ocaml/CMakeLists.txt 2013-10-24 09:35:47.093185622 -0600
-@@ -155,11 +155,11 @@ if(ENABLE_ocaml)
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
- )
-
-- # ocamlc -a -custom builds a *.cma library from *.cmo
-+ # ocamlc -a builds a *.cma library from *.cmo
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
-- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
-+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
- ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
-diff -up plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt
---- plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt.ocaml 2011-10-19 16:46:13.000000000 -0600
-+++ plplot-5.9.10/bindings/ocaml/plcairo/CMakeLists.txt 2013-10-24 09:45:36.884193889 -0600
-@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
- )
-
-- # ocamlc -a -custom builds a *.cma library from *.cmo
-+ # ocamlc -a builds a *.cma library from *.cmo
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma
-- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src
-+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/sci-libs/plplot/files/plplot-5.9.11-octave.patch b/sci-libs/plplot/files/plplot-5.9.11-octave.patch
deleted file mode 100644
index f21b4d2..00000000
--- a/sci-libs/plplot/files/plplot-5.9.11-octave.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up plplot-5.9.9/plplot_test/test_octave.sh.in.octave plplot-5.9.9/plplot_test/test_octave.sh.in
---- plplot-5.9.9/plplot_test/test_octave.sh.in.octave 2011-10-12 18:43:01.000000000 -0600
-+++ plplot-5.9.9/plplot_test/test_octave.sh.in 2012-01-16 08:29:46.551852247 -0700
-@@ -35,7 +35,7 @@ echo "$TOPDIR"
- export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
-
- # Launch an Octave script that exercises all the demos
--$octave -f -q -p "$octavedir" <<EOF 2> test.error
-+$octave -f -q $octaveopts -p "$octavedir" <<EOF 2> test.error
-
- # Check verbose_test variable
- if (strcmp(getenv("verbose_test"),"on") == 1)
diff --git a/sci-libs/plplot/plplot-5.10.0-r1.ebuild b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
deleted file mode 100644
index 296eaa2..00000000
--- a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python2_7 )
-VIRTUALX_REQUIRED=test
-
-inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
- virtualx wxwidgets java-pkg-opt-2 multilib
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/12"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
- ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
- threads tk truetype wxwidgets X"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:0=[svg?,X?] )
- gd? ( media-libs/gd:2=[jpeg?,png?] )
- java? ( >=virtual/jre-1.5:* )
- latex? (
- app-text/ghostscript-gpl
- virtual/latex-base
- )
- lua? ( dev-lang/lua:0= )
- ocaml? (
- dev-lang/ocaml
- dev-ml/camlidl
- cairo? ( dev-ml/cairo-ocaml[gtk] )
- )
- octave? ( sci-mathematics/octave:0= )
- pdf? ( media-libs/libharu:0= )
- pdl? (
- dev-perl/PDL
- dev-perl/XML-DOM
- )
- python? (
- dev-python/numpy[${PYTHON_USEDEP}]
- qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
- )
- qhull? ( media-libs/qhull:0= )
- qt4? (
- dev-qt/qtgui:4=
- dev-qt/qtsvg:4=
- )
- shapefile? ( sci-libs/shapelib:0= )
- tcl? (
- dev-lang/tcl:0=
- dev-tcltk/itcl:0=
- tk? (
- dev-lang/tk:0=
- dev-tcltk/itk
- )
- )
- truetype? (
- media-fonts/freefont
- media-libs/lasi:0=
- gd? ( media-libs/gd:2=[truetype] )
- )
- wxwidgets? (
- x11-libs/wxGTK:2.8=[X]
- x11-libs/agg:0=[truetype?]
- )
- X? (
- x11-libs/libX11:0=
- x11-libs/libXau:0=
- x11-libs/libXdmcp:0=
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- java? (
- >=virtual/jdk-1.5
- dev-lang/swig
- )
- ocaml? ( dev-ml/findlib )
- octave? ( >=dev-lang/swig-2.0.12 )
- python? ( dev-lang/swig )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.9.6-python.patch
- "${FILESDIR}"/${PN}-5.9.11-ocaml.patch
- "${FILESDIR}"/${PN}-5.9.11-octave.patch
- "${FILESDIR}"/${PN}-5.9.11-multiarch.patch
- "${FILESDIR}"/${PN}-5.10.0-have-config-h.patch
- "${FILESDIR}"/${PN}-5.10.0-cmake.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- # avoid installing license
- sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
- # prexify hard-coded /usr/include in cmake modules
- sed -i \
- -e "s:/usr/include:${EPREFIX}/usr/include:g" \
- -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:/usr/share:${EPREFIX}/usr/share:g" \
- cmake/modules/*.cmake || die
- # change default install directories for doc and examples
- sed -i \
- -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
- $(find "${S}" -name CMakeLists.txt) || die
- sed -i \
- -e 's:${VERSION}::g' \
- -e "s:doc/\${PACKAGE}:doc/${PF}:" \
- cmake/modules/instdirs.cmake || die
- java-utils-2_src_prepare
-}
-
-src_configure() {
- # don't build doc, it brings a whole lot of horrible dependencies
- local mycmakeargs=(
- -DDEFAULT_ALL_DEVICES=ON
- -DTEST_DYNDRIVERS=OFF
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- -DENABLE_ada=OFF
- -DENABLE_d=OFF
- -DBUILD_DVI=OFF
- -DDOX_DOC=OFF
- -DBUILD_DOC=OFF
- -DUSE_RPATH=OFF
- $(cmake-utils_use doc PREBUILT_DOC)
- $(cmake-utils_use_build test)
- $(cmake-utils_use_has python NUMPY)
- $(cmake-utils_use_has shapefile SHAPELIB)
- $(cmake-utils_use_with truetype FREETYPE)
- $(cmake-utils_use_enable cxx)
- $(cmake-utils_use_enable dynamic DYNDRIVERS)
- $(cmake-utils_use_enable fortran f77)
- $(cmake-utils_use_enable java)
- $(cmake-utils_use_enable lua)
- $(cmake-utils_use_enable ocaml)
- $(cmake-utils_use_enable octave)
- $(cmake-utils_use_enable pdl)
- $(cmake-utils_use_enable python)
- $(cmake-utils_use_enable qt4 qt)
- $(cmake-utils_use_enable tcl)
- $(cmake-utils_use_enable tcl itcl)
- $(cmake-utils_use_enable tk)
- $(cmake-utils_use_enable tk itk)
- $(cmake-utils_use_enable wxwidgets)
- $(cmake-utils_use threads PL_HAVE_PTHREAD)
- $(cmake-utils_use qhull PL_HAVE_QHULL)
- $(cmake-utils_use qt4 PLD_aqt)
- $(cmake-utils_use qt4 PLD_bmpqt)
- $(cmake-utils_use qt4 PLD_epsqt)
- $(cmake-utils_use qt4 PLD_extqt)
- $(cmake-utils_use qt4 PLD_jpgqt)
- $(cmake-utils_use qt4 PLD_memqt)
- $(cmake-utils_use qt4 PLD_pdfqt)
- $(cmake-utils_use qt4 PLD_pngqt)
- $(cmake-utils_use qt4 PLD_ppmqt)
- $(cmake-utils_use qt4 PLD_svgqt)
- $(cmake-utils_use qt4 PLD_qtwidget)
- $(cmake-utils_use qt4 PLD_tiffqt)
- $(cmake-utils_use cairo PLD_extcairo)
- $(cmake-utils_use cairo PLD_memcairo)
- $(cmake-utils_use cairo PLD_pdfcairo)
- $(cmake-utils_use cairo PLD_pngcairo)
- $(cmake-utils_use cairo PLD_pscairo)
- $(cmake-utils_use cairo PLD_svgcairo)
- $(cmake-utils_use cairo PLD_wincairo)
- $(cmake-utils_use cairo PLD_xcairo)
- $(cmake-utils_use tk PLD_ntk)
- $(cmake-utils_use tk PLD_tk)
- $(cmake-utils_use tk PLD_tkwin)
- $(cmake-utils_use gd PLD_gif)
- $(cmake-utils_use gd PLD_jpeg)
- $(cmake-utils_use gd PLD_png)
- $(cmake-utils_use pdf PLD_pdf)
- $(cmake-utils_use latex PLD_ps)
- $(cmake-utils_use latex PLD_pstex)
- $(cmake-utils_use truetype PLD_psttf)
- $(cmake-utils_use svg PLD_svg)
- $(cmake-utils_use wxwidgets PLD_wxpng)
- $(cmake-utils_use wxwidgets PLD_wxwidgets)
- $(cmake-utils_use X PLD_xwin)
- )
-
- [[ $(tc-getFC) != *g77 ]] && \
- mycmakeargs+=(
- $(cmake-utils_use_enable fortran f95)
- )
-
- use truetype && mycmakeargs+=(
- -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
- )
- use shapefile && mycmakeargs+=(
- -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
- )
- use ocaml && mycmakeargs+=(
- -DOCAML_INSTALL_DIR="$(ocamlc -where)"
- )
- use python && mycmakeargs+=(
- $(cmake-utils_use_enable qt4 pyqt4)
- )
-
- cmake-utils_src_configure
-
- # clean up bloated pkg-config files (help linking properly on prefix)
- sed -i \
- -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
- -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
- -e "s:${LDFLAGS}::g" \
- "${BUILD_DIR}"/pkgcfg/*pc || die
-}
-
-src_test() {
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r "${ED}"/usr/share/doc/${PF}/examples || die
- fi
- if use java; then
- rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni || die
- java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
- java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
- fi
-}
diff --git a/sci-libs/plplot/plplot-5.11.0-r1.ebuild b/sci-libs/plplot/plplot-5.11.0-r1.ebuild
deleted file mode 100644
index 08ee995..00000000
--- a/sci-libs/plplot/plplot-5.11.0-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python2_7 )
-VIRTUALX_REQUIRED=test
-
-inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
- virtualx wxwidgets java-pkg-opt-2 multilib
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/12"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
- ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
- threads tk truetype wxwidgets X"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:0=[svg?,X?] )
- gd? ( media-libs/gd:2=[jpeg?,png?] )
- java? ( >=virtual/jre-1.5:* )
- latex? (
- app-text/ghostscript-gpl
- virtual/latex-base
- )
- lua? ( dev-lang/lua:0= )
- ocaml? (
- dev-lang/ocaml
- dev-ml/camlidl
- cairo? ( dev-ml/cairo-ocaml[gtk] )
- )
- octave? ( sci-mathematics/octave:0= )
- pdf? ( media-libs/libharu:0= )
- pdl? (
- dev-perl/PDL
- dev-perl/XML-DOM
- )
- python? (
- dev-python/numpy[${PYTHON_USEDEP}]
- qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
- )
- qhull? ( media-libs/qhull:0= )
- qt4? (
- dev-qt/qtgui:4=
- dev-qt/qtsvg:4=
- )
- shapefile? ( sci-libs/shapelib:0= )
- tcl? (
- dev-lang/tcl:0=
- dev-tcltk/itcl:0=
- tk? (
- dev-lang/tk:0=
- dev-tcltk/itk
- )
- )
- truetype? (
- media-fonts/freefont
- media-libs/lasi:0=
- gd? ( media-libs/gd:2=[truetype] )
- )
- wxwidgets? (
- x11-libs/wxGTK:2.8=[X]
- x11-libs/agg:0=[truetype?]
- )
- X? (
- x11-libs/libX11:0=
- x11-libs/libXau:0=
- x11-libs/libXdmcp:0=
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- java? (
- >=virtual/jdk-1.5
- dev-lang/swig
- )
- ocaml? ( dev-ml/findlib )
- octave? ( >=dev-lang/swig-2.0.12 )
- python? ( dev-lang/swig )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.9.6-python.patch
- "${FILESDIR}"/${P}-ocaml.patch
- "${FILESDIR}"/${P}-octave.patch
- "${FILESDIR}"/${P}-multiarch.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- # avoid installing license
- sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
- # prexify hard-coded /usr/include in cmake modules
- sed -i \
- -e "s:/usr/include:${EPREFIX}/usr/include:g" \
- -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:/usr/share:${EPREFIX}/usr/share:g" \
- cmake/modules/*.cmake || die
- # change default install directories for doc and examples
- sed -i \
- -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
- $(find "${S}" -name CMakeLists.txt) || die
- sed -i \
- -e 's:${VERSION}::g' \
- -e "s:doc/\${PACKAGE}:doc/${PF}:" \
- cmake/modules/instdirs.cmake || die
- java-utils-2_src_prepare
-}
-
-src_configure() {
- # don't build doc, it brings a whole lot of horrible dependencies
-
- # -DPLPLOT_USE_QT5=ON
- # Not recomended by upstream, check next release
-
- local mycmakeargs=(
- -DPLD_plmeta=ON
- -DPLD_cgm=ON
- -DTEST_DYNDRIVERS=OFF
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- -DENABLE_ada=OFF
- -DENABLE_d=OFF
- -DBUILD_DVI=OFF
- -DDOX_DOC=OFF
- -DBUILD_DOC=OFF
- -DUSE_RPATH=OFF
- -DPLD_wxpng=OFF
- $(cmake-utils_use doc PREBUILT_DOC)
- $(cmake-utils_use_build test)
- $(cmake-utils_use_has python NUMPY)
- $(cmake-utils_use_has shapefile SHAPELIB)
- $(cmake-utils_use_with truetype FREETYPE)
- $(cmake-utils_use_enable cxx)
- $(cmake-utils_use_enable dynamic DYNDRIVERS)
- $(cmake-utils_use_enable fortran f77)
- $(cmake-utils_use_enable java)
- $(cmake-utils_use_enable lua)
- $(cmake-utils_use_enable ocaml)
- $(cmake-utils_use_enable octave)
- $(cmake-utils_use_enable pdl)
- $(cmake-utils_use_enable python)
- $(cmake-utils_use_enable qt4 qt)
- $(cmake-utils_use_enable tcl)
- $(cmake-utils_use_enable tcl itcl)
- $(cmake-utils_use_enable tk)
- $(cmake-utils_use_enable tk itk)
- $(cmake-utils_use_enable wxwidgets)
- $(cmake-utils_use threads PL_HAVE_PTHREAD)
- $(cmake-utils_use qhull PL_HAVE_QHULL)
- $(cmake-utils_use qt4 PLD_aqt)
- $(cmake-utils_use qt4 PLD_bmpqt)
- $(cmake-utils_use qt4 PLD_epsqt)
- $(cmake-utils_use qt4 PLD_extqt)
- $(cmake-utils_use qt4 PLD_jpgqt)
- $(cmake-utils_use qt4 PLD_memqt)
- $(cmake-utils_use qt4 PLD_pdfqt)
- $(cmake-utils_use qt4 PLD_pngqt)
- $(cmake-utils_use qt4 PLD_ppmqt)
- $(cmake-utils_use qt4 PLD_svgqt)
- $(cmake-utils_use qt4 PLD_qtwidget)
- $(cmake-utils_use qt4 PLD_tiffqt)
- $(cmake-utils_use cairo PLD_extcairo)
- $(cmake-utils_use cairo PLD_memcairo)
- $(cmake-utils_use cairo PLD_pdfcairo)
- $(cmake-utils_use cairo PLD_pngcairo)
- $(cmake-utils_use cairo PLD_pscairo)
- $(cmake-utils_use cairo PLD_svgcairo)
- $(cmake-utils_use cairo PLD_wincairo)
- $(cmake-utils_use cairo PLD_xcairo)
- $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
- $(cmake-utils_use tk PLD_ntk)
- $(cmake-utils_use tk PLD_tk)
- $(cmake-utils_use tk PLD_tkwin)
- $(cmake-utils_use gd PLD_gif)
- $(cmake-utils_use gd PLD_jpeg)
- $(cmake-utils_use gd PLD_png)
- $(cmake-utils_use pdf PLD_pdf)
- $(cmake-utils_use latex PLD_ps)
- $(cmake-utils_use latex PLD_pstex)
- $(cmake-utils_use truetype PLD_psttf)
- $(cmake-utils_use svg PLD_svg)
- $(cmake-utils_use wxwidgets PLD_wxwidgets)
- $(cmake-utils_use X PLD_xwin)
- )
-
- [[ $(tc-getFC) != *g77 ]] && \
- mycmakeargs+=(
- $(cmake-utils_use_enable fortran f95)
- )
-
- use truetype && mycmakeargs+=(
- -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
- )
- use shapefile && mycmakeargs+=(
- -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
- )
- use ocaml && mycmakeargs+=(
- -DOCAML_INSTALL_DIR="$(ocamlc -where)"
- )
- use python && mycmakeargs+=(
- $(cmake-utils_use_enable qt4 pyqt4)
- )
-
- cmake-utils_src_configure
-
- # clean up bloated pkg-config files (help linking properly on prefix)
- sed -i \
- -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
- -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
- -e "s:${LDFLAGS}::g" \
- "${BUILD_DIR}"/pkgcfg/*pc || die
-}
-
-src_test() {
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r "${ED}"/usr/share/doc/${PF}/examples || die
- fi
- if use java; then
- rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni || die
- java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
- java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
- fi
-}
diff --git a/sci-libs/plplot/plplot-5.11.1.ebuild b/sci-libs/plplot/plplot-5.11.1.ebuild
deleted file mode 100644
index 6ec96fc..00000000
--- a/sci-libs/plplot/plplot-5.11.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python2_7 )
-VIRTUALX_REQUIRED=test
-
-inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
- virtualx wxwidgets java-pkg-opt-2 multilib
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/12"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
- ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test
- threads tk truetype wxwidgets X"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:0=[svg?,X?] )
- gd? ( media-libs/gd:2=[jpeg?,png?] )
- java? ( >=virtual/jre-1.5:* )
- latex? (
- app-text/ghostscript-gpl
- virtual/latex-base
- )
- lua? ( dev-lang/lua:0= )
- ocaml? (
- dev-lang/ocaml
- dev-ml/camlidl
- cairo? ( dev-ml/cairo-ocaml[gtk] )
- )
- octave? ( sci-mathematics/octave:0= )
- pdf? ( media-libs/libharu:0= )
- pdl? (
- dev-perl/PDL
- dev-perl/XML-DOM
- )
- python? (
- dev-python/numpy[${PYTHON_USEDEP}]
- qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
- )
- qhull? ( media-libs/qhull:0= )
- qt4? (
- dev-qt/qtgui:4=
- dev-qt/qtsvg:4=
- )
- shapefile? ( sci-libs/shapelib:0= )
- tcl? (
- dev-lang/tcl:0=
- dev-tcltk/itcl:0=
- tk? (
- dev-lang/tk:0=
- dev-tcltk/itk
- )
- )
- truetype? (
- media-fonts/freefont
- media-libs/lasi:0=
- gd? ( media-libs/gd:2=[truetype] )
- )
- wxwidgets? (
- x11-libs/wxGTK:${WX_GTK_VER}=[X]
- x11-libs/agg:0=[truetype?]
- )
- X? (
- x11-libs/libX11:0=
- x11-libs/libXau:0=
- x11-libs/libXdmcp:0=
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- java? (
- >=virtual/jdk-1.5
- dev-lang/swig
- )
- ocaml? ( dev-ml/findlib )
- octave? ( >=dev-lang/swig-2.0.12 )
- python? ( dev-lang/swig )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.9.6-python.patch
- "${FILESDIR}"/${PN}-5.11.0-ocaml.patch
- "${FILESDIR}"/${PN}-5.11.0-octave.patch
- "${FILESDIR}"/${PN}-5.11.0-multiarch.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- use wxwidgets && need-wxwidgets unicode
- cmake-utils_src_prepare
- # avoid installing license
- sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
- # prexify hard-coded /usr/include in cmake modules
- sed -i \
- -e "s:/usr/include:${EPREFIX}/usr/include:g" \
- -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:/usr/share:${EPREFIX}/usr/share:g" \
- cmake/modules/*.cmake || die
- # change default install directories for doc and examples
- sed -i \
- -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
- $(find "${S}" -name CMakeLists.txt) || die
- sed -i \
- -e 's:${VERSION}::g' \
- -e "s:doc/\${PACKAGE}:doc/${PF}:" \
- cmake/modules/instdirs.cmake || die
- java-utils-2_src_prepare
-}
-
-src_configure() {
- # don't build doc, it brings a whole lot of horrible dependencies
-
- # -DPLPLOT_USE_QT5=ON
- # Not recomended by upstream, check next release
-
- local mycmakeargs=(
- -DPLD_plmeta=ON
- -DPLD_cgm=ON
- -DTEST_DYNDRIVERS=OFF
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- -DENABLE_ada=OFF
- -DENABLE_d=OFF
- -DBUILD_DVI=OFF
- -DDOX_DOC=OFF
- -DBUILD_DOC=OFF
- -DUSE_RPATH=OFF
- -DPLD_wxpng=OFF
- $(cmake-utils_use doc PREBUILT_DOC)
- $(cmake-utils_use_build test)
- $(cmake-utils_use_has python NUMPY)
- $(cmake-utils_use_has shapefile SHAPELIB)
- $(cmake-utils_use_with truetype FREETYPE)
- $(cmake-utils_use_enable cxx)
- $(cmake-utils_use_enable dynamic DYNDRIVERS)
- $(cmake-utils_use_enable fortran f77)
- $(cmake-utils_use_enable java)
- $(cmake-utils_use_enable lua)
- $(cmake-utils_use_enable ocaml)
- $(cmake-utils_use_enable octave)
- $(cmake-utils_use_enable pdl)
- $(cmake-utils_use_enable python)
- $(cmake-utils_use_enable qt4 qt)
- $(cmake-utils_use_enable tcl)
- $(cmake-utils_use_enable tcl itcl)
- $(cmake-utils_use_enable tk)
- $(cmake-utils_use_enable tk itk)
- $(cmake-utils_use_enable wxwidgets)
- $(cmake-utils_use threads PL_HAVE_PTHREAD)
- $(cmake-utils_use qhull PL_HAVE_QHULL)
- $(cmake-utils_use qt4 PLD_aqt)
- $(cmake-utils_use qt4 PLD_bmpqt)
- $(cmake-utils_use qt4 PLD_epsqt)
- $(cmake-utils_use qt4 PLD_extqt)
- $(cmake-utils_use qt4 PLD_jpgqt)
- $(cmake-utils_use qt4 PLD_memqt)
- $(cmake-utils_use qt4 PLD_pdfqt)
- $(cmake-utils_use qt4 PLD_pngqt)
- $(cmake-utils_use qt4 PLD_ppmqt)
- $(cmake-utils_use qt4 PLD_svgqt)
- $(cmake-utils_use qt4 PLD_qtwidget)
- $(cmake-utils_use qt4 PLD_tiffqt)
- $(cmake-utils_use cairo PLD_extcairo)
- $(cmake-utils_use cairo PLD_memcairo)
- $(cmake-utils_use cairo PLD_pdfcairo)
- $(cmake-utils_use cairo PLD_pngcairo)
- $(cmake-utils_use cairo PLD_pscairo)
- $(cmake-utils_use cairo PLD_svgcairo)
- $(cmake-utils_use cairo PLD_wincairo)
- $(cmake-utils_use cairo PLD_xcairo)
- $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
- $(cmake-utils_use tk PLD_ntk)
- $(cmake-utils_use tk PLD_tk)
- $(cmake-utils_use tk PLD_tkwin)
- $(cmake-utils_use gd PLD_gif)
- $(cmake-utils_use gd PLD_jpeg)
- $(cmake-utils_use gd PLD_png)
- $(cmake-utils_use pdf PLD_pdf)
- $(cmake-utils_use latex PLD_ps)
- $(cmake-utils_use latex PLD_pstex)
- $(cmake-utils_use truetype PLD_psttf)
- $(cmake-utils_use svg PLD_svg)
- $(cmake-utils_use wxwidgets PLD_wxwidgets)
- $(cmake-utils_use X PLD_xwin)
- )
-
- [[ $(tc-getFC) != *g77 ]] && \
- mycmakeargs+=(
- $(cmake-utils_use_enable fortran f95)
- )
-
- use truetype && mycmakeargs+=(
- -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
- )
- use shapefile && mycmakeargs+=(
- -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
- )
- use ocaml && mycmakeargs+=(
- -DOCAML_INSTALL_DIR="$(ocamlc -where)"
- )
- use python && mycmakeargs+=(
- $(cmake-utils_use_enable qt4 pyqt4)
- )
-
- cmake-utils_src_configure
-
- # clean up bloated pkg-config files (help linking properly on prefix)
- sed -i \
- -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
- -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
- -e "s:${LDFLAGS}::g" \
- "${BUILD_DIR}"/pkgcfg/*pc || die
-}
-
-src_test() {
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r "${ED}"/usr/share/doc/${PF}/examples || die
- fi
- if use java; then
- rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni || die
- java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
- java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
- fi
-}
next reply other threads:[~2016-11-25 18:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-25 18:57 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-18 19:10 [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/ David Seifert
2017-07-09 21:03 David Seifert
2018-01-22 0:42 Andreas Sturmlechner
2020-01-16 7:03 Michał Górny
2023-04-14 4:00 Sam James
2024-05-10 1:43 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480100194.dad2fef9431da5d53012fdab9a3a37ab64234a23.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox