Updating liguros repo21.1.2

13 files changed, 131 insertions, 281 deletions

diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest
index cb91835ca78f..43586506a2dd 100644
--- a/sci-misc/cdfplayer/Manifest
+++ b/sci-misc/cdfplayer/Manifest
@@ -1,2 +1,3 @@
 DIST CDFPlayer_11.2.0_LINUX.sh 1821479711 BLAKE2B 7d12a94b43fdd60dc6af3d78fe45f85a2aa68752c690de023d4cd0cc5d24f8b091db7846d3732d7618d7df659b982fbcf19543d7d0c0116ddcae7f7b1aa11d88 SHA512 8a9a98ed5dceb18db41e52269dedf2a00ee89015a76eb650b852f8e1c19040918ecfa7594737f2982118c7358eab4d1e85694eecbe059edc963d4bdc8533b470
 DIST CDFPlayer_11.3.0_LINUX.sh 1556151070 BLAKE2B 652adda3989bdac10f02c5fc648ded7189e56555bab9d48f75c642a9ca6b0ca70771cae54142f55bc2d19a720a17fad04abd3c7240a114a237dee69e4f8ca303 SHA512 d28939481772e1a2ec6296b5f4d7e98628ccc015c75c084b09a90937525415c6a447111c1488482bf355917ac2ddb8dc154f46b8864d0d001bb7d419cd2f671a
+DIST WolframPlayer_12.2.0_LINUX.sh 1003754320 BLAKE2B b37e2500e09543efd5084b6fadd6f5d6d6f7f2b75627fc8cb3819578d41de00a8ba5f529440d64efebabcf9d26a77b51b01969135f02baca851c42811ef521b7 SHA512 dc4449836419dd7abe8590319912b07019a4f2cf542e31759c15bde0055bfc6bebc880fd6ab88809758d5723862bbbe971affa07429a660b728698d24a4c9d20
diff --git a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild b/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
new file mode 100644
index 000000000000..2e5574c314ab
--- /dev/null
+++ b/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator
+
+DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
+SRC_URI="WolframPlayer_12.2.0_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/cdf-player/"
+
+LICENSE="WolframCDFPlayer"
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RESTRICT="strip mirror bindist fetch"
+
+DEPEND=""
+
+# this list comes from lsof output
+# probably there are still some libraries missing
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	media-libs/alsa-lib
+	dev-libs/expat
+	media-libs/fontconfig
+	dev-libs/icu
+	x11-libs/libxcb
+	dev-libs/libxml2
+	sys-libs/ncurses-compat:5
+	media-libs/freetype
+"
+
+# we need this a few times
+MPN="WolframPlayer"
+MPV=$(get_version_component_range 1-2)
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+}
+
+src_install() {
+	local ARCH
+	if use amd64; then ARCH='-x86-64'; else ARCH=''; fi
+
+	# move all over
+	mv "${S}"/opt "${D}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, redo
+	rm "${D}"/opt/bin/* || die
+	dosym ../Wolfram/${MPN}/${MPV}/Executables/wolframplayer opt/bin/wolframplayer
+	dosym ../Wolfram/${MPN}/${MPV}/Executables/WolframPlayer opt/bin/WolframPlayer
+
+	# fix some embedded paths and install desktop files
+	insinto /usr/share/applications
+	for filename in $(find "${D}" -name "wolfram-cdf12.desktop") ; do
+		echo Fixing "${filename}"
+		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+		doins "${filename}"
+	done
+
+	# install a wrapper
+	echo '#!/bin/sh' >> ${PN}
+	echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/lib/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/wolframplayer \$*" \
+		 >> ${PN}
+	dobin ${PN}
+}
+
+pkg_nofetch() {
+	einfo "Sadly Wolfram provides no permanent link to the player files."
+	einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from"
+	einfo "${HOMEPAGE} and place it into your DISTDIR directory."
+}
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
deleted file mode 100644
index 292cd0ac1fa2..000000000000
--- a/sci-misc/mendeleydesktop/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mendeleydesktop-1.19.6-linux-i486.tar.bz2 156023883 BLAKE2B b6e962100fe4f7a93ad9922bb26ec224cbece1de8f182394799f758942a7f5c666ff959d712c74c250a3dbde082a168250ba92d0a70db30823ac70d7526b6192 SHA512 8d610043abb325a8396256b4e6fca53db9198be7fecad0128120e79279b5ea048240fd98ccb9833d885eb9f9873b8479e184e4103455528d6a897011f798e2f0
-DIST mendeleydesktop-1.19.6-linux-x86_64.tar.bz2 159780391 BLAKE2B ca61beff5b213a3e2712aa95a3f8adff2639e5c22ab2c6cfeddfb985e427958397601f986f0c75b979a22e0119ea4a31dd3ec9b7f1f223a9798b949320e3b07f SHA512 7baebb8e20b7fb47ae49c5d8378469fb30f74f36033b8d9820ccf2b5559a184ec848a2463464c42d526d42c9c111c47e440e3dbf681b4e87dc5eafb9a42cf8ef
diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-libdir.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-libdir.patch
deleted file mode 100644
index 67ba57fca05f..000000000000
--- a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch to find libstdc++.
-
-https://bugs.funtoo.org/browse/FL-3519
---- a/bin/mendeleydesktop
-+++ b/bin/mendeleydesktop
-@@ -29,6 +29,13 @@ def library_paths():
-     paths.append("/usr/lib/x86_64-linux-gnu")
-     paths.append("/usr/lib/i386-linux-gnu")
- 
-+    gcc_libpath = subprocess.Popen(
-+        '/usr/bin/gcc-config -L', shell=True, stdout=subprocess.PIPE,
-+    ).stdout.read().decode('utf-8').replace('\n', '').split(':')
-+    for path in gcc_libpath:
-+        if len(path) > 0:
-+            paths.append(path)
-+
-     return paths
- 
- def library_version_from_path(lib_path):
diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-qt5plugins.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-qt5plugins.patch
deleted file mode 100644
index 49395a46a0f7..000000000000
--- a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-qt5plugins.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch to find qt5 plugins.
-
-Patch by Marius Brehler <marbre@linux.sungazer.de>
---- a/bin/mendeleydesktop
-+++ b/bin/mendeleydesktop
-@@ -75,7 +83,7 @@ def get_paths():
-         else:
-             results['MENDELEY_BIN'] = results['MENDELEY_BASE'] + "/lib/mendeleydesktop/libexec/mendeleydesktop.i486"
- 
--        results['MENDELEY_BUNDLED_QT_PLUGIN'] = results['MENDELEY_BASE'] + "/lib/mendeleydesktop/plugins/"
-+        results['MENDELEY_BUNDLED_QT_PLUGIN'] = "/usr/lib/qt5/plugins"
- 
-     # Path to Mendeley Desktop and PDFNet libraries
-     results['MENDELEY_LIB'] = results['MENDELEY_BASE'] + "/lib/"
- 
diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-unix-distro-build.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-unix-distro-build.patch
deleted file mode 100644
index dffd69df6b56..000000000000
--- a/sci-misc/mendeleydesktop/files/mendeleydesktop-1.17.8-unix-distro-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch to force --unix-distro-build.
-
-Patch by Marius Brehler <marbre@linux.sungazer.de>
---- a/bin/mendeleydesktop
-+++ b/bin/mendeleydesktop
-@@ -159,10 +167,7 @@ def mendeley_desktop_arguments():
-     """ Returns a list with the argumetns to be appended to Mendeley Desktop. """
-     extra_args = sys.argv[1:]
- 
--    if is_linux_distro_build():
--        # Enable Linux distro specific changes (eg. in auto-update
--        # handling)
--        extra_args = extra_args + ["--unix-distro-build"]
-+    extra_args = extra_args + ["--unix-distro-build"]
- 
-     use_debugger = sys.argv.count("--debug") > 0
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild
deleted file mode 100644
index 8490fab48151..000000000000
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.6.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit desktop python-single-r1 xdg
-
-MY_P_AMD64="${P}-linux-x86_64"
-MY_P_X86="${P}-linux-i486"
-
-DESCRIPTION="Research management tool for desktop and web"
-HOMEPAGE="https://www.mendeley.com/"
-SRC_URI="
-	amd64? ( ${MY_P_AMD64}.tar.bz2 )
-	x86? ( ${MY_P_X86}.tar.bz2 )
-	amd64-linux? ( ${MY_P_AMD64}.tar.bz2 )
-	x86-linux? ( ${MY_P_X86}.tar.bz2 )"
-
-LICENSE="Mendeley-terms"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist fetch"
-
-DEPEND=""
-BDEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwebkit:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-"
-
-QA_PREBUILT="/opt/mendeleydesktop/.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.8-libdir.patch
-	"${FILESDIR}"/${PN}-1.17.8-qt5plugins.patch
-	"${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch
-)
-
-pkg_nofetch() {
-	elog "Please download ${A} from:"
-	elog "http://www.mendeley.com/download-mendeley-desktop/"
-	elog "and move it to your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}" || die
-
-	if use amd64 || use amd64-linux ; then
-		mv -f "${MY_P_AMD64}" "${P}" || die
-	else
-		mv -f "${MY_P_X86}" "${P}" || die
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	# remove bundled Qt libraries
-	rm -r lib/mendeleydesktop/plugins \
-		|| die "failed to remove plugin directory"
-	rm -r lib/qt || die
-
-	# fix qt library path
-	sed -e "s:/usr/lib/qt5/plugins:${EROOT}/usr/$(get_libdir)/qt5/plugins:g" \
-		-i bin/mendeleydesktop || die
-
-	# fix library paths
-	sed -e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \
-		-e "s:MENDELEY_BASE'] + \"/lib/\":MENDELEY_BASE'] + \"/$(get_libdir)/\":g" \
-		-i bin/mendeleydesktop || die
-}
-
-src_install() {
-	# install menu
-	domenu share/applications/${PN}.desktop
-
-	# install application icons
-	insinto /usr/share/icons
-	doins -r share/icons/hicolor
-
-	# install default icon
-	insinto /usr/share/pixmaps
-	doins share/icons/hicolor/48x48/apps/${PN}.png
-
-	# install documentation, but no license file
-	dodoc share/doc/${PN}/Readme.txt
-
-	# install binary
-	python_fix_shebang bin/${PN}
-	into /opt/${PN}
-	dobin bin/*
-
-	# install libraries
-	dolib.so lib/lib*.so*
-
-	# remove qtconf and qt-5.10 workaround
-	rm lib/mendeleydesktop/libexec/qt.conf
-	rm "lib/mendeleydesktop/libexec/QtWebEngineProcess --type=zygote --lang=en-US"
-
-	# install programs
-	exeinto /opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec
-	doexe lib/mendeleydesktop/libexec/*
-
-	# install shared files
-	insinto /opt/${PN}/share
-	doins -r share/mendeleydesktop
-
-	# symlink launch script
-	dosym ../mendeleydesktop/bin/mendeleydesktop /opt/bin/mendeleydesktop
-}
diff --git a/sci-misc/mendeleydesktop/metadata.xml b/sci-misc/mendeleydesktop/metadata.xml
deleted file mode 100644
index 2f0528498efa..000000000000
--- a/sci-misc/mendeleydesktop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-Mendeley(TM) is a free reference manager and academic social network that can 
-help you organize your research, collaborate with others online, and discover 
-the latest research.
-</longdescription>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/sci-misc/oww/Manifest b/sci-misc/oww/Manifest
index ade477b528cb..cec83c5df817 100644
--- a/sci-misc/oww/Manifest
+++ b/sci-misc/oww/Manifest
@@ -1,2 +1 @@
-DIST oww-0.86.4.tar.gz 927032 BLAKE2B c8874d7ed8448a4e0a589c02936a0dc1e19121cc093f746ff2e74ce27fb05ea31ef82f1136ac5bfeb203bbdaf02497f8fd51f6934505ced039fad47b65b4fcdb SHA512 b97ddd164fe81848e87466992414c8382a0f681bd8f1e16fc51a43facb73f073eb6b0c1da858f4d2d1ffc09273b05b6c3b526a1ccf1d572dbbfd3bfcd0742e05
 DIST oww-0.86.5.tar.gz 926962 BLAKE2B 2309dc36f6ced4b131672d231079612e687a37df3529d93c9ef6d350e6d140138f87536dc4eeace290959466a6c2ee555287f8c07f4e4ca75e9643967dea9afa SHA512 cc787379790367eea02423f5213a8947de906d6ccdebb1b76e97196e0be9d9f86e77fbc402693588ae4d7db69968caa7bc9e97e8dfc9395bf420d9df51b28ba9
diff --git a/sci-misc/oww/files/oww-0.86.5-musl.patch b/sci-misc/oww/files/oww-0.86.5-musl.patch
new file mode 100644
index 000000000000..2d863a53164b
--- /dev/null
+++ b/sci-misc/oww/files/oww-0.86.5-musl.patch
@@ -0,0 +1,20 @@
+--- a/src/applctn.h
++++ b/src/applctn.h
+@@ -1,3 +1,5 @@
++#include <stdint.h>
++
+ void applctn_pre_init(int *argc, char ***argv) ;
+ void applctn_init(int *argc, char ***argv) ;
+ int applctn_startup_finished(void) ; /* Function to call in state_startup */
+--- a/src/ownet.h
++++ b/src/ownet.h
+@@ -42,9 +42,7 @@
+ //--------------------------------------------------------------//
+ #include <stdlib.h>
+ #include <stdio.h>
+-#ifdef __FreeBSD__
+ #include <sys/types.h>
+-#endif
+ //#include <windows.h>
+ 
+ //--------------------------------------------------------------//
diff --git a/sci-misc/oww/oww-0.86.4.ebuild b/sci-misc/oww/oww-0.86.4.ebuild
deleted file mode 100644
index 727aeedcfd17..000000000000
--- a/sci-misc/oww/oww-0.86.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
-HOMEPAGE="https://sourceforge.net/projects/oww/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls usb"
-
-RDEPEND="
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	)
-
-src_configure() {
-	local myeconfargs=(
-		--enable-interactive
-		$(use_enable nls)
-		$(use_enable gtk gui)
-		$(use_with usb)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-misc/oww/oww-0.86.5.ebuild b/sci-misc/oww/oww-0.86.5.ebuild
index 26ac6d31a4cb..d17d879daf5c 100644
--- a/sci-misc/oww/oww-0.86.5.ebuild
+++ b/sci-misc/oww/oww-0.86.5.ebuild
@@ -1,38 +1,41 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
 HOMEPAGE="https://sourceforge.net/projects/oww/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk nls usb"
 
 RDEPEND="
 	net-misc/curl
 	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.86.4-build.patch
 	"${FILESDIR}"/${P}-format-security.patch
-	)
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
-	local myeconfargs=(
-		--enable-interactive
-		$(use_enable nls)
-		$(use_enable gtk gui)
+	econf \
+		--enable-interactive \
+		$(use_enable nls) \
+		$(use_enable gtk gui) \
 		$(use_with usb)
-	)
-	autotools-utils_src_configure
 }
diff --git a/sci-misc/vitables/vitables-3.0.0-r1.ebuild b/sci-misc/vitables/vitables-3.0.0-r1.ebuild
deleted file mode 100644
index 065c449f606f..000000000000
--- a/sci-misc/vitables/vitables-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=ViTables-${PV}
-
-DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
-HOMEPAGE="https://vitables.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		dev-python/pytables[${PYTHON_MULTI_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# remove the PyQt5 dependency
-	# because PyQt5 in Gentoo does not provide egg-info
-	# see also: https://github.com/pyqt/python-qt5/issues/18
-	sed "s:'PyQt5 [^ ]*::" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}