gentoo resync : 28.04.2021

11 files changed, 123 insertions, 84 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 74301d4f758c..b4bb6cf53d6e 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 50d723e8e988..0c9e4ef32770 100644
--- a/sci-misc/ViSP-images/Manifest
+++ b/sci-misc/ViSP-images/Manifest
@@ -1,3 +1,3 @@
 DIST visp-images-3.3.0.zip 91291914 BLAKE2B e2c893303401e5facf52bff847785a155d3f990f8fc149ef1003b0bd1609b7740cea41bc5a24ed64bc0eefe23b02587cd6bfcd2d3303bbd84941d36f108da587 SHA512 d0f4c7f10a36f4aa365bd7bf65d35941755d429331c5f28b7731faa0c01c66fe9ab9137403c90cc0b3fb7b718553da69acdb3e9309c9bff14be7981a726bb41f
-EBUILD ViSP-images-3.3.0.ebuild 547 BLAKE2B 354dd4b474be45c9d255ae6cf4ed5e612582ef81b7a55560c5b70a2ac724edc3f25b0d95ebd8c85e940e75ed29f188eae4a2b889437c532be8411d2b3a8cb37c SHA512 b08d416c70908cef248f4828085eb3fe718d2e0f3a564f6fb117eb245b6353b08dc1380e5afe57fa468b62836616546afe8bdaf4bb6b8972c2b28161215f6549
+EBUILD ViSP-images-3.3.0.ebuild 529 BLAKE2B 8bf5360d98e1b73d46694420ee6ed4acd68c8e5955ac329e5aa740499fa76630be287d42ba9c1aa7c77e7cd8175d6ff070ba96c2f5c48cf1c5b9bcd52ec73917 SHA512 36079c2ebb01524ffa26757fd9f453870b32e69c47b1116f3dd8e41555623301788053ff9c7dbbc8423ae72207434bbed5dc1435e69375d806f981c7dc799f12
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild b/sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild
index c3d81803bebb..fcbffef71868 100644
--- a/sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild
+++ b/sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,10 +10,8 @@ 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=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/visp-images-${PV}"
 
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 009d2af3aaf0..3eb7859c0e11 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -3,10 +3,10 @@ AUX boinc-7.16-remove-usr_lib.patch 3195 BLAKE2B a13960c4c8376b7c6324b117415c764
 AUX boinc.conf 524 BLAKE2B 58ab78fe971d1da159b35b718e4078565d0f07925d55ab02e5dddafe2c674e227dc75f81c5971d5671fd97dc2d42aba42f8da0536c056ed07c993e3d6e543672 SHA512 60091e8ff96a07fd9bf508cb295f97be280a4c64d0dbefb88414c86bb193ead72c25dd085d20105b616be5e94dfd5aaf3f5b35fa6b6ce2adf09e38996f1f67b0
 AUX boinc.init.in 5362 BLAKE2B fbf7a49b276649fe15e41239fa730298de4170038bc8c8cc81f45a445240e5c434d582877569cb878e67d57b1d9ff31253e02c67cceac954d8c9be9facd88e25 SHA512 194ae8c0a8e36c66d7af584b1bf7de2af4276e1117f9d55036068e11c98b1d840cc07c0181823c196ea9aa746470e4a9bfd6e91df13ba88afb4be0a2db284688
 AUX fix_webview.patch 413 BLAKE2B cd33a6a72395d2c43b7126d4999d11102548184cd22a2b5b6e5035029b788aa4d7bb178d1360d6d81c472500da95d7f1ba77cb1e1e5f5510789a9ae61ff3d0cb SHA512 71f34c4211b28dfdf6837bee64cbf966abf4129109b23a8d05af1d5c3a9f7a5026aa7d88df9a7a646337ee8cad53f42235b9a5a8e43d3074def4c9319c8fb785
-DIST boinc-7.14.2.tar.gz 52236336 BLAKE2B fa97d3af9e9a650db409b24386e7950369ab2247469cd83d717d1b6dccb7952a0997763dad2285532cef6807f0460eb320edb3a162b6b20a70bae12159ec6b7f SHA512 dcb6d60893e8baad6282d5e4728387352e942375d988df9c2ad00022deaa9bc5ace967a1346e1b43b25342d2e477ab42e28640935d94e6950ee3716732c9c1af
 DIST boinc-7.16.14.tar.gz 49623696 BLAKE2B dde4163040d122cf4707e4747b18120f64c31af5ea4ca778709d9dd3c2fb019eb10ecb6ee367b73ea245cb5ed93bac710f268db2e0408b32120c750915473575 SHA512 9315cd8344571ac64eecf12676a2d3d6c021577ecee7a92eff253185f7ddf5bf4d64503a819c625afafd258ad28c3879839016c431aa3099083a90194c7e6454
+DIST boinc-7.16.16.tar.gz 49599131 BLAKE2B 819ab85c19a684144711f77e669b892aa73c006b81c1d7ef7adbd9d580e1e8473ae27b52dc17953ee677c70fc78ed15df936afd740e629715f30f2b81d84ea6f SHA512 dd7042e176d6506c70de7866556ae73b2f45734df92038086d5b0414751f3da08dc571c49f0c26d747d3fb2577674d3ff8cdec7d3563861eaaaa5af9c1db0a0e
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
-EBUILD boinc-7.14.2.ebuild 5782 BLAKE2B 8ce02661efe8bf9abce4b42e913a954d1eeacddf34ba4460c58a901d9d44e4a33312abf4cf722ed515724b4642637e880d4feec3e407369b669500722c8c0df3 SHA512 d758601742d515275a972e0098bfc145ab86754230d5765e465f0bff83f1b28321c88f61964deeb0d6bf54183be5019f78b80aaf3bf0b63497e78bbd1afafb50
-EBUILD boinc-7.16.14.ebuild 6140 BLAKE2B 84df551574c10578c97d73de22e8a6f1b33b26404a6c80c1cc247c1445624e3b6bee96eeb67f50e1f4300bbfe4becf8418806e5d45e9f31b61be2acf5cb85c92 SHA512 48aa5f6d377562b5268724fd741befcb8971f5e4f675961a5d49830b9e0b7213c283d469cf2070c7104a3bfbc28b0203032c854e7f852586fc97ccae8385c00b
-EBUILD boinc-9999.ebuild 5775 BLAKE2B efcbe217af056adecd6eb57babcddf0d293dd1f4840f9e5ebd5d9a19be1be70062e018970eedcd80dbe1061f12470e7cccbd6a9fc9489a328d23655a428c4b14 SHA512 bad0b54ec38d8a93e5e6335697b432c0343118076036678c6d9fece70d0030030b20f50260b3059406292af69c35fea065f559d1aa221b095976376f74a08b8b
+EBUILD boinc-7.16.14.ebuild 6431 BLAKE2B ef1ed6eee548dc1a779451ffc4935c8d43e4f0f6ddfdec560ca0cc410c493822ae2507ff62c5433b96f7e52cdb3b68d768e29ffabeca2274bd1491a2ac9622ab SHA512 a0d6e4ff7e37f75e0a4f02a41af9f8fd0471539d84a2dbeb539ef2acf42c75a9b21338aa2de4ab3a780409316e76229dbdc7013f6f6756728ae054c98a6d7228
+EBUILD boinc-7.16.16.ebuild 6365 BLAKE2B c95569d73d28fea0ae89ff836685b2d202f9a3a77749fcacc10fc5480e4aa7bb36b73e878aae62503d47b62190d45286f1b42c900aa2ec543e09689d5fd3e533 SHA512 2e807af05f96a786ec66172c52c209f39943c2240c3920ee655d43574e46fd0250d5d69236ff5c8836fd526e0c052bd750145bb497a51cbb794c9eb1f161220f
+EBUILD boinc-9999.ebuild 6355 BLAKE2B e5ada4eb2a3e095c2d000fdc8af5a1784475b5f16b8f423696c4de8103b038def1dbb39e464160a9c00b037a01136d3fb5a91fc402b1c21c2f1754f1104e0178 SHA512 58462dfc67dc3af2a010396e0e6762b7d75a414485d05b2f3767cade8ac4d476f46a456898ec45463815c5ef79e79b0a91f73f9ea97a422026d7919a9ea73325
 MISC metadata.xml 1012 BLAKE2B 899de312089e32121174d89d58a06ce4b8ea8ef284bf77a6ba9fe2da125b84df7106ce40ada7f852fa6d6168cfff21409f298b4a491317c94da7d5ad118b3152 SHA512 0bdea5e3ce06d761ffbbb42698042d7e5789ddb6505724a89d170e915579afe71373a2784a3eba10c095a09fc33097b090e31b3a523f22c209713d471955e1ae
diff --git a/sci-misc/boinc/boinc-7.16.14.ebuild b/sci-misc/boinc/boinc-7.16.14.ebuild
index cf696e8c6bc7..3f403c0a77fc 100644
--- a/sci-misc/boinc/boinc-7.16.14.ebuild
+++ b/sci-misc/boinc/boinc-7.16.14.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV=$(ver_cut 1-2)
 WX_GTK_VER=3.0-gtk3
 
-inherit autotools desktop linux-info systemd wxwidgets xdg-utils
+inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="https://boinc.ssl.berkeley.edu/"
@@ -107,8 +107,6 @@ src_prepare() {
 
 	eautoreconf
 
-	use X && setup-wxwidgets
-
 	# bug #732024
 	if test "x$(get_libdir)" = "xlib64"; then
 	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
@@ -116,7 +114,10 @@ src_prepare() {
 }
 
 src_configure() {
-	LDFLAGS="-L${EPREFIX}/usr/$(get_libdir) -L${EPREFIX}/$(get_libdir) ${LDFLAGS}" \
+	use X && setup-wxwidgets
+
+	append-libs -L"${ESYSROOT}"/usr/$(get_libdir) -L"${ESYSROOT}"/$(get_libdir)
+
 	econf --disable-server \
 		--enable-client \
 		--enable-dynamic-client-linkage \
@@ -137,7 +138,11 @@ src_install() {
 		# 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
+			# The convert command is not checked, because it will issue warnings and exit with
+			# an error code if imagemagick is used and was merged with USE="-xml", although the
+			# conversion has worked. See #766093
+			# Instead, newicon will fail if the conversion did not produce the icon.
+			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png
 			newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png
 		done
 		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
diff --git a/sci-misc/boinc/boinc-7.14.2.ebuild b/sci-misc/boinc/boinc-7.16.16.ebuild
index 9377eb9ee4ed..213bded49211 100644
--- a/sci-misc/boinc/boinc-7.14.2.ebuild
+++ b/sci-misc/boinc/boinc-7.16.16.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 gnome2-utils linux-info systemd user wxwidgets
+inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="https://boinc.ssl.berkeley.edu/"
@@ -15,13 +16,12 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/BOINC/${PN}.git"
 	inherit git-r3
 else
-	MY_PV="7.14"
 	SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 fi
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-3"
 SLOT="0"
 IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
 
@@ -30,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
@@ -43,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}
@@ -59,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/fix_webview.patch
+	"${FILESDIR}"/${PN}-${MY_PV}-fix_webview.patch
 )
 
 pkg_setup() {
@@ -86,6 +93,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
@@ -93,10 +105,17 @@ src_prepare() {
 
 	eautoreconf
 
-	use X && need-wxwidgets unicode
+	# bug #732024
+	if test "x$(get_libdir)" = "xlib64"; then
+	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
+	fi
 }
 
 src_configure() {
+	use X && setup-wxwidgets
+
+	append-libs -L"${ESYSROOT}"/usr/$(get_libdir) -L"${ESYSROOT}"/$(get_libdir)
+
 	econf --disable-server \
 		--enable-client \
 		--enable-dynamic-client-linkage \
@@ -117,18 +136,22 @@ src_install() {
 		# 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
+			# The convert command is not checked, because it will issue warnings and exit with
+			# an error code if imagemagick is used and was merged with USE="-xml", although the
+			# conversion has worked. See #766093
+			# Instead, newicon will fail if the conversion did not produce the icon.
+			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png
 			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 || \
+		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
@@ -136,20 +159,11 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }
 
-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}"
-	groups+=",video"
-	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
@@ -186,7 +200,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-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index 0d45457bf43c..6040de51a820 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_PV=7.16
 WX_GTK_VER=3.0-gtk3
 
-inherit autotools gnome2-utils linux-info systemd user wxwidgets
+inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="https://boinc.ssl.berkeley.edu/"
@@ -15,13 +16,12 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/BOINC/${PN}.git"
 	inherit git-r3
 else
-	MY_PV="7.14"
 	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"
+	KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 fi
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-3"
 SLOT="0"
 IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
 
@@ -30,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
@@ -43,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}
@@ -59,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/fix_webview.patch
+	"${FILESDIR}"/${PN}-${MY_PV}-fix_webview.patch
 )
 
 pkg_setup() {
@@ -86,6 +93,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
@@ -93,10 +105,17 @@ src_prepare() {
 
 	eautoreconf
 
-	use X && need-wxwidgets unicode
+	# bug #732024
+	if test "x$(get_libdir)" = "xlib64"; then
+	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
+	fi
 }
 
 src_configure() {
+	use X && setup-wxwidgets
+
+	append-libs -L"${ESYSROOT}"/usr/$(get_libdir) -L"${ESYSROOT}"/$(get_libdir)
+
 	econf --disable-server \
 		--enable-client \
 		--enable-dynamic-client-linkage \
@@ -117,18 +136,22 @@ src_install() {
 		# 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
+			# The convert command is not checked, because it will issue warnings and exit with
+			# an error code if imagemagick is used and was merged with USE="-xml", although the
+			# conversion has worked. See #766093
+			# Instead, newicon will fail if the conversion did not produce the icon.
+			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png
 			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 || \
+		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
@@ -136,20 +159,11 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }
 
-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}"
-	groups+=",video"
-	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
@@ -186,7 +200,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/gt-itm/Manifest b/sci-misc/gt-itm/Manifest
index c08ad6271576..a67e97d10098 100644
--- a/sci-misc/gt-itm/Manifest
+++ b/sci-misc/gt-itm/Manifest
@@ -1,5 +1,5 @@
 AUX gt-itm-implicits.patch 2731 BLAKE2B b8aaea5e6016d9c3e6badc3a5f02f83188830bbe79501183dbfea9453d3af51479d46e83a7053eb86241a203c3a808f8e9a0d78cb350c01eb9d6c6483be4bc91 SHA512 64dc41be9d914e1df68780576300c54aa8091862b37ae44b5530312b8eaafbda76d97021f62544bce7c57e447959eea5a83c72074a714b4894bf4fddc79b5fe7
 DIST gt-itm-19961004.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
 DIST sgb2ns-19961004.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
-EBUILD gt-itm-19961004-r2.ebuild 2118 BLAKE2B ce805335d8360fd8fb6f268a5a1afb0c573f514ceca3401786f6c1048da8ba30f3a57863eb2c53af1a0c0abdcefa3235ba4ca9ac294fd137ce8a26f3ddcaed61 SHA512 5504fb37e2fcdc8469cebdacbdf5cbc3bf85ded66154a91a85419a16f946f9d8fff9c3e7f8037e5ab34f811aa790e9a754fd6e41f99e327b93bdca6d7ab54e1d
+EBUILD gt-itm-19961004-r2.ebuild 2122 BLAKE2B b61ca4dfe47cdf2aea1f16ff6f1dba4a675df22fac8dd8c64591416353df63b97a77c244045949b4108930ff29d0c24ee33ff9559eda2307293f430c9abb9689 SHA512 ff636d79efa007527027e5edae75610ce26e436f3ac1a0bb0c2df03a8c5770bd5ef70e1036d0c8f8a10e457dee89eaf9e5e5d83874baa08ea2c3af86daae4bdd
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild b/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
index 99585d83edfe..295139f5bfc9 100644
--- a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
+++ b/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,8 +29,8 @@ DOCS=( README docs/. )
 src_unpack() {
 	unpack "sgb2ns-${PV}.tar.gz"
 
-	mkdir "$S" || die
-	cd "$S" || die
+	mkdir "${S}" || die
+	cd "${S}" || die
 	unpack "${P}.tar.gz"
 }
 
diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index a555e695b74c..968928034e7a 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -10,5 +10,5 @@ DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b79
 DIST netlogo-5.0.3.tar.gz 66725456 BLAKE2B 85df19cd0ef501c903e9b2f2ee2a6ca39430a5f64e1086365b9a29baa3962a7e1d018001652db7da54f1d6623b477d644f7b745b30e2c3be3462f5cb4e5cb891 SHA512 39d660d5dbd7e74f072621a74bfc18648ed208b833b3d442f2a9dbefc673065c4a7bf0e4a8ebb670b4d4220ee7bec452cc97f32731a28ca2eb56656bea795b81
 DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
 EBUILD netlogo-bin-5.0.3-r1.ebuild 1681 BLAKE2B 4907b55b86a29235e581397536fc00dd6b1ea7f0a06523cd0930b6bd9b8b176ccce8696f60f49a1b78e30d56ca68aee7c1fdfccbc48410cf53203715a136e5e1 SHA512 e3c0bf2c4b81a69fb7f9155f744a20ca34fbd8099a7a8aafad8f9b64ed6a7adab1475dbda74724fa8eadcf6eaa393ca6ed6cdae30ef53df04f738e3578e7ec3d
-EBUILD netlogo-bin-6.0.2.ebuild 2573 BLAKE2B 5e0f7e6a660dac2656fae96294cc01fb0622049a329b11551ccaaf89599f11a6fff59c490022e180d04837270ecf83e5204835a796963160120fef31c48d4983 SHA512 4b5efd20cef885027f6c0ad07c4df68a7542d72549bca1c32c941b476248685b11c022e5de767df0854d94d4d3ac64b1b474e35c32703cb31c5c972bdca8a139
+EBUILD netlogo-bin-6.0.2-r1.ebuild 2664 BLAKE2B 0424fbf3e659aa26d62ce2b97609710560a9693274ead734e2d4e3e114b248c549d60e6222511fd552a84ed14393acdd55cafd64acf2b9601075701c2f48b9ac SHA512 54fd7cbbe5eb08b8c01dafb901b8a2ae650fe6091fc0a292fd1b7caab9152d3201d0d6abc3a2d61d2d70d4c3234ac7ffba23020397437bf5a1d28766f20eae8a
 MISC metadata.xml 673 BLAKE2B d3bf352936babb7e5f8ae9e47f88899720920a23c5f421b63fd4f6e0235b58cef0e6a42fd04770aa92989b766bd986786a8c5ac264e316951fee2a0ce664e472 SHA512 2020dc83306d1152386c444ffaa488c0ec4529677b4a6239e2d23693018525d7bd63bcae18a3010f9cd71d3edd68f3fea15e95a264485160fc584b38f0c0a789
diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
index ae454d5e6ce7..4aa943e61dee 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit desktop
 
@@ -15,15 +15,18 @@ SRC_URI="
 	amd64? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
 	x86? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-32.tgz )
 "
+S="${WORKDIR}/${MY_PN} ${PV}"
+
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.8"
 
-S="${WORKDIR}/${MY_PN} ${PV}"
+RDEPEND="
+	>=virtual/jre-1.8
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+"
 
 DOCS=( "NetLogo User Manual.pdf" app/docs/shapes.nlogo readme.md )
 HTML_DOCS=( app/docs app/behaviorsearch/documentation )
@@ -32,12 +35,13 @@ QA_PREBUILT="opt/netlogo/app/natives/linux-*/*.so"
 
 src_prepare() {
 	default
-	cp "${FILESDIR}"/netlogo-${PV}.sh netlogo.sh
-	cp "${FILESDIR}"/netlogo3d-${PV}.sh netlogo3d.sh
-	cp "${FILESDIR}"/behaviorsearch-${PV}.sh behaviorsearch.sh
-	cp "${FILESDIR}"/hubnetclient-${PV}.sh hubnetclient.sh
+	cp "${FILESDIR}"/netlogo-${PV}.sh netlogo.sh || die
+	cp "${FILESDIR}"/netlogo3d-${PV}.sh netlogo3d.sh || die
+	cp "${FILESDIR}"/behaviorsearch-${PV}.sh behaviorsearch.sh || die
+	cp "${FILESDIR}"/hubnetclient-${PV}.sh hubnetclient.sh || die
+
 	if use x86; then
-		sed -i -e 's/linux-amd64/linux-i586/g' netlogo3d.sh
+		sed -i -e 's/linux-amd64/linux-i586/g' netlogo3d.sh || die
 	fi
 }
 
@@ -45,11 +49,11 @@ src_install() {
 	einstalldocs
 
 	# Override the config files so they don't use the bundled java path
-	sed -i -e 's/app.runtime=.*/app.runtime=$JAVA_HOME/g' app/*.cfg
+	sed -i -e 's/app.runtime=.*/app.runtime=$JAVA_HOME/g' app/*.cfg || die
 
 	# Once docs are installed, remove them from the source so they don't get
 	# installed below
-	rm -rf app/docs app/behaviorsearch/documentation
+	rm -rf app/docs app/behaviorsearch/documentation || die
 	insinto /opt/netlogo
 	doins -r app/
 	doins -r "Mathematica Link"