[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: 359a269725785328df0c0cf856d1e8374d98735e
Author: Sam James gentoo org>
AuthorDate: Fri May 10 01:24:28 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri May 10 01:24:28 2024 +
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 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 ..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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/, sci-libs/plplot/files/
commit: 1037d2547a1e241852c96c7d616d6ee82c5c2db8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 7 13:16:03 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 24 21:02:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1037d254
sci-libs/plplot: drop 5.15.0-r105
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/plplot-5.15.0-QPainterPath-include.patch | 10 -
.../files/plplot-5.15.0-configure-clang16.patch| 18 --
sci-libs/plplot/files/plplot-5.15.0-ieee.patch | 19 --
.../plplot/files/plplot-5.15.0-multiarch.patch | 56
.../plplot/files/plplot-5.15.0-ocaml-rpath.patch | 166 ---
sci-libs/plplot/files/plplot-5.15.0-ocaml.patch| 43 ---
sci-libs/plplot/files/plplot-5.9.6-python.patch| 13 -
sci-libs/plplot/plplot-5.15.0-r105.ebuild | 302 -
8 files changed, 627 deletions(-)
diff --git a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
deleted file mode 100644
index 3c6b85b1714e..
--- a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
a/include/qt.h
-+++ b/include/qt.h
-@@ -67,6 +67,7 @@
- #include
- #include
- #include
-+#include
-
- #include "plDevs.h"
- #include "plplotP.h"
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
deleted file mode 100644
index 1f72da24ffb0..
--- a/sci-libs/plplot/files/plplot-5.15.0-configure-clang16.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/files/plplot-5.15.0-ieee.patch
b/sci-libs/plplot/files/plplot-5.15.0-ieee.patch
deleted file mode 100644
index 065f59a52dfd..
--- a/sci-libs/plplot/files/plplot-5.15.0-ieee.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up
plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee
plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake
plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee
2018-09-19 20:31:11.333168883 -0600
-+++
plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake
2018-09-19 20:31:56.323728783 -0600
-@@ -27,15 +27,6 @@ option(WITH_CSA "Enable use of the csa l
- # expanded to a lot more cases as we gain platform experience.
- set(NAN_CFLAGS ${CMAKE_C_FLAGS})
- if(PL_HAVE_QHULL OR WITH_CSA)
-- if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER
MATCHES "gcc")
--set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp")
-- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
--if(CMAKE_C_COMPILER MATCHES "gcc")
-- set(NAN_CFLAGS "${NAN_CFLAGS} -mieee")
--else(CMAKE_C_COMPILER MATCHES "gcc")
-- set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
--endif(CMAKE_C_COMPILER MATCHES "gcc")
-- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER
MATCHES "gcc")
- if(NOT DEFINED NaNAwareCCompiler)
- message(STATUS "Check for NaN awareness in C compiler")
- try_run(RUN_RESULT COMPILE_RESULT
diff --git a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch
b/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch
deleted file mode 100644
index 4fc5b0b43d9e..
--- a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up plplot-5.15.0/examples/c/Makefile.examples.in.multiarch
plplot-5.15.0/examples/c/Makefile.examples.in
plplot-5.15.0/examples/c/Makefile.examples.in.multiarch2019-09-17
21:47:24.535984257 -0600
-+++ plplot-5.15.0/examples/c/Makefile.examples.in 2019-09-17
21:50:37.029009186 -0600
-@@ -23,9 +23,6 @@ SHELL = @SH_EXECUTABLE@
- CC = @CC@
- EXEEXT = @EXEEXT@
-
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--install_tree_c_RPATHCMD = @install_tree_c_RPATHCMD@
--
- @extXdrawable_true@extXdrawable_EXECUTABLES_list = \
- @extXdrawable_true@ extXdrawable_demo$(EXEEXT)
-
-diff -up plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch
plplot-5.15.0/examples/c++/Makefile.examples.in
plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch 2019-09-17
21:47:24.536984262 -0600
-+++ plplot-5.15.0/examples/c++/Makefile.examples.in2019-09-17
21:50:18.672911449 -0600
-@@ -23,15 +23,10 @@ SHELL = @SH_EXECUTABLE@
- CXX = @CXX@
- EXEEXT = @EXEEXT@
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 34f4e562294da67362411c7e4ec5f130779b22eb
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Nov 24 14:06:35 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Nov 24 14:30:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f4e562
sci-libs/plplot: add 5.15.0_p6
Apply lots of bugfixes from Debian
Closes: https://bugs.gentoo.org/814971
Closes: https://bugs.gentoo.org/828434
Closes: https://bugs.gentoo.org/832513
Closes: https://bugs.gentoo.org/891885
Signed-off-by: Pacho Ramos gentoo.org>
sci-libs/plplot/Manifest| 1 +
sci-libs/plplot/plplot-5.15.0_p6.ebuild | 296
2 files changed, 297 insertions(+)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 782cbdef89d3..114740b9cb03 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1 +1,2 @@
DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B
41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe
SHA512
54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
+DIST plplot_5.15.0+dfsg2-6.debian.tar.xz 73416 BLAKE2B
2f0a9be0aea6d77b2c538f53a509636a6edca59eb930b7885da7ba915a0324d3cbe0e4b0ffe33a2a552ec7b8b679931e9eaa3e4810372b05ac3c0901ea9c6ee9
SHA512
0d64352eb08cb5bb003e8eac11c73533f6ecd08ad542cce002474d20ba4a899fd54b77f96b5e53656b551180fa693da820e7c40b18d6d43e20ea2c7377c36c69
diff --git a/sci-libs/plplot/plplot-5.15.0_p6.ebuild
b/sci-libs/plplot/plplot-5.15.0_p6.ebuild
new file mode 100644
index ..7608ead0153c
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.15.0_p6.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER=3.2-gtk3
+FORTRAN_NEEDED=fortran
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{9..11} )
+# 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 virtualx wxwidgets
+
+DESCRIPTION="Multi-language scientific plotting library"
+HOMEPAGE="https://plplot.sourceforge.net";
+SRC_URI="mirror://sourceforge/${PN}/${P/_p*}.tar.gz
+
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}+dfsg2-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${P/_p*}"
+
+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
+ png python qhull qt5 shapefile svg tcl test threads tk truetype
wxwidgets X"
+REQUIRED_USE="
+ lua? ( ${LUA_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.8:* )
+ latex? (
+ app-text/ghostscript-gpl
+ virtual/latex-base
+ )
+ lua? ( ${LUA_DEPS} )
+ ocaml? (
+ dev-lang/ocaml:=
+ dev-ml/camlidl:=
+ )
+ octave? ( sci-mathematics/octave:0= )
+ pdf? ( media-libs/libharu:0= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ 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.8:*
+ dev-lang/swig
+ )
+ lua? ( 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
+ )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ use lua && lu
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 8d6e2dbfb5fdb14af1480fd18ba644bb0d7140ae
Author: Pacho Ramos gentoo org>
AuthorDate: Thu May 4 12:39:15 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu May 4 12:39:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6e2dbf
sci-libs/plplot: enable py3.11
Closes: https://bugs.gentoo.org/897224
Signed-off-by: Pacho Ramos gentoo.org>
sci-libs/plplot/plplot-5.15.0-r105.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r105.ebuild
b/sci-libs/plplot/plplot-5.15.0-r105.ebuild
index 0f4ce8cab531..f6506f7c5103 100644
--- a/sci-libs/plplot/plplot-5.15.0-r105.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r105.ebuild
@@ -6,7 +6,7 @@ EAPI=7
WX_GTK_VER=3.0-gtk3
FORTRAN_NEEDED=fortran
LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
# fails with ninja, due to USE=java missing swig output dependencies
CMAKE_MAKEFILE_GENERATOR=emake
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: b244a654356443f6fad7f6bb717305d02b853ef4
Author: Sam James gentoo org>
AuthorDate: Fri Apr 14 03:45:37 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 14 03:59:55 2023 +
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 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 ..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() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 3a9487c1437d5ac616699d1681958d33cc6c2a53
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Nov 19 09:14:46 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sat Nov 19 11:39:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9487c1
sci-libs/plplot: use HTTPS
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/plplot/plplot-5.15.0-r104.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r104.ebuild
b/sci-libs/plplot/plplot-5.15.0-r104.ebuild
index b09ff4482286..8b488ede4624 100644
--- a/sci-libs/plplot/plplot-5.15.0-r104.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r104.ebuild
@@ -13,7 +13,7 @@ CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single
python-single-r1 virtualx wxwidgets
DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/";
+HOMEPAGE="https://plplot.sourceforge.net";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 50fd9d23845233084c3bb9da562c3189ecf59f32
Author: Sam James gentoo org>
AuthorDate: Sat Oct 8 19:06:08 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 8 19:06:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50fd9d23
sci-libs/plplot: fix MissingUseDepDefault on cairo
Closes: https://bugs.gentoo.org/875941
Signed-off-by: Sam James gentoo.org>
.../plplot/{plplot-5.15.0-r103.ebuild => plplot-5.15.0-r104.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r103.ebuild
b/sci-libs/plplot/plplot-5.15.0-r104.ebuild
similarity index 98%
rename from sci-libs/plplot/plplot-5.15.0-r103.ebuild
rename to sci-libs/plplot/plplot-5.15.0-r104.ebuild
index 3b7f2ddfb10f..b09ff4482286 100644
--- a/sci-libs/plplot/plplot-5.15.0-r103.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r104.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{8..10} )
# 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
+inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single
python-single-r1 virtualx wxwidgets
DESCRIPTION="Multi-language scientific plotting library"
HOMEPAGE="http://plplot.sourceforge.net/";
@@ -36,7 +36,7 @@ RESTRICT="
"
RDEPEND="
- cairo? ( x11-libs/cairo:0=[svg?,X] )
+ cairo? ( x11-libs/cairo:0=[svg(+)?,X] )
gd? ( media-libs/gd:2=[jpeg?,png?] )
java? ( >=virtual/jre-1.8:* )
latex? (
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: ccdcb96a8b230d790af175665dd089a3a8cbe411
Author: Sam James gentoo org>
AuthorDate: Tue Jun 21 01:50:29 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 21 01:50:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccdcb96a
sci-libs/plplot: fix OCaml dep
Signed-off-by: Sam James gentoo.org>
.../plplot/{plplot-5.15.0-r102.ebuild => plplot-5.15.0-r103.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
b/sci-libs/plplot/plplot-5.15.0-r103.ebuild
similarity index 99%
rename from sci-libs/plplot/plplot-5.15.0-r102.ebuild
rename to sci-libs/plplot/plplot-5.15.0-r103.ebuild
index fca868efceea..3b7f2ddfb10f 100644
--- a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r103.ebuild
@@ -45,8 +45,8 @@ RDEPEND="
)
lua? ( ${LUA_DEPS} )
ocaml? (
- dev-lang/ocaml
- dev-ml/camlidl
+ dev-lang/ocaml:=
+ dev-ml/camlidl:=
)
octave? ( sci-mathematics/octave:0= )
pdf? ( media-libs/libharu:0= )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 4855111cef6a3ccf8a6f75e6f03e6474ec10e79f
Author: Sam James gentoo org>
AuthorDate: Tue Jun 14 13:06:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 14 13:06:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4855111c
sci-libs/plplot: enable py3.10
Closes: https://bugs.gentoo.org/846272
Signed-off-by: Sam James gentoo.org>
sci-libs/plplot/plplot-5.15.0-r102.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
index c4d312740e5a..fca868efceea 100644
--- a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
WX_GTK_VER=3.0-gtk3
FORTRAN_NEEDED=fortran
LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
# fails with ninja, due to USE=java missing swig output dependencies
CMAKE_MAKEFILE_GENERATOR=emake
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: b917f4b61cb06bfbc23aa0e630cfdd107759f0ae
Author: David Seifert gentoo org>
AuthorDate: Sat Jul 17 18:17:04 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jul 17 18:17:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b917f4b6
sci-libs/plplot: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP
Signed-off-by: David Seifert gentoo.org>
sci-libs/plplot/plplot-5.15.0-r102.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
index 25ff02cc744..c4d312740e5 100644
--- a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -6,7 +6,7 @@ EAPI=7
WX_GTK_VER=3.0-gtk3
FORTRAN_NEEDED=fortran
LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
# fails with ninja, due to USE=java missing swig output dependencies
CMAKE_MAKEFILE_GENERATOR=emake
@@ -53,8 +53,8 @@ RDEPEND="
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- qt5? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ dev-python/numpy[${PYTHON_USEDEP}]
+ qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
')
)
qhull? ( media-libs/qhull:0= )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: cee4e91f161c8f2851f35c814494981e72ccf549
Author: David Seifert gentoo org>
AuthorDate: Sun Jun 6 16:52:46 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jun 6 16:52:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee4e91f
sci-libs/plplot: Fix USE=java
Closes: https://bugs.gentoo.org/704248
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
sci-libs/plplot/plplot-5.15.0-r101.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
index 66bfce1ec68..a70c5c58d19 100644
--- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
@@ -7,6 +7,8 @@ WX_GTK_VER=3.0-gtk3
FORTRAN_NEEDED=fortran
LUA_COMPAT=( lua5-1 )
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
@@ -294,6 +296,6 @@ src_install() {
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
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 19650d970b040c9ba315cd77ee6674f02be2a01d
Author: David Seifert gentoo org>
AuthorDate: Sun Jun 6 16:52:49 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jun 6 16:52:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19650d97
sci-libs/plplot: Bump minimum JRE/JDK
Closes: https://bugs.gentoo.org/787650
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
.../plplot/{plplot-5.15.0-r101.ebuild => plplot-5.15.0-r102.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
similarity index 99%
rename from sci-libs/plplot/plplot-5.15.0-r101.ebuild
rename to sci-libs/plplot/plplot-5.15.0-r102.ebuild
index a70c5c58d19..25ff02cc744 100644
--- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -38,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
@@ -90,7 +90,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig
java? (
- >=virtual/jdk-1.5
+ >=virtual/jdk-1.8:*
dev-lang/swig
)
lua? ( dev-lang/swig )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 638824792af2d1140910027353c37542ebfaef60
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun Jun 6 11:16:22 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Jun 6 11:17:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63882479
sci-libs/plplot: fix typo
Closes: https://bugs.gentoo.org/794529
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/plplot/plplot-5.15.0-r101.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
index 6941579942f..66bfce1ec68 100644
--- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
@@ -290,7 +290,7 @@ src_install() {
rm -r "${ED}"/usr/share/doc/${PF}/examples || die
fi
- use python & python_optimize
+ use python && python_optimize
if use java; then
java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 2a2c79e8b4346c594ee2c97cee54fa7a45ea2766
Author: Bernd Waibel posteo net>
AuthorDate: Sat Jun 5 14:35:33 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sat Jun 5 15:10:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2c79e8
sci-libs/plplot: add support for python-3.9
Bugday 2021-06-05
Byte-compile python package to avoid QA warning
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21131
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/plplot/plplot-5.15.0-r101.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
index a8ca91a4eed..6941579942f 100644
--- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
@@ -6,7 +6,7 @@ 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} )
inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single
python-single-r1 toolchain-funcs virtualx wxwidgets
@@ -290,6 +290,8 @@ 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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 5f90f99cb34a65f9e4af59dd046219e490ca66cb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 27 23:36:47 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 27 23:59:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f90f99c
sci-libs/plplot: Drop 5.15.0-r100
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-libs/plplot/plplot-5.15.0-r100.ebuild | 298 --
1 file changed, 298 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
b/sci-libs/plplot/plplot-5.15.0-r100.ebuild
deleted file mode 100644
index ae2654d31d8..000
--- a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-FORTRAN_NEEDED=fortran
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single
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
- png python qhull qt5 shapefile svg tcl test threads tk truetype
wxwidgets X"
-REQUIRED_USE="
- lua? ( ${LUA_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? ( ${LUA_DEPS} )
- ocaml? (
- dev-lang/ocaml
- dev-ml/camlidl
- cairo? ( dev-ml/cairo-ocaml[gtk] )
- )
- octave? ( sci-mathematics/octave:0= )
- pdf? ( media-libs/libharu:0= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- qt5? ( dev-python/PyQt5[${PYTHON_MULTI_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
- )
- lua? ( 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
-
- # Fedora patches
- "${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
- "${FILESDIR}"/${PN}-5.15.0-ieee.patch
- "${FILESDIR}"/${PN}-5.15.0-multiarch.patch
- "${FILESDIR}"/${PN}-5.15.0-ocaml.patch
- "${FILESDIR}"/${PN}-5.12.0-safe-string.patch
- "${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- use lua && lua-single_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
- use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
- use wxwidgets && setup-wxwidgets
- cmake_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
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 2298e1d13f33640a384cc9db3bd39ee3ae34f5ff
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 27 23:36:20 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 27 23:59:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2298e1d1
sci-libs/plplot: Drop superfluous dev-ml/cairo-ocaml[gtk] DEPEND
ebuild run with USE="ocaml cairo" says:
-- WARNING: PLplot OCaml Cairo support currently requires substantial
development effort so is indefinitely disabled
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-libs/plplot/plplot-5.15.0-r101.ebuild | 297 ++
1 file changed, 297 insertions(+)
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
new file mode 100644
index 000..a8ca91a4eed
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+FORTRAN_NEEDED=fortran
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single
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
+ png python qhull qt5 shapefile svg tcl test threads tk truetype
wxwidgets X"
+REQUIRED_USE="
+ lua? ( ${LUA_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? ( ${LUA_DEPS} )
+ ocaml? (
+ dev-lang/ocaml
+ dev-ml/camlidl
+ )
+ octave? ( sci-mathematics/octave:0= )
+ pdf? ( media-libs/libharu:0= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ qt5? ( dev-python/PyQt5[${PYTHON_MULTI_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
+ )
+ lua? ( 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
+
+ # Fedora patches
+ "${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
+ "${FILESDIR}"/${PN}-5.15.0-ieee.patch
+ "${FILESDIR}"/${PN}-5.15.0-multiarch.patch
+ "${FILESDIR}"/${PN}-5.15.0-ocaml.patch
+ "${FILESDIR}"/${PN}-5.12.0-safe-string.patch
+ "${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ use lua && lua-single_pkg_setup
+ use java && java-pkg-opt-2_pkg_setup
+ use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+ use wxwidgets && setup-wxwidgets
+ cmake_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 ||
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 382cda39d8a5c6f8d6c34f7b325abd47c1757292
Author: Jakov Smolic sartura hr>
AuthorDate: Thu Feb 18 18:56:22 2021 +
Commit: David Seifert gentoo org>
CommitDate: Thu Feb 18 18:56:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382cda39
sci-libs/plplot: Remove old
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-libs/plplot/plplot-5.15.0-r1.ebuild | 291
1 file changed, 291 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r1.ebuild
b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
deleted file mode 100644
index fe1ce68f2a0..000
--- a/sci-libs/plplot/plplot-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0-gtk3
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python3_{7,8} )
-
-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
- 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= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- qt5? ( dev-python/PyQt5[${PYTHON_MULTI_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
-
- # Fedora patches
- "${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
- "${FILESDIR}"/${PN}-5.15.0-ieee.patch
- "${FILESDIR}"/${PN}-5.15.0-multiarch.patch
- "${FILESDIR}"/${PN}-5.15.0-ocaml.patch
- "${FILESDIR}"/${PN}-5.12.0-safe-string.patch
- "${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.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 \
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: e1e578aec8e2ba245f00b4e39d32670cd275caa8
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Feb 14 16:32:37 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Feb 14 16:32:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e578ae
sci-libs/plplot: Call setup-wxwidgets
need-wxwidgets is not available for eapi7
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Pacho Ramos gentoo.org>
sci-libs/plplot/plplot-5.15.0-r100.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
b/sci-libs/plplot/plplot-5.15.0-r100.ebuild
index 18d022329b6..ae2654d31d8 100644
--- a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -122,7 +122,7 @@ pkg_setup() {
}
src_prepare() {
- use wxwidgets && need-wxwidgets unicode
+ use wxwidgets && setup-wxwidgets
cmake_src_prepare
# avoid installing license
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/, sci-libs/plplot/files/
commit: 8ed5329c23c1bfbd4e023cd1e0c787c7a303cfb2
Author: David Seifert gentoo org>
AuthorDate: Mon Sep 21 08:21:19 2020 +
Commit: David Seifert gentoo org>
CommitDate: Mon Sep 21 08:21:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed5329c
sci-libs/plplot: Fix #include
Closes: https://bugs.gentoo.org/743166
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert gentoo.org>
sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch | 10 ++
sci-libs/plplot/plplot-5.15.0-r1.ebuild| 1 +
2 files changed, 11 insertions(+)
diff --git a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
new file mode 100644
index 000..3c6b85b1714
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
@@ -0,0 +1,10 @@
+--- a/include/qt.h
b/include/qt.h
+@@ -67,6 +67,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "plDevs.h"
+ #include "plplotP.h"
diff --git a/sci-libs/plplot/plplot-5.15.0-r1.ebuild
b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
index f0f9d5c4247..7f16c4d0e29 100644
--- a/sci-libs/plplot/plplot-5.15.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
@@ -108,6 +108,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.0-multiarch.patch
"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
+ "${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: cbcbb8f5109c340e7d710323443f96405e25f9e4
Author: Michał Górny gentoo org>
AuthorDate: Fri Feb 7 19:07:00 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Feb 9 16:35:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbcbb8f5
sci-libs/plplot: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny gentoo.org>
sci-libs/plplot/{plplot-5.15.0.ebuild => plplot-5.15.0-r1.ebuild} | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.15.0.ebuild
b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
similarity index 97%
rename from sci-libs/plplot/plplot-5.15.0.ebuild
rename to sci-libs/plplot/plplot-5.15.0-r1.ebuild
index bafe731a8d4..f0f9d5c4247 100644
--- a/sci-libs/plplot/plplot-5.15.0.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -49,8 +49,10 @@ RDEPEND="
pdf? ( media-libs/libharu:0= )
python? (
${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ qt5? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ ')
)
qhull? ( media-libs/qhull:0= )
qt5? (
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: 54487bb4b714227bb48925c2316cd2305566f23e
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 16 06:55:11 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 16 07:02:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54487bb4
sci-libs/plplot: Remove old
Signed-off-by: Michał Górny 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..000
--- 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 < 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/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..000
--- 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..000
--- 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)
d
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/
commit: db051883fd804516a5e90654cb54787891c6fee4
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Dec 27 12:53:07 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Dec 27 12:53:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db051883
sci-libs/plplot: Drop patch committed by mistake
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Pacho Ramos gentoo.org>
...hange-install-tree-location-of-wxPLViewer.patch | 117 -
1 file changed, 117 deletions(-)
diff --git
a/sci-libs/plplot/files/Change-install-tree-location-of-wxPLViewer.patch
b/sci-libs/plplot/files/Change-install-tree-location-of-wxPLViewer.patch
deleted file mode 100644
index f23b199c576..000
--- a/sci-libs/plplot/files/Change-install-tree-location-of-wxPLViewer.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Ole Streicher
-Date: Wed, 20 Nov 2019 08:56:53 +0100
-Subject: Change install-tree location of wxPLViewer
-
-The wxPLViewer application is only used internally by the wxwidgets
-
-This is based on commit 4e9679b22 in upstream git,
-author Alan W. Irwin
-
-https://sourceforge.net/p/plplot/plplot/ci/4e9679b2266e190f66969f21392cdcf9766a58c9
-
-Closes: #944579
- drivers/wxwidgets_dev.cpp | 32 ++--
- include/plplotP.h | 2 --
- src/plcore.c | 5 +
- utils/CMakeLists.txt | 6 +-
- 4 files changed, 12 insertions(+), 33 deletions(-)
-
-diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp
-index 6351c68..43e70be 100644
a/drivers/wxwidgets_dev.cpp
-+++ b/drivers/wxwidgets_dev.cpp
-@@ -1753,32 +1753,12 @@ void wxPLDevice::SetupMemoryMap()
- header->completeFlag = 0;
- #endif // #ifdef PL_WXWIDGETS_IPC3
-
--//try to find the wxPLViewer executable, in the first instance just
assume it
--//is in the path.
--//wxString exeName = wxT(
"/nfs/see-fs-02_users/earpros/usr/src/plplot-plplot/build/utils/"
NAME_wxPLViewer );
--wxString exeName = wxT( NAME_wxPLViewer );
--if ( plInBuildTree() )
--{
--//if we are in the build tree check for the needed exe in there
--wxArrayString files;
--wxString utilsDir = wxString( wxT( BUILD_DIR ) ) + wxString(
wxT( "/utils" ) );
--wxDir::GetAllFiles( utilsDir, &files, exeName, wxDIR_FILES |
wxDIR_DIRS );
--if ( files.size() == 0 )
--wxDir::GetAllFiles( utilsDir, &files, exeName + wxT( ".exe"
), wxDIR_FILES | wxDIR_DIRS );
--if ( files.size() > 0 )
--exeName = files[0];
--}
--else
--{
--//check the plplot bin install directory
--wxArrayString files;
--wxDir::GetAllFiles( wxT( BIN_DIR ), &files, exeName, wxDIR_FILES
| wxDIR_DIRS );
--if ( files.size() == 0 )
--wxDir::GetAllFiles( wxT( BIN_DIR ), &files, exeName + wxT(
".exe" ), wxDIR_FILES | wxDIR_DIRS );
--if ( files.size() > 0 )
--exeName = files[0];
--}
--//Run the wxPlViewer with command line parameters telling it the
location and size of the buffer
-+// The wxPLViewer executable has been built (build-tree case)
-+// or installed (install-tree case) in the drivers directory.
-+// So use the appropriate build-tree or install-tree location
-+// when referring to it.
-+wxString exeName = wxString( _( plGetDrvDir() ) ) + _( "/" ) + _(
NAME_wxPLViewer );
-+//Run wxPlViewer with command line parameters telling it the location
and size of the buffer
- wxString command;
- command << wxT( "\"" ) << exeName << wxT( "\" " ) << wxString(
mapName, wxConvUTF8 ) << wxT( " " ) <<
- mapSize << wxT( " " ) << m_width << wxT( " " ) << m_height;
-diff --git a/include/plplotP.h b/include/plplotP.h
-index 8d44e49..22a2036 100644
a/include/plplotP.h
-+++ b/include/plplotP.h
-@@ -1275,10 +1275,8 @@ plwytik( PLFLT x, PLFLT y, PLBOOL minor, PLBOOL invert
);
-
- // get drivers directory
-
--#ifdef ENABLE_DYNDRIVERS
- PLDLLIMPEXP const char*
- plGetDrvDir( void );
--#endif
-
- #ifdef PL_HAVE_FREETYPE
- PLDLLIMPEXP void
-diff --git a/src/plcore.c b/src/plcore.c
-index 84b8063..f57e756 100644
a/src/plcore.c
-+++ b/src/plcore.c
-@@ -2966,7 +2966,7 @@ int plInBuildTree()
- return inBuildTree;
- }
-
--#ifdef ENABLE_DYNDRIVERS
-+// Need this for both the ENABLE_DYNDRIVERS case and the wxPLViewer case.
-
- PLCHAR_VECTOR
- plGetDrvDir()
-@@ -2998,9 +2998,6 @@ plGetDrvDir()
- return drvdir;
- }
-
--#endif
--
--
- //--
- // void plInitDispatchTable()
- //
-diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 5772910..f2a8411 100644
a/utils/CMakeLists.txt
-+++ b/utils/CMakeLists.txt
-@@ -52,7 +52,11 @@ if(ENABLE_wxwidgets AND NOT OLD_WXWIDGETS
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/, sci-libs/plplot/files/
commit: bb6e02b6dd02c5f5466dc82818490693ab361f81
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Dec 27 12:51:58 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Dec 27 12:53:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6e02b6
sci-libs/plplot: Bump to 5.15.0
Closes: https://bugs.gentoo.org/604358
Closes: https://bugs.gentoo.org/606760
Closes: https://bugs.gentoo.org/624576
Closes: https://bugs.gentoo.org/624592
Closes: https://bugs.gentoo.org/645292
Closes: https://bugs.gentoo.org/659252
Closes: https://bugs.gentoo.org/661144
Closes: https://bugs.gentoo.org/33
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Pacho Ramos gentoo.org>
sci-libs/plplot/Manifest | 1 +
...hange-install-tree-location-of-wxPLViewer.patch | 117 ++
.../plplot/files/plplot-5.12.0-safe-string.patch | 20 +
sci-libs/plplot/files/plplot-5.15.0-ieee.patch | 19 +
.../plplot/files/plplot-5.15.0-multiarch.patch | 56 +++
.../plplot/files/plplot-5.15.0-ocaml-rpath.patch | 166
sci-libs/plplot/files/plplot-5.15.0-ocaml.patch| 43 ++
sci-libs/plplot/files/replace-gdc-extensions.patch | 434 +
sci-libs/plplot/plplot-5.15.0.ebuild | 288 ++
9 files changed, 1144 insertions(+)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index cf755394678..f8b1522a06a 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1 +1,2 @@
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/Change-install-tree-location-of-wxPLViewer.patch
b/sci-libs/plplot/files/Change-install-tree-location-of-wxPLViewer.patch
new file mode 100644
index 000..f23b199c576
--- /dev/null
+++ b/sci-libs/plplot/files/Change-install-tree-location-of-wxPLViewer.patch
@@ -0,0 +1,117 @@
+From: Ole Streicher
+Date: Wed, 20 Nov 2019 08:56:53 +0100
+Subject: Change install-tree location of wxPLViewer
+
+The wxPLViewer application is only used internally by the wxwidgets
+
+This is based on commit 4e9679b22 in upstream git,
+author Alan W. Irwin
+
+https://sourceforge.net/p/plplot/plplot/ci/4e9679b2266e190f66969f21392cdcf9766a58c9
+
+Closes: #944579
+---
+ drivers/wxwidgets_dev.cpp | 32 ++--
+ include/plplotP.h | 2 --
+ src/plcore.c | 5 +
+ utils/CMakeLists.txt | 6 +-
+ 4 files changed, 12 insertions(+), 33 deletions(-)
+
+diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp
+index 6351c68..43e70be 100644
+--- a/drivers/wxwidgets_dev.cpp
b/drivers/wxwidgets_dev.cpp
+@@ -1753,32 +1753,12 @@ void wxPLDevice::SetupMemoryMap()
+ header->completeFlag = 0;
+ #endif // #ifdef PL_WXWIDGETS_IPC3
+
+-//try to find the wxPLViewer executable, in the first instance just
assume it
+-//is in the path.
+-//wxString exeName = wxT(
"/nfs/see-fs-02_users/earpros/usr/src/plplot-plplot/build/utils/"
NAME_wxPLViewer );
+-wxString exeName = wxT( NAME_wxPLViewer );
+-if ( plInBuildTree() )
+-{
+-//if we are in the build tree check for the needed exe in there
+-wxArrayString files;
+-wxString utilsDir = wxString( wxT( BUILD_DIR ) ) + wxString(
wxT( "/utils" ) );
+-wxDir::GetAllFiles( utilsDir, &files, exeName, wxDIR_FILES |
wxDIR_DIRS );
+-if ( files.size() == 0 )
+-wxDir::GetAllFiles( utilsDir, &files, exeName + wxT( ".exe"
), wxDIR_FILES | wxDIR_DIRS );
+-if ( files.size() > 0 )
+-exeName = files[0];
+-}
+-else
+-{
+-//check the plplot bin install directory
+-wxArrayString files;
+-wxDir::GetAllFiles( wxT( BIN_DIR ), &files, exeName, wxDIR_FILES
| wxDIR_DIRS );
+-if ( files.size() == 0 )
+-wxDir::GetAllFiles( wxT( BIN_DIR ), &files, exeName + wxT(
".exe" ), wxDIR_FILES | wxDIR_DIRS );
+-if ( files.size() > 0 )
+-exeName = files[0];
+-}
+-//Run the wxPlViewer with command line parameters telling it the
location and size of the buffer
++// The wxPLViewer executable has been built (build-tree case)
++// or installed (install-tree case) in the drivers directory.
++// So use the app
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: e3cb7609996c4e1b0bf6988940cd2c2cebb16c87
Author: Michał Górny gentoo org>
AuthorDate: Thu Dec 12 15:33:32 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Dec 12 16:35:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cb7609
sci-libs/plplot: [QA] Fix MissingTestRestrict
Signed-off-by: Michał Górny gentoo.org>
sci-libs/plplot/plplot-5.12.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.12.0-r1.ebuild
b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
index a8582c6ed65..cf5c4e33674 100644
--- a/sci-libs/plplot/plplot-5.12.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ 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="octave? ( test )"
+RESTRICT="!test? ( test ) octave? ( test )"
RDEPEND="
cairo? ( x11-libs/cairo:0=[svg?,X] )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: ea558c969ac66320d8e6dd31a51f21dc0df551c8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jan 22 00:12:02 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jan 22 00:42:30 2018 +
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..000
--- 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..000
--- 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
${CMAK
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: e094f6f984fe57e55a2850f60ba11be9dfaf23a6
Author: David Seifert gentoo org>
AuthorDate: Sun Jul 9 21:02:26 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jul 9 21:02:53 2017 +
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 000..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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 427357ed9e978e8255d9757940f3011fce9cb436
Author: David Seifert gentoo org>
AuthorDate: Thu Apr 20 15:45:10 2017 +
Commit: David Seifert gentoo org>
CommitDate: Thu Apr 20 16:38:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427357ed
sci-libs/plplot: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index 764e1192491..a46a090713e 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
dev-perl/XML-DOM
)
python? (
+ ${PYTHON_DEPS}
dev-python/numpy[${PYTHON_USEDEP}]
qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: ac4bcec25b071c5564e05f19be9b625c215104d7 Author: Michael Palimaka gentoo org> AuthorDate: Mon Mar 13 01:57:13 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Mar 13 01:57:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4bcec2 sci-libs/plplot: pin dev-qt/qtprintsupport to SLOT 5 Package-Manager: Portage-2.3.4, Repoman-2.3.2 sci-libs/plplot/plplot-5.12.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/plplot/plplot-5.12.0-r1.ebuild b/sci-libs/plplot/plplot-5.12.0-r1.ebuild index 01468a2a891..c8be469a4e5 100644 --- a/sci-libs/plplot/plplot-5.12.0-r1.ebuild +++ b/sci-libs/plplot/plplot-5.12.0-r1.ebuild @@ -46,7 +46,7 @@ RDEPEND=" qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 - dev-qt/qtprintsupport + dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? (
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: a4a96bc66864e6aabbc1b2edcfee32e2bc9f5312
Author: David Seifert gentoo org>
AuthorDate: Mon Feb 20 19:29:37 2017 +
Commit: David Seifert gentoo org>
CommitDate: Mon Feb 20 19:33:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a96bc6
sci-libs/plplot: Fix .pc file by using full paths
* Use CMAKE_INSTALL_LIBDIR with a full path
* java-pkg_regso is not EPREFIX aware
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610066
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/plplot/{plplot-5.12.0.ebuild => plplot-5.12.0-r1.ebuild} | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.12.0.ebuild
b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
similarity index 96%
rename from sci-libs/plplot/plplot-5.12.0.ebuild
rename to sci-libs/plplot/plplot-5.12.0-r1.ebuild
index 9cf3d800c8..92a67705fb 100644
--- a/sci-libs/plplot/plplot-5.12.0.ebuild
+++ b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
@@ -143,6 +143,10 @@ src_configure() {
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
@@ -268,6 +272,6 @@ src_install() {
if use java; then
java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
- java-pkg_regso /usr/$(get_libdir)/jni/plplotjavac_wrap.so
+ java-pkg_regso
"${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
fi
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 1517d387651e81dcbf881289d60e58ef765ababc
Author: David Seifert gentoo org>
AuthorDate: Sun Feb 19 11:06:40 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Feb 19 11:07:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1517d387
sci-libs/plplot: Build in C++11 mode
Bug: https://bugs.gentoo.org/show_bug.cgi?id=609980
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/plplot/plplot-5.12.0.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.12.0.ebuild
b/sci-libs/plplot/plplot-5.12.0.ebuild
index 5bf49807a6..9cf3d800c8 100644
--- a/sci-libs/plplot/plplot-5.12.0.ebuild
+++ b/sci-libs/plplot/plplot-5.12.0.ebuild
@@ -9,7 +9,7 @@ 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
+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/";
@@ -138,6 +138,10 @@ src_configure() {
# * 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=(
## Features
-DBUILD_DOC=OFF
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: 51fd4fb2277b7117039a9572f242dd39ffd322cb
Author: David Seifert gentoo org>
AuthorDate: Sat Feb 18 19:09:44 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 18 19:10:08 2017 +
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 00..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 00..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 00..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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 0fc08144e90d401dff10aa03e51a4c657a877206
Author: David Seifert gentoo org>
AuthorDate: Mon Feb 13 12:56:28 2017 +
Commit: David Seifert gentoo org>
CommitDate: Mon Feb 13 13:18:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc08144
sci-libs/plplot: Remove ppc from KEYWORDS
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3947
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index cd01cf6f58..f7735a5fea 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/12"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+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"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/files/, sci-libs/plplot/
commit: dad2fef9431da5d53012fdab9a3a37ab64234a23
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Nov 25 18:52:18 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Nov 25 18:56:34 2016 +
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..
--- 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..
--- 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.txt2014-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/qsastim
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 077fe42177f6a0a36edf437b6fd3e49bf7d590e8
Author: David Seifert gentoo org>
AuthorDate: Sat Oct 8 12:11:11 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Oct 8 12:13:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077fe421
sci-libs/plplot: Remove support for USE="ada"
Gentoo-bug: 596530
Package-Manager: portage-2.3.1
sci-libs/plplot/metadata.xml| 44 +++--
sci-libs/plplot/plplot-5.10.0-r1.ebuild | 7 +++---
sci-libs/plplot/plplot-5.11.0-r1.ebuild | 7 +++---
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 5 ++--
sci-libs/plplot/plplot-5.11.1.ebuild| 7 +++---
5 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 663e4b7..7b64efe 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,33 +1,19 @@
http://www.gentoo.org/dtd/metadata.dtd";>
-
-s...@gentoo.org
-Gentoo Science Project
-
-
- PLplot is a library of functions that are useful for making scientific
- plots. It can be used from within compiled languages such as C, C++,
- FORTRAN and Java, as well as interactively from interpreted languages such
- as Octave, Python, Perl and Tcl. It is capable of producing standard x-y
- plots, semilog plots, log-log plots, contour plots, 3D surface plots, mesh
- plots, bar charts and pie charts. Multiple graphs may be composited, and it
- also supports a large variety of output file devices such as Postscript,
- PNG, JPEG, LaTeX and others. It is also possible to to use interactive
- devices such as xwin, tk and xterm as output devices. PLplot also offers
- support for extended characters inculding the Greek alphabet and a host of
- mathematical symbols.
-
-
-Add bindings for the ADA programming language
-Build with dynamic drivers
-Add bindings for
- sci-mathematics/octave
-Add bindings for dev-perl/PDL
-Add bindings for media-libs/qhull
-Enable support for ESRI shapefiles
-
-
-plplot
-
+
+ s...@gentoo.org
+ Gentoo Science Project
+
+ PLplot is a library of functions that are
useful for making scientific plots. It can be used from within compiled
languages such as C, C++, FORTRAN and Java, as well as interactively from
interpreted languages such as Octave, Python, Perl and Tcl. It is capable of
producing standard x-y plots, semilog plots, log-log plots, contour plots, 3D
surface plots, mesh plots, bar charts and pie charts. Multiple graphs may be
composited, and it also supports a large variety of output file devices such as
Postscript, PNG, JPEG, LaTeX and others. It is also possible to to use
interactive devices such as xwin, tk and xterm as output devices. PLplot also
offers support for extended characters inculding the Greek alphabet and a host
of mathematical symbols.
+
+ Build with dynamic drivers
+ Add bindings for
sci-mathematics/octave
+ Add bindings for dev-perl/PDL
+ Add bindings for
media-libs/qhull
+ Enable support for ESRI shapefiles
+
+
+ plplot
+
diff --git a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
index 1976b72..296eaa2 100644
--- a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,12 +19,11 @@ 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
+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="
- ada? ( virtual/gnat:* )
cairo? ( x11-libs/cairo:0=[svg?,X?] )
gd? ( media-libs/gd:2=[jpeg?,png?] )
java? ( >=virtual/jre-1.5:* )
@@ -134,6 +133,7 @@ src_configure() {
-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
@@ -144,7 +144,6 @@ src_configure() {
$(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)
diff --git a/sci-libs/plplo
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: c616104f112f4e400ffe4832ef5ee81f81eb356d
Author: David Seifert gentoo org>
AuthorDate: Wed Aug 3 17:45:12 2016 +
Commit: David Seifert gentoo org>
CommitDate: Wed Aug 3 17:45:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c616104f
sci-libs/plplot: Add missing call to fortran-2_pkg_setup
Package-Manager: portage-2.3.0
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index f0f9c7c..eb7c2f0 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
pkg_setup() {
use python && python-single-r1_pkg_setup
java-pkg-opt-2_pkg_setup
+ fortran-2_pkg_setup
}
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 00dd4c54ae69d42478629dbd8571edd6b5b3ac4e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Feb 1 08:13:37 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Feb 1 08:13:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00dd4c54
sci-libs/plplot: amd64 stable wrt bug #546578
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index 737d78f..51eed1c 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/12"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+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"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: e5593d10779a9fefa8f0c87b18bea74a5e6da14c
Author: Justin Lecher gentoo org>
AuthorDate: Wed Jan 20 08:49:48 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Wed Jan 20 08:50:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5593d10
sci-libs/plplot: Amend test phase again
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index bed1a23..737d78f 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -232,7 +232,7 @@ src_configure() {
}
src_test() {
- virtx cmake-utils_src_test virtualmake
+ virtx cmake-utils_src_test
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 240686b55999a079473db20eaf191940f681d8d0
Author: Justin Lecher gentoo org>
AuthorDate: Wed Jan 20 07:57:36 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Wed Jan 20 08:19:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240686b5
sci-libs/plplot: Drop deprecated use of virtualx.eclass
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
index a64af2b..bed1a23 100644
--- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -232,7 +232,7 @@ src_configure() {
}
src_test() {
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+ virtx cmake-utils_src_test virtualmake
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 86b02d33cd1e4fe22c92754467b376d9f3e76f2c
Author: David Seifert gentoo org>
AuthorDate: Tue Jan 19 18:03:33 2016 +
Commit: David Seifert gentoo org>
CommitDate: Tue Jan 19 18:03:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b02d33
sci-libs/plplot: Do not copy plplotjavac_wrap.so from BUILD_DIR
Gentoo-Bug: 546578
Instead, we use the installed .so file instead, which has
RPATH removed by cmake and register the .so file with the
Java environment.
Package-Manager: portage-2.2.26
sci-libs/plplot/plplot-5.11.1-r1.ebuild | 249
1 file changed, 249 insertions(+)
diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild
b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
new file mode 100644
index 000..a64af2b
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.11.1-r1.ebuild
@@ -0,0 +1,249 @@
+# 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="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:${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
+
+ # -DPLPLO
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 9617bab88cf2b9cc175ae4e843c1dd1a7e5595c3
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Oct 25 10:42:10 2015 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Oct 25 10:42:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9617bab8
sci-libs/plplot: Version bump, support wxGTK:3.0
Package-Manager: portage-2.2.23
sci-libs/plplot/Manifest | 1 +
sci-libs/plplot/plplot-5.11.1.ebuild | 250 +++
2 files changed, 251 insertions(+)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 25e28a6..022e61d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,2 +1,3 @@
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/plplot-5.11.1.ebuild
b/sci-libs/plplot/plplot-5.11.1.ebuild
new file mode 100644
index 000..77f2d41
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.11.1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 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="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:${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}"/$
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: d03c2a24161d547f2f91103a22700115e1eb24ff
Author: Mikle Kolyada gentoo org>
AuthorDate: Wed Aug 26 14:21:31 2015 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Wed Aug 26 14:21:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03c2a24
sci-libs/plplot: x86 stable wrt bug #529038
Package-Manager: portage-2.2.20.1
sci-libs/plplot/plplot-5.11.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.11.0-r1.ebuild
b/sci-libs/plplot/plplot-5.11.0-r1.ebuild
index bdaa6f1..d5d9a14 100644
--- a/sci-libs/plplot/plplot-5.11.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/12"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+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"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/plplot/
commit: 8b623a045e5a86141db5da1bd348a3919f946ba3
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Aug 16 22:59:58 2015 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Aug 16 22:59:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b623a04
sci-libs/plplot: amd64 stable wrt bug #529038
Package-Manager: portage-2.2.20.1
sci-libs/plplot/plplot-5.11.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/plplot/plplot-5.11.0-r1.ebuild
b/sci-libs/plplot/plplot-5.11.0-r1.ebuild
index b855029..bdaa6f1 100644
--- a/sci-libs/plplot/plplot-5.11.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.11.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/12"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+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"
