gentoo new year resync : 01.01.2021

5 files changed, 94 insertions, 39 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index cf49f30f5f20..03b3434228d6 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest
index 6d6759d716e9..1c7c3a3af8c6 100644
--- a/sci-misc/cdfplayer/Manifest
+++ b/sci-misc/cdfplayer/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD cdfplayer-11.2.0.ebuild 2120 BLAKE2B 4020500bd8bd2032fae3c12c8afb2000449f0e4e3fe7b2ce6567d193b1b0f27796fb7b7b755151d8d68ffbd1740d21ccdaa1cb666ee21e0d7a0e432d6718580e SHA512 c2a569b65ee170725b7ee491c5210d90b79a956939d7558f53f55bc34d413e4f0a9d8cd88eb4290ae410898e9003895a99c42d7544c2df4da8978e9822e6ff56
 EBUILD cdfplayer-11.3.0.ebuild 2610 BLAKE2B 3d915c6a1ce66a16bc109c14bfbcebc9cd8720a78218b32f2d5cad45931ed3f8094a838242438dcedee6f53fd5f028dd4de664ec892264e853da073946887a04 SHA512 adfea102aa519a56a62955d60db6aeb5dbbaeea806c6d6dbf55c80c75e0318ca0dffc3ff4c64ab93c48e996196733c3fdab4e73bc7fc3ff2b7d31b42b8f422d6
+EBUILD cdfplayer-12.2.0.ebuild 2422 BLAKE2B 2797e5a868784a1ea474ba9fffe79c1dbf8716eff82b1f008d8592bbfd0fd4fc42dc7223612c8bf305074320eaaba954e8db40829e1c0a12dc2f6ae2aa2cc73f SHA512 ac9b485f118c266bedfc5cc855a40fa94840fea8830767f12ab24d2f57f78bd3fcc548bb944813cc819297bf50160d6854a43bc33f4462ca9c1fd325c9256737
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
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..6120fae9e88b
--- /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="http://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/vitables/Manifest b/sci-misc/vitables/Manifest
index c1a381a83029..c2eecfdd1949 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,4 +1,3 @@
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
-EBUILD vitables-3.0.0-r1.ebuild 929 BLAKE2B cba4e7d580c20ae6437853725346565f342439d084e79eb3dedc1e44714d178233149533c72853db85bffca292cf8cfd1d641e24a9a02577b4cffc3a40649b1d SHA512 9f927980f5a336b867506d1d89c1658f87d90431023f2ac7eebf1e69184c993c64386b69329741620aa7c032c7a1f1d2601093f51698d5c1ffe970fcff5c7b3f
 EBUILD vitables-3.0.0-r2.ebuild 911 BLAKE2B 8ac5c65cb405fc850ef853d71e59c360ad05825edfbb4dae45987b8ff3b56b9f75030ce95f068905724eb92d35b71f40628fbda17828f5d8f91a8a289ecaf238 SHA512 937682cb77303a5458f8e25ee010f7d7f64f5b922c4b413dab2eb958af970be7d92b021c87100c06c178fa5659fb043490a7137798f678999f4cc02cb9601bf2
 MISC metadata.xml 637 BLAKE2B 5de3507f0c14fd0a8af230464a40a60f861433cddea38ea9490a00477f7677045845e48465d1684b0e93cc94ad6423b416e4993aabc23c793114c70365f514c6 SHA512 3e891f2f726db29eb10ae7f26e4dd30abeb8cc3d251b119c226cccfa6ca8fc90311dae6b96acd810e95423674fb57017cae938f48e213d4a873da2d9e9ee7789
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 a39e483b2048..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 )
-
-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
-}