gentoo auto-resync : 08:08:2022 - 20:14:39

7 files changed, 391 insertions, 7 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index caac2d43de6f..65dfbd464d9b 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest
index 029c7c5ee8e4..61a0cba30335 100644
--- a/sci-mathematics/mathematica/Manifest
+++ b/sci-mathematics/mathematica/Manifest
@@ -3,9 +3,14 @@ DIST Mathematica_12.1.0_LINUX.sh 5889770327 BLAKE2B b0e637714f376d4066d5e484ef9f
 DIST Mathematica_12.1.1_LINUX.sh 4438946649 BLAKE2B 473f814a3e0686bb3a6ac1f49c887842bc17db11439b65c1dad1dae8cd5797e6762d94bccdf156f6f9ba1edb9a16ed5172936a6884d2f0f98c29808214b1eabe SHA512 5cfdd91bae9bad53afe405b40759732589119256c3f785058808b20faf21f593d90bf7bb2dbaccf3e983aa84ff380a1fa6d40fd63f5ba17109c1cd6818c63490
 DIST Mathematica_12.2.0_LINUX.sh 4454613844 BLAKE2B 03b0567afe001fd0781ea6daf0f23ccaccf44ed6ce225cc190239d228c684099a1fa1070cedc0c5bf1517804a4b8b34903d56b2b028392895437a304b56f682d SHA512 0b98d0f2a15ea834892897a64089da08bee5783a8a51b1a0e624618105c896c91c865cca5b5c7b8e72569a5065ef091be7138b7d72d94e4697a213a91d5b8770
 DIST Mathematica_13.0.0_BNDL_LINUX.sh 5118155611 BLAKE2B ff15a9def53f7fb808b117ecf2573f415b928c13a86d15634e6282c8f8542b32fa42ff76baeac95faa1242dc4350b0db28231c5cb7f36bc5b57425c2804bf996 SHA512 05008559c531a6920745d0047be0f2c42cb6994309db3f2ee2ad44151655f43d88de063a4952c5ac5544818e2da8973305ee46f44e74d7301da21cdf710cbd5b
+DIST Mathematica_13.0.1_BNDL_LINUX.sh 5094982487 BLAKE2B 55375b6038422fd5f11db36b33bc1162064c8d6a88575c982ce53b15678bf7b19dc62d66336b2105cbaa18a7fe86ba64f09db40e494c15d558f3ebd92ea025fe SHA512 cf4106202dfcf290f0dbe9e8062457eb705c2802f608e60f2810fc31e166ab60b5726c0c9bf675fadb02f5628af1dc2d25db8d02119dc63381eef8a88cdb6ec6
+DIST Mathematica_13.1.0_LINUX.sh 2032362325 BLAKE2B d044fe1ed3c71e6ebc2357c440af6feaeb360962aea32843abbdfe40f124a29bd07bf0c3a5a35f8bac29c97a7d23dbcd79967b6d0028d01e09c9b662fc1f2b95 SHA512 3d84313be4da86d72cc652b0ec7dbbbf6d815debbde4c9ab855f447dda36aeccb416e90d298f0be975ae86fdf55f20aa7597b0d96d291ebdf6e4eb0dc2ca5433
+DIST WLDocs_13.1.0_LINUX.sh 3546448755 BLAKE2B e5dbf6bf9cd60a313329df8591c281215039d7efa7c83a53f3b2d4e176765b62efae3ff04628ecf6905e76bbaf6867e87c96bd6188d13df2b981bea5a633335a SHA512 2107b37b30fc76974d040e746ca26ddb5df23bbacb9d8fabcd546a7cf789f1daaf70179c53890bed2385430665f601fbbc1f9829bf64f61068909ea8774f91d2
 EBUILD mathematica-10.3.1-r1.ebuild 2821 BLAKE2B 958869840413f275d50272636693c776ac399cc14401d21d8709aab81ec23f396b0407618b787a4c04fe5a70327c604bef81735f6fcdeb8cbbaf6b74cf387172 SHA512 ac52970098b31e2e1a72d50dffc0db3cfe67c68eed8272b1d78febe5e47eb514b333c23a9c5f7030bb606f937106b5a237818d9ab829779533e33f5459d2aeb2
 EBUILD mathematica-12.1.0.ebuild 3134 BLAKE2B 4a8f269cfb1d77dd941dfab8c56dc310306aea75fd6d676f2e79a1208420c25161afef7e253c101763d57a441480403580dbb62b31b420f6dbce3f7cfa786fc8 SHA512 cf14b8567a9dc6bd7f19447cb9d277c929084abf20bf073c4d9aa049e1795ddba0862f43340bfbb37d2633d84e7b5adfe4a3123554fd62bc55c018394177a2ee
 EBUILD mathematica-12.1.1-r1.ebuild 3134 BLAKE2B 4a8f269cfb1d77dd941dfab8c56dc310306aea75fd6d676f2e79a1208420c25161afef7e253c101763d57a441480403580dbb62b31b420f6dbce3f7cfa786fc8 SHA512 cf14b8567a9dc6bd7f19447cb9d277c929084abf20bf073c4d9aa049e1795ddba0862f43340bfbb37d2633d84e7b5adfe4a3123554fd62bc55c018394177a2ee
 EBUILD mathematica-12.2.0.ebuild 3135 BLAKE2B 782b070347eea963fc8e59799f2b971649014518947cbd0f0b8a602d7c2f7fad3aaf1b66ada9db3e20ff255a833cf8909a5a819912ddf6f7a72bc85440221089 SHA512 6e8348a8b7fdde48be0ee851ecf89445dffad1d63ece74485c04404c662384f72fad918278ffd88893e3b1ec5084c6a4072b6f9b1e8d71babe8abe59383ff480
 EBUILD mathematica-13.0.0.ebuild 3140 BLAKE2B d9e0fbdb71a760470783cbab6ef2a333682d968bfa60d062068d351b8ff9e4f4a574286ee9cd80241998b037ee76d2e366f398ae20fc59f8ba6a0bb3f4998596 SHA512 67ebf9553163e8518daea7fee095345b26a7f20ca204101e796117d84b937c4e11c5d7953fdd7682ffd2606a5af4164e03ca630e51bcfabca934c28db26fb853
-MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
+EBUILD mathematica-13.0.1.ebuild 5421 BLAKE2B 27b1943495659b3bf64097f9f3c7ce7ab6022fea3c3661e38a4e18ceb8d427862c1d9af7c4ee37cd0b6340f2045d35b1e71e2f32685fcb945e7069b6b1970efc SHA512 d27f8af6092dee45b5ef094af55f187b79d028b3029f5e9a7b664a4f5392baab166de3dda0fbf15a20d749046d0e68f71f2257dc265b2c36ff2ef8b1b0dfabc7
+EBUILD mathematica-13.1.0.ebuild 7044 BLAKE2B 6411bceb04e19d939c7ac4287f37ecaf20add4cfb49edb4f4caac3ea1cd8eb706a59e42a60640002024f511036ab0f12b5ffd0caf02c9bf5627bb2c653e559ad SHA512 296c74dc0c2be909a1b029eae0a1fdab89f541443417d9e85a35d5623ae366300491c25f0a62208291870b540257d9ad7c8768b0aa6df9b8f7a4301ef3940d02
+MISC metadata.xml 1188 BLAKE2B 41bb4d62fbe49dcf4da86e9e263aa16089a261a141f6fb749319898be09706d1ef0e353ccdb2c5766f8bdd2aa892c7ecbdac20c38b1f1c5a8bce62796a6ba89d SHA512 59775f53f72417c0f5960984e1e7c9098734b9595a16a796e188a58e4118a350a3fddbb03d1aadf80ad7cdd40707946e38a57c321e2c5643ab5dbf9f0055ecaa
diff --git a/sci-mathematics/mathematica/mathematica-13.0.1.ebuild b/sci-mathematics/mathematica/mathematica-13.0.1.ebuild
new file mode 100644
index 000000000000..128562af249c
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-13.0.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=19G
+inherit check-reqs desktop unpacker xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="Mathematica_${PV}_BNDL_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE="cuda doc R"
+
+RESTRICT="strip mirror bindist fetch"
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+# RLink (libjri.so) requires dev-lang/R
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	media-libs/freetype
+	R? ( dev-lang/R )
+	virtual/libcrypt
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	dev-util/patchelf
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(ver_cut 1-2)
+M_BINARIES="MathKernel Mathematica WolframKernel wolframscript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --keep --target "${S}/unpack" -- "-help" || die
+}
+
+src_prepare() {
+	pushd "${S}/unpack" > /dev/null || die
+	# fix ACCESS DENIED issue when installer check the avahi-daemon
+	sed -e "s|avahi-daemon -c|true|g" -i "Unix/Installer/MathInstaller" || die
+	/bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
+	popd > /dev/null || die
+	eapply_user
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation" || die
+	fi
+
+	einfo 'Removing MacOS- and Windows-specific files'
+	find "${S}/${M_TARGET}" -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -o -name Macintosh -\) \
+		-exec rm -rv {} + || die
+
+	if ! use cuda; then
+		einfo 'Removing cuda support'
+		rm -r "${S}/${M_TARGET}/SystemFiles/Components/CUDACompileTools/LibraryResources/Linux-x86-64/CUDAExtensions.so" || die
+	fi
+
+	# Linux-x86-64/AllVersions is the supported version, other versions remove
+	einfo 'Removing unsupported RLink versions'
+	rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/3.5.0" || die
+	rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/3.6.0" || die
+	rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux/AllVersions" || die
+	if ! use R; then
+		einfo 'Removing RLink support'
+		rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/AllVersions/libjri.so" || die
+	fi
+
+	# fix RPATH
+	while IFS= read -r -d '' i; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		# Skip .o files and static files to avoid surprises
+		[[ $(od -t x1 -N 4 "${i}") == *"7f 45 4c 46"* ]] || continue
+		[[ -f "${i}" && "${i: -2}" != ".o" ]] || continue
+		[[ "$(file "${i}")" == *"dynamically"* ]] || continue
+		einfo "Fixing RPATH of ${i}"
+		patchelf --set-rpath \
+'/'"${M_TARGET}"'/SystemFiles/Libraries/Linux-x86-64:'\
+'/'"${M_TARGET}"'/SystemFiles/Libraries/Linux-x86-64/Qt/lib:'\
+'/'"${M_TARGET}"'/SystemFiles/Java/Linux-x86-64/lib:'\
+'/'"${M_TARGET}"'/SystemFiles/Java/Linux-x86-64/lib/jli:'\
+'$ORIGIN' "${i}" || \
+		die "patchelf failed on ${i}"
+	done < <(find "${S}/${M_TARGET}" -type f -print0)
+
+	# fix broken symbolic link
+	ln -sf "/${M_TARGET}/SystemFiles/Kernel/Binaries/Linux-x86-64/wolframscript" "${S}/${M_TARGET}/Executables/wolframscript" || die
+
+	# move all over
+	mv "${S}"/opt "${ED}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${ED}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}" || die
+		echo 'QT_QPA_PLATFORM="wayland;xcb"' >> "${T}/${name}" || die
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1:/$(get_libdir)/libcrypt.so.1 /${M_TARGET}/Executables/${name} \$*" \
+			>> "${T}/${name}" || die
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	for filename in $(find "${ED}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica*.desktop") ; do
+		einfo "Fixing ${filename}"
+		sed -e "s|${S}||g" -e 's|^\t\t||g' -i "${filename}" || die
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" || die
+		domenu "${filename}"
+	done
+
+	# install icons
+	for iconsize in 16 32 64 128 256; do
+		local iconfile="${ED}/${M_TARGET}/SystemFiles/FrontEnd/SystemResources/X/App-${iconsize}.png"
+		if [ -e "${iconfile}" ]; then
+			newicon -s "${iconsize}" "${iconfile}" wolfram-mathematica.png
+		fi
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${ED}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}" || die
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/mathematica/mathematica-13.1.0.ebuild b/sci-mathematics/mathematica/mathematica-13.1.0.ebuild
new file mode 100644
index 000000000000..577553f186a1
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-13.1.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=19G
+inherit check-reqs desktop unpacker xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="
+	doc? ( WLDocs_${PV}_LINUX.sh )
+	Mathematica_${PV}_LINUX.sh
+"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE="cuda doc ffmpeg R"
+
+RESTRICT="strip mirror bindist fetch"
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+# RLink (libjri.so) requires dev-lang/R
+# FFmpegTools (FFmpegToolsSystem-5.0.so) requires media-video/ffmpeg
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	media-libs/freetype
+	ffmpeg? ( media-video/ffmpeg )
+	R? ( dev-lang/R )
+	virtual/libcrypt
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	dev-util/patchelf
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(ver_cut 1-2)
+M_BINARIES="MathKernel Mathematica WolframKernel wolframscript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/Mathematica_${PV}_LINUX.sh" --nox11 --keep --target "${S}/unpack_app" -- "-help" || die
+	if use doc; then
+		/bin/sh "${DISTDIR}/WLDocs_${PV}_LINUX.sh" --nox11 --keep --target "${S}/unpack_doc" -- "-help" || die
+	fi
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	pushd "${S}/unpack_app" > /dev/null || die
+	# fix ACCESS DENIED issue when installer generate desktop files
+	sed -e "s|xdg-desktop-icon|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die
+	sed -e "s|xdg-desktop-menu|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die
+	sed -e "s|xdg-icon-resource|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die
+	sed -e "s|xdg-mime|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die
+	# fix ACCESS DENIED issue when installer check the avahi-daemon
+	sed -e "s|avahi-daemon -c|true|g" -i "Unix/Installer/MathInstaller" || die
+	/bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
+	popd > /dev/null || die
+
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation" || die
+	else
+		pushd "${S}/unpack_doc" > /dev/null || die
+		/bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/temp_doc" "-execdir=${S}/opt/bin" || die
+		popd > /dev/null || die
+		# Merge contents of Mathematica_docs with Mathematica
+		rm -r "${S}/${M_TARGET}"/Documentation/English/{SearchIndex,System} || die
+		mv "${S}"/temp_doc/Documentation/English/* "${S}/${M_TARGET}/"Documentation/English/ || die
+		rm -r "${S}"/temp_doc || die
+	fi
+
+	# fix world writable file QA problem for files
+	while IFS= read -r -d '' i; do
+		chmod o-w "${i}" || die
+	done < <(find "${S}/${M_TARGET}" -type f -print0)
+
+	einfo 'Removing MacOS- and Windows-specific files'
+	find "${S}/${M_TARGET}" -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -o -name Macintosh -\) \
+		-exec rm -rv {} + || die
+
+	if ! use cuda; then
+		einfo 'Removing cuda support'
+		rm -r "${S}/${M_TARGET}/SystemFiles/Components/CUDACompileTools/LibraryResources/Linux-x86-64/CUDAExtensions.so" || die
+	fi
+
+	# Linux-x86-64/AllVersions is the supported version, other versions remove
+	einfo 'Removing unsupported RLink versions'
+	rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/3.5.0" || die
+	rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/3.6.0" || die
+	rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux/AllVersions" || die
+	# RLink can't use if R not used
+	if ! use R; then
+		einfo 'Removing RLink support'
+		rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/AllVersions/libjri.so" || die
+	fi
+	# FFmpegTools can't use if ffmpeg not used
+	if ! use ffmpeg || ! has_version '>=media-video/ffmpeg-5'; then
+		einfo 'Removing FFmpegTools support because lack of >=media-video/ffmpeg-5'
+		rm -r "${S}/${M_TARGET}/SystemFiles/Links/FFmpegTools/LibraryResources/Linux-x86-64/FFmpegToolsSystem-5.0.so" || die
+	fi
+
+	# fix RPATH
+	while IFS= read -r -d '' i; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		# Skip .o files and static files to avoid surprises
+		[[ $(od -t x1 -N 4 "${i}") == *"7f 45 4c 46"* ]] || continue
+		[[ -f "${i}" && "${i: -2}" != ".o" ]] || continue
+		[[ "$(file "${i}")" == *"dynamically"* ]] || continue
+		einfo "Fixing RPATH of ${i}"
+		patchelf --set-rpath \
+'/'"${M_TARGET}"'/SystemFiles/Libraries/Linux-x86-64:'\
+'/'"${M_TARGET}"'/SystemFiles/Libraries/Linux-x86-64/Qt/lib:'\
+'/'"${M_TARGET}"'/SystemFiles/Java/Linux-x86-64/lib:'\
+'/'"${M_TARGET}"'/SystemFiles/Java/Linux-x86-64/lib/jli:'\
+'$ORIGIN' "${i}" || \
+		die "patchelf failed on ${i}"
+	done < <(find "${S}/${M_TARGET}" -type f -print0)
+
+	# fix broken symbolic link
+	ln -sf "/${M_TARGET}/SystemFiles/Kernel/Binaries/Linux-x86-64/wolframscript" "${S}/${M_TARGET}/Executables/wolframscript" || die
+
+	# move all over
+	mv "${S}"/opt "${ED}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${ED}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}" || die
+		echo 'QT_QPA_PLATFORM="wayland;xcb"' >> "${T}/${name}" || die
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1:/$(get_libdir)/libcrypt.so.1 /${M_TARGET}/Executables/${name} \$*" \
+			>> "${T}/${name}" || die
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	for filename in $(find "${ED}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica*.desktop") ; do
+		einfo "Fixing ${filename}"
+		sed -e "s|${S}||g" -e 's|^\t\t||g' -i "${filename}" || die
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" || die
+		domenu "${filename}"
+	done
+
+	# install icons
+	for iconsize in 16 32 64 128 256; do
+		local iconfile="${ED}/${M_TARGET}/SystemFiles/FrontEnd/SystemResources/X/App-${iconsize}.png"
+		if [ -e "${iconfile}" ]; then
+			newicon -s "${iconsize}" "${iconfile}" wolfram-mathematica.png
+		fi
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${ED}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}" || die
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/mathematica/metadata.xml b/sci-mathematics/mathematica/metadata.xml
index 71a5bee94e5a..3e0af950b15f 100644
--- a/sci-mathematics/mathematica/metadata.xml
+++ b/sci-mathematics/mathematica/metadata.xml
@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Wolfram Mathematica is a software system with built-in libraries for
+		several areas of technical computing that allow machine learning,
+		statistics, symbolic computation, data manipulation, network analysis,
+		time series analysis, plotting functions and various types of data,
+		implementation of algorithms, creation of user interfaces, and interfacing
+		with programs written in other programming languages.
+	</longdescription>
+	<use>
+		<flag name="cuda">Install with cuda support</flag>
+		<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
+		<flag name="ffmpeg">Enable <pkg>media-video/ffmpeg</pkg> backend support</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index dca63455ee69..bb4877f7956a 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,6 +5,6 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
-EBUILD pari-2.13.4-r1.ebuild 3282 BLAKE2B c509b6a41a501e54e5004110c49b83c6811d49883d089be2a1b077376b15dde11bcd13749a7544482db577ef1830b3c3ce26a30c9cc4eb824d5db4b1bafed099 SHA512 0c4e271e1486c58686f060589a6c331e48b3501f448665d9aee9a1cae027172ce585da1320a87e141db714fb9f8c54679be72c34ae365b930f0f041edd43b350
+EBUILD pari-2.13.4-r1.ebuild 3672 BLAKE2B 1bfb79d530f7e2af624c817e4d3cc53a33b7af278c891b5c1deed6a5ba55c9275e945bbd70448f821a2ed238a109312d10d954db9b7c22bc7768ce635982d4c0 SHA512 e3cf5a1241d7edefac1b1a22343f8865ef7251ac369ec439c1261e90cd5cdb6eb0576b70ee4a54f6807189568fc8a287baf6b30b22f6ee206514ab49a25488bb
 EBUILD pari-2.13.4.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.4-r1.ebuild b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
index 0f105d54107a..a3404e9b1593 100644
--- a/sci-mathematics/pari/pari-2.13.4-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +48,15 @@ src_prepare() {
 		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
 		-e 's:"acroread":"xdg-open":' \
 		doc/gphelp.in || die "Failed to fix doc dir"
+
+	# These tests fail when LaTeX is not installed (which we don't
+	# require without USE=doc), most likely due to output formatting
+	# issues but I haven't deleted my LaTeX installation to check.
+	# There's no real upstream support for enabling/disabling the LaTeX
+	# docs, so this is probably the correctest way to skip these tests.
+	if ! use doc; then
+		rm src/test/{in,32}/help || die
+	fi
 }
 
 src_configure() {