5 files changed, 98 insertions, 156 deletions
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 94e9dc374315..6bc21d33150c 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,8 +1,7 @@
-AUX scidavis-build.patch 1397 BLAKE2B 70abb5dee8d3afbf4eaf88d50c8df30fb0ad34345e92d049113c5ef0e1ecf9f5d7b127166453905f79056d812128f2c427ddcb3736363591c2e3aba67ed8b3d1 SHA512 91044ad9994ffe8047529b262d578b575a559d888b17da772be10346b87c655a2c53c67ba06b7a5bb85870510de5a1c4f1f14777b5c60bbfaab4ccd545d00929
 AUX scidavis-muparser.patch 2299 BLAKE2B 9ba9e99c838c4fe8c767b8cbfdb9ce93202a8d539039993552a6da2590a28b7acd27f891b6e251ee9bb063a0010d52fa419807ab2a515e633ebd32ea8179877d SHA512 44841cac0f111687ffe38e322c8fb25139f5529321eb4609a8a7821e0ee3bba832f61fe9f6b0e42f28f4571898468de83274d36bbdfc57c97ed227426244c103
 AUX scidavis-qwtplot3d.patch 453 BLAKE2B 774cae5c148944cb4c0a85965431031296b9f846b1154620e39cca0c6ec4ba8645e84bfccbcca051334f11ba301f3aa1bb6a4d6110cec57dc9cb881fd4fa0d85 SHA512 95a778670c8540a150e52317a95f8ff8211bc0cdaf10280f84bf2c5365f7b803cd56b46760a56db75ba29289ebf53abf9d803d0bb78cf55c0426059bb994b584
-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
-EBUILD scidavis-2.4.0-r2.ebuild 2894 BLAKE2B 3edd4fb5526eb6d1f2688c23d49c66a686125c07de8875efe9c576ec68ff2d014357e1a66c58c6a2551bffaa119cc8daee8d9a33f65985dbd8806d66780c7f81 SHA512 4646b6d6c507861f24cbd28e2cbb594e4b82caca938213ab352cb84137d31e985a0eb7a9f2ba10b818f25ec3c5313b1d2e218bc269d8961aaa65971e38fd953c
+DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de
 EBUILD scidavis-2.4.0_p20211117.ebuild 2211 BLAKE2B e0c6796817df8c47712ec8d09739116e6252d5379f77d90263968809298fe382c9f3fb1ec4d88872c0f85dcbd0a3a00bc6cb0893a64cba3a49bc38926184f2bb SHA512 a27456b517479b96713b9c06a67e05d6034c796ccffd8e44c8371c9aa6c5fd601a6cf430ee5810f8a0d9b706d9e80dba3d0e7fb481d7636bef3acbc5ba254c85
-MISC metadata.xml 1208 BLAKE2B 9f19f619ba6b20048b901d5e2020b5f23fec5e39cbca24fb21cd17e174b01d92bd488879cf04a98ddeeebee87434ec9317423eead54cd6d4884fe4ccd8b49aba SHA512 ecdeaff7221d25d1b2aafb750f28b0150d36d5ceda77924590bc0e016533c2b07cf7faa4b2c27e43b3fc93d0f9de2f1b94e3e2098687ff85f31f9bd2ec391961
+EBUILD scidavis-2.7.ebuild 2104 BLAKE2B c342b5e17575d5e2cb3f583c67d35c814b47dc5ef87d7648fc8078436205ec8b1ecd2db06de26cd20cfe3ae6b31abeb3fc044daddec3b746181d2a5c3da7b751 SHA512 d98a5bf780411ca6601162c6652a6af5058b265a70ba0261120df7420e6b7605d5d47c86b005ef528fcfcf0684ce02ee2593e907b04e6e5b19f3c32c46f59b0f
+MISC metadata.xml 1085 BLAKE2B e02c4b1a7fa0eecbdb26db3cd577a06591b557678e91598c5e84a4dfec87c215e5758ca67a438331bef33265b6a0f1441141b6711b05c7e496f7e5feebca9954 SHA512 e33807092bd789cdc11819a0d56d9d39fcb7065d870d47ef1f20254e75f6f85a299ca4fe9c3dae50c53a90d9fe730cb9062c8b0cf8e09c4a46e449bff655181a
diff --git a/sci-visualization/scidavis/files/scidavis-build.patch b/sci-visualization/scidavis/files/scidavis-build.patch
deleted file mode 100644
index cb1e2600c6f9..000000000000
--- a/sci-visualization/scidavis/files/scidavis-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/config.pri b/config.pri
-index 2b8d943..6034b6a 100644
---- a/config.pri
-+++ b/config.pri
-@@ -278,30 +278,13 @@ osx_dist {
- 
- contains(PRESET, linux_package) {
- 	### dynamically link against Qwt(3D) installed system-wide
--
--        exists(/usr/include/qt5/qwt5-qt5)      {INCLUDEPATH+=/usr/include/qt5/qwt5-qt5}
--        exists(/usr/include/qt5/qwtplot3d-qt5) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d-qt5}
--        exists(/usr/include/qwt5-qt5) {INCLUDEPATH+=/usr/include/qwt5-qt5}
--        exists(/usr/include/qwtplot3d) {INCLUDEPATH+=/usr/include/qwtplot3d}
--
--        system (ls /usr/lib*/libqwt5-qt5.so) {LIBS+=-lqwt5-qt5}
--        system (ls /usr/lib*/*/libqwt5-qt5.so) {LIBS+=-lqwt5-qt5}
--        system (ls /usr/lib*/libqwt-qt5.so) {LIBS+=-lqwt-qt5}
--        system (ls /usr/lib*/libqwtplot3d-qt5.so) {LIBS+=-lqwtplot3d-qt5}
--        system (ls /usr/lib*/*/libqwtplot3d-qt5.so) {LIBS+=-lqwtplot3d-qt5}
--
--
-+	INCLUDEPATH  +=/usr/include/qwt5
-+	INCLUDEPATH  +=/usr/include/qwtplot3d
-+	LIBS         +=-lqwt5-qt5
-+	LIBS         +=-lqwtplot3d
- 	LIBS         += -lz -lGLU 
--
--	INCLUDEPATH  += /usr/include/muParser
- 	LIBS         += -lgsl -lgslcblas
- 	LIBS         += -lmuparser 
--
--        # enable user installed packages
--        INCLUDEPATH = "$(HOME)/usr/include" $$INCLUDEPATH
--        QMAKE_LIBDIR = "$(HOME)/usr/lib" $$QMAKE_LIBDIR
--
--
- }
- 
- contains(PRESET, self_contained) {
diff --git a/sci-visualization/scidavis/metadata.xml b/sci-visualization/scidavis/metadata.xml
index 71ea968fc6f6..93c583ed2a8f 100644
--- a/sci-visualization/scidavis/metadata.xml
+++ b/sci-visualization/scidavis/metadata.xml
@@ -14,7 +14,6 @@
 		It strives to combine an intuitive, easy-to-use graphical user interface with powerful features such as Python scriptability.
 	</longdescription>
 	<use>
-		<flag name="assistant">Compile with QAssistant (documentation broweser) support from <pkg>dev-qt/assistant</pkg>.</flag>
 		<flag name="origin">Add support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</pkg>.</flag>
 		<flag name="python">Build support for python scripting.</flag>
 		<flag name="muparser">Build support for muparser scripting.</flag>
diff --git a/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
deleted file mode 100644
index 70fc6b255c6b..000000000000
--- a/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="media-gfx/graphviz"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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}-gh.tar.gz"
-
-LICENSE="GPL-2+ ZLIB"
-KEYWORDS="~amd64"
-SLOT="0"
-
-IUSE="assistant doc origin python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# RESTRICT="!test? ( test )"
-# Looks like we have an incompatible version of gtest in the tree, fails to
-# 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
-	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
-	assistant? ( dev-qt/assistant )
-	origin? ( sci-libs/liborigin )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			<dev-python/PyQt5-5.15.5[${PYTHON_USEDEP}]
-			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			<dev-python/sip-5:0[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	test? (
-		dev-libs/unittest++
-		dev-cpp/gtest
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-build.patch"
-)
-
-src_prepare() {
-	default
-
-	# Fix small upstream typo
-	sed -i -e 's/grabFramebuffer/grabFrameBuffer/g' libscidavis/src/Graph3D.cpp || die
-
-	# 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
-
-	# fix paths
-	cat >> config.pri <<-EOF || die
-		# install docs to ${PF} instead of ${PN}
-		documentation.path = "\$\$INSTALLBASE/share/doc/${PF}"
-
-		# install python files in Gentoo specific directories
-		pythonconfig.path = "$(python_get_scriptdir)"
-		pythonutils.path = "$(python_get_scriptdir)"
-
-		# /usr/share/appdata is deprecated
-		appdata.path = "\$\$INSTALLBASE/share/metainfo"
-	EOF
-}
-
-src_configure() {
-	INSTALLBASE="${EPREFIX}/usr" eqmake5 \
-		$(usex assistant  " " " CONFIG+=noassistant ") \
-		$(usex origin " CONFIG+=liborigin " " ") \
-		$(usex python " CONFIG+=python " " ") \
-		$(usex test " CONFIG+=test " " ")
-}
-
-src_compile() {
-	default
-	docs_compile
-}
-
-src_install () {
-	emake INSTALL_ROOT="${ED}" install
-	einstalldocs
-	use python && python_optimize
-}
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
+}