[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     c9874d70091e86de31ec8e7c0e4e508d2fedb7ba
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 13:08:08 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 23 13:08:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9874d70

sci-visualization/scidavis: add missing die on the heredoc

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
index ef0e7918d2f..a11db0d4f97 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
 
 	# fix paths
-	cat >> config.pri <<-EOF
+	cat >> config.pri <<-EOF || die
 		# install docs to ${PF} instead of ${PN}
 		documentation.path = "\$\$INSTALLBASE/share/doc/${PF}"
 

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     fe1ee4dbe1123992726ecca192b9bab5ed9aba97
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 06:25:41 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 06:26:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1ee4db

sci-visualization/scidavis: re-gen manifest

Not sure what went wrong here, but lets just regen it first.
Maybe this was just a dumb mistake on my end (if not then
I'll have to switch SRC_URI to somewhere else)

Closes: https://bugs.gentoo.org/791721
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/Manifest              | 2 +-
 sci-visualization/scidavis/scidavis-2.4.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 491a30c9708..f6b5a420012 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1 +1 @@
-DIST scidavis-2.4.0.tar.gz 11887195 BLAKE2B aeee055f2a002cb22f391f4557e866b4e27287169cb0e01178770b2e85b7e6bc592d64b576bdd01a415b9e236ed685837a34a9413411be6c47249541a2e6991a SHA512 e439d593917999ec3586932c631453d498f6198934852be48ad8f9c62ea3d3752db2a88c4eebc8e9d8613cd94f83b9e1b19cb398a175ae9951510761e0588710
+DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B 5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e SHA512 9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
index a11db0d4f97..8c37de7de86 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -12,7 +12,7 @@ inherit python-single-r1 docs qmake-utils xdg
 
 DESCRIPTION="Application for Scientific Data Analysis and Visualization"
 HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
-SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}-gh.tar.gz"
 
 LICENSE="GPL-2+ ZLIB"
 KEYWORDS="~amd64"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     9d376a78500389def130fe35a67345b86cea579f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 06:48:02 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 06:48:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d376a78

sci-visualization/scidavis: add missing deps

Closes: https://bugs.gentoo.org/791763
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.4.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
index 8c37de7de86..ed25a358df8 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -29,9 +29,11 @@ RDEPEND="
 	dev-cpp/muParser
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sci-libs/gsl
 	sys-libs/zlib[minizip]
 	x11-libs/qwt:5

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     3931df1564e279fffb90b809b6d345f58a210ab4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 07:47:25 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 07:47:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3931df15

sci-visualization/scidavis: add another missing dep

Closes: https://bugs.gentoo.org/791778
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.4.0.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
index ed25a358df8..3ae844ff06e 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -49,10 +49,13 @@ RDEPEND="
 		')
 	)
 "
-BDEPEND="test? (
-	dev-libs/unittest++
-	dev-cpp/gtest
-)"
+BDEPEND="
+	dev-qt/qtchooser
+	test? (
+		dev-libs/unittest++
+		dev-cpp/gtest
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-build.patch"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     ea6873d24a5457282e536b427103eda7403990f3
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 08:35:47 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 08:35:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea6873d2

sci-visualization/scidavis: fix dep on .../lupdate

Closes: https://bugs.gentoo.org/791805
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
index 3ae844ff06e..cd3f9366947 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 	)
 "
 BDEPEND="
-	dev-qt/qtchooser
+	dev-qt/linguist-tools:5
 	test? (
 		dev-libs/unittest++
 		dev-cpp/gtest

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     61f9858743ebfb03f7bf445d98ae599a424c6cd5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 17:53:47 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 17:54:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f98587

sci-visualization/scidavis: restrict <dev-python/sip-5

Bug: https://bugs.gentoo.org/793419
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
index cd3f9366947..6a4067dcf43 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/PyQt5[${PYTHON_USEDEP}]
 			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			dev-python/sip[${PYTHON_USEDEP}]
+			<dev-python/sip-5[${PYTHON_USEDEP}]
 		')
 	)
 "

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Sam James]

commit:     f2dcffa7f0c0ce71a569864cadff4ad10edf4395
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 21:28:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  2 21:50:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2dcffa7

sci-visualization/scidavis: subscribe to sci-libs/gsl subslot

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../scidavis/{scidavis-2.4.0.ebuild => scidavis-2.4.0-r1.ebuild}       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
similarity index 98%
rename from sci-visualization/scidavis/scidavis-2.4.0.ebuild
rename to sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
index 6a4067dcf43..44611a1ad6b 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sci-libs/gsl
+	sci-libs/gsl:=
 	sys-libs/zlib[minizip]
 	x11-libs/qwt:5
 	x11-libs/qwtplot3d
@@ -49,6 +49,7 @@ RDEPEND="
 		')
 	)
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	test? (

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     b962e1f48e375231c1b9fdbd3271bd86436c5f5e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 28 13:36:18 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 13:36:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b962e1f4

sci-visualization/scidavis: enable py3.10

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{scidavis-2.4.0-r1.ebuild => scidavis-2.4.0-r2.ebuild}        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
similarity index 90%
rename from sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
rename to sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
index 44611a1ad6bc..70fc6b255c6b 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 docs qmake-utils xdg
 
@@ -25,6 +25,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # compile with CONFIG+="test"
 RESTRICT="test"
 
+# We need to depend on a version of PyQt5 that depends on <sip-5:0. If PyQt5 is
+# built with sip:5 then we will get Syntax Error when running sip-4 for scidavis.
 RDEPEND="
 	dev-cpp/muParser
 	dev-qt/qtcore:5
@@ -43,9 +45,9 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP}]
+			<dev-python/PyQt5-5.15.5[${PYTHON_USEDEP}]
 			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			<dev-python/sip-5[${PYTHON_USEDEP}]
+			<dev-python/sip-5:0[${PYTHON_USEDEP}]
 		')
 	)
 "

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     5477382d2dd1bf4c3d6450ae744ed78c84c03fa8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 10:44:37 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 11:12:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5477382d

sci-visualization/scidavis: add version 2.7

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/Manifest            |  1 +
 sci-visualization/scidavis/scidavis-2.7.ebuild | 95 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 861d0375614f..29cc21dd1d19 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,2 +1,3 @@
 DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B 5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e SHA512 9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318
 DIST scidavis-2.4.0_p20211117.tar.gz 9248921 BLAKE2B e14d4a270ab0b7221b3e21762c4547e5d64930ddc72bf085d72d02e4756cc4c82f38b438f90dc472a05837d059650ea3718e100ad8c56762e990b11f571fce31 SHA512 f3fba2569d5ba79be1b10ffe4ed242f7a4df81fb4561388fcdb9461404ab966b21ecfdaa001518b5139eeef319e3c979109e2889d9268b07dad9c3cec970999b
+DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de

diff --git a/sci-visualization/scidavis/scidavis-2.7.ebuild b/sci-visualization/scidavis/scidavis-2.7.ebuild
new file mode 100644
index 000000000000..d6d6452d9a35
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-2.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1 cmake docs virtualx xdg
+
+DESCRIPTION="Application for Scientific Data Analysis and Visualization"
+HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ ZLIB"
+KEYWORDS="~amd64"
+SLOT="0"
+
+IUSE="doc +muparser origin python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# requires network
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	muparser? ( dev-cpp/muParser )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gsl:=
+	sys-libs/zlib[minizip]
+	x11-libs/qwt:5
+	x11-libs/qwtplot3d
+	origin? ( sci-libs/liborigin )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}]
+			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+			>=dev-python/sip-6:5[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	test? (
+		dev-libs/unittest++
+		dev-cpp/gtest
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-muparser.patch"
+	"${FILESDIR}/${PN}-qwtplot3d.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove things which are packaged elsewhere
+	rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die
+
+	# OF has been renamed in Gentoo https://bugs.gentoo.org/383179
+	# Note this is *not* packaged in sys-libs/zlib[minizip] because
+	# this file resides in the test directory in upstream zlib
+	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSCRIPTING_MUPARSER=$(usex muparser)
+		-DSCRIPTING_PYTHON=$(usex python)
+		-DPYTHON_SCRIPTDIR="$(python_get_scriptdir)"
+		-DORIGIN_IMPORT=$(usex origin)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     56e254657fd9731d3fab4da5d7943e519475e70f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 11:01:17 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 11:01:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e25465

sci-visualization/scidavis: drop 2.4.0_p20211117

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/Manifest                |  1 -
 .../scidavis/scidavis-2.4.0_p20211117.ebuild       | 98 ----------------------
 2 files changed, 99 deletions(-)

diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 2cfe83bdeee3..f2ebad33c866 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,2 +1 @@
-DIST scidavis-2.4.0_p20211117.tar.gz 9248921 BLAKE2B e14d4a270ab0b7221b3e21762c4547e5d64930ddc72bf085d72d02e4756cc4c82f38b438f90dc472a05837d059650ea3718e100ad8c56762e990b11f571fce31 SHA512 f3fba2569d5ba79be1b10ffe4ed242f7a4df81fb4561388fcdb9461404ab966b21ecfdaa001518b5139eeef319e3c979109e2889d9268b07dad9c3cec970999b
 DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de

diff --git a/sci-visualization/scidavis/scidavis-2.4.0_p20211117.ebuild b/sci-visualization/scidavis/scidavis-2.4.0_p20211117.ebuild
deleted file mode 100644
index 83ff296ac304..000000000000
--- a/sci-visualization/scidavis/scidavis-2.4.0_p20211117.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="media-gfx/graphviz"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-single-r1 cmake docs virtualx xdg
-
-COMMIT="acc11c507631dc89db90c8777bab53b814620b4c"
-
-DESCRIPTION="Application for Scientific Data Analysis and Visualization"
-HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
-SRC_URI="https://github.com/SciDAVis/scidavis/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-2+ ZLIB"
-KEYWORDS="~amd64"
-SLOT="0"
-
-IUSE="doc +muparser origin python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# requires network
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	muparser? ( dev-cpp/muParser )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gsl:=
-	sys-libs/zlib[minizip]
-	x11-libs/qwt:5
-	x11-libs/qwtplot3d
-	origin? ( sci-libs/liborigin )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}]
-			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			>=dev-python/sip-6:5[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	test? (
-		dev-libs/unittest++
-		dev-cpp/gtest
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-muparser.patch"
-	"${FILESDIR}/${PN}-qwtplot3d.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove things which are packaged elsewhere
-	rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die
-
-	# OF has been renamed in Gentoo https://bugs.gentoo.org/383179
-	# Note this is *not* packaged in sys-libs/zlib[minizip] because
-	# this file resides in the test directory in upstream zlib
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSCRIPTING_MUPARSER=$(usex muparser)
-		-DSCRIPTING_PYTHON=$(usex python)
-		-DPYTHON_SCRIPTDIR="$(python_get_scriptdir)"
-		-DORIGIN_IMPORT=$(usex origin)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     73c68609087651730494b1de9a2f1e1264a337f1
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 15:49:26 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May  9 15:49:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c68609

sci-visualization/scidavis: add 2.9.0

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/Manifest              |  1 +
 sci-visualization/scidavis/scidavis-2.9.0.ebuild | 97 ++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index aa0153baaf57..acdc6f3f960f 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,2 +1,3 @@
 DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de
 DIST scidavis-2.8.tar.gz 12796976 BLAKE2B a1774f89235c9a6f49c20a45bec64e914b71c80afb54ca3e8b71151fa660a6da75c6dd914e42932bbe1b2a9abffaee045b3542ecc30ddb2824f5c4c5ccdf5da4 SHA512 3250846cd4cd320aa765d564ef07de10ccba0621b89e033b5b6092850c5eae4ca30b47eca392b67540e7757cbd497909a8cabd09bf44791543a809087f199c21
+DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba

diff --git a/sci-visualization/scidavis/scidavis-2.9.0.ebuild b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
new file mode 100644
index 000000000000..0487299231ed
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1 cmake docs virtualx xdg
+
+DESCRIPTION="Application for Scientific Data Analysis and Visualization"
+HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
+SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ ZLIB"
+KEYWORDS="~amd64"
+SLOT="0"
+
+IUSE="doc origin python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# requires network
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gsl:=
+	sys-libs/zlib[minizip]
+	x11-libs/qwt:5
+	x11-libs/qwtplot3d
+	origin? ( sci-libs/liborigin )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}]
+			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+			>=dev-python/sip-6:5[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	test? (
+		dev-libs/unittest++
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove things which are packaged elsewhere
+	rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die
+
+	# OF has been renamed in Gentoo https://bugs.gentoo.org/383179
+	# Note this is *not* packaged in sys-libs/zlib[minizip] because
+	# this file resides in the test directory in upstream zlib
+	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Even if we disable muparser scripting, we still need MuParser.h
+		# for Graph3D.cpp. So just enable it unconditionally. Bug 834074
+		-DSCRIPTING_MUPARSER=ON
+		-DORIGIN_IMPORT=$(usex origin)
+		-DSCRIPTING_PYTHON=$(usex python)
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_SCRIPTDIR="$(python_get_scriptdir)"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     d35e9a29339a8ab2e33440ec02cec902c584ef6b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 20:16:59 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 20:24:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35e9a29

sci-visualization/scidavis: enable py3.11

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/scidavis/scidavis-2.9.0.ebuild b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
index 0487299231ed..804c41cd7ccc 100644
--- a/sci-visualization/scidavis/scidavis-2.9.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-single-r1 cmake docs virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     8f36ac513492c35f08b19383272c9eedf35271e6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  9 20:50:52 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr  9 20:50:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f36ac51

sci-visualization/scidavis: drop myself as a maintainer

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sci-visualization/scidavis/metadata.xml b/sci-visualization/scidavis/metadata.xml
index 1c44688f2711..8954aa4356f9 100644
--- a/sci-visualization/scidavis/metadata.xml
+++ b/sci-visualization/scidavis/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     c6fa2c7d707f8d39fee23bfebb3f25934b391571
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 11:08:46 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 11:08:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6fa2c7d

sci-visualization/scidavis: enable py3.12

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-visualization/scidavis/scidavis-2.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/scidavis/scidavis-2.9.0.ebuild b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
index f1cef76015eb..1d4d6aacecf7 100644
--- a/sci-visualization/scidavis/scidavis-2.9.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1 cmake docs virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     3088bcd9e6f979dcfb124b2b5151ee26cc4d6727
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 20:36:35 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 20:37:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3088bcd9

sci-visualization/scidavis: fix compat with zlib-1.3-r1

See-also: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491bf8bd3ef621da49b168736a04f23aa4c7719c
Closes: https://bugs.gentoo.org/913142
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../scidavis/{scidavis-2.9.0.ebuild => scidavis-2.9.0-r1.ebuild} | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sci-visualization/scidavis/scidavis-2.9.0.ebuild b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild
similarity index 83%
rename from sci-visualization/scidavis/scidavis-2.9.0.ebuild
rename to sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild
index 1d4d6aacecf7..d57c2b132cbf 100644
--- a/sci-visualization/scidavis/scidavis-2.9.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit python-single-r1 cmake docs virtualx xdg
 
 DESCRIPTION="Application for Scientific Data Analysis and Visualization"
-HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
+HOMEPAGE="https://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
 SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ ZLIB"
@@ -35,7 +35,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sci-libs/gsl:=
-	sys-libs/zlib[minizip]
+	>=sys-libs/zlib-1.3[minizip]
 	x11-libs/qwt:5
 	x11-libs/qwtplot3d
 	origin? ( sci-libs/liborigin )
@@ -62,11 +62,6 @@ src_prepare() {
 
 	# Remove things which are packaged elsewhere
 	rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die
-
-	# OF has been renamed in Gentoo https://bugs.gentoo.org/383179
-	# Note this is *not* packaged in sys-libs/zlib[minizip] because
-	# this file resides in the test directory in upstream zlib
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
 }
 
 src_configure() {