[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: 3088bcd9e6f979dcfb124b2b5151ee26cc4d6727
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Oct 25 20:36:35 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Oct 25 20:37:59 2023 +
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 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() {
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: c6fa2c7d707f8d39fee23bfebb3f25934b391571
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu Sep 14 11:08:46 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Thu Sep 14 11:08:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6fa2c7d
sci-visualization/scidavis: enable py3.12
Signed-off-by: Andrew Ammerlaan 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/
commit: 8f36ac513492c35f08b19383272c9eedf35271e6 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Apr 9 20:50:52 2023 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Apr 9 20:50:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f36ac51 sci-visualization/scidavis: drop myself as a maintainer Signed-off-by: Andrew Ammerlaan 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 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - andrewammerl...@gentoo.org - Andrew Ammerlaan - s...@gentoo.org Gentoo Science Project
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: d35e9a29339a8ab2e33440ec02cec902c584ef6b
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Jun 8 20:16:59 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Jun 8 20:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35e9a29
sci-visualization/scidavis: enable py3.11
Signed-off-by: Andrew Ammerlaan 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/files/, sci-visualization/scidavis/
commit: 5c433da8946eea1ee0c76a62aea5df79ed36bdca
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Mon May 9 15:49:38 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon May 9 15:49:38 2022 +
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 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..
--- 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..
---
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..
--- 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
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: 73c68609087651730494b1de9a2f1e1264a337f1
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Mon May 9 15:49:26 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon May 9 15:49:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c68609
sci-visualization/scidavis: add 2.9.0
Signed-off-by: Andrew Ammerlaan 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 ..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/files/, sci-visualization/scidavis/
commit: d0a5eb02d2822879e62e59c272f545bb601daa5a
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu Apr 21 17:21:59 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Thu Apr 21 17:23:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a5eb02
sci-visualization/scidavis: add 2.8
Signed-off-by: Andrew Ammerlaan 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 ..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 ..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
+
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/, sci-visualization/scidavis/files/
commit: 3da8fa0555ccb69b5f3114da975c166fd032faf2
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sat Apr 16 16:28:22 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sat Apr 16 16:30:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da8fa05
sci-visualization/scidavis: multiple bug fixes
- Enable muparser unconditionally
Closes: https://bugs.gentoo.org/834074
- Only set PYTHON_SCRIPTDIR if we enable python scripting
Closes: https://bugs.gentoo.org/832753
- Fix build if sip-4 installed as well as sip-6
Closes: https://bugs.gentoo.org/828938
Signed-off-by: Andrew Ammerlaan gentoo.org>
...t3d.patch => scidavis-2.7-find-qwtplot3d.patch} | 0
.../scidavis-2.7-fix-build-if-sip4-installed.patch | 13 +
patch => scidavis-2.7-install-locations.patch} | 0
sci-visualization/scidavis/metadata.xml| 1 -
...{scidavis-2.7.ebuild => scidavis-2.7-r1.ebuild} | 22 +++---
5 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch
b/sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch
similarity index 100%
rename from sci-visualization/scidavis/files/scidavis-qwtplot3d.patch
rename to sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch
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
new file mode 100644
index ..2b415458da22
--- /dev/null
+++
b/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch
@@ -0,0 +1,13 @@
+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-muparser.patch
b/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch
similarity index 100%
rename from sci-visualization/scidavis/files/scidavis-muparser.patch
rename to sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch
diff --git a/sci-visualization/scidavis/metadata.xml
b/sci-visualization/scidavis/metadata.xml
index 93c583ed2a8f..1c44688f2711 100644
--- a/sci-visualization/scidavis/metadata.xml
+++ b/sci-visualization/scidavis/metadata.xml
@@ -16,7 +16,6 @@
Add support for reading OriginLab OPJ
project files through sci-libs/liborigin.
Build support for python scripting.
- Build support for muparser
scripting.
scidavis
diff --git a/sci-visualization/scidavis/scidavis-2.7.ebuild
b/sci-visualization/scidavis/scidavis-2.7-r1.ebuild
similarity index 80%
rename from sci-visualization/scidavis/scidavis-2.7.ebuild
rename to sci-visualization/scidavis/scidavis-2.7-r1.ebuild
index d6d6452d9a35..94668d6588f5 100644
--- a/sci-visualization/scidavis/scidavis-2.7.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.7-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2+ ZLIB"
KEYWORDS="~amd64"
SLOT="0"
-IUSE="doc +muparser origin python test"
+IUSE="doc origin python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# requires network
@@ -26,7 +26,7 @@ RESTRICT="test"
PROPERTIES="test_network"
RDEPEND="
- muparser? ( dev-cpp/muParser )
+ dev-cpp/muParser
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -58,8 +58,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-muparser.patch"
- "${FILESDIR}/${PN}-qwtplot3d.patch"
+ "${FILESDIR}/${P}-install-locations.patch"
+ "${FILESDIR}/${P}-find-qwtplot3d.patch"
+ "${FILESDIR}/${P}-fix-build-if-sip4-installed.patch"
)
src_prepare() {
@@ -76,12 +77,19 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DSCRIPTING_MUPARSER=$(usex muparser)
- -DSCRIPTING_PYTHON=$(usex python)
- -DPYTHON_SCRIPTDIR="$(python_get_scriptdir)"
+ # 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)"
+
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: 56e254657fd9731d3fab4da5d7943e519475e70f
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sat Mar 26 11:01:17 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sat Mar 26 11:01:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e25465
sci-visualization/scidavis: drop 2.4.0_p2027
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-visualization/scidavis/Manifest| 1 -
.../scidavis/scidavis-2.4.0_p2027.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_p2027.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_p2027.ebuild
b/sci-visualization/scidavis/scidavis-2.4.0_p2027.ebuild
deleted file mode 100644
index 83ff296ac304..
--- a/sci-visualization/scidavis/scidavis-2.4.0_p2027.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/files/, sci-visualization/scidavis/
commit: 85737704fc9452eb486b9615a05020ed67c258fd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 18 17:44:10 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 18 21:16:41 2022 +
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 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_p2027.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..
--- 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.
- Compile with QAssistant (documentation
broweser) support from dev-qt/assistant.
Add support for reading OriginLab OPJ
project files through sci-libs/liborigin.
Build support for python scripting.
Build support for muparser
scripting.
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..
--- 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} )
-
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: 5477382d2dd1bf4c3d6450ae744ed78c84c03fa8
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sat Feb 19 10:44:37 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sat Feb 19 11:12:19 2022 +
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 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_p2027.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 ..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/, sci-visualization/scidavis/files/
commit: 8e4607aa21b6465f729301980972085f453dd1dd
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Tue Dec 7 22:39:32 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Dec 7 22:40:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4607aa
sci-visualization/scidavis: add new snapshot
for sip-6 support
switched to cmake build system
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-visualization/scidavis/Manifest| 1 +
.../scidavis/files/scidavis-muparser.patch | 61 ++
.../scidavis/files/scidavis-qwtplot3d.patch| 15
sci-visualization/scidavis/metadata.xml| 1 +
.../scidavis/scidavis-2.4.0_p2027.ebuild | 98 ++
5 files changed, 176 insertions(+)
diff --git a/sci-visualization/scidavis/Manifest
b/sci-visualization/scidavis/Manifest
index f6b5a4200127..861d0375614f 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1 +1,2 @@
DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B
5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e
SHA512
9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318
+DIST scidavis-2.4.0_p2027.tar.gz 9248921 BLAKE2B
e14d4a270ab0b7221b3e21762c4547e5d64930ddc72bf085d72d02e4756cc4c82f38b438f90dc472a05837d059650ea3718e100ad8c56762e990b11f571fce31
SHA512
f3fba2569d5ba79be1b10ffe4ed242f7a4df81fb4561388fcdb9461404ab966b21ecfdaa001518b5139eeef319e3c979109e2889d9268b07dad9c3cec970999b
diff --git a/sci-visualization/scidavis/files/scidavis-muparser.patch
b/sci-visualization/scidavis/files/scidavis-muparser.patch
new file mode 100644
index ..1b8c994bc74e
--- /dev/null
+++ b/sci-visualization/scidavis/files/scidavis-muparser.patch
@@ -0,0 +1,61 @@
+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}/$/scidavisrc.pyc DESTINATION etc )
++install( FILES scidavisrc.py
${CMAKE_CURRENT_BINARY_DIR}/$/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-qwtplot3d.patch
b/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch
new file mode 100644
index ..857cca79bd98
--- /dev/null
+++ b/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch
@@ -0,0 +1,15 @@
+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 (
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: b962e1f48e375231c1b9fdbd3271bd86436c5f5e
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun Nov 28 13:36:18 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Nov 28 13:36:27 2021 +
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 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
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: f2dcffa7f0c0ce71a569864cadff4ad10edf4395
Author: Sam James gentoo org>
AuthorDate: Wed Jun 2 21:28:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 2 21:50:29 2021 +
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 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/
commit: 61f9858743ebfb03f7bf445d98ae599a424c6cd5
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Tue Jun 1 17:53:47 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Jun 1 17:54:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f98587
sci-visualization/scidavis: restrict https://bugs.gentoo.org/793419
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan 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}]
+
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/
commit: ea6873d24a5457282e536b427103eda7403990f3 Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon May 24 08:35:47 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon May 24 08:35:47 2021 + 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 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/
commit: 3931df1564e279fffb90b809b6d345f58a210ab4
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Mon May 24 07:47:25 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon May 24 07:47:37 2021 +
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 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/
commit: 9d376a78500389def130fe35a67345b86cea579f Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon May 24 06:48:02 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon May 24 06:48:11 2021 + 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 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/
commit: fe1ee4dbe1123992726ecca192b9bab5ed9aba97
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Mon May 24 06:25:41 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon May 24 06:26:29 2021 +
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 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/
commit: c9874d70091e86de31ec8e7c0e4e508d2fedb7ba
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun May 23 13:08:08 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun May 23 13:08:54 2021 +
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 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/, sci-visualization/scidavis/files/
commit: a9fa805e47c117ce5554e13c9d2a578a97a45c22
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun May 23 12:15:23 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun May 23 12:47:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fa805e
sci-visualization/scidavis: import from ::sci
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-visualization/scidavis/Manifest| 1 +
.../scidavis/files/scidavis-build.patch| 39
sci-visualization/scidavis/metadata.xml| 25 +
sci-visualization/scidavis/scidavis-2.4.0.ebuild | 104 +
4 files changed, 169 insertions(+)
diff --git a/sci-visualization/scidavis/Manifest
b/sci-visualization/scidavis/Manifest
new file mode 100644
index 000..491a30c9708
--- /dev/null
+++ b/sci-visualization/scidavis/Manifest
@@ -0,0 +1 @@
+DIST scidavis-2.4.0.tar.gz 11887195 BLAKE2B
aeee055f2a002cb22f391f4557e866b4e27287169cb0e01178770b2e85b7e6bc592d64b576bdd01a415b9e236ed685837a34a9413411be6c47249541a2e6991a
SHA512
e439d593917999ec3586932c631453d498f6198934852be48ad8f9c62ea3d3752db2a88c4eebc8e9d8613cd94f83b9e1b19cb398a175ae9951510761e0588710
diff --git a/sci-visualization/scidavis/files/scidavis-build.patch
b/sci-visualization/scidavis/files/scidavis-build.patch
new file mode 100644
index 000..cb1e2600c6f
--- /dev/null
+++ b/sci-visualization/scidavis/files/scidavis-build.patch
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000..1810069d362
--- /dev/null
+++ b/sci-visualization/scidavis/metadata.xml
@@ -0,0 +1,25 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ andrewammerl...@gentoo.org
+ Andrew Ammerlaan
+
+
+ s...@gentoo.org
+ Gentoo Science Project
+
+
+ SciDAVis is a user-friendly data analysis and visualization
program primarily aimed at high-quality plotting of scientific data.
+ It strives to combine an intuitive, easy-to-use graphical user
interface with powerful features such as Python scriptability.
+
+
+ Compile with QAssistant (documentation
broweser) support from dev-qt/assistant.
+ Add support for reading OriginLab OPJ
project files through sci-libs/liborigin.
+ Build support for python scripting.
+
+
+ scidavis
+ SciDAVis/scidavis
+
+
diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
new file mode 100644
index 000..ef0e7918d2f
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -0,0 +1,104 @@
+# 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_{7..9} )
+
+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"
+
+LICENSE="GPL-2+ ZLIB"
+KEYWORDS="~amd64"
+SLOT="0"
+
+IUSE="assistant doc origin python test"
