gentoo resync : 28.04.2021

4 files changed, 97 insertions, 60 deletions

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
 }