From 5dae0c638f360c6cea9a0308c26d0c691412636b Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 20 Apr 2015 15:31:41 +0000 Subject: [PATCH] Version Bump Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- sci-libs/plplot/ChangeLog | 9 +- sci-libs/plplot/Manifest | 41 +-- .../files/plplot-5.11.0-multiarch.patch | 60 +++++ .../plplot/files/plplot-5.11.0-ocaml.patch | 40 +++ .../plplot/files/plplot-5.11.0-octave.patch | 16 ++ sci-libs/plplot/plplot-5.11.0.ebuild | 247 ++++++++++++++++++ 6 files changed, 394 insertions(+), 19 deletions(-) create mode 100644 sci-libs/plplot/files/plplot-5.11.0-multiarch.patch create mode 100644 sci-libs/plplot/files/plplot-5.11.0-ocaml.patch create mode 100644 sci-libs/plplot/files/plplot-5.11.0-octave.patch create mode 100644 sci-libs/plplot/plplot-5.11.0.ebuild diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog index 12d24b5b233c..41f1d233f905 100644 --- a/sci-libs/plplot/ChangeLog +++ b/sci-libs/plplot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/plplot # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.62 2015/04/08 18:49:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.63 2015/04/20 15:31:36 jlec Exp $ + +*plplot-5.11.0 (20 Apr 2015) + + 20 Apr 2015; Justin Lecher + +files/plplot-5.11.0-multiarch.patch, +files/plplot-5.11.0-ocaml.patch, + +files/plplot-5.11.0-octave.patch, +plplot-5.11.0.ebuild: + Version Bump 08 Apr 2015; Michał Górny plplot-5.10.0-r1.ebuild: Drop old Python implementations diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 6cde4c7d5a9a..826fe9b3205e 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,32 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX plplot-5.10.0-cmake.patch 830 SHA256 43b8c9ecc521730c3121f3372c7d22681ba7e7ff097670886914c2e953f3f5ed SHA512 3e547dc71b10bac35c8564242818d6af1b4257982e1552ee55202dbc98f427b56ec2e4bbc5d5e2c26699ade56d3bb9110c9558c4e217a112a33af8b594438953 WHIRLPOOL 64b1d0aaa63a2235049369b446d4720b5e3eb27114863e023579daa5fa4557811723d89537c72d2154950ccdc25192e867d0d4f65a77a6cdd039db3e6128fe13 AUX plplot-5.10.0-have-config-h.patch 10257 SHA256 981cdb158924046788b6de596f962dcfc047b6b98d80fb3a32576e196d5eb74f SHA512 b94a917d906c49a77cc7f5ae68b3419fc83d16721d2d841ec3f5fac31b30718690a82ae03659a1cd08e8d2432282df97c9fb01b2fd44b8ea4c578a81d50fd83e WHIRLPOOL d00c0dd0365c8ff4c3b76592527aaf79e8ec5de27ca24546e3e74258a253e67eb5d331d33367905a991c946a2448d5027795c12646ee1e8173741d6d1e8dc177 +AUX plplot-5.11.0-multiarch.patch 1937 SHA256 8c63ee02f2b850518735110bb911b844998ffb971c5bf499606be6e1708da2ca SHA512 505fbd1d1c6700ba7d16795e262a930f58b77c3565ca844a3cca1313f004057c1432ad60132d3844d0f04f959c005236b9ebd10f3615d4368e4fa968141d147d WHIRLPOOL ee510155a768c8ed07fa17301707569f7aa31b1cfbf6b10db5fa0e2c20ad7609cbcf2646456908b9f0feef3db26fb17be8c95855bb80ae36ecb7fcb2c673abf3 +AUX plplot-5.11.0-ocaml.patch 2736 SHA256 00f7832589815f25626d6658ab942ec9d875ca1ff2087011e1be0bc1746cd54a SHA512 3d41fec8b2c2a07771fefab7c0f9199f1b31376d71d0c0c8f7d3ddedea3889eebfd9d44432b8f22e6d6dca233d6011d0b1645b193d319eb953b18543ec212412 WHIRLPOOL b7ab89597d7b92cfd4abe281c735beab343d73230d586b88b8f037f0fa46fccd89d8b66f2252cee1020d0c16f9a3af3238ced3d7d01afafa8ec04e5c637b84ad +AUX plplot-5.11.0-octave.patch 669 SHA256 6ef1e46b2718665bb81cbb1b703f2a69a35e11e3cb4db9afe08c0bc4ba11f551 SHA512 7ddd8105aa8ba684e423cac3657f2d1bc753b86eb2054edd2ff9497ec235354134da4ecfff5d26e26f01efced2f630f0e2488d114ce7dc887e7761f5ee060814 WHIRLPOOL 0bfecd6a7095255a7c604fec12c366c546474f7040b17dc7445d3ce3f5d2dc522fd16935f76c5da735745f41e107986e8582b4d45088990c8cd754ec8f221d27 AUX plplot-5.9.11-multiarch.patch 2150 SHA256 8100cdcb843c2d52a663434c481e804e4db22e319a1d6b69c0cfdc6938c70648 SHA512 c638a5bdba7d29d76fdf5c96415d56718dea162c1a03bf4f0180c12d8d8bf26603f628de4ec130403234a5a8e349630bed6d17e53a13fa6faf921da402869da9 WHIRLPOOL b88727e63940505512906886739f0aad7561b3659112bcf03b9ad25b8640a244a60acc69e5f355636c5dd876fc76db2043dafe399669f28b2eb0cbfc3e801d11 AUX plplot-5.9.11-ocaml.patch 2829 SHA256 f355a3af4862133438a90c2b923dfedbce5b3311d2b38736a5cea998ec3fc1e0 SHA512 26d739d0cc3f3b8227de9fdfbb6a7cbfdca6daff6515b1b91571316abc2d057eac953951ad9bb7b0fd2b28d8e220836c5da652e19170ed8401a9b3946b39c34a WHIRLPOOL 7202a6f0d54510bfb46fcf8411014170f407526ed9bb2b14b19269ff66ffbe9a1a597751cb8ab63e2d98f73f9408bb4d8df961d9b2d5d188aba5f8005cff4153 AUX plplot-5.9.11-octave.patch 633 SHA256 672f25cc93722d8116fb45853939b0e0b3cefa75b57ff87f2a8439c97723393e SHA512 c3832d531425cea20aa436cb757ed7bfd30bdc44a4d5cc11cf9a5e5fc7109897cc10748ce780de53232b63cd67d00c1cd2d9f62ef6d378d0f814182d1beb10e2 WHIRLPOOL 96ce5a919a944a833c3febc5b6932376ee32f764709470a405d73f691b2125f76ddb8b99b6ede13a19e9ee996d2ea226e0f4a8c299b174dd9f83b9e9a4aa7a7d AUX plplot-5.9.6-python.patch 379 SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 WHIRLPOOL a6ae20047cd0e99251746cadf703e19d35897a6788e5b5d665758f970cc47aad31331640a679f974455aeab4ab6ec4927649d4b1c1a9d9efbe474f2e966aed83 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 EBUILD plplot-5.10.0-r1.ebuild 6751 SHA256 4a91df270619cec1f887de15165015590e69a942fd69a1dc97017164a2db09d4 SHA512 7840c92fa63d2e9527dbc5dd5299e8d6ea9518b6760b835bd259cd4ca959c2433ed959acd7fe584869f9e29246b72df46960ee81b828026f314fc674ed4aa11d WHIRLPOOL 5ce3f2d728bcd206f25ff36811c8ba39c4d143ef346d94520fdb6374df40ef9e8769ecaad1880c80aaf3d8e6144e30756924a76837e4a19edbbbd68d05412957 -MISC ChangeLog 11586 SHA256 3bcaeacebdb47a94a3d66aa93e326c442e53ecc704c936a5bd9fbda2ff13e684 SHA512 31db0ad6ae40642d17dacc9ed9899298a4cf6ed5563be68f3281648220cb583e93d3af7e87c53708b2cd34ccad4aa2f6bc40ddb001a72dc404681967734b2aef WHIRLPOOL f4a12f4b17dd44bd773643edf71a021376739a033108c020c835a1734e952c49736345d094ddca9c917c3c71292c6bc19ff7a5154ca7a01003240277c8f2e0cd +EBUILD plplot-5.11.0.ebuild 6709 SHA256 f9f8ec190138e2addb741c009911d72b50ccc21af78cf836f42be5aa99aa62a4 SHA512 46db0ad2a1761d9d7966e7e6cbf6b798fde7027bb4f89d2e400c0c584df64c66786c4dcd915ef3ab05f2f253157776749126a9faa9631ead45c1e711f74797dd WHIRLPOOL 621da01cf02a5fba511eede67949075d40817de282fbe555036817840978ac57ba5d04f8c3bd7b19286ac80793d2e71c13beb701fa6f799078b09ff1014576ed +MISC ChangeLog 11811 SHA256 d1ab5d1c5f84704e68381fbb3e6445753f353d6dc79287e7b150ed27bec6d8f2 SHA512 03a77472be155f583edf9c3b0dc99ae78ef26fdcda79b76dfff895d08d3cde0803722fbeee5cf5fa587fb7f4ad73167bc0c5e676b9647e70f5b01600ad766223 WHIRLPOOL c24ad8ad0803b4055bdad0f08105ef1b80db6be1d7d772fee39278882410d884bfd8f4056dd25d14f875d52d2d14a83d585fddbd359b69d354bb0381c8132b6a MISC metadata.xml 1429 SHA256 69a86cbfe74c03beb7603183c6e6cebe3feebd2e013008034b3a7b9e2f47174b SHA512 ac998adfee018189ffdc434c0eb24a8c1406612b17e476ccfaa648e52094cfd205ace285129d5840ef40f1aa12aaa4ffddeadbe0938769ecc67e5073ad0a4b2a WHIRLPOOL 4178e7bc90990ca48e9a03efb3cef7785d98e81558787a2c27fff61d65877d92f90ced7b34ec5be2538bd8c42a38911cfc2f217f97a241156a461e4d394341a7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iQJ8BAEBCABmBQJVJXhEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsDcQAMgXQrFPOEVXuouvXjIPDwet -u4auTwYOPBcifLQ3pj5i0c44wDPyaYcrC+U/TTgNx71t7wgqytjTJkSwC2zBVpuT -oA2LyRXO+VOI2Njq79A1S71LZdjtDeW75lpOcDAyEpneCawTlsCTP/3gBvu8Yn9J -y2QMDO3K9OZWtbSO51bzH/4xafax/JFapWYOvljnXeiNsY+KmVWlLxqpdK2HbZ8u -CbrAp8q0pJP4zjrcze9yeh49tnCb8U3/bbmDvfPGDkO0S4AtfiuiXt2E+9JB55im -0YHKUPUcCMIt8FGGwtFGcUhyMhUw14L2LK+eo7oD/eoCYUCF1apxXE7zuCZQOrPU -dgEwYs9BPNjaWCqIUJqFScESc8g/VJ6FhN7IWuKCBz97a+qDzMhhOOyXx4P4NZmc -u9xEzBAiXqgtXq8qhZh8dY5agdtxNEtNPq2/0fUgdEbhLy4yLKjql8oV5ci7Z4ha -69vcKsIEpB9lFs2xCJKkfoDupczoXovIh0I5BIFQfiYxMd3GhQivGrN+2vj2v1J2 -yTWLQlDOZfB/cSOI5Kp+XhlUzI+QBjazT01Ab5Nkumv4W7+TSfkgjBhrromb2TWk -lGKbkUlddqDBVB9ESzyYKGarO+6gGQvoKt/sdsICjONkw/LUyKXs3QW7V3YoCWqu -e78QHJmC1Hd3A0ytrR4h -=pE+J +iQJ8BAEBCgBmBQJVNRvZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir2Y8P/0IaqZmgp5pCYjKYiBiBGy+g +tfbkSoTzdn3unJheYSWmwsQu7jGfiOfI+NQiOdWm91xyeP6nwEIlgNibjVkn/cO3 +tTzu/f8M6rLZFy0zPdj5rahhyEmO0D0xKWtAITtTCxJ9NwmlNYve49VnHbKLN2sv +7oqbhkVyYv8W8OOF9XyjVUBIMdHOQk2IoI+vC9J1054CQtWfhHZjJog1wRCumHuO +SqxXUrtWgdJjdLP6iVk78ApqeclDFPleCRKkV9ua8+KCnA6/qLec48OSgaijAPzE +7ujlhMFak+eM2yak+es7dnuwLYuCDLUf1ynbJCe9bxEeB9odboqAGO7XorxEDcCb +LIF4SWMJxPQ9BqkqiS41FSGME2C1KeACOokOZX6Rags0/C0u2ttA/y2WMhB84/aK +o4Baws/ou2kimXOFPPKAmOHG9Igioh2ncQMBpiMIf4TrzYn7t3fyCwR56CuutQl3 +Tcx5/sZsFalVzCRWUSITfh7hImgI0VAAb6LJApGVInZtDCZMnyOU68zB0c8W8ERe +w5nUMMEFKoEYvrgQWxOBEzsVPJq/JTt4o1GQSQiARif5WKIhaoyZtcl/JlUjAKFw +mdvXnPeTzc6sx6cxQ7/v1YGj+FNQj2fSnttkUaNHrb4qqW+dWaf9qOSh2ReuNgmi +SnPbFrRCzTCisU+X6GxS +=LQRN -----END PGP SIGNATURE----- diff --git a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch new file mode 100644 index 000000000000..cb6f7d01cf16 --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch @@ -0,0 +1,60 @@ + 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 new file mode 100644 index 000000000000..32841825f0de --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch @@ -0,0 +1,40 @@ + 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/files/plplot-5.11.0-octave.patch b/sci-libs/plplot/files/plplot-5.11.0-octave.patch new file mode 100644 index 000000000000..a2a41c96da7a --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.11.0-octave.patch @@ -0,0 +1,16 @@ + 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 < test.error ++$octave -f -q $octaveopts -p "$octavedir" < 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/plplot-5.11.0.ebuild b/sci-libs/plplot/plplot-5.11.0.ebuild new file mode 100644 index 000000000000..5930f4146707 --- /dev/null +++ b/sci-libs/plplot/plplot-5.11.0.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.11.0.ebuild,v 1.1 2015/04/20 15:31:36 jlec Exp $ + +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="ada 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=" + ada? ( virtual/gnat:* ) + 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=( + -DDEFAULT_ALL_DEVICES=ON + -DTEST_DYNDRIVERS=OFF + -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" + -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 ada) + $(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 +} -- 2.26.2