diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-22 01:12:02 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-22 01:42:30 +0100 |
commit | ea558c969ac66320d8e6dd31a51f21dc0df551c8 (patch) | |
tree | 0c90bb6216c2588dcaad3a8cf1b8e646314bdb49 /sci-libs/plplot/files | |
parent | virtual/bitcoin-leveldb: revbump to 0-r2 for leveldb-1.18-r2 dep change (bug ... (diff) | |
download | gentoo-ea558c969ac66320d8e6dd31a51f21dc0df551c8.tar.gz gentoo-ea558c969ac66320d8e6dd31a51f21dc0df551c8.tar.bz2 gentoo-ea558c969ac66320d8e6dd31a51f21dc0df551c8.zip |
sci-libs/plplot: Drop old
Version 5.12.0-r1 is probably not going to be stabilised soon.
Considering 5.11.1-r1 is having issues as well, follow Soap_'s
advice and simply de-stabilise this package.
Bug: https://bugs.gentoo.org/644414
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'sci-libs/plplot/files')
-rw-r--r-- | sci-libs/plplot/files/plplot-5.11.0-multiarch.patch | 60 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.11.0-ocaml.patch | 40 |
2 files changed, 0 insertions, 100 deletions
diff --git a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch deleted file mode 100644 index cb6f7d01cf16..000000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch +++ /dev/null @@ -1,60 +0,0 @@ - examples/c++/Makefile.examples.in | 3 --- - examples/c/Makefile.examples.in | 2 -- - examples/f95/Makefile.examples.in | 2 -- - examples/tk/Makefile.examples.in | 2 -- - 4 files changed, 9 deletions(-) - -diff --git a/examples/c++/Makefile.examples.in b/examples/c++/Makefile.examples.in -index bb067e7..176706b 100644 ---- a/examples/c++/Makefile.examples.in -+++ b/examples/c++/Makefile.examples.in -@@ -25,10 +25,7 @@ SHELL = @SH_EXECUTABLE@ - CXX = @CXX@ - EXEEXT = @EXEEXT@ - --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 --git a/examples/c/Makefile.examples.in b/examples/c/Makefile.examples.in -index bc47762..56d1f49 100644 ---- a/examples/c/Makefile.examples.in -+++ b/examples/c/Makefile.examples.in -@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - - @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \ - @gcw_true@ plplotcanvas_demo$(EXEEXT) \ -diff --git a/examples/f95/Makefile.examples.in b/examples/f95/Makefile.examples.in -index 29631b7..32823d6 100644 ---- a/examples/f95/Makefile.examples.in -+++ b/examples/f95/Makefile.examples.in -@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@ - F95 = @FC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - - EXECUTABLES_list = \ - x00f$(EXEEXT) \ -diff --git a/examples/tk/Makefile.examples.in b/examples/tk/Makefile.examples.in -index 98407fa..c15c94a 100644 ---- a/examples/tk/Makefile.examples.in -+++ b/examples/tk/Makefile.examples.in -@@ -24,8 +24,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --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.11.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch deleted file mode 100644 index 32841825f0de..000000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch +++ /dev/null @@ -1,40 +0,0 @@ - bindings/ocaml/CMakeLists.txt | 4 ++-- - bindings/ocaml/plcairo/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bindings/ocaml/CMakeLists.txt b/bindings/ocaml/CMakeLists.txt -index 93d073a..d31a64f 100644 ---- a/bindings/ocaml/CMakeLists.txt -+++ b/bindings/ocaml/CMakeLists.txt -@@ -154,11 +154,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 -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 -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -diff --git a/bindings/ocaml/plcairo/CMakeLists.txt b/bindings/ocaml/plcairo/CMakeLists.txt -index c4b4a41..ce1dc92 100644 ---- a/bindings/ocaml/plcairo/CMakeLists.txt -+++ b/bindings/ocaml/plcairo/CMakeLists.txt -@@ -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 -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 -dllpath ${CMAKE_BINARY_DIR}/src - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |