* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/files/, sci-visualization/scidavis/
@ 2022-03-18 21:16 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-03-18 21:16 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/files/, sci-visualization/scidavis/
@ 2022-04-21 17:23 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-04-21 17:23 UTC (permalink / raw
To: gentoo-commits
commit: d0a5eb02d2822879e62e59c272f545bb601daa5a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 17:21:59 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 17:23:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a5eb02
sci-visualization/scidavis: add 2.8
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-visualization/scidavis/Manifest | 1 +
.../files/scidavis-2.8-fix-buildfailure.patch | 68 ++++++++++++++
sci-visualization/scidavis/scidavis-2.8.ebuild | 104 +++++++++++++++++++++
3 files changed, 173 insertions(+)
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index f2ebad33c866..aa0153baaf57 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1 +1,2 @@
DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de
+DIST scidavis-2.8.tar.gz 12796976 BLAKE2B a1774f89235c9a6f49c20a45bec64e914b71c80afb54ca3e8b71151fa660a6da75c6dd914e42932bbe1b2a9abffaee045b3542ecc30ddb2824f5c4c5ccdf5da4 SHA512 3250846cd4cd320aa765d564ef07de10ccba0621b89e033b5b6092850c5eae4ca30b47eca392b67540e7757cbd497909a8cabd09bf44791543a809087f199c21
diff --git a/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch b/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch
new file mode 100644
index 000000000000..779fb803cebb
--- /dev/null
+++ b/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch
@@ -0,0 +1,68 @@
+diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt
+index 9484a87..d177a55 100644
+--- a/scidavis/CMakeLists.txt
++++ b/scidavis/CMakeLists.txt
+@@ -8,35 +8,35 @@ if( WIN32 )
+ endif()
+
+ # Translation Files
+-#file( COPY translations DESTINATION . )
+-#set( TS_FILES
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts"
+-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts"
+-# )
++file( COPY translations DESTINATION . )
+ set( TS_FILES
+- "translations/scidavis_de.ts"
+- "translations/scidavis_es.ts"
+- "translations/scidavis_fr.ts"
+- "translations/scidavis_ru.ts"
+- "translations/scidavis_ja.ts"
+- "translations/scidavis_sv.ts"
+- "translations/scidavis_pt-br.ts"
+- "translations/scidavis_cs.ts"
+- "translations/scidavis_cs-alt.ts"
+- "translations/scidavis_pl.ts"
+- "translations/scidavis_zh-cn.ts"
+- "translations/scidavis_zh-tw.ts"
+- )
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts"
++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts"
++ )
++#set( TS_FILES
++ #"translations/scidavis_de.ts"
++ #"translations/scidavis_es.ts"
++ #"translations/scidavis_fr.ts"
++ #"translations/scidavis_ru.ts"
++ #"translations/scidavis_ja.ts"
++ #"translations/scidavis_sv.ts"
++ #"translations/scidavis_pt-br.ts"
++ #"translations/scidavis_cs.ts"
++ #"translations/scidavis_cs-alt.ts"
++ #"translations/scidavis_pl.ts"
++ #"translations/scidavis_zh-cn.ts"
++ #"translations/scidavis_zh-tw.ts"
++ #)
+
+ qt5_create_translation( QM_FILES "${CMAKE_SOURCE_DIR}/libscidavis" ${TS_FILES} )
+
diff --git a/sci-visualization/scidavis/scidavis-2.8.ebuild b/sci-visualization/scidavis/scidavis-2.8.ebuild
new file mode 100644
index 000000000000..2a99b10ff17f
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-2.8.ebuild
@@ -0,0 +1,104 @@
+# 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 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
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.7-install-locations.patch"
+ "${FILESDIR}/${PN}-2.7-find-qwtplot3d.patch"
+ "${FILESDIR}/${PN}-2.7-fix-build-if-sip4-installed.patch"
+ "${FILESDIR}/${P}-fix-buildfailure.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=(
+ # 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/files/, sci-visualization/scidavis/
@ 2022-05-09 15:50 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-05-09 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 5c433da8946eea1ee0c76a62aea5df79ed36bdca
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 15:49:38 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 9 15:49:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c433da8
sci-visualization/scidavis: drop 2.7-r1, 2.8
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-visualization/scidavis/Manifest | 2 -
.../files/scidavis-2.7-find-qwtplot3d.patch | 15 ---
.../scidavis-2.7-fix-build-if-sip4-installed.patch | 13 ---
.../files/scidavis-2.7-install-locations.patch | 61 ------------
.../files/scidavis-2.8-fix-buildfailure.patch | 68 --------------
sci-visualization/scidavis/scidavis-2.7-r1.ebuild | 103 --------------------
sci-visualization/scidavis/scidavis-2.8.ebuild | 104 ---------------------
7 files changed, 366 deletions(-)
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index acdc6f3f960f..7cc12ce69cc0 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,3 +1 @@
-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/files/scidavis-2.7-find-qwtplot3d.patch b/sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch
deleted file mode 100644
index 857cca79bd98..000000000000
--- a/sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
-index 1b43375..a2bd52c 100644
---- a/3rdparty/CMakeLists.txt
-+++ b/3rdparty/CMakeLists.txt
-@@ -46,8 +46,8 @@ endif()
- option( BUILD_QWTPLOT3D "Build QwtPlot3D using own code" OFF )
-
- if( NOT BUILD_QWTPLOT3D )
-- find_library ( QWTPLOT3D_LIBRARY
-- NAMES qwtplot3d-qt5
-+find_library ( QWTPLOT3D_LIBRARY
-+ NAMES qwtplot3d
- HINTS ${QT_LIBRARY_DIR}
- )
- if( NOT QWTPLOT3D_LIBRARY )
diff --git a/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch b/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch
deleted file mode 100644
index 2b415458da22..000000000000
--- a/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libscidavis/CMakeLists.txt b/libscidavis/CMakeLists.txt
-index 8fc6c4e3..27464ec2 100644
---- a/libscidavis/CMakeLists.txt
-+++ b/libscidavis/CMakeLists.txt
-@@ -483,7 +483,7 @@ if( SCRIPTING_PYTHON )
- set(scidavis_PyQt_HDR ${scidavis_SIP_OUTPUT_DIR}/sipAPIscidavis.h)
- if( SIP_VERSION VERSION_GREATER_EQUAL 5 )
- set( scidavis_SIP_HDR ${CMAKE_CURRENT_BINARY_DIR}/python/sip.h )
-- target_include_directories( libscidavis PUBLIC
-+ target_include_directories( libscidavis BEFORE PUBLIC
- "${CMAKE_CURRENT_BINARY_DIR}/python"
- "${scidavis_SIP_OUTPUT_DIR}"
- )
diff --git a/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch b/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch
deleted file mode 100644
index 1b8c994bc74e..000000000000
--- a/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b75dcc..f6c730a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,5 @@
- cmake_minimum_required( VERSION 3.16 )
-+include(GNUInstallDirs)
-
- # Target platform is Windows 10
- if( CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017" OR
-@@ -115,6 +116,7 @@ find_package( ZLIB "1.2.11" REQUIRED )
- find_package( OpenGL COMPONENTS OpenGL REQUIRED )
-
- # muParser
-+if( SCRIPTING_MUPARSER )
- find_library( MUPARSER_LIB
- NAMES muparser
- REQUIRED
-@@ -124,6 +126,7 @@ find_path( MUPARSER_INCLUDE_DIR
- REQUIRED
- )
- message( STATUS "Found muParser : ${MUPARSER_LIB} include: ${MUPARSER_INCLUDE_DIR}" )
-+endif()
-
- add_subdirectory( 3rdparty )
-
-@@ -149,7 +152,7 @@ set( DOC_FILES
- if( WIN32 )
- install( FILES ${DOC_FILES} DESTINATION . )
- else()
-- install( FILES ${DOC_FILES} DESTINATION share/doc/scidavis )
-+ install( FILES ${DOC_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR} )
- endif()
-
- if( MSVC )
-diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt
-index cc68d4d..fb6da42 100644
---- a/scidavis/CMakeLists.txt
-+++ b/scidavis/CMakeLists.txt
-@@ -127,15 +127,18 @@ if (NOT CMAKE_CROSS_COMPILING)
- install( FILES scidavis.desktop DESTINATION share/applications )
- install( FILES scidavis.xml DESTINATION share/mime/packages )
- install( FILES scidavis.1 DESTINATION share/man/man1 )
-- install( FILES scidavis.appdata.xml DESTINATION share/appdata )
-+ install( FILES scidavis.appdata.xml DESTINATION share/metainfo )
- install( FILES x-sciprj.desktop DESTINATION share/mimelnk/application )
- endif()
-
- if( SCRIPTING_PYTHON )
-+ if(NOT PYTHON_SCRIPTDIR)
-+ set(PYTHON_SCRIPTDIR etc)
-+ endif()
- if( MULTI_CONFIG )
-- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION etc )
-+ install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} )
- else()
-- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION etc )
-+ install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} )
- endif()
- install( FILES scidavisUtil.py DESTINATION share/scidavis )
- endif()
diff --git a/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch b/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch
deleted file mode 100644
index 779fb803cebb..000000000000
--- a/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt
-index 9484a87..d177a55 100644
---- a/scidavis/CMakeLists.txt
-+++ b/scidavis/CMakeLists.txt
-@@ -8,35 +8,35 @@ if( WIN32 )
- endif()
-
- # Translation Files
--#file( COPY translations DESTINATION . )
--#set( TS_FILES
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts"
--# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts"
--# )
-+file( COPY translations DESTINATION . )
- set( TS_FILES
-- "translations/scidavis_de.ts"
-- "translations/scidavis_es.ts"
-- "translations/scidavis_fr.ts"
-- "translations/scidavis_ru.ts"
-- "translations/scidavis_ja.ts"
-- "translations/scidavis_sv.ts"
-- "translations/scidavis_pt-br.ts"
-- "translations/scidavis_cs.ts"
-- "translations/scidavis_cs-alt.ts"
-- "translations/scidavis_pl.ts"
-- "translations/scidavis_zh-cn.ts"
-- "translations/scidavis_zh-tw.ts"
-- )
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts"
-+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts"
-+ )
-+#set( TS_FILES
-+ #"translations/scidavis_de.ts"
-+ #"translations/scidavis_es.ts"
-+ #"translations/scidavis_fr.ts"
-+ #"translations/scidavis_ru.ts"
-+ #"translations/scidavis_ja.ts"
-+ #"translations/scidavis_sv.ts"
-+ #"translations/scidavis_pt-br.ts"
-+ #"translations/scidavis_cs.ts"
-+ #"translations/scidavis_cs-alt.ts"
-+ #"translations/scidavis_pl.ts"
-+ #"translations/scidavis_zh-cn.ts"
-+ #"translations/scidavis_zh-tw.ts"
-+ #)
-
- qt5_create_translation( QM_FILES "${CMAKE_SOURCE_DIR}/libscidavis" ${TS_FILES} )
-
diff --git a/sci-visualization/scidavis/scidavis-2.7-r1.ebuild b/sci-visualization/scidavis/scidavis-2.7-r1.ebuild
deleted file mode 100644
index 94668d6588f5..000000000000
--- a/sci-visualization/scidavis/scidavis-2.7-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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 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
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-install-locations.patch"
- "${FILESDIR}/${P}-find-qwtplot3d.patch"
- "${FILESDIR}/${P}-fix-build-if-sip4-installed.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=(
- # 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
-}
diff --git a/sci-visualization/scidavis/scidavis-2.8.ebuild b/sci-visualization/scidavis/scidavis-2.8.ebuild
deleted file mode 100644
index 2a99b10ff17f..000000000000
--- a/sci-visualization/scidavis/scidavis-2.8.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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 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
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.7-install-locations.patch"
- "${FILESDIR}/${PN}-2.7-find-qwtplot3d.patch"
- "${FILESDIR}/${PN}-2.7-fix-build-if-sip4-installed.patch"
- "${FILESDIR}/${P}-fix-buildfailure.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=(
- # 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-09 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-21 17:23 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/files/, sci-visualization/scidavis/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 15:50 Andrew Ammerlaan
2022-03-18 21:16 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox