gentoo resync : 31.05.2021

9 files changed, 213 insertions, 33 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 904be8b83dcc..fb20adce3b4f 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 518ecf32fed6..7c68b634a73d 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -3,5 +3,5 @@ AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a6
 AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590
 AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
-EBUILD gle-4.2.5-r1.ebuild 2167 BLAKE2B 1ddd7ac42774d96c9f1ab07b077b4938dc9df773a1821506e81c03a8f82bdbad5038e008d888963093c8794649b868289c393b227bf2beb3464ff9064abaf3dc SHA512 aa541e860b0bed8da5a5a1b21c7462e84b8fd68a195cc3381edc706d89c90d1dbe2403488049ce7313e30e5a46cd089dd840575c40aa78cc9d4f8259f614eaa0
+EBUILD gle-4.2.5-r2.ebuild 2155 BLAKE2B 004c8f6fc85e54660f8774cfd8a723342df9248017609a746b0db525432417bca1a90d102bad73f63bd56ce18782d3b028b4843fa15413c12d1b77a3cd789bad SHA512 2a8170ba881a50219fd465b5df290886d9d09287ef4c5aadda4653f29e985cba16555e71cabb74542dab06e4607cd2169b998aba6c225f6508534c7257a89caf
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r2.ebuild
index 9c52191e544f..185bd857cbb2 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r2.ebuild
@@ -1,34 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit elisp-common flag-o-matic autotools
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic
+
+MY_P=${PN}-graphics-${PV}
 
 DESCRIPTION="Graphics Layout Engine"
 HOMEPAGE="http://glx.sourceforge.net/"
-MY_P=${PN}-graphics-${PV}
-MAN_V=4.2.2
 SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
-SLOT="0"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD-2 emacs? ( GPL-2 )"
-IUSE="X jpeg png tiff doc emacs vim-syntax"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs jpeg png tiff vim-syntax X"
 
 DEPEND="
-	sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
+	sys-libs/ncurses:=
+	emacs? ( >=app-editors/emacs-23.1:* )
 	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	doc? ( dev-texlive/texlive-latexextra )
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )
+	X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
 	virtual/latex-base
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S="${WORKDIR}"/${MY_P}
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)"
+BDEPEND="doc? ( dev-texlive/texlive-latexextra )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-parallel.patch
@@ -45,6 +50,7 @@ src_prepare() {
 src_configure() {
 	# CPPFLAGS are understood as C++ flags
 	append-cppflags ${CXXFLAGS}
+	append-cppflags -std=c++14
 	econf \
 		--without-rpath \
 		--without-qt \
@@ -57,36 +63,32 @@ src_configure() {
 
 src_compile() {
 	emake
-	if use doc; then
-		emake -j1 doc
-	fi
+	use doc && emake -j1 doc
+
 	if use emacs; then
-		cd contrib/editors/highlighting
-		mv ${PN}-emacs.el ${PN}-mode.el
-		elisp-compile ${PN}-mode.el || die
+		cd contrib/editors/highlighting || die
+		mv ${PN}-emacs.el ${PN}-mode.el || die
+		elisp-compile ${PN}-mode.el
 	fi
 }
 
 src_install() {
 	# -jN failed to install some data files
 	emake -j1 DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/gle-graphics
+	rm -rf "${ED}"/usr/share/doc/gle-graphics || die
 	dodoc README.txt
 
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins build/doc/gle-manual.pdf
-	fi
+	use doc && dodoc build/doc/gle-manual.pdf
 
 	if use emacs; then
-		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
+		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el
 	fi
 
 	if use vim-syntax ; then
 		dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
 		cd contrib/editors/highlighting/vim || die
-		chmod 644 ftplugin/* indent/* syntax/*
+		chmod 644 ftplugin/* indent/* syntax/* || die
 		insinto /usr/share/vim/vimfiles
 		doins -r ftplugin indent syntax
 	fi
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index df734a287f40..6b518a1be010 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -2,5 +2,5 @@ AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b66
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
 EBUILD quickplot-0.10.6-r1.ebuild 913 BLAKE2B ffbddeef6843c940e33fad83c0f2445e7e9e28b8094085307d24bef00753ba81c109afd28ed354c562ca04005d1b8d2a02212c64ab1bd2b4038593d3efd1ef75 SHA512 08a9c86b2a0fda0edd61124765a5d53220dcfb0ad960b420d878cd34a84b6374b23b74b3784b10f6caf9eec985c3458177b716619616c4014acbde4a07def11a
-EBUILD quickplot-1.0.1_rc.ebuild 1032 BLAKE2B 825cc7a512a18099c844fd558997d2a1441b9023e1317027c06f02f8671466b09cd0d793c1ad5c6497c3f5ce043ed87f002a2ca854a73c320b80cb96699c0a91 SHA512 7ebd9fea51c58945cd0cc0c7cf06f103dbe1447a5f24412dfb3f96bb4c5f164ff2c9cb3590bc7eebce9eeb51f234ada59a55c20b6f87f5531acda8b001c5909b
+EBUILD quickplot-1.0.1_rc.ebuild 1045 BLAKE2B 5259ca25ce3b38513b2e59bd3a926f0091a755c45bcba3287aa322838fd0851e444ff317d9d019268466c812de1bde30f3a2e648bdd3ddc85febbc0cb8a91a79 SHA512 ae4cc45a02c89bda473e90c02f0f787aaf2e1fd36bab9a9c15b01b38766ab7c3ad8b5cb2c93b24bd6ec6f4d3f5955a10c4b3618238deadc1882cd4b2d31e499a
 MISC metadata.xml 853 BLAKE2B 8e5a7f7a90c345657b2ae6b9460bad955899cecbdf38c9fa668f1da36a35928268368bb6339e43874733124b553ba6a2a8177a060e4dc5a9204ee3e88b5c74de SHA512 ec630df795d369d1ebbdb5cccf33b55134e6d4400d97caed721b0a02882c5cc321ac21c526b50d1556f9c4e21504a51dfbfdcb2b463ffa09d2f81d0890bf0cd9
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 19ccf287fd22..688dc57516ed 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	media-gfx/imagemagick[png]
 	virtual/pkgconfig
-	www-client/lynx"
+	www-client/lynx
+	dev-vcs/git"
 
 PATCHES=( "${FILESDIR}"/${P}-automake.patch )
 
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
new file mode 100644
index 000000000000..400800e3f687
--- /dev/null
+++ b/sci-visualization/scidavis/Manifest
@@ -0,0 +1,4 @@
+AUX scidavis-build.patch 1397 BLAKE2B 70abb5dee8d3afbf4eaf88d50c8df30fb0ad34345e92d049113c5ef0e1ecf9f5d7b127166453905f79056d812128f2c427ddcb3736363591c2e3aba67ed8b3d1 SHA512 91044ad9994ffe8047529b262d578b575a559d888b17da772be10346b87c655a2c53c67ba06b7a5bb85870510de5a1c4f1f14777b5c60bbfaab4ccd545d00929
+DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B 5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e SHA512 9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318
+EBUILD scidavis-2.4.0.ebuild 2696 BLAKE2B ffa75f5a2986635b37f3a53883a855d7cd83e49cde8b17023f2e02d980f5e2f87a29b7434e4f828aa251cedf6e2faabc27855ac6b769316b6f05636f278d82be SHA512 b8f69ab8aed52498123752940ee9c48c8339f1d4c02091fba122a23dc086b13e0791b0f4240e9a1881c9913ac161dd268aadda8689acf8b9503d67f02c0d307a
+MISC metadata.xml 1138 BLAKE2B 695ca203915a491dd670b060c233e18f475c5ce7e041a14fe19cb914211929324415145c30b5fa7bcdca4293c9c407a1aed89e749c0863cca5a6d37ee97ad3da SHA512 108ca45c3d0ae439968b78a402e71e2f08ce084f6e43fa4d1f63a112085ee9f32ee4fb03eec8658b8f8ff3a441565fafb1e2cd952b7f2e98a9c0f2155951a105
diff --git a/sci-visualization/scidavis/files/scidavis-build.patch b/sci-visualization/scidavis/files/scidavis-build.patch
new file mode 100644
index 000000000000..cb1e2600c6f9
--- /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 000000000000..1810069d362e
--- /dev/null
+++ b/sci-visualization/scidavis/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		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.
+	</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>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">scidavis</remote-id>
+		<remote-id type="github">SciDAVis/scidavis</remote-id>
+	</upstream>
+</pkgmetadata>
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 000000000000..cd3f9366947e
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-2.4.0.ebuild
@@ -0,0 +1,109 @@
+# 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}-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"
+
+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[${PYTHON_USEDEP}]
+			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+			dev-python/sip[${PYTHON_USEDEP}]
+		')
+	)
+"
+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
+}