gentoo resync : 22.12.2021

6 files changed, 180 insertions, 1 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 8594da1e4240..0d3d8a5c5c29 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index a6eaa4604d67..94e9dc374315 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,4 +1,8 @@
 AUX scidavis-build.patch 1397 BLAKE2B 70abb5dee8d3afbf4eaf88d50c8df30fb0ad34345e92d049113c5ef0e1ecf9f5d7b127166453905f79056d812128f2c427ddcb3736363591c2e3aba67ed8b3d1 SHA512 91044ad9994ffe8047529b262d578b575a559d888b17da772be10346b87c655a2c53c67ba06b7a5bb85870510de5a1c4f1f14777b5c60bbfaab4ccd545d00929
+AUX scidavis-muparser.patch 2299 BLAKE2B 9ba9e99c838c4fe8c767b8cbfdb9ce93202a8d539039993552a6da2590a28b7acd27f891b6e251ee9bb063a0010d52fa419807ab2a515e633ebd32ea8179877d SHA512 44841cac0f111687ffe38e322c8fb25139f5529321eb4609a8a7821e0ee3bba832f61fe9f6b0e42f28f4571898468de83274d36bbdfc57c97ed227426244c103
+AUX scidavis-qwtplot3d.patch 453 BLAKE2B 774cae5c148944cb4c0a85965431031296b9f846b1154620e39cca0c6ec4ba8645e84bfccbcca051334f11ba301f3aa1bb6a4d6110cec57dc9cb881fd4fa0d85 SHA512 95a778670c8540a150e52317a95f8ff8211bc0cdaf10280f84bf2c5365f7b803cd56b46760a56db75ba29289ebf53abf9d803d0bb78cf55c0426059bb994b584
 DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B 5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e SHA512 9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318
+DIST scidavis-2.4.0_p20211117.tar.gz 9248921 BLAKE2B e14d4a270ab0b7221b3e21762c4547e5d64930ddc72bf085d72d02e4756cc4c82f38b438f90dc472a05837d059650ea3718e100ad8c56762e990b11f571fce31 SHA512 f3fba2569d5ba79be1b10ffe4ed242f7a4df81fb4561388fcdb9461404ab966b21ecfdaa001518b5139eeef319e3c979109e2889d9268b07dad9c3cec970999b
 EBUILD scidavis-2.4.0-r2.ebuild 2894 BLAKE2B 3edd4fb5526eb6d1f2688c23d49c66a686125c07de8875efe9c576ec68ff2d014357e1a66c58c6a2551bffaa119cc8daee8d9a33f65985dbd8806d66780c7f81 SHA512 4646b6d6c507861f24cbd28e2cbb594e4b82caca938213ab352cb84137d31e985a0eb7a9f2ba10b818f25ec3c5313b1d2e218bc269d8961aaa65971e38fd953c
-MISC metadata.xml 1139 BLAKE2B 406046dd8fb76e0ba5041ffd4ab1348adbb220b1d60f54d771b47fc8f592c9d8a54ead641e6ffb57c4aa41e9135bbb0bdb207042a4a68a831124ad6544b87b62 SHA512 96662659dbd13c848af7a06642aa4af6b5b53d233c342fdbf39f4470c2504fc2d6354a09f3296968d2aa664f771ae0819b457c3508e5d82e4eb262925931fcc4
+EBUILD scidavis-2.4.0_p20211117.ebuild 2211 BLAKE2B e0c6796817df8c47712ec8d09739116e6252d5379f77d90263968809298fe382c9f3fb1ec4d88872c0f85dcbd0a3a00bc6cb0893a64cba3a49bc38926184f2bb SHA512 a27456b517479b96713b9c06a67e05d6034c796ccffd8e44c8371c9aa6c5fd601a6cf430ee5810f8a0d9b706d9e80dba3d0e7fb481d7636bef3acbc5ba254c85
+MISC metadata.xml 1208 BLAKE2B 9f19f619ba6b20048b901d5e2020b5f23fec5e39cbca24fb21cd17e174b01d92bd488879cf04a98ddeeebee87434ec9317423eead54cd6d4884fe4ccd8b49aba SHA512 ecdeaff7221d25d1b2aafb750f28b0150d36d5ceda77924590bc0e016533c2b07cf7faa4b2c27e43b3fc93d0f9de2f1b94e3e2098687ff85f31f9bd2ec391961
diff --git a/sci-visualization/scidavis/files/scidavis-muparser.patch b/sci-visualization/scidavis/files/scidavis-muparser.patch
new file mode 100644
index 000000000000..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}/$<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-qwtplot3d.patch b/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch
new file mode 100644
index 000000000000..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 ( QWTPLOT3D_LIBRARY
++    NAMES qwtplot3d
+     HINTS ${QT_LIBRARY_DIR}
+   )
+   if( NOT QWTPLOT3D_LIBRARY )
diff --git a/sci-visualization/scidavis/metadata.xml b/sci-visualization/scidavis/metadata.xml
index 4a839925ffcb..71ea968fc6f6 100644
--- a/sci-visualization/scidavis/metadata.xml
+++ b/sci-visualization/scidavis/metadata.xml
@@ -17,6 +17,7 @@
 		<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>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">scidavis</remote-id>
diff --git a/sci-visualization/scidavis/scidavis-2.4.0_p20211117.ebuild b/sci-visualization/scidavis/scidavis-2.4.0_p20211117.ebuild
new file mode 100644
index 000000000000..83ff296ac304
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-2.4.0_p20211117.ebuild
@@ -0,0 +1,98 @@
+# 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
+}