[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2024-04-23 Thread Sam James
commit: db314d3e40bc858e158bc07d164fd8ebe222de3d
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 20:31:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 20:33:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db314d3e

sci-libs/mathgl: add subslot dep on sci-libs/hdf5

Signed-off-by: Sam James  gentoo.org>

 sci-libs/mathgl/{mathgl-8.0.1.ebuild => mathgl-8.0.1-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-8.0.1.ebuild 
b/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild
similarity index 97%
rename from sci-libs/mathgl/mathgl-8.0.1.ebuild
rename to sci-libs/mathgl/mathgl-8.0.1-r1.ebuild
index bc9909e31c95..8d2a2064061c 100644
--- a/sci-libs/mathgl/mathgl-8.0.1.ebuild
+++ b/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,7 @@ RDEPEND="
glut? ( media-libs/freeglut )
gsl? ( >=sci-libs/gsl-2:= )
hdf? ( sci-libs/hdf )
-   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   hdf5? ( >=sci-libs/hdf5-1.8:=[mpi=] )
jpeg? ( virtual/jpeg:0 )
octave? ( >=sci-mathematics/octave-3.4.0 )
openmp? ( sys-cluster/openmpi )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2024-03-24 Thread Andreas Sturmlechner
commit: 8b862121d306c5e32e44ad54cf2f8c6b3abe4972
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar  7 13:16:56 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 24 21:02:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b862121

sci-libs/mathgl: drop 2.4.4-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/mathgl/Manifest   |   2 -
 sci-libs/mathgl/mathgl-2.4.4-r1.ebuild | 159 -
 2 files changed, 161 deletions(-)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 9a1cf0f5c874..32667b8b502a 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,3 +1 @@
-DIST STIX_font.tgz 2450541 BLAKE2B 
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
 SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
-DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 
11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf
 SHA512 
6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573
 DIST mathgl-8.0.1.tar.gz 23979834 BLAKE2B 
275301c945ea15a38d1c75fd509c126425080b811403d5a8c8e864c8a975b914b5f0909bdc2c0de2feb84638ef0655694cd4d0c2aec8fb537c937147d81608c9
 SHA512 
1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2

diff --git a/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
deleted file mode 100644
index 67cf1d52fc52..
--- a/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-
-inherit cmake wxwidgets multilib flag-o-matic
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="https://mathgl.sourceforge.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3+"
-SLOT="0/7.5.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
-   png qt5 static-libs threads wxwidgets zlib"
-
-LANGS="ru"
-for l in ${LANGS}; do
-   IUSE+=" l10n_${l}"
-done
-unset l
-
-RDEPEND="
-   virtual/opengl
-   fltk? ( x11-libs/fltk:1 )
-   gif? ( media-libs/giflib )
-   glut? ( media-libs/freeglut )
-   gsl? ( >=sci-libs/gsl-2:= )
-   hdf? ( sci-libs/hdf )
-   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-   jpeg? ( virtual/jpeg:0 )
-   octave? ( >=sci-mathematics/octave-3.4.0 )
-   openmp? ( sys-cluster/openmpi )
-   pdf? ( media-libs/libharu )
-   png? ( media-libs/libpng:0 )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-text/texi2html virtual/texi2dvi )
-   octave? ( dev-lang/swig )"
-
-REQUIRED_USE="
-   mpi? ( hdf5 )
-   openmp? ( !threads )
-   png? ( zlib )
-   pdf? ( png )"
-
-pkg_setup() {
-   use mpi && export CC=mpicc CXX=mpicxx
-}
-
-src_unpack() {
-   default
-   if ! [[ -d "${S}"/fonts ]]; then
-   mkdir "${S}"/fonts || die
-   fi
-   cd "${S}"/fonts || die
-   unpack STIX_font.tgz
-}
-
-src_prepare() {
-   # fix for location of hdf headers
-   sed -i -e 's:hdf/::g' src/data_io.cpp || die
-   # bored of reporting bad libdir upstream
-   sed -i \
-   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
-   {src,widgets}/CMakeLists.txt || die
-   echo "" > lang/install.m || die
-   # fix desktop file
-   sed -i -e 's/.png//' udav/udav.desktop || die
-   # prevent sandbox violation
-   sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
-   sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   use wxwidgets && setup-wxwidgets unicode
-
-   local mycmakeargs=()
-   if use hdf; then
-   mycmakeargs+=(
-   -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
-   )
-   fi
-   mycmakeargs+=(
-   # No clue about this option:
-   # option(enable-mgl2 "Use names 'libmgl2-*' instead of 
'libmgl-*'")
-   -DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-   -Denable-all-docs=$(usex doc)
-   -Denable-fltk=$(usex fltk)
-   -Denable-gif=$(usex gif)
-   

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/, sci-libs/mathgl/files/

2023-11-24 Thread Pacho Ramos
commit: b7e1372b7791f70b4f162a8ef5762c892633b4c7
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 24 14:04:23 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 24 14:30:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e1372b

sci-libs/mathgl: add 8.0.1

Closes: https://bugs.gentoo.org/587150
Closes: https://bugs.gentoo.org/886468
Closes: https://bugs.gentoo.org/873457
Closes: https://bugs.gentoo.org/808713
Closes: https://bugs.gentoo.org/780318
Closes: https://bugs.gentoo.org/711154
Signed-off-by: Pacho Ramos  gentoo.org>

 sci-libs/mathgl/Manifest  |   1 +
 sci-libs/mathgl/files/mathgl-libharu2.4.patch |  25 +
 sci-libs/mathgl/mathgl-8.0.1.ebuild   | 145 ++
 3 files changed, 171 insertions(+)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index ed743f578265..9a1cf0f5c874 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,2 +1,3 @@
 DIST STIX_font.tgz 2450541 BLAKE2B 
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
 SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 
11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf
 SHA512 
6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573
+DIST mathgl-8.0.1.tar.gz 23979834 BLAKE2B 
275301c945ea15a38d1c75fd509c126425080b811403d5a8c8e864c8a975b914b5f0909bdc2c0de2feb84638ef0655694cd4d0c2aec8fb537c937147d81608c9
 SHA512 
1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2

diff --git a/sci-libs/mathgl/files/mathgl-libharu2.4.patch 
b/sci-libs/mathgl/files/mathgl-libharu2.4.patch
new file mode 100644
index ..fb0acb5da547
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-libharu2.4.patch
@@ -0,0 +1,25 @@
+diff -up mathgl-8.0.1/src/prc.cpp.libharu2.4 mathgl-8.0.1/src/prc.cpp
+--- mathgl-8.0.1/src/prc.cpp.libharu2.42022-01-11 13:48:53.0 
-0700
 mathgl-8.0.1/src/prc.cpp   2022-10-05 21:10:18.640050969 -0600
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #endif // MGL_HAVE_PDF
+ 
+ 
+@@ -959,7 +960,12 @@ void MGL_EXPORT mgl_write_prc(HMGL gr, c
+   HPDF_U3D_SetDefault3DView(u3d, "DefaultView");
+ 
+   //  Create annotation
+-  annot = HPDF_Page_Create3DAnnot (page, rect, u3d );
++  annot
++#if HPDF_VERSION_ID >= 20400
++= HPDF_Page_Create3DAnnot (page, rect, HPDF_FALSE, 
HPDF_FALSE, u3d, NULL);
++#else
++= HPDF_Page_Create3DAnnot (page, rect, u3d );
++#endif
+ 
+   //  Enable toolbar
+   HPDF_Dict action = (HPDF_Dict)HPDF_Dict_GetItem (annot, "3DA", 
HPDF_OCLASS_DICT);

diff --git a/sci-libs/mathgl/mathgl-8.0.1.ebuild 
b/sci-libs/mathgl/mathgl-8.0.1.ebuild
new file mode 100644
index ..bc9909e31c95
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-8.0.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets multilib flag-o-matic xdg
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="https://mathgl.sourceforge.net;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/7.5.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
+   png qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+   IUSE+=" l10n_${l}"
+done
+unset l
+
+RDEPEND="
+   virtual/opengl
+   fltk? ( x11-libs/fltk:1 )
+   gif? ( media-libs/giflib )
+   glut? ( media-libs/freeglut )
+   gsl? ( >=sci-libs/gsl-2:= )
+   hdf? ( sci-libs/hdf )
+   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   jpeg? ( virtual/jpeg:0 )
+   octave? ( >=sci-mathematics/octave-3.4.0 )
+   openmp? ( sys-cluster/openmpi )
+   pdf? ( media-libs/libharu )
+   png? ( media-libs/libpng:0 )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/texi2html virtual/texi2dvi )
+   octave? ( dev-lang/swig )"
+
+REQUIRED_USE="
+   mpi? ( hdf5 )
+   openmp? ( !threads )
+   png? ( zlib )
+   pdf? ( png )"
+
+pkg_setup() {
+   use mpi && export CC=mpicc CXX=mpicxx
+}
+
+PATCHES=(
+   # From Fedora
+   

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2022-11-19 Thread Andrew Ammerlaan
commit: a5c7fb7c5bf1e14c38f0d4f117f9e4fa4bbbc562
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Nov 19 09:13:26 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Nov 19 11:39:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c7fb7c

sci-libs/mathgl: use HTTPS, fix LICENSE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/mathgl/mathgl-2.4.4-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
index ba882749acc0..67cf1d52fc52 100644
--- a/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.4-r1.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
@@ -8,10 +8,10 @@ WX_GTK_VER=3.0
 inherit cmake wxwidgets multilib flag-o-matic
 
 DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/;
+HOMEPAGE="https://mathgl.sourceforge.net;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
 
-LICENSE="LGPL-3"
+LICENSE="LGPL-3+"
 SLOT="0/7.5.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2021-06-02 Thread Sam James
commit: 322284b3306fe95a940faae3cb4fdbcfbf6d2c87
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 21:31:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  2 21:50:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322284b3

sci-libs/mathgl: subscribe to sci-libs/gsl subslot

Signed-off-by: Sam James  gentoo.org>

 sci-libs/mathgl/{mathgl-2.4.4.ebuild => mathgl-2.4.4-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.4.ebuild 
b/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
similarity index 99%
rename from sci-libs/mathgl/mathgl-2.4.4.ebuild
rename to sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
index c3da586164f..ba882749acc 100644
--- a/sci-libs/mathgl/mathgl-2.4.4.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
fltk? ( x11-libs/fltk:1 )
gif? ( media-libs/giflib )
glut? ( media-libs/freeglut )
-   gsl? ( >=sci-libs/gsl-2 )
+   gsl? ( >=sci-libs/gsl-2:= )
hdf? ( sci-libs/hdf )
hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
jpeg? ( virtual/jpeg:0 )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2021-04-04 Thread David Seifert
commit: 07eb2c196281061e5bb1c1ee2eefefd928877aaf
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr  4 20:21:00 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr  4 20:21:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07eb2c19

sci-libs/mathgl: need-wxwidgets -> setup-wxwidgets

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/mathgl/mathgl-2.4.4.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.4.ebuild 
b/sci-libs/mathgl/mathgl-2.4.4.ebuild
index 4485d272e44..c3da586164f 100644
--- a/sci-libs/mathgl/mathgl-2.4.4.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.4.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
@@ -81,11 +81,12 @@ src_prepare() {
sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
 
-   use wxwidgets && need-wxwidgets unicode
cmake_src_prepare
 }
 
 src_configure() {
+   use wxwidgets && setup-wxwidgets unicode
+
local mycmakeargs=()
if use hdf; then
mycmakeargs+=(



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-11-29 Thread Marek Szuba
commit: 977f8099bd230cb4c539b2fafa784d1687c7316a
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Nov 29 15:08:12 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Nov 29 15:10:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977f8099

sci-libs/mathgl: bump to 2.4.4

Signed-off-by: Marek Szuba  gentoo.org>

 sci-libs/mathgl/Manifest|   1 +
 sci-libs/mathgl/mathgl-2.4.4.ebuild | 158 
 2 files changed, 159 insertions(+)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index c5725ed2951..d194ed33c61 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,2 +1,3 @@
 DIST STIX_font.tgz 2450541 BLAKE2B 
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
 SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B 
a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f
 SHA512 
10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d
+DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 
11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf
 SHA512 
6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573

diff --git a/sci-libs/mathgl/mathgl-2.4.4.ebuild 
b/sci-libs/mathgl/mathgl-2.4.4.ebuild
new file mode 100644
index 000..4485d272e44
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.4.4.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0
+
+inherit cmake wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.5.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
+   png qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+   IUSE+=" l10n_${l}"
+done
+unset l
+
+RDEPEND="
+   virtual/opengl
+   fltk? ( x11-libs/fltk:1 )
+   gif? ( media-libs/giflib )
+   glut? ( media-libs/freeglut )
+   gsl? ( >=sci-libs/gsl-2 )
+   hdf? ( sci-libs/hdf )
+   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   jpeg? ( virtual/jpeg:0 )
+   octave? ( >=sci-mathematics/octave-3.4.0 )
+   openmp? ( sys-cluster/openmpi )
+   pdf? ( media-libs/libharu )
+   png? ( media-libs/libpng:0 )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/texi2html virtual/texi2dvi )
+   octave? ( dev-lang/swig )"
+
+REQUIRED_USE="
+   mpi? ( hdf5 )
+   openmp? ( !threads )
+   png? ( zlib )
+   pdf? ( png )"
+
+pkg_setup() {
+   use mpi && export CC=mpicc CXX=mpicxx
+}
+
+src_unpack() {
+   default
+   if ! [[ -d "${S}"/fonts ]]; then
+   mkdir "${S}"/fonts || die
+   fi
+   cd "${S}"/fonts || die
+   unpack STIX_font.tgz
+}
+
+src_prepare() {
+   # fix for location of hdf headers
+   sed -i -e 's:hdf/::g' src/data_io.cpp || die
+   # bored of reporting bad libdir upstream
+   sed -i \
+   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+   {src,widgets}/CMakeLists.txt || die
+   echo "" > lang/install.m || die
+   # fix desktop file
+   sed -i -e 's/.png//' udav/udav.desktop || die
+   # prevent sandbox violation
+   sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+   sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+
+   use wxwidgets && need-wxwidgets unicode
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=()
+   if use hdf; then
+   mycmakeargs+=(
+   -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+   )
+   fi
+   mycmakeargs+=(
+   # No clue about this option:
+   # option(enable-mgl2 "Use names 'libmgl2-*' instead of 
'libmgl-*'")
+   -DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+   -Denable-all-docs=$(usex doc)
+   -Denable-fltk=$(usex fltk)
+   -Denable-gif=$(usex gif)
+   -Denable-glut=$(usex glut)
+   -Denable-gsl=$(usex gsl)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-11-29 Thread Marek Szuba
commit: 9b4cd61f8a70df0509efdd41034f904f211d19bc
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Nov 29 14:53:31 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Nov 29 15:10:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4cd61f

sci-libs/mathgl: drop USE=lua support

It had a missing build-time dependency on dev-lang/swig, and having
fixed this I found out that even with unslotted Lua, it:
 - installs the module directly into /usr/lib64 instead of the correct
   cmod directory,
 - has the module linked against liblua, which is a huge no-no, and
 - fails to load (even when moved to the correct directory) due to
   undefined symbols.

Signed-off-by: Marek Szuba  gentoo.org>

 sci-libs/mathgl/mathgl-2.4.1-r2.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
index 871e6edae56..b9f2abff3f8 100644
--- a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_
 LICENSE="LGPL-3"
 SLOT="0/7.5.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
png qt5 static-libs threads wxwidgets zlib"
 
 LANGS="ru"
@@ -32,7 +32,6 @@ RDEPEND="
hdf? ( sci-libs/hdf )
hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
jpeg? ( virtual/jpeg:0 )
-   lua? ( >=dev-lang/lua-5.1:0 )
octave? ( >=sci-mathematics/octave-3.4.0 )
openmp? ( sys-cluster/openmpi )
pdf? ( media-libs/libharu )
@@ -110,7 +109,6 @@ src_configure() {
-Denable-hdf4=$(usex hdf)
-Denable-hdf5=$(usex hdf5)
-Denable-jpeg=$(usex jpeg)
-   -Denable-lua=$(usex lua)
-Denable-mpi=$(usex mpi)
-Denable-octave=$(usex octave)
-Denable-opengl=$(usex opengl)



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-09-09 Thread Michał Górny
commit: 2471bf6baf2a3766bc7439900e028ecb0a131c37
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep  9 11:44:12 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  9 11:44:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2471bf6b

sci-libs/mathgl: Eradicate python2

Closes: https://bugs.gentoo.org/735474
Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/mathgl/mathgl-2.4.1-r2.ebuild | 33 +
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
index e07d56b6edf..871e6edae56 100644
--- a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
 WX_GTK_VER=3.0
 
-inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+inherit cmake-utils eutils wxwidgets multilib flag-o-matic
 
 DESCRIPTION="Math Graphics Library"
 HOMEPAGE="http://mathgl.sourceforge.net/;
@@ -16,7 +15,7 @@ LICENSE="LGPL-3"
 SLOT="0/7.5.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
-   png python qt5 static-libs threads wxwidgets zlib"
+   png qt5 static-libs threads wxwidgets zlib"
 
 LANGS="ru"
 for l in ${LANGS}; do
@@ -38,15 +37,6 @@ RDEPEND="
openmp? ( sys-cluster/openmpi )
pdf? ( media-libs/libharu )
png? ( media-libs/libpng:0 )
-   python? (
-   $(python_gen_cond_dep '
-   || (
-   dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-   )
-   ')
-   ${PYTHON_DEPS}
-   )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -58,15 +48,13 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
doc? ( app-text/texi2html virtual/texi2dvi )
-   octave? ( dev-lang/swig )
-   python? ( dev-lang/swig )"
+   octave? ( dev-lang/swig )"
 
 REQUIRED_USE="
mpi? ( hdf5 )
openmp? ( !threads )
png? ( zlib )
-   pdf? ( png )
-   python? ( ${PYTHON_REQUIRED_USE} )"
+   pdf? ( png )"
 
 PATCHES=(
"${FILESDIR}"/${P}-mutex.patch
@@ -74,7 +62,6 @@ PATCHES=(
 
 pkg_setup() {
use mpi && export CC=mpicc CXX=mpicxx
-   use python && python-single-r1_pkg_setup
 }
 
 src_unpack() {
@@ -100,9 +87,6 @@ src_prepare() {
sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
 
-   use python && \
-   append-cppflags \
-   -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
use wxwidgets && need-wxwidgets unicode
cmake-utils_src_prepare
 }
@@ -138,17 +122,11 @@ src_configure() {
-Denable-qt5asqt=$(usex qt5)
-Denable-pthread=$(usex threads)
-Denable-pthr-widget=$(usex threads)
-   -Denable-python=$(usex python)
+   -Denable-python=OFF
-Denable-wx=$(usex wxwidgets)
-Denable-zlib=$(usex zlib)
)
cmake-utils_src_configure
-   # to whoever cares: TODO: do for multiple python ABI
-   if use python; then
-   sed -i \
-   -e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
-   "${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
-   fi
 }
 
 src_install() {
@@ -168,7 +146,6 @@ src_install() {
insinto /usr/share/${PN}/octave
doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
fi
-   use python && python_optimize
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-02-09 Thread Michał Górny
commit: c89e571cb194ce6e02d70d38a7c44a6e4b6e5a33
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 19:06:41 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89e571c

sci-libs/mathgl: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>

 .../mathgl/{mathgl-2.4.1-r1.ebuild => mathgl-2.4.1-r2.ebuild}  | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.1-r1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
similarity index 96%
rename from sci-libs/mathgl/mathgl-2.4.1-r1.ebuild
rename to sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
index 81c1241a2fa..e07d56b6edf 100644
--- a/sci-libs/mathgl/mathgl-2.4.1-r1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
@@ -39,10 +39,12 @@ RDEPEND="
pdf? ( media-libs/libharu )
png? ( media-libs/libpng:0 )
python? (
-   || (
-   dev-python/numpy-python2[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   )
+   $(python_gen_cond_dep '
+   || (
+   dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   )
+   ')
${PYTHON_DEPS}
)
qt5? (



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-01-22 Thread Michał Górny
commit: 0bb600394949feb476bfa6517552984fde977a81
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:42:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb60039

sci-libs/mathgl: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/mathgl/{mathgl-2.4.1.ebuild => mathgl-2.4.1-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1-r1.ebuild
similarity index 100%
rename from sci-libs/mathgl/mathgl-2.4.1.ebuild
rename to sci-libs/mathgl/mathgl-2.4.1-r1.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2020-01-15 Thread Michał Górny
commit: 9ab2591dbc80ed201ca0095ee58342d6eb160672
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:49:39 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab2591d

sci-libs/mathgl: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/mathgl/mathgl-2.4.1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.4.1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1.ebuild
index 461956958f1..81c1241a2fa 100644
--- a/sci-libs/mathgl/mathgl-2.4.1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,13 @@ RDEPEND="
openmp? ( sys-cluster/openmpi )
pdf? ( media-libs/libharu )
png? ( media-libs/libpng:0 )
-   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+   python? (
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   ${PYTHON_DEPS}
+   )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2018-06-06 Thread Andreas Sturmlechner
commit: ae8bfdb3650b8ca1efaeaf43950908cc1c7bf3b6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  3 12:41:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  6 14:54:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8bfdb3

sci-libs/mathgl: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/mathgl/Manifest   |   1 -
 sci-libs/mathgl/mathgl-2.3.4-r1.ebuild | 177 -
 2 files changed, 178 deletions(-)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index f36f9767c84..c5725ed2951 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,3 +1,2 @@
 DIST STIX_font.tgz 2450541 BLAKE2B 
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
 SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
-DIST mathgl-2.3.4.tar.gz 21361705 BLAKE2B 
652cae42ace83077c5e5add2164a99d9a4f0b76a95d9ddd9b5570c04e87ce06c6cf127af85c451f74c7aa59e411c02c970e5fea7ed501a690f6d1a1456dcbd9c
 SHA512 
2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
 DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B 
a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f
 SHA512 
10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d

diff --git a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild 
b/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
deleted file mode 100644
index 187531c3a89..000
--- a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER=3.0
-
-inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0/7.4.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
-   png python qt5 static-libs threads wxwidgets zlib"
-
-LANGS="ru"
-for l in ${LANGS}; do
-   IUSE+=" l10n_${l}"
-done
-unset l
-
-RDEPEND="
-   !sci-visualization/udav
-   virtual/opengl
-   fltk? ( x11-libs/fltk:1 )
-   gif? ( media-libs/giflib )
-   glut? ( media-libs/freeglut )
-   gsl? ( >=sci-libs/gsl-2 )
-   hdf? ( sci-libs/hdf )
-   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-   jpeg? ( virtual/jpeg:0 )
-   lua? ( >=dev-lang/lua-5.1:0 )
-   octave? ( >=sci-mathematics/octave-3.4.0 )
-   openmp? ( sys-cluster/openmpi )
-   pdf? ( media-libs/libharu )
-   png? ( media-libs/libpng:0 )
-   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-   zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-   doc? ( app-text/texi2html virtual/texi2dvi )
-   octave? ( dev-lang/swig )
-   python? ( dev-lang/swig )"
-
-REQUIRED_USE="
-   mpi? ( hdf5 )
-   openmp? ( !threads )
-   png? ( zlib )
-   pdf? ( png )
-   python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-   use mpi && export CC=mpicc CXX=mpicxx
-   use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-   default
-   if ! [[ -d "${S}"/fonts ]]; then
-   mkdir "${S}"/fonts || die
-   fi
-   cd "${S}"/fonts || die
-   unpack STIX_font.tgz
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # fix for location of hdf headers
-   sed -i -e 's:hdf/::g' src/data_io.cpp || die
-   # bored of reporting bad libdir upstream
-   sed -i \
-   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
-   {src,widgets}/CMakeLists.txt || die
-   echo "" > lang/install.m || die
-   # fix desktop file
-   sed -i -e 's/.png//' udav/udav.desktop || die
-   # prevent sandbox violation
-   sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
-   sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
-   # fix missing include, bug 564204
-   sed \
-   -e '/#include /i #include ' \
-   -i json/Backend.hpp || die
-
-   use python && \
-   append-cppflags \
-   -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
-   use wxwidgets && 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/, sci-libs/mathgl/files/

2018-04-01 Thread Patrice Clement
commit: e77c75e99ed8208c5eafdf74af09eb9631c8c160
Author: Jouni Kosonen  tukesoft  com>
AuthorDate: Mon Feb 19 16:05:27 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Apr  1 21:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77c75e9

sci-libs/mathgl: version bump to 2.4.1.

Closes: https://bugs.gentoo.org/596150
Closes: https://github.com/gentoo/gentoo/pull/7229

 sci-libs/mathgl/Manifest   |   1 +
 sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch |  16 +++
 sci-libs/mathgl/mathgl-2.4.1.ebuild| 180 +
 3 files changed, 197 insertions(+)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 4e77e01a129..f36f9767c84 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,2 +1,3 @@
 DIST STIX_font.tgz 2450541 BLAKE2B 
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
 SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 DIST mathgl-2.3.4.tar.gz 21361705 BLAKE2B 
652cae42ace83077c5e5add2164a99d9a4f0b76a95d9ddd9b5570c04e87ce06c6cf127af85c451f74c7aa59e411c02c970e5fea7ed501a690f6d1a1456dcbd9c
 SHA512 
2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
+DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B 
a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f
 SHA512 
10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d

diff --git a/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch 
b/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
new file mode 100644
index 000..4ce7bb73311
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
@@ -0,0 +1,16 @@
+diff --git a/src/canvas.cpp b/src/canvas.cpp
+index ba4ffededb9b..7ea755d18265 100644
+--- a/src/canvas.cpp
 b/src/canvas.cpp
+@@ -1219,9 +1219,9 @@ void mglCanvas::Pop()
+ {
+   B = stack.back(); 
+ #if MGL_HAVE_PTHREAD
+-  pthread_mutex_lock();
++  pthread_mutex_lock();
+   stack.pop_back();
+-  pthread_mutex_unlock();
++  pthread_mutex_unlock();
+ #else
+ #pragma omp critical(stk)
+   stack.pop_back();

diff --git a/sci-libs/mathgl/mathgl-2.4.1.ebuild 
b/sci-libs/mathgl/mathgl-2.4.1.ebuild
new file mode 100644
index 000..461956958f1
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.4.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.5.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+   png python qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+   IUSE+=" l10n_${l}"
+done
+unset l
+
+RDEPEND="
+   virtual/opengl
+   fltk? ( x11-libs/fltk:1 )
+   gif? ( media-libs/giflib )
+   glut? ( media-libs/freeglut )
+   gsl? ( >=sci-libs/gsl-2 )
+   hdf? ( sci-libs/hdf )
+   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   jpeg? ( virtual/jpeg:0 )
+   lua? ( >=dev-lang/lua-5.1:0 )
+   octave? ( >=sci-mathematics/octave-3.4.0 )
+   openmp? ( sys-cluster/openmpi )
+   pdf? ( media-libs/libharu )
+   png? ( media-libs/libpng:0 )
+   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   doc? ( app-text/texi2html virtual/texi2dvi )
+   octave? ( dev-lang/swig )
+   python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+   mpi? ( hdf5 )
+   openmp? ( !threads )
+   png? ( zlib )
+   pdf? ( png )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-mutex.patch
+)
+
+pkg_setup() {
+   use mpi && export CC=mpicc CXX=mpicxx
+   use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+   default
+   if ! [[ -d "${S}"/fonts ]]; then
+   mkdir "${S}"/fonts || die
+   fi
+   cd "${S}"/fonts || die
+   unpack STIX_font.tgz
+}
+
+src_prepare() {
+   # fix for location of hdf headers
+   sed -i -e 's:hdf/::g' src/data_io.cpp || die
+   # bored of 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2018-01-08 Thread Ulrich Müller
commit: f48532ac2130fc8a08e368fe94bb31522e863dba
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan  8 17:33:06 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan  8 17:33:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48532ac

sci-libs/mathgl: Migrate from LINGUAS to L10N.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/mathgl/mathgl-2.3.4-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild 
b/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
index f42b9c87871..187531c3a89 100644
--- a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave 
opengl openmp pdf
 
 LANGS="ru"
 for l in ${LANGS}; do
-   IUSE+=" linguas_${l}"
+   IUSE+=" l10n_${l}"
 done
 unset l
 
@@ -150,7 +150,7 @@ src_install() {
local lang
insinto /usr/share/udav
for lang in ${LANGS} ; do
-   use linguas_${lang} && doins udav/udav_${lang}.qm
+   use l10n_${lang} && doins udav/udav_${lang}.qm
done
fi
if use octave ; then



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2017-12-19 Thread Andreas Sturmlechner
commit: 041341aa8a089d7f8b7e7cd35a6722085df64629
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 20 03:26:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 20 03:27:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041341aa

sci-libs/mathgl: Fix USE=qt5 DEPENDs, drop USE=qt4

Bug: https://bugs.gentoo.org/540218
Bug: https://bugs.gentoo.org/596150
Closes: https://bugs.gentoo.org/578752
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/mathgl/mathgl-2.3.4-r1.ebuild | 177 +
 1 file changed, 177 insertions(+)

diff --git a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild 
b/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
new file mode 100644
index 000..f42b9c87871
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.4.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+   png python qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+   IUSE+=" linguas_${l}"
+done
+unset l
+
+RDEPEND="
+   !sci-visualization/udav
+   virtual/opengl
+   fltk? ( x11-libs/fltk:1 )
+   gif? ( media-libs/giflib )
+   glut? ( media-libs/freeglut )
+   gsl? ( >=sci-libs/gsl-2 )
+   hdf? ( sci-libs/hdf )
+   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   jpeg? ( virtual/jpeg:0 )
+   lua? ( >=dev-lang/lua-5.1:0 )
+   octave? ( >=sci-mathematics/octave-3.4.0 )
+   openmp? ( sys-cluster/openmpi )
+   pdf? ( media-libs/libharu )
+   png? ( media-libs/libpng:0 )
+   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   doc? ( app-text/texi2html virtual/texi2dvi )
+   octave? ( dev-lang/swig )
+   python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+   mpi? ( hdf5 )
+   openmp? ( !threads )
+   png? ( zlib )
+   pdf? ( png )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+   use mpi && export CC=mpicc CXX=mpicxx
+   use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+   default
+   if ! [[ -d "${S}"/fonts ]]; then
+   mkdir "${S}"/fonts || die
+   fi
+   cd "${S}"/fonts || die
+   unpack STIX_font.tgz
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # fix for location of hdf headers
+   sed -i -e 's:hdf/::g' src/data_io.cpp || die
+   # bored of reporting bad libdir upstream
+   sed -i \
+   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+   {src,widgets}/CMakeLists.txt || die
+   echo "" > lang/install.m || die
+   # fix desktop file
+   sed -i -e 's/.png//' udav/udav.desktop || die
+   # prevent sandbox violation
+   sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+   sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+   # fix missing include, bug 564204
+   sed \
+   -e '/#include /i #include ' \
+   -i json/Backend.hpp || die
+
+   use python && \
+   append-cppflags \
+   -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+   use wxwidgets && need-wxwidgets unicode
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # No clue about this option:
+   # option(enable-mgl2 "Use names 'libmgl2-*' instead of 
'libmgl-*'")
+   -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+   -DMGL_LIB_INSTALL_DIR="$(get_libdir)"
+   $(cmake-utils_use doc enable-all-docs)
+   $(cmake-utils_use fltk enable-fltk)
+   $(cmake-utils_use gif enable-gif)
+   $(cmake-utils_use glut enable-glut)
+   $(cmake-utils_use gsl enable-gsl)
+   $(cmake-utils_use hdf enable-hdf4)
+   $(cmake-utils_use hdf5 enable-hdf5_18)
+   $(cmake-utils_use jpeg enable-jpeg)
+   $(cmake-utils_use lua enable-lua)
+   $(cmake-utils_use mpi enable-mpi)
+   $(cmake-utils_use octave enable-octave)
+   $(cmake-utils_use opengl enable-opengl)
+   $(cmake-utils_use openmp enable-openmp)
+   

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2017-12-19 Thread Andreas Sturmlechner
commit: 2f035d3da5a0cddcbcdfdb45bc234ac35030b55a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 20 03:26:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 20 03:27:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f035d3d

sci-libs/mathgl: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/mathgl/mathgl-2.3.4.ebuild | 171 
 1 file changed, 171 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.3.4.ebuild 
b/sci-libs/mathgl/mathgl-2.3.4.ebuild
deleted file mode 100644
index 7ec2be14d82..000
--- a/sci-libs/mathgl/mathgl-2.3.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER=3.0
-
-inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0/7.4.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
-   png python qt4 qt5 static-libs threads wxwidgets zlib"
-
-LANGS="ru"
-for l in ${LANGS}; do
-   IUSE+=" linguas_${l}"
-done
-unset l
-
-RDEPEND="
-   !sci-visualization/udav
-   virtual/opengl
-   fltk? ( x11-libs/fltk:1 )
-   gif? ( media-libs/giflib )
-   glut? ( media-libs/freeglut )
-   gsl? ( >=sci-libs/gsl-2 )
-   hdf? ( sci-libs/hdf )
-   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-   jpeg? ( virtual/jpeg:0 )
-   lua? ( >=dev-lang/lua-5.1:0 )
-   octave? ( >=sci-mathematics/octave-3.4.0 )
-   openmp? ( sys-cluster/openmpi )
-   pdf? ( media-libs/libharu )
-   png? ( media-libs/libpng:0 )
-   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-   qt4? ( dev-qt/qtgui:4 )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-   zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-   doc? ( app-text/texi2html virtual/texi2dvi )
-   octave? ( dev-lang/swig )
-   python? ( dev-lang/swig )"
-
-REQUIRED_USE="
-   mpi? ( hdf5 )
-   openmp? ( !threads )
-   png? ( zlib )
-   pdf? ( png )
-   python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-   use mpi && export CC=mpicc CXX=mpicxx
-   use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-   default
-   if ! [[ -d "${S}"/fonts ]]; then
-   mkdir "${S}"/fonts || die
-   fi
-   cd "${S}"/fonts || die
-   unpack STIX_font.tgz
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # fix for location of hdf headers
-   sed -i -e 's:hdf/::g' src/data_io.cpp || die
-   # bored of reporting bad libdir upstream
-   sed -i \
-   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
-   {src,widgets}/CMakeLists.txt || die
-   echo "" > lang/install.m || die
-   # fix desktop file
-   sed -i -e 's/.png//' udav/udav.desktop || die
-   # prevent sandbox violation
-   sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
-   sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
-   # fix missing include, bug 564204
-   sed \
-   -e '/#include /i #include ' \
-   -i json/Backend.hpp || die
-
-   use python && \
-   append-cppflags \
-   -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
-   use wxwidgets && need-wxwidgets unicode
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # No clue about this option:
-   # option(enable-mgl2 "Use names 'libmgl2-*' instead of 
'libmgl-*'")
-   -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
-   -DMGL_LIB_INSTALL_DIR="$(get_libdir)"
-   $(cmake-utils_use doc enable-all-docs)
-   $(cmake-utils_use fltk enable-fltk)
-   $(cmake-utils_use gif enable-gif)
-   $(cmake-utils_use glut enable-glut)
-   $(cmake-utils_use gsl enable-gsl)
-   $(cmake-utils_use hdf enable-hdf4)
-   $(cmake-utils_use hdf5 enable-hdf5_18)
-   $(cmake-utils_use jpeg enable-jpeg)
-   $(cmake-utils_use lua enable-lua)
-   $(cmake-utils_use mpi enable-mpi)
-   $(cmake-utils_use octave enable-octave)
-   $(cmake-utils_use opengl enable-opengl)
-   $(cmake-utils_use openmp enable-openmp)
-   $(cmake-utils_use pdf enable-pdf)
-   $(cmake-utils_use png enable-png)
-   $(cmake-utils_use qt4 enable-qt4)
-   $(cmake-utils_use qt5 enable-qt5)
-   $(cmake-utils_use threads enable-pthread)
-   

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2017-12-15 Thread Andrey Grozin
commit: 4d6239f70687e23f5d1f1829802712f2103a2220
Author: Andrey Grozin  gentoo  org>
AuthorDate: Fri Dec 15 10:20:59 2017 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Fri Dec 15 10:20:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6239f7

sci-libs/mathgl: remove myself from maintainers

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 sci-libs/mathgl/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sci-libs/mathgl/metadata.xml b/sci-libs/mathgl/metadata.xml
index 2ca4b1ae580..c8a7abfe76a 100644
--- a/sci-libs/mathgl/metadata.xml
+++ b/sci-libs/mathgl/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-gro...@gentoo.org
-Andrey Grozin
-  
   
 s...@gentoo.org
 Gentoo Science Project



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2017-10-15 Thread David Seifert
commit: 7f8552ee86fb402a5a7006da5cca595911284f8b
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 16 03:04:06 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 03:04:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8552ee

sci-libs/mathgl: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sci-libs/mathgl/mathgl-2.3.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/mathgl/mathgl-2.3.4.ebuild 
b/sci-libs/mathgl/mathgl-2.3.4.ebuild
index aaacf6c2285..7ec2be14d82 100644
--- a/sci-libs/mathgl/mathgl-2.3.4.ebuild
+++ b/sci-libs/mathgl/mathgl-2.3.4.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
 
 EAPI=5
@@ -71,7 +71,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
 
# fix for location of hdf headers
sed -i -e 's:hdf/::g' src/data_io.cpp || die



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/, sci-libs/mathgl/files/

2016-11-25 Thread Pacho Ramos
commit: 6c4ffe5d0a8f296ab5cba6754d5e6a2c39ab55e7
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 25 18:50:54 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 25 18:56:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4ffe5d

sci-libs/mathgl: Drop old

Package-Manager: portage-2.3.2

 sci-libs/mathgl/Manifest   |   3 -
 sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch |  65 -
 sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch |  25 
 sci-libs/mathgl/mathgl-2.1.3.1.ebuild  | 149 -
 sci-libs/mathgl/mathgl-2.1.3.ebuild| 147 -
 sci-libs/mathgl/mathgl-2.3.3-r1.ebuild | 174 -
 sci-libs/mathgl/mathgl-2.3.3.ebuild| 160 ---
 7 files changed, 723 deletions(-)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index f865dc1..c015411 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,5 +1,2 @@
 DIST STIX_font.tgz 2450541 SHA256 
6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 WHIRLPOOL 
912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
-DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 
a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 
c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc
 WHIRLPOOL 
3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
-DIST mathgl-2.1.3.tar.gz 5269347 SHA256 
b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 
aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73
 WHIRLPOOL 
9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
-DIST mathgl-2.3.3.tar.gz 20888708 SHA256 
324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 
8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2
 WHIRLPOOL 
e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942
 DIST mathgl-2.3.4.tar.gz 21361705 SHA256 
6e93cd9f640c5b6c9dac4ca56854612d4261b4eadd6c8aad6536965195f08c02 SHA512 
2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
 WHIRLPOOL 
cc7043ec2f6a84999de65ad3a5127564da3563644456d08c280d7f462dedf86e7cd5f28996f43e32300aa30adb730904c6cf6cb8f8e2c434402395af37f3ddc7

diff --git a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch 
b/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
deleted file mode 100644
index cff2787..
--- a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
+++ /dev/null
@@ -1,65 +0,0 @@
- CMakeLists.txt | 1 +
- json/CMakeLists.txt| 2 +-
- udav/CMakeLists.txt| 2 +-
- widgets/CMakeLists.txt | 4 ++--
- 4 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3364973..0c3a645 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -316,6 +316,7 @@ endif(enable-wx)
- if(enable-qt)
-   set(MGL_HAVE_QT 1)
-   FIND_PACKAGE(Qt4 4.8 REQUIRED QtCore QtGui QtNetwork QtWebKit)
-+  FIND_PACKAGE(X11)
-   if(NOT QT4_FOUND)
-   message(SEND_ERROR "Couldn't find Qt4 library.")
-   endif(NOT QT4_FOUND)
-diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt
-index 79d4716..0a53874 100644
 a/json/CMakeLists.txt
-+++ b/json/CMakeLists.txt
-@@ -9,6 +9,6 @@ include_directories(${MathGL_BINARY_DIR}/json)
- qt4_wrap_ui(json_ui_src MainWindow.ui)
- qt4_wrap_cpp(json_moc_src ${json_moc_hdr} )
- add_executable(MglForJsTestBench ${json_src} ${json_moc_src} ${json_ui_src})
--target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES})
-+target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES} 
${X11_LIBRARIES})
- 
- endif(MGL_HAVE_QT)
-diff --git a/udav/CMakeLists.txt b/udav/CMakeLists.txt
-index 9a9c574..a1ff2df 100644
 a/udav/CMakeLists.txt
-+++ b/udav/CMakeLists.txt
-@@ -27,7 +27,7 @@ qt4_add_resources(udav_rc_src ${udav_rc} )
- qt4_wrap_cpp(udav_moc_src ${udav_moc_hdr} )
- add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src})
- #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} 
-pthread")
--target_link_libraries(udav mgl-qt ${QT_LIBRARIES})
-+target_link_libraries(udav mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES})
- 
- if(MGL_HAVE_PTHREAD)
-   target_link_libraries(udav ${CMAKE_THREAD_LIBS_INIT})
-diff --git 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2016-02-23 Thread Justin Lecher
commit: feffa1d7be3de0fd2c6a5f1cfcdc7cfb5ce38213
Author: Justin Lecher  gentoo  org>
AuthorDate: Tue Feb 23 09:05:08 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Feb 23 09:05:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feffa1d7

sci-libs/mathgl: Version Bump

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575316

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/mathgl/Manifest|   1 +
 sci-libs/mathgl/mathgl-2.3.4.ebuild | 172 
 2 files changed, 173 insertions(+)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 4cf23af..f865dc1 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -2,3 +2,4 @@ DIST STIX_font.tgz 2450541 SHA256 
6408290fd4a5267637a88507344a8f07b908ce72f46ef9
 DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 
a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 
c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc
 WHIRLPOOL 
3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 
b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 
aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73
 WHIRLPOOL 
9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
 DIST mathgl-2.3.3.tar.gz 20888708 SHA256 
324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 
8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2
 WHIRLPOOL 
e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942
+DIST mathgl-2.3.4.tar.gz 21361705 SHA256 
6e93cd9f640c5b6c9dac4ca56854612d4261b4eadd6c8aad6536965195f08c02 SHA512 
2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
 WHIRLPOOL 
cc7043ec2f6a84999de65ad3a5127564da3563644456d08c280d7f462dedf86e7cd5f28996f43e32300aa30adb730904c6cf6cb8f8e2c434402395af37f3ddc7

diff --git a/sci-libs/mathgl/mathgl-2.3.4.ebuild 
b/sci-libs/mathgl/mathgl-2.3.4.ebuild
new file mode 100644
index 000..165c0d1
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.4.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.4.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+   png python qt4 qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+   IUSE+=" linguas_${l}"
+done
+unset l
+
+RDEPEND="
+   !sci-visualization/udav
+   virtual/opengl
+   fltk? ( x11-libs/fltk:1 )
+   gif? ( media-libs/giflib )
+   glut? ( media-libs/freeglut )
+   gsl? ( >=sci-libs/gsl-2 )
+   hdf? ( sci-libs/hdf )
+   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   jpeg? ( virtual/jpeg:0 )
+   lua? ( >=dev-lang/lua-5.1:0 )
+   octave? ( >=sci-mathematics/octave-3.4.0 )
+   openmp? ( sys-cluster/openmpi )
+   pdf? ( media-libs/libharu )
+   png? ( media-libs/libpng:0 )
+   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+   qt4? ( dev-qt/qtgui:4 )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   doc? ( app-text/texi2html virtual/texi2dvi )
+   octave? ( dev-lang/swig )
+   python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+   mpi? ( hdf5 )
+   openmp? ( !threads )
+   png? ( zlib )
+   pdf? ( png )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+   use mpi && export CC=mpicc CXX=mpicxx
+   use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+   default
+   if ! [[ -d "${S}"/fonts ]]; then
+   mkdir "${S}"/fonts || die
+   fi
+   cd "${S}"/fonts || die
+   unpack STIX_font.tgz
+}
+
+src_prepare() {
+   default
+
+   # fix for location of hdf headers
+   sed -i -e 's:hdf/::g' src/data_io.cpp || die
+   # bored of reporting bad libdir upstream
+   sed -i \
+   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+   {src,widgets}/CMakeLists.txt || die
+   echo 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/files/, sci-libs/mathgl/

2016-02-20 Thread Justin Lecher
commit: 585d5b592d35130304541dcd3d17f0f8714a8343
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Feb 20 15:29:17 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Feb 20 15:39:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585d5b59

sci-libs/mathgl: Add compatibility patch for gsl API change

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575158

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch | 25 +
 sci-libs/mathgl/mathgl-2.1.3.1.ebuild  |  4 ++--
 sci-libs/mathgl/mathgl-2.1.3.ebuild|  4 ++--
 ...{mathgl-2.3.3.ebuild => mathgl-2.3.3-r1.ebuild} | 26 +-
 sci-libs/mathgl/mathgl-2.3.3.ebuild|  2 +-
 5 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch 
b/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch
new file mode 100644
index 000..6254321
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch
@@ -0,0 +1,25 @@
+ src/fit.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/fit.cpp b/src/fit.cpp
+index 6a42a4b..d167022 100644
+--- a/src/fit.cpp
 b/src/fit.cpp
+@@ -179,6 +179,7 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData , mreal 
*ini)
+   const gsl_multifit_fdfsolver_type *T = gsl_multifit_fdfsolver_lmsder;
+   gsl_multifit_fdfsolver *s = gsl_multifit_fdfsolver_alloc(T, n, m);
+   gsl_multifit_function_fdf f;
++  gsl_matrix *J;
+   f.f = mgl_fit__f;   f.df = mgl_fit__df;
+   f.fdf = mgl_fit__fdf;   f.n = n;f.p = m;
+   f.params = 
+@@ -193,7 +194,8 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData , mreal 
*ini)
+   }
+   while ( status == GSL_CONTINUE && iter < 500 );
+   gsl_matrix *covar = gsl_matrix_alloc(m, m);
+-  gsl_multifit_covar (s->J, 0.0, covar );
++  gsl_multifit_fdfsolver_jac (s, J);
++  gsl_multifit_covar (J, 0.0, covar);
+   mglFitCovar.Set(covar);
+   mreal res = gsl_blas_dnrm2(s->f);
+   for(i=0;ix, i);

diff --git a/sci-libs/mathgl/mathgl-2.1.3.1.ebuild 
b/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
index 7f0ff4a..7b50859 100644
--- a/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.1.3.1.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$
 
@@ -30,7 +30,7 @@ RDEPEND="
fltk? ( x11-libs/fltk:1 )
gif? ( media-libs/giflib )
glut? ( media-libs/freeglut )
-   gsl? ( sci-libs/gsl )
+   gsl? ( =sci-libs/hdf5-1.8[mpi=] )
jpeg? ( virtual/jpeg:0 )

diff --git a/sci-libs/mathgl/mathgl-2.1.3.ebuild 
b/sci-libs/mathgl/mathgl-2.1.3.ebuild
index 65ff4c8..ce36b9d 100644
--- a/sci-libs/mathgl/mathgl-2.1.3.ebuild
+++ b/sci-libs/mathgl/mathgl-2.1.3.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$
 
@@ -30,7 +30,7 @@ RDEPEND="
fltk? ( x11-libs/fltk:1 )
gif? ( media-libs/giflib )
glut? ( media-libs/freeglut )
-   gsl? ( sci-libs/gsl )
+   gsl? ( =sci-libs/hdf5-1.8[mpi=] )
jpeg? ( virtual/jpeg:0 )

diff --git a/sci-libs/mathgl/mathgl-2.3.3.ebuild 
b/sci-libs/mathgl/mathgl-2.3.3-r1.ebuild
similarity index 90%
copy from sci-libs/mathgl/mathgl-2.3.3.ebuild
copy to sci-libs/mathgl/mathgl-2.3.3-r1.ebuild
index f75fe4b..7b3109f 100644
--- a/sci-libs/mathgl/mathgl-2.3.3.ebuild
+++ b/sci-libs/mathgl/mathgl-2.3.3-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
fltk? ( x11-libs/fltk:1 )
gif? ( media-libs/giflib )
glut? ( media-libs/freeglut )
-   gsl? ( sci-libs/gsl )
+   gsl? ( >=sci-libs/gsl-2 )
hdf? ( sci-libs/hdf )
hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
jpeg? ( virtual/jpeg:0 )
@@ -56,19 +56,27 @@ REQUIRED_USE="
pdf? ( png )
python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gsl-2.patch
+)
+
 pkg_setup() {
use mpi && export CC=mpicc CXX=mpicxx
use python && python-single-r1_pkg_setup
 }
 
 src_unpack() {
-   unpack ${A}
-   [[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
+   default
+   if ! [[ -d "${S}"/fonts ]]; then
+   mkdir "${S}"/fonts || die
+   fi
cd "${S}"/fonts || die
unpack STIX_font.tgz
 }
 
 src_prepare() {
+   default
+   epatch "${PATCHES[@]}"
# fix for location of hdf headers
sed -i -e 's:hdf/::g' src/data_io.cpp || die
# bored of reporting bad libdir upstream
@@ -82,9 +90,13 @@ src_prepare() {
sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
sed -i -e 's/update-desktop-database/true/' 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2016-01-12 Thread David Seifert
commit: 8e175dc223f4ea8e76895378ecac80670f5f5a5e
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jan 12 21:51:46 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jan 12 21:52:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e175dc2

sci-libs/mathgl: fix #564204

Package-Manager: portage-2.2.26

 sci-libs/mathgl/mathgl-2.3.3.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/mathgl/mathgl-2.3.3.ebuild 
b/sci-libs/mathgl/mathgl-2.3.3.ebuild
index fcf734c..f75fe4b 100644
--- a/sci-libs/mathgl/mathgl-2.3.3.ebuild
+++ b/sci-libs/mathgl/mathgl-2.3.3.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$
 
@@ -81,6 +81,8 @@ src_prepare() {
# prevent sandbox violation
sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+   # fix missing include, bug 564204
+   sed -i -e '/#include /i #include ' 
json/Backend.hpp || die
 
use python && append-cppflags -I"$(${EPYTHON} -c 'import numpy; 
print(numpy.get_include())')"
use wxwidgets && need-wxwidgets unicode



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/

2015-10-25 Thread Pacho Ramos
commit: ad5db20ae648a4334adecc71af72e64ac32371ae
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 12:15:35 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 12:15:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5db20a

sci-libs/mathgl: Version bump and support wxGTK:3.0 (#563330)

Package-Manager: portage-2.2.23

 sci-libs/mathgl/Manifest|   1 +
 sci-libs/mathgl/mathgl-2.3.3.ebuild | 158 
 2 files changed, 159 insertions(+)

diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index acee230..4cf23af 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,3 +1,4 @@
 DIST STIX_font.tgz 2450541 SHA256 
6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 WHIRLPOOL 
912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
 DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 
a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 
c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc
 WHIRLPOOL 
3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 
b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 
aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73
 WHIRLPOOL 
9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
+DIST mathgl-2.3.3.tar.gz 20888708 SHA256 
324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 
8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2
 WHIRLPOOL 
e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942

diff --git a/sci-libs/mathgl/mathgl-2.3.3.ebuild 
b/sci-libs/mathgl/mathgl-2.3.3.ebuild
new file mode 100644
index 000..fcf734c
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz 
mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+   png python qt4 qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+   IUSE+=" linguas_${l}"
+done
+
+RDEPEND="
+   !sci-visualization/udav
+   virtual/opengl
+   fltk? ( x11-libs/fltk:1 )
+   gif? ( media-libs/giflib )
+   glut? ( media-libs/freeglut )
+   gsl? ( sci-libs/gsl )
+   hdf? ( sci-libs/hdf )
+   hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+   jpeg? ( virtual/jpeg:0 )
+   lua? ( >=dev-lang/lua-5.1:0 )
+   octave? ( >=sci-mathematics/octave-3.4.0 )
+   openmp? ( sys-cluster/openmpi )
+   pdf? ( media-libs/libharu )
+   png? ( media-libs/libpng:0 )
+   python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+   qt4? ( dev-qt/qtgui:4 )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   doc? ( app-text/texi2html virtual/texi2dvi )
+   octave? ( dev-lang/swig )
+   python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+   mpi? ( hdf5 )
+   openmp? ( !threads )
+   png? ( zlib )
+   pdf? ( png )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+   use mpi && export CC=mpicc CXX=mpicxx
+   use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+   unpack ${A}
+   [[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
+   cd "${S}"/fonts || die
+   unpack STIX_font.tgz
+}
+
+src_prepare() {
+   # fix for location of hdf headers
+   sed -i -e 's:hdf/::g' src/data_io.cpp || die
+   # bored of reporting bad libdir upstream
+   sed -i \
+   -e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+   {src,widgets}/CMakeLists.txt || die
+   echo "" > lang/install.m || die
+   # fix desktop file
+   sed -i -e 's/.png//' udav/udav.desktop || die
+   # prevent sandbox violation
+   sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+   sed -i -e