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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     85737704fc9452eb486b9615a05020ed67c258fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 17:44:10 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 21:16:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85737704

sci-visualization/scidavis: Drop 2.4.0-r2

This avoids investigating how valid IUSE=assistant might be and fixing deps.

Closes: https://bugs.gentoo.org/835595
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-visualization/scidavis/Manifest                |   1 -
 .../scidavis/files/scidavis-build.patch            |  39 -------
 sci-visualization/scidavis/metadata.xml            |   1 -
 .../scidavis/scidavis-2.4.0-r2.ebuild              | 112 ---------------------
 4 files changed, 153 deletions(-)

diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 29cc21dd1d19..2cfe83bdeee3 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,3 +1,2 @@
-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/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
-}