* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2020-01-16 7:03 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2020-01-16 7:03 UTC (permalink / raw
To: gentoo-commits
commit: 54487bb4b714227bb48925c2316cd2305566f23e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:55:11 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 07:02:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54487bb4
sci-libs/plplot: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/plplot/Manifest | 1 -
sci-libs/plplot/files/plplot-5.11.0-octave.patch | 16 -
.../files/plplot-5.12.0-java-install-path.patch | 13 -
.../plplot/files/plplot-5.12.0-multiarch.patch | 49 ---
.../files/plplot-5.12.0-ocaml-remove-rpath.patch | 34 --
sci-libs/plplot/files/replace-gdc-extensions.patch | 434 ---------------------
sci-libs/plplot/metadata.xml | 1 -
sci-libs/plplot/plplot-5.12.0-r1.ebuild | 282 -------------
8 files changed, 830 deletions(-)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index f8b1522a06a..782cbdef89d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,2 +1 @@
-DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b
DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
diff --git a/sci-libs/plplot/files/plplot-5.11.0-octave.patch b/sci-libs/plplot/files/plplot-5.11.0-octave.patch
deleted file mode 100644
index a2a41c96da7..00000000000
--- a/sci-libs/plplot/files/plplot-5.11.0-octave.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- plplot_test/test_octave.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plplot_test/test_octave.sh.in b/plplot_test/test_octave.sh.in
-index 8a50d8b..8eb35fc 100755
---- a/plplot_test/test_octave.sh.in
-+++ b/plplot_test/test_octave.sh.in
-@@ -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 <<EOF 2> test.error
-+$octave -f -q $octaveopts -p "$octavedir" <<EOF 2> test.error
-
- # Disable warnings about shadowed functions - PLplot is _supposed_ to shadow the core functions
- warning("off","Octave:shadowed-function");
diff --git a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch
deleted file mode 100644
index 2c053a2b166..00000000000
--- a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Java libs are installed into an already prefixed path.
-
---- a/bindings/java/CMakeLists.txt
-+++ b/bindings/java/CMakeLists.txt
-@@ -189,7 +189,7 @@
- )
- endif(APPLE)
-
-- install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_HARDDIR})
-+ install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_DIR})
-
- set(JAVA_CLASSES)
- foreach( srcfile ${JAVA_FILES_FULL} )
diff --git a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch
deleted file mode 100644
index 63e92f5aa5a..00000000000
--- a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/examples/c/Makefile.examples.in
-+++ b/examples/c/Makefile.examples.in
-@@ -25,9 +25,6 @@
- CC = @CC@
- EXEEXT = @EXEEXT@
-
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
--
- @extXdrawable_true@extXdrawable_EXECUTABLES_list = \
- @extXdrawable_true@ extXdrawable_demo$(EXEEXT)
-
---- a/examples/c++/Makefile.examples.in
-+++ b/examples/c++/Makefile.examples.in
-@@ -25,10 +25,7 @@
- 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@ @wxdemo_name@$(EXEEXT)
---- a/examples/f95/Makefile.examples.in
-+++ b/examples/f95/Makefile.examples.in
-@@ -25,9 +25,6 @@
- F95 = @FC@
- EXEEXT = @EXEEXT@
-
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--FORTRAN_RPATHCMD = @FORTRAN_RPATHCMD@
--
- EXECUTABLES_list = \
- x00f$(EXEEXT) \
- x01f$(EXEEXT) \
---- a/examples/tk/Makefile.examples.in
-+++ b/examples/tk/Makefile.examples.in
-@@ -24,9 +24,6 @@
- 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.
- @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT)
diff --git a/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch b/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch
deleted file mode 100644
index 2d18c79736f..00000000000
--- a/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix OCaml's asinine RPATH inserting behaviour.
-
---- a/bindings/ocaml/CMakeLists.txt
-+++ b/bindings/ocaml/CMakeLists.txt
-@@ -97,6 +97,20 @@
-
- # ocamlc -c compiles *.c into *.o.
- # ocamlmklib links *.o into *.so and *.a
-+
-+ # ocamlmklib implicits inserts RPATHs if it is provided with an absolute path to -L,
-+ # which is absolutely unacceptable and presents a massive security hazard. The
-+ # following statements convert the absolute paths to relative ones to fix this.
-+ # See also:
-+ # https://caml.inria.fr/mantis/view.php?id=5943
-+ if(CMAKE_SKIP_RPATH)
-+ file(RELATIVE_PATH CAMLIDL_LINK_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR} ${CAMLIDL_LIB_DIR})
-+ file(RELATIVE_PATH CMAKE_LINK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR})
-+ else(CMAKE_SKIP_RPATH)
-+ set(CAMLIDL_LINK_LIB_DIR ${CAMLIDL_LIB_DIR})
-+ set(CMAKE_LINK_BINARY_DIR ${CMAKE_BINARY_DIR})
-+ endif(CMAKE_SKIP_RPATH)
-+
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o
-@@ -105,7 +119,7 @@
- ${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 -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 ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
-+ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LINK_LIB_DIR} -lcamlidl -L${CMAKE_LINK_BINARY_DIR}/src -lplplot ${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
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
diff --git a/sci-libs/plplot/files/replace-gdc-extensions.patch b/sci-libs/plplot/files/replace-gdc-extensions.patch
deleted file mode 100644
index 551926dc154..00000000000
--- a/sci-libs/plplot/files/replace-gdc-extensions.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-Description: Replace gdc extensions in D binding and examples source code with equivalent standard D source code
- This patch is needed to avoid FTBFS with recent gdc versions.
-Origin: upstream, https://sourceforge.net/p/plplot/plplot/ci/74799e02c5435e491b46dfc1fd053753105c3441/
-Reviewed-by: Sébastien Villemot <sebastien@debian.org>
-Last-Update: 2019-10-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/bindings/d/plplot.d
-+++ b/bindings/d/plplot.d
-@@ -298,7 +298,7 @@ void plfill3( PLFLT[] x, PLFLT[] y, PLFL
- // Get the current device (keyword) name
- void plgdev( out string p_dev )
- {
-- char cdev[1024];
-+ char[1024] cdev;
- c_plgdev( cdev.ptr );
- p_dev = to!string( cdev.ptr );
- }
-@@ -306,7 +306,7 @@ void plgdev( out string p_dev )
- // Get the (current) output file name. Must be preallocated to >80 bytes
- void plgfnam( out string fnam )
- {
-- char cfnam[1024];
-+ char[1024] cfnam;
- c_plgfnam( cfnam.ptr );
- fnam = to!string( cfnam.ptr );
- }
-@@ -337,7 +337,7 @@ void plgriddata( PLFLT[] x, PLFLT[] y,
- // Get the current library version number
- void plgver( out string p_ver )
- {
-- char cver[1024];
-+ char[1024] cver;
- c_plgver( cver.ptr );
- p_ver = to!string( cver.ptr );
- }
---- a/examples/d/x01d.d
-+++ b/examples/d/x01d.d
-@@ -224,7 +224,7 @@ class plot {
-
- if ( do_test && test_xor )
- {
-- writefln( "The -xor command line option can only be exercised if your "
-+ writefln( "The -xor command line option can only be exercised if your " ~
- "system\nhas usleep(), which does not seem to happen." );
- }
- }
-@@ -294,4 +294,4 @@ class plot {
- plcol0( 4 );
- plline( x, y );
- }
--}
-\ No newline at end of file
-+}
---- a/examples/d/x08d.d
-+++ b/examples/d/x08d.d
-@@ -24,7 +24,7 @@
- import plplot;
- import std.string;
- import std.math;
--import std.c.stdlib;
-+import core.stdc.stdlib;
-
- //--------------------------------------------------------------------------
- // cmap1_init1
-@@ -92,8 +92,8 @@ int main( char[][] args )
- PLFLT[] alt = [ 60.0, 40.0 ];
- PLFLT[] az = [ 30.0, -30.0 ];
-
-- string title[] = [ "#frPLplot Example 8 - Alt=60, Az=30",
-- "#frPLplot Example 8 - Alt=40, Az=-30" ];
-+ string[] title = [ "#frPLplot Example 8 - Alt=60, Az=30",
-+ "#frPLplot Example 8 - Alt=40, Az=-30" ];
-
- // Parse and process command line arguments
- plparseopts( args, PL_PARSE_FULL );
---- a/examples/d/x11d.d
-+++ b/examples/d/x11d.d
-@@ -48,16 +48,16 @@ void cmap1_init()
- //--------------------------------------------------------------------------
- int main( char[][] args )
- {
-- const nlevel = 10;
-- const XPTS = 35; // Data points in x
-- const YPTS = 46; // Data points in y
-+ const nlevel = 10;
-+ const XPTS = 35; // Data points in x
-+ const YPTS = 46; // Data points in y
-
-- int[] opt = [ DRAW_LINEXY, DRAW_LINEXY ];
-+ int[] opt = [ DRAW_LINEXY, DRAW_LINEXY ];
-
-- PLFLT[] alt = [ 33.0, 17.0 ];
-- PLFLT[] az = [ 24.0, 115.0 ];
-+ PLFLT[] alt = [ 33.0, 17.0 ];
-+ PLFLT[] az = [ 24.0, 115.0 ];
-
-- string title[] = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
-+ string[] title = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
- "#frPLplot Example 11 - Alt=17, Az=115, Opt=3" ];
-
- PLFLT xx, yy;
---- a/examples/d/x15d.d
-+++ b/examples/d/x15d.d
-@@ -145,10 +145,10 @@ class plot {
- //--------------------------------------------------------------------------
- public void plot2( PLFLT[][] z )
- {
-- static PLINT nlin[10] = [ 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 ];
-- static PLINT inc[10][2] = [ [450, 0], [-450, 0], [0, 0], [900, 0], [300, 0],
-+ static PLINT[10] nlin = [ 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 ];
-+ static PLINT[2][10] inc = [ [450, 0], [-450, 0], [0, 0], [900, 0], [300, 0],
- [450, -450], [0, 900], [0, 450], [450, -450], [0, 900] ];
-- static PLINT del[10][2] = [ [2000, 2000], [2000, 2000], [2000, 2000],
-+ static PLINT[2][10] del = [ [2000, 2000], [2000, 2000], [2000, 2000],
- [2000, 2000], [2000, 2000], [2000, 2000],
- [2000, 2000], [2000, 2000], [4000, 4000],
- [4000, 2000] ];
-@@ -191,11 +191,11 @@ class plot {
- //--------------------------------------------------------------------------
- public void plot3()
- {
-- static PLFLT xx[2][5] = [ [-1.0, 1.0, 1.0, -1.0, -1.0],
-+ static PLFLT[5][2] xx = [ [-1.0, 1.0, 1.0, -1.0, -1.0],
- [-1.0, 1.0, 1.0, -1.0, -1.0] ];
-- static PLFLT yy[2][5] = [ [1.0, 1.0, 0.0, 0.0, 1.0],
-+ static PLFLT[5][2] yy = [ [1.0, 1.0, 0.0, 0.0, 1.0],
- [-1.0, -1.0, 0.0, 0.0, -1.0] ];
-- static PLFLT zz[2][5] = [ [0.0, 0.0, 1.0, 1.0, 0.0],
-+ static PLFLT[5][2] zz = [ [0.0, 0.0, 1.0, 1.0, 0.0],
- [0.0, 0.0, 1.0, 1.0, 0.0] ];
-
- pladv( 0 );
---- a/examples/d/x16d.d
-+++ b/examples/d/x16d.d
-@@ -195,7 +195,7 @@ int main( char[][] args )
- string[] axis_opts = [
- "bcvtm",
- ];
-- PLFLT[] values[NUM_AXES];
-+ PLFLT[][NUM_AXES] values;
- for ( size_t i = 0; i < NUM_AXES; i++ )
- {
- values[i] = new PLFLT[ns];
-@@ -207,7 +207,7 @@ int main( char[][] args )
- 0,
- ];
- const int NUM_LABELS = 1;
-- PLINT label_opts[] = [
-+ PLINT[] label_opts = [
- PL_COLORBAR_LABEL_BOTTOM,
- ];
- string[] labels = [
---- a/examples/d/x17d.d
-+++ b/examples/d/x17d.d
-@@ -4,7 +4,7 @@
- import std.string;
- import std.math;
- import std.stdio;
--import std.c.stdlib;
-+import core.stdc.stdlib;
- import plplot;
-
-
---- a/examples/d/x18d.d
-+++ b/examples/d/x18d.d
-@@ -6,9 +6,9 @@ import std.string;
-
- import plplot;
-
--int opt[] = [ 1, 0, 1, 0 ];
--PLFLT alt[] = [ 20.0, 35.0, 50.0, 65.0 ];
--PLFLT az[] = [ 30.0, 40.0, 50.0, 60.0 ];
-+int[] opt = [ 1, 0, 1, 0 ];
-+PLFLT[] alt = [ 20.0, 35.0, 50.0, 65.0 ];
-+PLFLT[] az = [ 30.0, 40.0, 50.0, 60.0 ];
-
- //--------------------------------------------------------------------------
- // main
-@@ -81,7 +81,7 @@ int main( char[][] args )
-
- void test_poly( int k )
- {
-- PLINT draw[][] = [ [ 1, 1, 1, 1 ],
-+ PLINT[][] draw = [ [ 1, 1, 1, 1 ],
- [ 1, 0, 1, 0 ],
- [ 0, 1, 0, 1 ],
- [ 1, 1, 0, 0 ] ];
---- a/examples/d/x19d.d
-+++ b/examples/d/x19d.d
-@@ -4,7 +4,7 @@
-
- import std.math;
- import std.string;
--import std.c.string;
-+import core.stdc.string;
-
- import plplot;
-
-@@ -109,15 +109,15 @@ int main( char[][] args )
- PLFLT maxy = 80;
-
- //variables for the shapelib example
-- const PLINT nbeachareas = 2;
-- const PLINT beachareas[] = [ 23, 24 ];
-- const nwoodlandareas = 94;
-- PLINT woodlandareas[94];
-- const PLINT nshingleareas = 22;
-- const PLINT shingleareas[] = [ 0, 1, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 217, 2424, 2425, 2426, 2427, 2428, 2491, 2577 ];
-- const PLINT ncragareas = 2024;
-- PLINT cragareas[2024];
-- const PLINT majorroads[] = [ 33, 48, 71, 83, 89, 90, 101, 102, 111 ];
-+ const PLINT nbeachareas = 2;
-+ const PLINT[] beachareas = [ 23, 24 ];
-+ const nwoodlandareas = 94;
-+ PLINT[94] woodlandareas;
-+ const PLINT nshingleareas = 22;
-+ const PLINT[] shingleareas = [ 0, 1, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 217, 2424, 2425, 2426, 2427, 2428, 2491, 2577 ];
-+ const PLINT ncragareas = 2024;
-+ PLINT[2024] cragareas;
-+ const PLINT[] majorroads = [ 33, 48, 71, 83, 89, 90, 101, 102, 111 ];
-
- plinit();
-
-@@ -173,8 +173,8 @@ int main( char[][] args )
- // Show Baltimore, MD on the map
- plcol0( 2 );
- plssym( 0.0, 2.0 );
-- PLFLT x[1] = -76.6125;
-- PLFLT y[1] = 39.2902778;
-+ PLFLT[1] x = -76.6125;
-+ PLFLT[1] y = 39.2902778;
- plpoin( x, y, 18 );
- plssym( 0.0, 1.0 );
- plptex( -76.6125, 43.0, 0.0, 0.0, 0.0, "Baltimore, MD" );
---- a/examples/d/x23d.d
-+++ b/examples/d/x23d.d
-@@ -336,14 +336,14 @@ int main( char[][] args )
- }
- else if ( page == 14 )
- {
-- text = format( "Page 15, %s, %s, %s: #<0x%1x0>#<0x%1x1>#<0x%1x2>"
-+ text = format( "Page 15, %s, %s, %s: #<0x%1x0>#<0x%1x1>#<0x%1x2>" ~
- "The quick brown fox jumps over the lazy dog",
- family[family_index], style[style_index], weight[weight_index],
- family_index, style_index, weight_index );
- }
- else if ( page == 15 )
- {
-- text = format( "Page 16, %s, %s, %s: #<%s/>#<%s/>#<%s/>"
-+ text = format( "Page 16, %s, %s, %s: #<%s/>#<%s/>#<%s/>" ~
- "The quick brown fox jumps over the lazy dog",
- family[family_index], style[style_index], weight[weight_index],
- family[family_index], style[style_index], weight[weight_index] );
---- a/examples/d/x33d.d
-+++ b/examples/d/x33d.d
-@@ -30,7 +30,7 @@ import plplot;
- import std.math;
- import std.string;
-
--static PLINT position_options[16] = [
-+static PLINT[16] position_options = [
- PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
- PL_POSITION_TOP | PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
-@@ -50,7 +50,7 @@ static PLINT position_options[16] = [
- ];
-
- // Pick 5 arbitrary UTF-8 symbols useful for plotting points (✠✚✱✪✽✺✰✴✦).
--static string special_symbols[5] = [
-+static string[5] special_symbols = [
- "✰",
- "✴",
- "✱",
-@@ -61,14 +61,14 @@ static string special_symbols[5] = [
- // plcolorbar options
-
- // Colorbar type options
--const int COLORBAR_KINDS = 4;
--static PLINT colorbar_option_kinds[COLORBAR_KINDS] = [
-+const int COLORBAR_KINDS = 4;
-+static PLINT[COLORBAR_KINDS] colorbar_option_kinds = [
- PL_COLORBAR_SHADE,
- PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL,
- PL_COLORBAR_IMAGE,
- PL_COLORBAR_GRADIENT
- ];
--static string colorbar_option_kind_labels[COLORBAR_KINDS] = [
-+static string[COLORBAR_KINDS] colorbar_option_kind_labels = [
- "Shade colorbars",
- "Shade colorbars with custom labels",
- "Image colorbars",
-@@ -76,14 +76,14 @@ static string colorbar_option_kind_label
- ];
-
- // Which side of the page are we positioned relative to?
--const int COLORBAR_POSITIONS = 4;
--static PLINT colorbar_position_options[COLORBAR_POSITIONS] = [
-+const int COLORBAR_POSITIONS = 4;
-+static PLINT[COLORBAR_POSITIONS] colorbar_position_options = [
- PL_POSITION_LEFT,
- PL_POSITION_RIGHT,
- PL_POSITION_TOP,
- PL_POSITION_BOTTOM
- ];
--static string colorbar_position_option_labels[COLORBAR_POSITIONS] = [
-+static string[COLORBAR_POSITIONS] colorbar_position_option_labels = [
- "Left",
- "Right",
- "Top",
-@@ -91,14 +91,14 @@ static string colorbar_position_option_l
- ];
-
- // Colorbar label positioning options
--const int COLORBAR_LABELS = 4;
--static PLINT colorbar_label_options[COLORBAR_LABELS] = [
-+const int COLORBAR_LABELS = 4;
-+static PLINT[COLORBAR_LABELS] colorbar_label_options = [
- PL_COLORBAR_LABEL_LEFT,
- PL_COLORBAR_LABEL_RIGHT,
- PL_COLORBAR_LABEL_TOP,
- PL_COLORBAR_LABEL_BOTTOM
- ];
--static string colorbar_label_option_labels[COLORBAR_LABELS] = [
-+static string[COLORBAR_LABELS] colorbar_label_option_labels = [
- "Label left",
- "Label right",
- "Label top",
-@@ -106,14 +106,14 @@ static string colorbar_label_option_labe
- ];
-
- // Colorbar cap options
--const int COLORBAR_CAPS = 4;
--static PLINT colorbar_cap_options[COLORBAR_CAPS] = [
-+const int COLORBAR_CAPS = 4;
-+static PLINT[COLORBAR_CAPS] colorbar_cap_options = [
- PL_COLORBAR_CAP_NONE,
- PL_COLORBAR_CAP_LOW,
- PL_COLORBAR_CAP_HIGH,
- PL_COLORBAR_CAP_LOW | PL_COLORBAR_CAP_HIGH
- ];
--static string colorbar_cap_option_labels[COLORBAR_CAPS] = [
-+static string[COLORBAR_CAPS] colorbar_cap_option_labels = [
- "No caps",
- "Low cap",
- "High cap",
-@@ -126,20 +126,20 @@ void
- plcolorbar_example_page( int kind_i, int label_i, int cap_i, PLINT cont_color, PLFLT cont_width, PLINT n_values, PLFLT [] values )
- {
- // Parameters for the colorbars on this page
-- PLINT position_i, position, opt;
-- PLFLT x, y, x_length, y_length;
-- PLFLT ticks[1] = [ 0.0 ];
-- PLINT sub_ticks[1] = [ 0 ];
-+ PLINT position_i, position, opt;
-+ PLFLT x, y, x_length, y_length;
-+ PLFLT[1] ticks = [ 0.0 ];
-+ PLINT[1] sub_ticks = [ 0 ];
- PLFLT low_cap_color, high_cap_color;
- PLINT vertical, ifn;
- PLINT n_axes = 1;
- string[] axis_opts;
-- PLINT n_labels = 1;
-- PLINT label_opts[1] = [ 0 ];
-+ PLINT n_labels = 1;
-+ PLINT[1] label_opts = [ 0 ];
- string[] label;
- string title;
- PLFLT colorbar_width, colorbar_height;
-- PLINT n_values_array[1];
-+ PLINT[1] n_values_array;
- PLFLT[][] values_array;
-
- axis_opts.length = 1;
-@@ -279,26 +279,26 @@ const int MAX_NLEGEND = 7;
-
- int main( char[][] args )
- {
-- int i, k;
-- PLINT opt;
-- PLINT nlegend, nturn;
-- PLINT opt_array[MAX_NLEGEND];
-- PLINT text_colors[MAX_NLEGEND];
-- PLINT box_colors[MAX_NLEGEND];
-- PLINT box_patterns[MAX_NLEGEND];
-- PLFLT box_scales[MAX_NLEGEND];
-- PLFLT box_line_widths[MAX_NLEGEND];
-- PLINT line_colors[MAX_NLEGEND];
-- PLINT line_styles[MAX_NLEGEND];
-- PLFLT line_widths[MAX_NLEGEND];
-- PLINT symbol_numbers[MAX_NLEGEND];
-- PLINT symbol_colors[MAX_NLEGEND];
-- PLFLT symbol_scales[MAX_NLEGEND];
-- string text[MAX_NLEGEND];
-- string symbols[MAX_NLEGEND];
-- PLFLT legend_width, legend_height, x, y, xstart, ystart;
-- PLFLT max_height, text_scale;
-- PLINT position, opt_base, nrow, ncolumn;
-+ int i, k;
-+ PLINT opt;
-+ PLINT nlegend, nturn;
-+ PLINT[MAX_NLEGEND] opt_array;
-+ PLINT[MAX_NLEGEND] text_colors;
-+ PLINT[MAX_NLEGEND] box_colors;
-+ PLINT[MAX_NLEGEND] box_patterns;
-+ PLFLT[MAX_NLEGEND] box_scales;
-+ PLFLT[MAX_NLEGEND] box_line_widths;
-+ PLINT[MAX_NLEGEND] line_colors;
-+ PLINT[MAX_NLEGEND] line_styles;
-+ PLFLT[MAX_NLEGEND] line_widths;
-+ PLINT[MAX_NLEGEND] symbol_numbers;
-+ PLINT[MAX_NLEGEND] symbol_colors;
-+ PLFLT[MAX_NLEGEND] symbol_scales;
-+ string[MAX_NLEGEND] text;
-+ string[MAX_NLEGEND] symbols;
-+ PLFLT legend_width, legend_height, x, y, xstart, ystart;
-+ PLFLT max_height, text_scale;
-+ PLINT position, opt_base, nrow, ncolumn;
-
- // Parse and process command line arguments
- plparseopts( args, PL_PARSE_FULL );
-@@ -822,9 +822,9 @@ int main( char[][] args )
- if ( colorbar )
- {
- // Color bar examples
-- PLFLT values_small[2] = [ -1.0e-20, 1.0e-20 ];
-- PLFLT values_uneven[9] = [ -1.0e-20, 2.0e-20, 2.6e-20, 3.4e-20, 6.0e-20, 7.0e-20, 8.0e-20, 9.0e-20, 10.0e-20 ];
-- PLFLT values_even[9] = [ -2.0e-20, -1.0e-20, 0.0e-20, 1.0e-20, 2.0e-20, 3.0e-20, 4.0e-20, 5.0e-20, 6.0e-20 ];
-+ PLFLT[2] values_small = [ -1.0e-20, 1.0e-20 ];
-+ PLFLT[9] values_uneven = [ -1.0e-20, 2.0e-20, 2.6e-20, 3.4e-20, 6.0e-20, 7.0e-20, 8.0e-20, 9.0e-20, 10.0e-20 ];
-+ PLFLT[9] values_even = [ -2.0e-20, -1.0e-20, 0.0e-20, 1.0e-20, 2.0e-20, 3.0e-20, 4.0e-20, 5.0e-20, 6.0e-20 ];
-
- // Use unsaturated green background colour to contrast with black caps.
- plscolbg( 70, 185, 70 );
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 7b64efe140a..88a36164cbf 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -9,7 +9,6 @@
<use>
<flag name="dynamic">Build with dynamic drivers</flag>
<flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
- <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag>
<flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
<flag name="shapefile">Enable support for ESRI shapefiles</flag>
</use>
diff --git a/sci-libs/plplot/plplot-5.12.0-r1.ebuild b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
deleted file mode 100644
index cf5c4e33674..00000000000
--- a/sci-libs/plplot/plplot-5.12.0-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0-gtk3
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=95
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/14" # SONAME of libplplot.so
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
- pdl png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )"
-RESTRICT="!test? ( test ) octave? ( test )"
-
-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? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
- )
- qhull? ( media-libs/qhull:0= )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtprintsupport:5
- )
- 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-3.0.12 )
- python? ( dev-lang/swig )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.9.6-python.patch
- "${FILESDIR}"/${PN}-5.11.0-octave.patch
- "${FILESDIR}"/${PN}-5.12.0-multiarch.patch
- "${FILESDIR}"/${PN}-5.12.0-java-install-path.patch
- "${FILESDIR}"/${PN}-5.12.0-ocaml-remove-rpath.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
- use fortran && fortran-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
- local f
- while IFS="" read -d $'\0' -r f; do
- sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die
- done < <(find "${S}" -name CMakeLists.txt -print0)
-
- 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 pulls in a whole stack of horrible dependencies
- # - Bindings:
- # * Ada is a mess in Gentoo, don't use
- # * D has been removed from Gentoo, don't use
- # * Qt4 has been disabled, as it is deprecated and unsupported upstream
- # - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
- # the testsuite performs a string comparison to determine which tests to run
-
- # Octave bindings now require C++11 support, #609980
- append-cxxflags -std=c++11
-
- local mycmakeargs=(
- # The build system does not honour CMAKE_INSTALL_LIBDIR as a
- # relative dir, which is against the spirit of GNUInstallDirs, #610066
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-
- ## Features
- -DBUILD_DOC=OFF
- -DBUILD_DOX_DOC=OFF
- -DCMAKE_SKIP_RPATH=ON
- -DPREBUILT_DOC=$(usex doc)
- -DHAVE_SHAPELIB=$(usex shapefile)
- -DWITH_FREETYPE=$(usex truetype)
- -DPL_HAVE_PTHREAD=$(usex threads)
- -DPL_HAVE_QHULL=$(usex qhull)
- -DPLPLOT_USE_QT5=$(usex qt5)
-
- ## Tests
- -DTEST_DYNDRIVERS=OFF
- -DBUILD_TEST=$(usex test)
-
- ## Bindings
- -DENABLE_ada=OFF
- -DENABLE_d=OFF
- -DENABLE_ocaml=$(usex ocaml)
- -DENABLE_pyqt4=OFF
- -DENABLE_cxx=$(usex cxx)
- -DENABLE_DYNDRIVERS=$(usex dynamic)
- -DENABLE_f95=$(usex fortran)
- -DENABLE_java=$(usex java)
- -DENABLE_lua=$(usex lua)
- -DTRY_OCTAVE4=$(usex octave)
- -DENABLE_octave=$(usex octave)
- -DENABLE_pdl=$(usex pdl)
- -DENABLE_python=$(usex python)
- -DENABLE_qt=$(usex qt5)
- -DENABLE_tcl=$(usex tcl)
- -DENABLE_itcl=$(usex tcl)
- -DENABLE_tk=$(usex tk)
- -DENABLE_itk=$(usex tk)
- -DENABLE_wxwidgets=$(usex wxwidgets)
-
- ## Drivers
- -DPLD_cgm=OFF
- -DPLD_gif=OFF
- -DPLD_jpeg=OFF
- -DPLD_plmeta=OFF
- -DPLD_png=OFF
- -DPLD_pstex=OFF
- -DPLD_wxpng=OFF
- -DPLD_mem=ON
- -DPLD_null=ON
- -DPLD_wingcc=ON
- # Cairo
- $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
- -DPLD_epscairo=$(usex cairo ON OFF)
- -DPLD_extcairo=$(usex cairo ON OFF)
- -DPLD_memcairo=$(usex cairo ON OFF)
- -DPLD_pdfcairo=$(usex cairo ON OFF)
- -DPLD_pngcairo=$(usex cairo ON OFF)
- -DPLD_pscairo=$(usex cairo ON OFF)
- -DPLD_svgcairo=$(usex cairo ON OFF)
- -DPLD_xcairo=$(usex cairo ON OFF)
- # LaTeX
- -DPLD_ps=$(usex latex ON OFF)
- # PDF
- -DPLD_pdf=$(usex pdf ON OFF)
- # Qt
- -DPLD_aqt=$(usex qt5 ON OFF)
- -DPLD_bmpqt=$(usex qt5 ON OFF)
- -DPLD_epsqt=$(usex qt5 ON OFF)
- -DPLD_extqt=$(usex qt5 ON OFF)
- -DPLD_jpgqt=$(usex qt5 ON OFF)
- -DPLD_memqt=$(usex qt5 ON OFF)
- -DPLD_pdfqt=$(usex qt5 ON OFF)
- -DPLD_pngqt=$(usex qt5 ON OFF)
- -DPLD_ppmqt=$(usex qt5 ON OFF)
- -DPLD_qtwidget=$(usex qt5 ON OFF)
- -DPLD_svgqt=$(usex qt5 ON OFF)
- -DPLD_tiffqt=$(usex qt5 ON OFF)
- # SVG
- -DPLD_svg=$(usex svg ON OFF)
- # Tk
- -DPLD_ntk=$(usex tk ON OFF)
- -DPLD_tk=$(usex tk ON OFF)
- -DPLD_tkwin=$(usex tk ON OFF)
- # Truetype
- -DPLD_psttf=$(usex truetype ON OFF)
- # Wx
- -DPLD_wxwidgets=$(usex wxwidgets ON OFF)
- # X
- -DPLD_xfig=$(usex X ON OFF)
- -DPLD_xwin=$(usex X ON OFF)
- )
-
- use truetype && mycmakeargs+=(
- -DPL_FREETYPE_FONT_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+=(
- -DENABLE_pyqt5=$(usex qt5)
- )
-
- 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() {
- virtx cmake-utils_src_test
-}
-
-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
- java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
- java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2024-05-10 1:43 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-05-10 1:43 UTC (permalink / raw
To: gentoo-commits
commit: 359a269725785328df0c0cf856d1e8374d98735e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 01:24:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 01:24:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359a2697
sci-libs/plplot: fix modern C issue in (CMake) configure
Closes: https://bugs.gentoo.org/879761
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../plplot/files/plplot-5.15.0_p6-configure-c99.patch | 18 ++++++++++++++++++
...lot-5.15.0_p6.ebuild => plplot-5.15.0_p6-r1.ebuild} | 1 +
2 files changed, 19 insertions(+)
diff --git a/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch b/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch
new file mode 100644
index 000000000000..60bb7aaf4501
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0_p6-configure-c99.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/879761
+https://sourceforge.net/p/plplot/patches/37/
+
+Avoid implicitly declaring exit. Future compilers will not support
+implicit function declarations, so this cmake probe will always fail.
+
+--- a/cmake/modules/TestForHighBitCharacters.c
++++ b/cmake/modules/TestForHighBitCharacters.c
+@@ -17,6 +17,6 @@ int
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i))
+- exit(1);
+- exit (0);
++ return 1;
++ return 0;
+ }
+
diff --git a/sci-libs/plplot/plplot-5.15.0_p6.ebuild b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild
similarity index 99%
rename from sci-libs/plplot/plplot-5.15.0_p6.ebuild
rename to sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild
index 57b6884acdff..9ea598c98339 100644
--- a/sci-libs/plplot/plplot-5.15.0_p6.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0_p6-r1.ebuild
@@ -120,6 +120,7 @@ src_prepare() {
for p in $(<"${WORKDIR}"/debian/patches/series) ; do
eapply -p1 "${WORKDIR}/debian/patches/${p}"
done
+ eapply "${FILESDIR}"/${PN}-5.15.0_p6-configure-c99.patch
# avoid installing license
sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2023-04-14 4:00 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-04-14 4:00 UTC (permalink / raw
To: gentoo-commits
commit: b244a654356443f6fad7f6bb717305d02b853ef4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 03:45:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 03:59:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b244a654
sci-libs/plplot: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/898258
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../plplot/files/plplot-5.15.0-configure-clang16.patch | 18 ++++++++++++++++++
...ot-5.15.0-r104.ebuild => plplot-5.15.0-r105.ebuild} | 1 +
2 files changed, 19 insertions(+)
diff --git a/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch b/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch
new file mode 100644
index 000000000000..1f72da24ffb0
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/898258
+https://sourceforge.net/p/plplot/patches/37/
+
+Avoid implicitly declaring exit. Future compilers will not support
+implicit function declarations, so this cmake probe will always fail.
+
+--- a/cmake/modules/TestForHighBitCharacters.c
++++ b/cmake/modules/TestForHighBitCharacters.c
+@@ -17,6 +17,6 @@ int
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i))
+- exit(1);
+- exit (0);
++ return 1;
++ return 0;
+ }
+
diff --git a/sci-libs/plplot/plplot-5.15.0-r104.ebuild b/sci-libs/plplot/plplot-5.15.0-r105.ebuild
similarity index 99%
rename from sci-libs/plplot/plplot-5.15.0-r104.ebuild
rename to sci-libs/plplot/plplot-5.15.0-r105.ebuild
index a36423a145f2..0f4ce8cab531 100644
--- a/sci-libs/plplot/plplot-5.15.0-r104.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r105.ebuild
@@ -113,6 +113,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
"${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch
+ "${FILESDIR}"/${PN}-5.15.0-configure-clang16.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2018-01-22 0:42 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-01-22 0:42 UTC (permalink / raw
To: gentoo-commits
commit: ea558c969ac66320d8e6dd31a51f21dc0df551c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 00:12:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 00:42:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea558c96
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
sci-libs/plplot/Manifest | 1 -
.../plplot/files/plplot-5.11.0-multiarch.patch | 60 -----
sci-libs/plplot/files/plplot-5.11.0-ocaml.patch | 40 ----
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 249 ---------------------
4 files changed, 350 deletions(-)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 48ab04b322d..cf755394678 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,2 +1 @@
-DIST plplot-5.11.1.tar.gz 15445404 BLAKE2B ea3d0cac2d47e9028f604c5665842aae95dd058c0b522f477e2a4397f686f1dd01321660c2b2d259771dbc30ce758721bc8db085b29f35d170ea8b89b539aa91 SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd
DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b
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 cb6f7d01cf1..00000000000
--- 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 32841825f0d..00000000000
--- 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}
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
deleted file mode 100644
index a46a090713e..00000000000
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 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? (
- ${PYTHON_DEPS}
- 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
- fortran-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() {
- virtx cmake-utils_src_test
-}
-
-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
- java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
- java-pkg_regso "${ED}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2017-07-09 21:03 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-07-09 21:03 UTC (permalink / raw
To: gentoo-commits
commit: e094f6f984fe57e55a2850f60ba11be9dfaf23a6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 21:02:26 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 21:02:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e094f6f9
sci-libs/plplot: Re-enable OCaml support
* Convert absolute -L paths to relative ones in
order to prevent ocamlmklib's braindead behaviour
of randomly inserting RPATHs into libraries.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../files/plplot-5.12.0-ocaml-remove-rpath.patch | 34 ++++++++++++++++++++++
sci-libs/plplot/plplot-5.12.0-r1.ebuild | 20 ++++++++-----
2 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch b/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch
new file mode 100644
index 00000000000..2d18c79736f
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.12.0-ocaml-remove-rpath.patch
@@ -0,0 +1,34 @@
+Fix OCaml's asinine RPATH inserting behaviour.
+
+--- a/bindings/ocaml/CMakeLists.txt
++++ b/bindings/ocaml/CMakeLists.txt
+@@ -97,6 +97,20 @@
+
+ # ocamlc -c compiles *.c into *.o.
+ # ocamlmklib links *.o into *.so and *.a
++
++ # ocamlmklib implicits inserts RPATHs if it is provided with an absolute path to -L,
++ # which is absolutely unacceptable and presents a massive security hazard. The
++ # following statements convert the absolute paths to relative ones to fix this.
++ # See also:
++ # https://caml.inria.fr/mantis/view.php?id=5943
++ if(CMAKE_SKIP_RPATH)
++ file(RELATIVE_PATH CAMLIDL_LINK_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR} ${CAMLIDL_LIB_DIR})
++ file(RELATIVE_PATH CMAKE_LINK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR})
++ else(CMAKE_SKIP_RPATH)
++ set(CAMLIDL_LINK_LIB_DIR ${CAMLIDL_LIB_DIR})
++ set(CMAKE_LINK_BINARY_DIR ${CMAKE_BINARY_DIR})
++ endif(CMAKE_SKIP_RPATH)
++
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o
+@@ -105,7 +119,7 @@
+ ${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 -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 ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
++ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LINK_LIB_DIR} -lcamlidl -L${CMAKE_LINK_BINARY_DIR}/src -lplplot ${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
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
diff --git a/sci-libs/plplot/plplot-5.12.0-r1.ebuild b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
index c8be469a4e5..a8582c6ed65 100644
--- a/sci-libs/plplot/plplot-5.12.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/14" # SONAME of libplplot.so
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua octave pdf
+IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
pdl png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )"
RESTRICT="octave? ( test )"
@@ -31,6 +31,11 @@ RDEPEND="
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? (
@@ -78,6 +83,7 @@ DEPEND="${RDEPEND}
>=virtual/jdk-1.5
dev-lang/swig
)
+ ocaml? ( dev-ml/findlib )
octave? ( >=dev-lang/swig-3.0.12 )
python? ( dev-lang/swig )
test? (
@@ -90,6 +96,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.11.0-octave.patch
"${FILESDIR}"/${PN}-5.12.0-multiarch.patch
"${FILESDIR}"/${PN}-5.12.0-java-install-path.patch
+ "${FILESDIR}"/${PN}-5.12.0-ocaml-remove-rpath.patch
)
pkg_setup() {
@@ -131,9 +138,6 @@ src_configure() {
# - Bindings:
# * Ada is a mess in Gentoo, don't use
# * D has been removed from Gentoo, don't use
- # * OCaml is a general disaster and randomly inserts RPATH
- # on the basis of absolute -L linker paths:
- # https://caml.inria.fr/mantis/view.php?id=5943
# * Qt4 has been disabled, as it is deprecated and unsupported upstream
# - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
# the testsuite performs a string comparison to determine which tests to run
@@ -149,8 +153,7 @@ src_configure() {
## Features
-DBUILD_DOC=OFF
-DBUILD_DOX_DOC=OFF
- -DUSE_RPATH=OFF
- -DCMAKE_SKIP_INSTALL_RPATH=ON
+ -DCMAKE_SKIP_RPATH=ON
-DPREBUILT_DOC=$(usex doc)
-DHAVE_SHAPELIB=$(usex shapefile)
-DWITH_FREETYPE=$(usex truetype)
@@ -165,7 +168,7 @@ src_configure() {
## Bindings
-DENABLE_ada=OFF
-DENABLE_d=OFF
- -DENABLE_ocaml=OFF
+ -DENABLE_ocaml=$(usex ocaml)
-DENABLE_pyqt4=OFF
-DENABLE_cxx=$(usex cxx)
-DENABLE_DYNDRIVERS=$(usex dynamic)
@@ -242,6 +245,9 @@ src_configure() {
use shapefile && mycmakeargs+=(
-DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp
)
+ use ocaml && mycmakeargs+=(
+ -DOCAML_INSTALL_DIR="$(ocamlc -where)"
+ )
use python && mycmakeargs+=(
-DENABLE_pyqt5=$(usex qt5)
)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2017-02-18 19:10 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-02-18 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 51fd4fb2277b7117039a9572f242dd39ffd322cb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 19:09:44 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 19:10:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51fd4fb2
sci-libs/plplot: Version bump to 5.12.0
Bug: https://bugs.gentoo.org/show_bug.cgi?id=529382
Bug: https://bugs.gentoo.org/show_bug.cgi?id=554156
Bug: https://bugs.gentoo.org/show_bug.cgi?id=585114
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/plplot/Manifest | 1 +
.../files/plplot-5.12.0-java-install-path.patch | 13 +
.../plplot/files/plplot-5.12.0-multiarch.patch | 49 ++++
sci-libs/plplot/plplot-5.12.0.ebuild | 269 +++++++++++++++++++++
4 files changed, 332 insertions(+)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index f31d3e9684..e94655ac8e 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1 +1,2 @@
DIST plplot-5.11.1.tar.gz 15445404 SHA256 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd WHIRLPOOL 21e11c496b89060d00c9b0e513a0fb4833713f021d1fa63ea9210198713324e6efc3a1a28a218a75acd1fa5752ee4058465575481c27cfaec1cb91c52db40864
+DIST plplot-5.12.0.tar.gz 16253895 SHA256 8dc5da5ef80e4e19993d4c3ef2a84a24cc0e44a5dade83201fca7160a6d352ce SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b WHIRLPOOL ef50a5974d6e5043cf225e840021517bd13b9c3ae8680f8f4f808c9e641f5593d2faab6e0825a93e884c42509dc7a9b77655b2da7e793991e9384ccf0bf00ecb
diff --git a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch
new file mode 100644
index 0000000000..2c053a2b16
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch
@@ -0,0 +1,13 @@
+Java libs are installed into an already prefixed path.
+
+--- a/bindings/java/CMakeLists.txt
++++ b/bindings/java/CMakeLists.txt
+@@ -189,7 +189,7 @@
+ )
+ endif(APPLE)
+
+- install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_HARDDIR})
++ install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_DIR})
+
+ set(JAVA_CLASSES)
+ foreach( srcfile ${JAVA_FILES_FULL} )
diff --git a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch
new file mode 100644
index 0000000000..63e92f5aa5
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch
@@ -0,0 +1,49 @@
+--- a/examples/c/Makefile.examples.in
++++ b/examples/c/Makefile.examples.in
+@@ -25,9 +25,6 @@
+ CC = @CC@
+ EXEEXT = @EXEEXT@
+
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-RPATHCMD = @RPATHCMD@
+-
+ @extXdrawable_true@extXdrawable_EXECUTABLES_list = \
+ @extXdrawable_true@ extXdrawable_demo$(EXEEXT)
+
+--- a/examples/c++/Makefile.examples.in
++++ b/examples/c++/Makefile.examples.in
+@@ -25,10 +25,7 @@
+ 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@ @wxdemo_name@$(EXEEXT)
+--- a/examples/f95/Makefile.examples.in
++++ b/examples/f95/Makefile.examples.in
+@@ -25,9 +25,6 @@
+ F95 = @FC@
+ EXEEXT = @EXEEXT@
+
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-FORTRAN_RPATHCMD = @FORTRAN_RPATHCMD@
+-
+ EXECUTABLES_list = \
+ x00f$(EXEEXT) \
+ x01f$(EXEEXT) \
+--- a/examples/tk/Makefile.examples.in
++++ b/examples/tk/Makefile.examples.in
+@@ -24,9 +24,6 @@
+ 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.
+ @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT)
diff --git a/sci-libs/plplot/plplot-5.12.0.ebuild b/sci-libs/plplot/plplot-5.12.0.ebuild
new file mode 100644
index 0000000000..5bf49807a6
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.12.0.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WX_GTK_VER=3.0-gtk3
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=95
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="Multi-language scientific plotting library"
+HOMEPAGE="http://plplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/14" # SONAME of libplplot.so
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua octave pdf
+ pdl png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )"
+RESTRICT="octave? ( test )"
+
+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= )
+ octave? ( sci-mathematics/octave:0= )
+ pdf? ( media-libs/libharu:0= )
+ pdl? (
+ dev-perl/PDL
+ dev-perl/XML-DOM
+ )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+ )
+ qhull? ( media-libs/qhull:0= )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtprintsupport
+ )
+ 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
+ )
+ octave? ( >=dev-lang/swig-3.0.12 )
+ python? ( dev-lang/swig )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.9.6-python.patch
+ "${FILESDIR}"/${PN}-5.11.0-octave.patch
+ "${FILESDIR}"/${PN}-5.12.0-multiarch.patch
+ "${FILESDIR}"/${PN}-5.12.0-java-install-path.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ use java && java-pkg-opt-2_pkg_setup
+ use fortran && fortran-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
+ local f
+ while IFS="" read -d $'\0' -r f; do
+ sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die
+ done < <(find "${S}" -name CMakeLists.txt -print0)
+
+ 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 pulls in a whole stack of horrible dependencies
+ # - Bindings:
+ # * Ada is a mess in Gentoo, don't use
+ # * D has been removed from Gentoo, don't use
+ # * OCaml is a general disaster and randomly inserts RPATH
+ # on the basis of absolute -L linker paths:
+ # https://caml.inria.fr/mantis/view.php?id=5943
+ # * Qt4 has been disabled, as it is deprecated and unsupported upstream
+ # - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
+ # the testsuite performs a string comparison to determine which tests to run
+ local mycmakeargs=(
+ ## Features
+ -DBUILD_DOC=OFF
+ -DBUILD_DOX_DOC=OFF
+ -DUSE_RPATH=OFF
+ -DCMAKE_SKIP_INSTALL_RPATH=ON
+ -DPREBUILT_DOC=$(usex doc)
+ -DHAVE_SHAPELIB=$(usex shapefile)
+ -DWITH_FREETYPE=$(usex truetype)
+ -DPL_HAVE_PTHREAD=$(usex threads)
+ -DPL_HAVE_QHULL=$(usex qhull)
+ -DPLPLOT_USE_QT5=$(usex qt5)
+
+ ## Tests
+ -DTEST_DYNDRIVERS=OFF
+ -DBUILD_TEST=$(usex test)
+
+ ## Bindings
+ -DENABLE_ada=OFF
+ -DENABLE_d=OFF
+ -DENABLE_ocaml=OFF
+ -DENABLE_pyqt4=OFF
+ -DENABLE_cxx=$(usex cxx)
+ -DENABLE_DYNDRIVERS=$(usex dynamic)
+ -DENABLE_f95=$(usex fortran)
+ -DENABLE_java=$(usex java)
+ -DENABLE_lua=$(usex lua)
+ -DTRY_OCTAVE4=$(usex octave)
+ -DENABLE_octave=$(usex octave)
+ -DENABLE_pdl=$(usex pdl)
+ -DENABLE_python=$(usex python)
+ -DENABLE_qt=$(usex qt5)
+ -DENABLE_tcl=$(usex tcl)
+ -DENABLE_itcl=$(usex tcl)
+ -DENABLE_tk=$(usex tk)
+ -DENABLE_itk=$(usex tk)
+ -DENABLE_wxwidgets=$(usex wxwidgets)
+
+ ## Drivers
+ -DPLD_cgm=OFF
+ -DPLD_gif=OFF
+ -DPLD_jpeg=OFF
+ -DPLD_plmeta=OFF
+ -DPLD_png=OFF
+ -DPLD_pstex=OFF
+ -DPLD_wxpng=OFF
+ -DPLD_mem=ON
+ -DPLD_null=ON
+ -DPLD_wingcc=ON
+ # Cairo
+ $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
+ -DPLD_epscairo=$(usex cairo ON OFF)
+ -DPLD_extcairo=$(usex cairo ON OFF)
+ -DPLD_memcairo=$(usex cairo ON OFF)
+ -DPLD_pdfcairo=$(usex cairo ON OFF)
+ -DPLD_pngcairo=$(usex cairo ON OFF)
+ -DPLD_pscairo=$(usex cairo ON OFF)
+ -DPLD_svgcairo=$(usex cairo ON OFF)
+ -DPLD_xcairo=$(usex cairo ON OFF)
+ # LaTeX
+ -DPLD_ps=$(usex latex ON OFF)
+ # PDF
+ -DPLD_pdf=$(usex pdf ON OFF)
+ # Qt
+ -DPLD_aqt=$(usex qt5 ON OFF)
+ -DPLD_bmpqt=$(usex qt5 ON OFF)
+ -DPLD_epsqt=$(usex qt5 ON OFF)
+ -DPLD_extqt=$(usex qt5 ON OFF)
+ -DPLD_jpgqt=$(usex qt5 ON OFF)
+ -DPLD_memqt=$(usex qt5 ON OFF)
+ -DPLD_pdfqt=$(usex qt5 ON OFF)
+ -DPLD_pngqt=$(usex qt5 ON OFF)
+ -DPLD_ppmqt=$(usex qt5 ON OFF)
+ -DPLD_qtwidget=$(usex qt5 ON OFF)
+ -DPLD_svgqt=$(usex qt5 ON OFF)
+ -DPLD_tiffqt=$(usex qt5 ON OFF)
+ # SVG
+ -DPLD_svg=$(usex svg ON OFF)
+ # Tk
+ -DPLD_ntk=$(usex tk ON OFF)
+ -DPLD_tk=$(usex tk ON OFF)
+ -DPLD_tkwin=$(usex tk ON OFF)
+ # Truetype
+ -DPLD_psttf=$(usex truetype ON OFF)
+ # Wx
+ -DPLD_wxwidgets=$(usex wxwidgets ON OFF)
+ # X
+ -DPLD_xfig=$(usex X ON OFF)
+ -DPLD_xwin=$(usex X ON OFF)
+ )
+
+ use truetype && mycmakeargs+=(
+ -DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont
+ )
+ use shapefile && mycmakeargs+=(
+ -DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp
+ )
+ use python && mycmakeargs+=(
+ -DENABLE_pyqt5=$(usex qt5)
+ )
+
+ 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() {
+ virtx cmake-utils_src_test
+}
+
+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
+ java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
+ java-pkg_regso /usr/$(get_libdir)/jni/plplotjavac_wrap.so
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
@ 2016-11-25 18:57 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2016-11-25 18:57 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-10 1:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-16 7:03 [gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 1:43 Sam James
2023-04-14 4:00 Sam James
2018-01-22 0:42 Andreas Sturmlechner
2017-07-09 21:03 David Seifert
2017-02-18 19:10 David Seifert
2016-11-25 18:57 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox