gentoo resync : 22.01.2021

15 files changed, 195 insertions, 549 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 8d0aef73b278..c30bb5a1ee36 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/ViSP-images/Manifest b/sci-misc/ViSP-images/Manifest
index b69ae4a80f60..50d723e8e988 100644
--- a/sci-misc/ViSP-images/Manifest
+++ b/sci-misc/ViSP-images/Manifest
@@ -1,5 +1,3 @@
-DIST visp-images-3.2.0.zip 84366211 BLAKE2B a0cb17bf7e79ed187a40f229b236e83127bd449f48a4046c21235f6f6cd37b25a324ba74c1337a110b91a42789249e71ce86fc2fa81e1573733db1bf4fff1cc5 SHA512 1249f63ca648e0248d6dcc13ae19a8485d347c90f3f929d4725909ec1b25962f58a999e8feed664ed51ccba9a3ba95a184385aabd0a5aef88f118dbb2a020c14
 DIST visp-images-3.3.0.zip 91291914 BLAKE2B e2c893303401e5facf52bff847785a155d3f990f8fc149ef1003b0bd1609b7740cea41bc5a24ed64bc0eefe23b02587cd6bfcd2d3303bbd84941d36f108da587 SHA512 d0f4c7f10a36f4aa365bd7bf65d35941755d429331c5f28b7731faa0c01c66fe9ab9137403c90cc0b3fb7b718553da69acdb3e9309c9bff14be7981a726bb41f
-EBUILD ViSP-images-3.2.0.ebuild 547 BLAKE2B e8a9da04ebb39e8bb5140d5be1ccf87b507f79e830fa94c2be74ca43d1f7e194c7dfd47342f832398e60338a03d1647d8d838be9d5f1368d6ffd1b6b343f2f7f SHA512 6ac2b1294ab67aa5379e0834b2e6df45a29eab46d7e79d55b2044ee9ddda11daee387277b933031d12c09f4765b560892730748fc5d2328bf862a75a1a38b01e
 EBUILD ViSP-images-3.3.0.ebuild 547 BLAKE2B 354dd4b474be45c9d255ae6cf4ed5e612582ef81b7a55560c5b70a2ac724edc3f25b0d95ebd8c85e940e75ed29f188eae4a2b889437c532be8411d2b3a8cb37c SHA512 b08d416c70908cef248f4828085eb3fe718d2e0f3a564f6fb117eb245b6353b08dc1380e5afe57fa468b62836616546afe8bdaf4bb6b8972c2b28161215f6549
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild b/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
deleted file mode 100644
index ff0ecbb3bdf4..000000000000
--- a/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="ViSP images data set"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/"
-SRC_URI="http://visp-doc.inria.fr/download/dataset/visp-images-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/visp-images-${PV}"
-
-src_install() {
-	dodoc README.md
-	rm -f README.md LICENSE.txt
-	dodir /usr/share/visp-images-data/
-	mv "${S}" "${ED}/usr/share/visp-images-data/${PN}"
-}
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 26de4aa36ce3..186974695b56 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,15 +1,15 @@
 AUX 7.10-fix_xlocale.patch 1715 BLAKE2B 3e221d1c496e3438dd8d86506f76fc269b994c876f47c9b5de04abf0c683d240af683d75dfe09e744db82cdd5ebcb94cf9426c37a9202a49db600b320e78acdb SHA512 c24f8a3289950ef04daaa2c2523171c5e53c26c50238f777fe683c2a45b9a6f0f50db3f9f7150a7e50fc7b4a5df97289c6b6d048310e9436ca420d78c1ef020f
 AUX 7.8-fix_xlocale.patch 1944 BLAKE2B 5e54790ccf9208077db9d50ccb8fb536b68700e68a61361664a106d0bae2517105b57d2f65a8314edb129d13703a9617c273a4f6a1ee4172c98eb3697822e560 SHA512 c2d63f8d22cbbf37c5ac6d4c232943a5ddfd151e8854344729bd3b171be74d21fb8af825b26939f221eac929a7faa0d979968c6f1d6189ea6b1fe77dac6c7e74
+AUX boinc-7.16-fix_webview.patch 381 BLAKE2B 7f08c46014c4d39457b0695ef07dc7f91ceaf9e86cf6cd5ec26596d90a4f222b797d4e0094676331699c49c5837d4b9b460438374394885a30a30838a9085742 SHA512 fe624bce3b4dd13b48080dc97b7165cca1d491db4f95bc1bdb5de8a64bbbcefca4c72a859dbb85c47128f2972a7530c9e273fba8dcbc7f47b8ed360026443c49
+AUX boinc-7.16-remove-usr_lib.patch 3195 BLAKE2B a13960c4c8376b7c6324b117415c76460aebf2a16fcbdcd98681fd915a2286578416b6c3d0e7012b6dd1cd79864563a213778a35f53380607aeeffd7b4c277d6 SHA512 09ad49f40804030d48abc8f7f1f2950358ebdaa4ca49dc1bd426efd24ff99912f776c7015676a7883c4b210eb6263ab4ba4d45cb0e60facafa9c1d17b4d13f1f
 AUX boinc.conf 524 BLAKE2B 58ab78fe971d1da159b35b718e4078565d0f07925d55ab02e5dddafe2c674e227dc75f81c5971d5671fd97dc2d42aba42f8da0536c056ed07c993e3d6e543672 SHA512 60091e8ff96a07fd9bf508cb295f97be280a4c64d0dbefb88414c86bb193ead72c25dd085d20105b616be5e94dfd5aaf3f5b35fa6b6ce2adf09e38996f1f67b0
-AUX boinc.init.in 6144 BLAKE2B 1391b4b8da0327c471f268712287c58fe6efbc8809e971f31abf269f62066f817a7fa1235afa2c192a0328ed5a3a57629e24ccd14a686ea14fc038aa735621b9 SHA512 be57013b24d4cf7a140890d70e08f8113560a88c000c7f42ea0da0c4d6b5207a25f10fb08cb3f42ec02ea8d0697e2e108e8a4f2276b30554197b214a70f98697
+AUX boinc.init.in 5362 BLAKE2B fbf7a49b276649fe15e41239fa730298de4170038bc8c8cc81f45a445240e5c434d582877569cb878e67d57b1d9ff31253e02c67cceac954d8c9be9facd88e25 SHA512 194ae8c0a8e36c66d7af584b1bf7de2af4276e1117f9d55036068e11c98b1d840cc07c0181823c196ea9aa746470e4a9bfd6e91df13ba88afb4be0a2db284688
 AUX boinc.service 178 BLAKE2B daec610c2e2cff3e4d37b3cb1964e80b85910dec838268bdf03477f1a8b00b19c6a36853f73640575006a219b95983b00bdc12c0486ef8494af4286053d8c058 SHA512 86a59b9096b19e6472781cb2a7229dd0540569666bcb5bedd83371e6264f1d6bee70e8b47216e1a5b6462726dcd3b54d86ba8de4478faab6c1792071b76abaf9
 AUX fix_webview.patch 413 BLAKE2B cd33a6a72395d2c43b7126d4999d11102548184cd22a2b5b6e5035029b788aa4d7bb178d1360d6d81c472500da95d7f1ba77cb1e1e5f5510789a9ae61ff3d0cb SHA512 71f34c4211b28dfdf6837bee64cbf966abf4129109b23a8d05af1d5c3a9f7a5026aa7d88df9a7a646337ee8cad53f42235b9a5a8e43d3074def4c9319c8fb785
 DIST boinc-7.14.2.tar.gz 52236336 BLAKE2B fa97d3af9e9a650db409b24386e7950369ab2247469cd83d717d1b6dccb7952a0997763dad2285532cef6807f0460eb320edb3a162b6b20a70bae12159ec6b7f SHA512 dcb6d60893e8baad6282d5e4728387352e942375d988df9c2ad00022deaa9bc5ace967a1346e1b43b25342d2e477ab42e28640935d94e6950ee3716732c9c1af
-DIST boinc-7.8.6.tar.gz 52037690 BLAKE2B 21d356488d8ea7e665f1b47e8ef0a0055d8b1a11e6e2aeea0b0ee7839fc7c0498b97ff9bc0183cd7391b5c86590ffc8234d823a743688a833ffcbe83797fd679 SHA512 e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997
-DIST boinc-7.9.3.tar.gz 49628586 BLAKE2B a053645f5e5c41610863c19be028963fb2e92fc0015b9df5377e734af968f1a70e4913cdc2052fd4a396dd1a9a782464e3ffc96a4b59a166f25c387de4c30d6d SHA512 d85880ec8e58d53af2cc5c9e357a29fbefe149450f33dea6fed5847b8e8c8bd9c9c5a309180c801c77fbedd740ebef83c1b410e8bc514e35fe210af57552bad5
+DIST boinc-7.16.14.tar.gz 49623696 BLAKE2B dde4163040d122cf4707e4747b18120f64c31af5ea4ca778709d9dd3c2fb019eb10ecb6ee367b73ea245cb5ed93bac710f268db2e0408b32120c750915473575 SHA512 9315cd8344571ac64eecf12676a2d3d6c021577ecee7a92eff253185f7ddf5bf4d64503a819c625afafd258ad28c3879839016c431aa3099083a90194c7e6454
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
 EBUILD boinc-7.14.2.ebuild 5782 BLAKE2B 8ce02661efe8bf9abce4b42e913a954d1eeacddf34ba4460c58a901d9d44e4a33312abf4cf722ed515724b4642637e880d4feec3e407369b669500722c8c0df3 SHA512 d758601742d515275a972e0098bfc145ab86754230d5765e465f0bff83f1b28321c88f61964deeb0d6bf54183be5019f78b80aaf3bf0b63497e78bbd1afafb50
-EBUILD boinc-7.8.6.ebuild 5899 BLAKE2B ee3c8221383a367c2cb603dd149212071c9face092786f8384e0df4b4f26856313e05a6f09ea667b4c983c1170ba6beb6dafd2ca92afe4e89b56e6270c01b006 SHA512 9c3af948037412f3acc7ebbb56796f9016534edb1c5cab0b70d2c07a2efeb82ac3ced6d3be789e8152417d76e9260394caf08392c9237cd9fc7fa5a8c526f3be
-EBUILD boinc-7.9.3.ebuild 5853 BLAKE2B c4b5a5ffc46018771a0e4f271d15e37441649b34d17a7ebce5fb96f88fb1d4abaa531c16716e30cf08c58b041b2c9b81c0fba2243ccf788f4f44f575476227ad SHA512 556641e862bcd4a856e4e6049bdee40e8aff827d9331abacd14254dfa454d840305a0437b6527ac258f594a01b0d151568759b182f143c701e83ace0685772ab
+EBUILD boinc-7.16.14.ebuild 6133 BLAKE2B 59560501884107e1ae84d5e71eca25d497c28ab575bf16e47146076a89cf2e75456024c997e57d677c667a43a630b0bebb98e8b16200679129360b347596a3a2 SHA512 5923f6dc9cd8f08f2af2ec0b9af0ddb3d840da40dc18c6fcba5834dba6ff6e3e897968c6d34afc7631db6c1bb554232761b55d6038bcb45f412eefeef4d75da1
 EBUILD boinc-9999.ebuild 5775 BLAKE2B efcbe217af056adecd6eb57babcddf0d293dd1f4840f9e5ebd5d9a19be1be70062e018970eedcd80dbe1061f12470e7cccbd6a9fc9489a328d23655a428c4b14 SHA512 bad0b54ec38d8a93e5e6335697b432c0343118076036678c6d9fece70d0030030b20f50260b3059406292af69c35fea065f559d1aa221b095976376f74a08b8b
-MISC metadata.xml 767 BLAKE2B 06b9425b2448a1eca7fc2921feb26a709ee9ddb932d7647d1685ec4966c0afa55f4990408075a84f739874a12f875be242315ea45018290e58f5bbe2ee54d84c SHA512 18071a452ef64ba0f2b55df5c99d00a6d30c7b796059143d94a461c1f2931f8cdd237953f9ddfaa0c972ab150b3bf900f296379af6e45422f6f2e0b00053e68e
+MISC metadata.xml 982 BLAKE2B 802fec4f5f453f999c555df5fbda885038f196e55f4aa361f7d1882d0f82ff712f23eed02c1f73bbea9346ab17563b89b6f43c9f82ad0b681a2c1ad4df4012ea SHA512 5f54438d25a50feb86aa3e932c12a8d40f7c9470bfad04d7b3b8d13386bc66f95f0ad6d8417a27dd6ad7d19aa6a9f6c96bab8578a006f788388c6194ffea28f3
diff --git a/sci-misc/boinc/boinc-7.9.3.ebuild b/sci-misc/boinc/boinc-7.16.14.ebuild
index 784d06069db1..904a85356413 100644
--- a/sci-misc/boinc/boinc-7.9.3.ebuild
+++ b/sci-misc/boinc/boinc-7.16.14.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_PV=$(ver_cut 1-2)
 WX_GTK_VER=3.0-gtk3
 
-inherit autotools eutils gnome2-utils linux-info systemd user wxwidgets
-
-MY_PV="7.10"
+inherit autotools desktop linux-info systemd wxwidgets xdg-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz
-	X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2.1"
+HOMEPAGE="https://boinc.ssl.berkeley.edu/"
+
+SRC_URI="X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/BOINC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
+fi
+
+LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
 
 REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
@@ -25,6 +30,8 @@ REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
 # libcurl must not be using an ssl backend boinc does not support.
 # If the libcurl ssl backend changes, boinc should be recompiled.
 COMMON_DEPEND="
+	acct-group/boinc
+	acct-user/boinc
 	>=app-misc/ca-certificates-20080809
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-2.1
@@ -38,8 +45,13 @@ COMMON_DEPEND="
 		media-libs/freeglut
 		virtual/jpeg:0=
 		x11-libs/gtk+:3
+		x11-libs/libICE
 		>=x11-libs/libnotify-0.7
+		x11-libs/libSM
+		x11-libs/libXi
+		x11-libs/libXmu
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
+		virtual/jpeg
 	)
 "
 DEPEND="${RDEPEND}
@@ -54,13 +66,11 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/fix_webview.patch
-	# xlocale.h was removed in modern glibc, bug 639108
-	"${FILESDIR}"/${MY_PV}-fix_xlocale.patch
+	"${FILESDIR}"/${PN}-${MY_PV}-fix_webview.patch
+	# bug #732024
+	"${FILESDIR}"/${PN}-${MY_PV}-remove-usr_lib.patch
 )
 
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
 pkg_setup() {
 	# Bug 578750
 	if use kernel_linux; then
@@ -85,6 +95,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #732024
+	if test "x$(get_libdir)" = "xlib64"; then
+	    sed -i -e 's,/:/lib:/usr/lib:,:/lib64:/usr/lib64:,g' m4/sah_check_lib.m4 || die
+	fi
+
 	default
 
 	# prevent bad changes in compile flags, bug 286701
@@ -92,10 +107,16 @@ src_prepare() {
 
 	eautoreconf
 
-	use X && need-wxwidgets unicode
+	use X && setup-wxwidgets
+
+	# bug #732024
+	if test "x$(get_libdir)" = "xlib64"; then
+	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
+	fi
 }
 
 src_configure() {
+	LDFLAGS="-L${EPREFIX}/usr/$(get_libdir) -L${EPREFIX}/$(get_libdir) ${LDFLAGS}" \
 	econf --disable-server \
 		--enable-client \
 		--enable-dynamic-client-linkage \
@@ -122,36 +143,24 @@ src_install() {
 		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
 
 		# Rename the desktop file to boincmgr.desktop to (hot)fix bug 599910
-		mv "${ED%/}"/usr/share/applications/boincmgr{-${PN},}.desktop || \
+		mv "${ED}"/usr/share/applications/boincmgr{-${PN},}.desktop || \
 			die "Failed to rename desktop file"
 	fi
 
 	# cleanup cruft
-	rm -rf "${ED%/}"/etc || die "rm failed"
+	rm -r "${ED}"/etc || die "rm failed"
 	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
 	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
 	newinitd ${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		groups+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
 }
 
 pkg_postinst() {
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
+	if use X; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update
 	fi
 
 	elog
@@ -173,12 +182,10 @@ pkg_postinst() {
 		elog "Remember to launch init script before using manager. Or changing the password."
 		elog
 	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-		elog
-	fi
+	elog "To be able to use CUDA or OpenCL you should add the boinc user to the video group."
+	elog "Run as root:"
+	elog "gpasswd -a boinc video"
+	elog
 	# Add information about BOINC supporting OpenCL
 	elog "BOINC supports OpenCL. To use it you have to eselect"
 	if use cuda; then
@@ -190,7 +197,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
+	if use X; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update
 	fi
 }
diff --git a/sci-misc/boinc/boinc-7.8.6.ebuild b/sci-misc/boinc/boinc-7.8.6.ebuild
deleted file mode 100644
index 79674f896626..000000000000
--- a/sci-misc/boinc/boinc-7.8.6.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0-gtk3
-
-inherit autotools eutils gnome2-utils linux-info systemd user versionator wxwidgets
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz
-	X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
-
-REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
-
-# libcurl must not be using an ssl backend boinc does not support.
-# If the libcurl ssl backend changes, boinc should be recompiled.
-COMMON_DEPEND="
-	>=app-misc/ca-certificates-20080809
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	X? (
-		>=x11-libs/libnotify-0.7
-		dev-db/sqlite:3
-		media-libs/freeglut
-		virtual/jpeg:0=
-		x11-libs/gtk+:3
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-	sys-devel/gettext
-	X? ( virtual/imagemagick-tools[png,tiff] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-admin/quickswitch
-"
-
-PATCHES=(
-	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/fix_webview.patch
-	# xlocale.h was removed in modern glibc, bug 639108
-	"${FILESDIR}"/${MY_PV}-fix_xlocale.patch
-)
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-pkg_setup() {
-	# Bug 578750
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might be missing vsyscall support."
-		elif kernel_is -ge 4 4 \
-			&& linux_chkconfig_present LEGACY_VSYSCALL_NONE; then
-			ewarn "You do not have vsyscall emulation enabled."
-			ewarn "This will prevent some boinc projects from running."
-			ewarn "Please enable vsyscall emulation:"
-			ewarn "    CONFIG_LEGACY_VSYSCALL_EMULATE=y"
-			ewarn "in /usr/src/linux/.config, to be found at"
-			ewarn "    Processor type and features --->"
-			ewarn "        vsyscall table for legacy applications (None) --->"
-			ewarn "            (X) Emulate"
-			ewarn "Alternatively, you can enable CONFIG_LEGACY_VSYSCALL_NATIVE."
-			ewarn "However, this has security implications and is not recommended."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	eautoreconf
-
-	use X && need-wxwidgets unicode
-}
-
-src_configure() {
-	econf --disable-server \
-		--enable-client \
-		--enable-dynamic-client-linkage \
-		--disable-static \
-		--enable-unicode \
-		--with-ssl \
-		$(use_with X x) \
-		$(use_enable X manager) \
-		$(usex X --with-wx-config="${WX_CONFIG}" --without-wxdir)
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/${PN}
-
-	if use X; then
-		# Create new icons. bug 593362
-		local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256)
-		for s in "${SIZES[@]}"; do
-			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die
-			newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png
-		done
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-
-		# Rename the desktop file to boincmgr.desktop to (hot)fix bug 599910
-		mv "${ED%/}"/usr/share/applications/boincmgr{-${PN},}.desktop || \
-			die "Failed to rename desktop file"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED%/}"/etc || die "rm failed"
-	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
-	newinitd ${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		groups+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
-
-	elog
-	elog "You are using the source compiled version of boinc."
-	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
-	elog
-	elog "You need to attach to a project to do anything useful with boinc."
-	elog "You can do this by running /etc/init.d/boinc attach"
-	elog "The howto for configuration is located at:"
-	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
-	elog
-	# Add warning about the new password for the client, bug 121896.
-	if use X; then
-		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/boinc/gui_rpc_auth.cfg"
-		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/boinc"
-		elog "You should change this password to something more memorable (can be even blank)."
-		elog "Remember to launch init script before using manager. Or changing the password."
-		elog
-	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-		elog
-	fi
-	# Add information about BOINC supporting OpenCL
-	elog "BOINC supports OpenCL. To use it you have to eselect"
-	if use cuda; then
-		elog "nvidia as the OpenCL implementation, as you are using CUDA."
-	else
-		elog "the correct OpenCL implementation for your graphic card."
-	fi
-	elog
-}
-
-pkg_postrm() {
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/sci-misc/boinc/files/boinc-7.16-fix_webview.patch b/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
new file mode 100644
index 000000000000..4f58b2725b31
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2020-11-08 00:31:06.304751639 +0100
++++ b/configure.ac	2020-11-08 00:32:03.848754956 +0100
+@@ -1238,7 +1238,7 @@
+     CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
+ fi
+ 
+-CLIENTGUILIBS="${WX_LIBS}"
++CLIENTGUILIBS="${WX_LIBS} $($WX_CONFIG_WITH_ARGS --libs webview)"
+ 
+ if test "${enable_client_release}" = "yes" ; then
+    if test "x${WX_LIBS_STATIC}" = "x" ; then
diff --git a/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch b/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
new file mode 100644
index 000000000000..c9750a03b666
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
@@ -0,0 +1,89 @@
+--- a/m4/ax_check_glut.m4	2020-11-08 01:03:40.797864295 +0100
++++ b/m4/ax_check_glut.m4	2020-11-08 01:04:53.407868481 +0100
+@@ -41,7 +41,7 @@
+     else
+       ax_try_lib="${ax_lib}"
+     fi
+-    LIBS="-L${prefix}/lib ${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
++    LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
+     AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM([[
+ #define FREEGLUT_STATIC 1
+@@ -50,7 +50,7 @@
+ # endif
+ # include <GL/glut.h>]],
+                      [[glutMainLoop()]])],
+-    [ax_cv_check_glut_libglut="-L${prefix}/lib ${ax_try_lib}"; break])
++    [ax_cv_check_glut_libglut="${ax_try_lib}"; break])
+ 
+   done
+   LIBS=${ax_save_LIBS}
+--- a/m4/ax_check_glu.m4	2020-11-08 01:03:48.221864723 +0100
++++ b/m4/ax_check_glu.m4	2020-11-08 01:04:53.405868480 +0100
+@@ -19,7 +19,7 @@
+     else
+       ax_try_lib="${ax_lib}"
+     fi
+-    LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
++    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+     #
+     # libGLU typically links with libstdc++ on POSIX platforms. However,
+     # setting the language to C++ means that test program source is named
+@@ -37,7 +37,7 @@
+ # endif
+ # include <GL/glu.h>]],
+                      [[gluBeginCurve(0)]])],
+-    [ax_cv_check_glu_libglu="-L${prefix}/lib ${ax_try_lib}"; break])
++    [ax_cv_check_glu_libglu="${ax_try_lib}"; break])
+     if test X$ax_compiler_ms = Xyes; then
+       AC_LANG_POP([C])
+     fi
+--- a/m4/ax_check_gl.m4	2020-11-08 01:03:57.178865240 +0100
++++ b/m4/ax_check_gl.m4	2020-11-08 01:04:53.401868480 +0100
+@@ -39,7 +39,7 @@
+       GL_CFLAGS="-I${x_includes} -I${prefix}/include ${GL_CFLAGS}"
+     fi
+     if test -n "$x_libraries"; then
+-      GL_LIBS="-L${x_libraries} -L${prefix}/lib -lX11 ${GL_LIBS}"
++      GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"
+     fi
+   fi
+ 
+@@ -58,7 +58,7 @@
+     else
+       ax_try_lib="${ax_lib}"
+     fi
+-    LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
++    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+     AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM([[
+ # if HAVE_WINDOWS_H && defined(_WIN32)
+@@ -66,7 +66,7 @@
+ # endif
+ # include <GL/gl.h>]],
+                      [[glBegin(0)]])],
+-    [ax_cv_check_gl_libgl="-L${prefix}/lib ${ax_try_lib}"; break])
++    [ax_cv_check_gl_libgl="${ax_try_lib}"; break])
+   done
+   LIBS=${ax_save_LIBS}
+   CPPFLAGS=${ax_save_CPPFLAGS}])
+--- a/m4/check_ssl.m4	2020-11-11 08:29:37.638655925 +0100
++++ b/m4/check_ssl.m4	2020-11-11 08:31:28.319659865 +0100
+@@ -46,7 +46,7 @@
+       SSLDIR="${ssldir}"
+       SSL_CFLAGS="-I$ssldir/include -I$ssldir/include/openssl";
+       SSL_CXXFLAGS="-I$ssldir/include -I$ssldir/include/openssl";
+-      SSL_LIBS="-L$ssldir -L$ssldir/lib -lssl -lcrypto"
++      SSL_LIBS="-lssl -lcrypto"
+       AC_CHECK_LIB([dl], [dlopen], 
+           [SSL_LIBS="${SSL_LIBS} ${sah_lib_last}"])
+       AC_CHECK_LIB([z], [gzopen], 
+@@ -58,7 +58,7 @@
+       SSLDIR="${ssldir}"
+       SSL_CFLAGS="-I$ssldir/include/"
+       SSL_CXXFLAGS="-I$ssldir/include/"
+-      SSL_LIBS="-L$ssldir -L$ssldir/lib -lssl -lcrypto"
++      SSL_LIBS="-lssl -lcrypto"
+       AC_CHECK_LIB([dl], [dlopen], 
+           [SSL_LIBS="${SSL_LIBS} ${sah_lib_last}"])
+       AC_CHECK_LIB([z], [gzopen], 
diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in
index b46a06e3d384..763b69694444 100644
--- a/sci-misc/boinc/files/boinc.init.in
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -18,12 +18,12 @@ create_work_directory() {
 			eerror "Directory ${RUNTIMEDIR} could not be created!"
 			return 1
 		fi
+	fi
 
-		# ensure proper ownership
-		if ! chown "${USER}:${GROUP}" "${RUNTIMEDIR}"; then
-			eerror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
-			return 1
-		fi
+	# ensure proper ownership
+	if ! chown "${USER}:${GROUP}" "${RUNTIMEDIR}"; then
+		eerror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
+		return 1
 	fi
 
 	if [ ! -e "${RUNTIMEDIR}"/ca-bundle.crt ]; then
@@ -117,17 +117,6 @@ env_check() {
 	return 0
 }
 
-need_passwd_arg() {
-	local vers=$(${BOINCBIN} --version | tr -d .)
-	[ -z "${vers}" ] && vers="00"
-	[ $(expr substr "${vers}" 1 2) -lt 74 ] && return 0
-
-	# From version 7.4 on, the default is to read
-	# gui_rpc_auth.cfg for the password.
-
-	return 1
-}
-
 start_pre() {
 	env_check || return 1
 	create_work_directory || return 1
@@ -164,7 +153,6 @@ start() {
 }
 
 attach() {
-	local password=""
 	local url=""
 	local key=""
 
@@ -182,14 +170,10 @@ attach() {
 		"${RC_SERVICE}" start
 	fi
 
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	ebegin "${RC_SVCNAME}: Attaching to project"
 	start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 		--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
-		-- ${password} --project_attach ${url} ${key}
+		-- --project_attach ${url} ${key}
 	eend $?
 
 	sleep 10
@@ -197,15 +181,10 @@ attach() {
 }
 
 stop() {
-	local password=""
 	local stop_timeout="SIGTERM/60/SIGTERM/30/SIGKILL/30"
 
 	env_check || return 1
 
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	ebegin "Stopping ${RC_SVCNAME}"
 	start-stop-daemon --stop --quiet --progress \
 		--retry ${stop_timeout} \
@@ -216,19 +195,13 @@ stop() {
 resume() {
 	env_check || return 1
 
-	local password=""
-
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	for url in $(cd "${RUNTIMEDIR}" ; \
-		  "${BOINCCMD}" ${password} --get_project_status | \
+		  "${BOINCCMD}" --get_project_status | \
 		  sed -n 's/\s*master URL: //p'); do
 		ebegin "Resuming ${url}"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 			--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
-			-- ${password} --project ${url} resume
+			-- --project ${url} resume
 		eend $?
 	done
 }
@@ -236,19 +209,13 @@ resume() {
 suspend() {
 	env_check || return 1
 
-	local password=""
-
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	for url in $(cd "${RUNTIMEDIR}" ; \
-		  "${BOINCCMD}" ${password} --get_project_status | \
+		  "${BOINCCMD}" --get_project_status | \
 		  sed -n 's/\s*master URL: //p'); do
 		ebegin "Suspending ${url}"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 			--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
-			-- ${password} --project ${url} suspend
+			-- --project ${url} suspend
 		eend $?
 	done
 }
diff --git a/sci-misc/boinc/metadata.xml b/sci-misc/boinc/metadata.xml
index ca04e552419f..3d9951823296 100644
--- a/sci-misc/boinc/metadata.xml
+++ b/sci-misc/boinc/metadata.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-<longdescription lang="en">
-  BOINC (Berkeley Open Infrastructure for Network Computing) is a software
-  platform for distributed computing using volunteered computer resources.
-</longdescription>
-  <use>
-    <flag name="cuda">
-  Use nvidia cuda toolkit for speeding up computations.
-  NOTE: works only for subset of nvidia graphic cards so make sure your card
-  is supported before opening a bug about it.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">BOINC/boinc</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		BOINC (Berkeley Open Infrastructure for Network Computing) is a software
+		platform for distributed computing using volunteered computer resources.
+	</longdescription>
+	<use>
+		<flag name="cuda">
+			Use nvidia cuda toolkit for speeding up computations.
+			NOTE: works only for subset of nvidia graphic cards so make sure your card
+			is supported before opening a bug about it.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">BOINC/boinc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest
index 1c7c3a3af8c6..1833c0ea5b57 100644
--- a/sci-misc/cdfplayer/Manifest
+++ b/sci-misc/cdfplayer/Manifest
@@ -1,7 +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
-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-11.2.0.ebuild b/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
deleted file mode 100644
index cf38ea4120dd..000000000000
--- a/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
-SRC_URI="CDFPlayer_11.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
-"
-
-# we need this a few times
-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/CDFPlayer/${MPV}" "-execdir=${S}/opt/bin" || die
-}
-
-src_install() {
-	# move all over
-	mv "${S}/opt" "${D}/opt" || die
-
-	# the autogenerated symlinks point into sandbox, redo
-	rm "${D}/opt/bin/"* || die
-	dosym ../Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
-	dosym ../Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
-
-	# fix some embedded paths and install desktop files
-	insinto /usr/share/applications
-	for filename in $(find "${D}" -name "wolfram-cdf11.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
-}
-
-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/cdfplayer/cdfplayer-11.3.0.ebuild b/sci-misc/cdfplayer/cdfplayer-11.3.0.ebuild
deleted file mode 100644
index a2c1dfbad55b..000000000000
--- a/sci-misc/cdfplayer/cdfplayer-11.3.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 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="CDFPlayer_11.3.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="CDFPlayer"
-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/wolframcdfplayer opt/bin/wolframcdfplayer
-	dosym ../Wolfram/${MPN}/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
-	rm "${D}"/opt/Wolfram/${MPN}/${MPV}/Executables/wolframscript
-	dosym ../SystemFiles/Kernel/Binaries/Linux${ARCH}/wolframscript /opt/Wolfram/${MPN}/${MPV}/Executables/wolframscript
-
-	# fix some embedded paths and install desktop files
-	insinto /usr/share/applications
-	for filename in $(find "${D}" -name "wolfram-cdf11.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/wolframcdfplayer \$*" \
-		 >> ${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/fitsverify/Manifest b/sci-misc/fitsverify/Manifest
index 7be347eccb64..9f1d3d197a4a 100644
--- a/sci-misc/fitsverify/Manifest
+++ b/sci-misc/fitsverify/Manifest
@@ -1,5 +1,3 @@
-DIST fitsverify-4.17.tar.gz 42634 BLAKE2B 6273b709314d8ffa05b981d781fc80d5ef03f7c3c64cd2414d003be10a0dc537b902e3e8bcbac2fc572e6011687a9e806db16cdd660f5d2c4b4d0f1e3b394e4d SHA512 0d15b8e4ae5098126bed2bb2dfaa47ac20d977ed707352dc7930ebaf23a7a20cc69458fd77f9e76888e2ec4ef8a2a2f180c2fe03b9b7a4c9299aeea6df831879
 DIST fitsverify-4.18.tar.gz 42840 BLAKE2B e02fc9d5558e31fa2fa98b155a8acabe75f1fa2dfd8924519c6117cfde4754a2f49085e77fe52c0f859310877f5927e7a17f93c458e7d5aa72cb14b313c99211 SHA512 4be82078bf328538e1b98b386aedd6b2501a25e3d17f19e0db5b82ed8f62493e51f01228653ecf769ff3c706a16c8d65fe64ebc8693e8dd406e88d0a9ffc5010
-EBUILD fitsverify-4.17.ebuild 782 BLAKE2B ab629fad58555ea8a5d71783820bab6787dc58eadfb080047e01768cf8ea4962b996afc6a8e2b491a9b76e0ff4b0cee28bde6449a49815e6015db7fc379ebd3d SHA512 a85ff09bd7d6fa9e18f677a92c0c0bc0afa857d6a23d17b07e3498f1127d07959b5fb73e07f2af7d0b4746a1e31e7d1cff4f71289cc545d027211a3f3501bb3f
 EBUILD fitsverify-4.18.ebuild 782 BLAKE2B ab629fad58555ea8a5d71783820bab6787dc58eadfb080047e01768cf8ea4962b996afc6a8e2b491a9b76e0ff4b0cee28bde6449a49815e6015db7fc379ebd3d SHA512 a85ff09bd7d6fa9e18f677a92c0c0bc0afa857d6a23d17b07e3498f1127d07959b5fb73e07f2af7d0b4746a1e31e7d1cff4f71289cc545d027211a3f3501bb3f
 MISC metadata.xml 510 BLAKE2B 49d32959c075e4564e6382078754a3d03fbde35590d1b02a285d14650f5336de6c58a272322c0880b5aa63cfbdd3778d1fa0a093673ef8430d92063895601e99 SHA512 9ea9f53b535bd5b567682c2a0c62e2e9b9549a2bb250ffd71ebb5729a2299744dd4cbd324393d8fdc266d208c19e4156195e0729f0ffbbc591d8d798fc5d118b
diff --git a/sci-misc/fitsverify/fitsverify-4.17.ebuild b/sci-misc/fitsverify/fitsverify-4.17.ebuild
deleted file mode 100644
index 9d85f6e203cf..000000000000
--- a/sci-misc/fitsverify/fitsverify-4.17.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="FITS file format checker"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/"
-SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sci-libs/cfitsio:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	$(tc-getCC) ${CPPFLAGS} -DSTANDALONE ${CFLAGS} ${LDFLAGS} \
-		$($(tc-getPKG_CONFIG) --cflags cfitsio) \
-		ftverify.c fvrf*.c \
-		$($(tc-getPKG_CONFIG) --libs cfitsio) -o ${PN} \
-		|| die "compiled failed"
-}
-
-src_install() {
-	dobin fitsverify
-	dodoc README
-}