diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sci-libs/plplot | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'sci-libs/plplot')
| -rw-r--r-- | sci-libs/plplot/Manifest | 2 | ||||
| -rw-r--r-- | sci-libs/plplot/plplot-5.15.0-r102.ebuild (renamed from sci-libs/plplot/plplot-5.15.0-r101.ebuild) | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index feb00ba5a979..0a55cc03b138 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8 -EBUILD plplot-5.15.0-r101.ebuild 7365 BLAKE2B 861295cc021c38f2f0dc5f0b8e3defd09598aac5471153541aae2c512d5032560ec028164c7c8eecc7ad65d73529900fb6d2661ce831c67180947062bb55e130 SHA512 04c0ee802ae4cbd40dfec62ec178fdb31cdb3fd9808f40a4a36589a28013f930ca27a68a7b9063412dcada8cbf13735b45203dc59c3d002ddab52b42cb0e6d81 +EBUILD plplot-5.15.0-r102.ebuild 7504 BLAKE2B 8461982fe592d9168266f291e5b6ea36ebdcaedc0e88c202d81962db1fa11d51d554528fdf56a890587a1969ea524696ba3fdcd87c28a3d98d1abd428d150dec SHA512 06a5d6cf5908ea8270208fcd9c6fcd4820f0a95b772cae4ee5c2d7e220ccf80e492d73062e01e9ee5c7b34c21092d0a0bb04523d100db842d57dfd0abcbdfef7 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild b/sci-libs/plplot/plplot-5.15.0-r102.ebuild index a8ca91a4eed2..25ff02cc744c 100644 --- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild +++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild @@ -6,7 +6,9 @@ EAPI=7 WX_GTK_VER=3.0-gtk3 FORTRAN_NEEDED=fortran LUA_COMPAT=( lua5-1 ) -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) +# fails with ninja, due to USE=java missing swig output dependencies +CMAKE_MAKEFILE_GENERATOR=emake inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 toolchain-funcs virtualx wxwidgets @@ -36,7 +38,7 @@ RESTRICT=" RDEPEND=" cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) - java? ( >=virtual/jre-1.5:* ) + java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base @@ -88,7 +90,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig java? ( - >=virtual/jdk-1.5 + >=virtual/jdk-1.8:* dev-lang/swig ) lua? ( dev-lang/swig ) @@ -290,8 +292,10 @@ src_install() { rm -r "${ED}"/usr/share/doc/${PF}/examples || die fi + use python && python_optimize + if use java; then java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so + java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/libplplotjavac_wrap.so fi } |