gentoo resync : 12.05.2022

11 files changed, 52 insertions, 168 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index d8fd72e603e5..c476fbb13e6a 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index bfb5839e7ecd..b65c722773ae 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,10 +1,8 @@
-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 5362 BLAKE2B fbf7a49b276649fe15e41239fa730298de4170038bc8c8cc81f45a445240e5c434d582877569cb878e67d57b1d9ff31253e02c67cceac954d8c9be9facd88e25 SHA512 194ae8c0a8e36c66d7af584b1bf7de2af4276e1117f9d55036068e11c98b1d840cc07c0181823c196ea9aa746470e4a9bfd6e91df13ba88afb4be0a2db284688
-AUX fix_webview.patch 413 BLAKE2B cd33a6a72395d2c43b7126d4999d11102548184cd22a2b5b6e5035029b788aa4d7bb178d1360d6d81c472500da95d7f1ba77cb1e1e5f5510789a9ae61ff3d0cb SHA512 71f34c4211b28dfdf6837bee64cbf966abf4129109b23a8d05af1d5c3a9f7a5026aa7d88df9a7a646337ee8cad53f42235b9a5a8e43d3074def4c9319c8fb785
-DIST boinc-7.16.17.tar.gz 49628624 BLAKE2B 87e266a29506ecaa41fd18a2521b08c291548a4e31f7748001e5214e6f1fada1ded8bb8b559635d4f9c7c256cd7829dcf9132c02448c559d5ceb13524ca42e0f SHA512 e9882f37ad5c83ed020155c8192228322932f83b88ed00d025dcda63bff2dca109ecdcbaf98b48c4522b841f545f32352e5c158ae0a41de0a1f2941ac8135221
+AUX boinc-7.18-fix_webview.patch 382 BLAKE2B c96026e1782fdc3608798fcedcc3d320950e7fd7d548e6f42d35b553d32b06d4400dcfdd3724cd588c0826fc3c258eddc78558fd79d55682e38f1c137bb5bb25 SHA512 a9e7da3dbedeaf3a5aad88ffcaf2aa95f6dfe257a0390f5f7f3a5ecd94c1b256cfb793cdbf7d76e1f8f073b202e8c084c5e8ddb181767b4b13813665ede99dc8
+AUX boinc.conf 606 BLAKE2B bbd48576bdf340b5a8a28ad72c8e4ee6bcd8579331edf036db357d324aa1a484836aa869fd5c39a7ed7ccf805e413a01eb2a27537d32f21692599291ec1e325d SHA512 aaf6e7180d4fde023c228a038a5d9ab295165ad6ee03bc892e5003943fa91bff03b21c39c86d6b4406d70d8d67e4fcb6dfb592a78e6df174e6bac28f70056654
+AUX boinc.init.in 5370 BLAKE2B a6b501850adf43ac80c7796bdc354038c257a0bd18a571960b0fb69bbba3a584c6aa8c54b4a9ea0bf1a159e5718ff2018ffa728a6ca1dc3bf0ccb4d9f2b5b55d SHA512 7ac150f008332a7bb7fb4fd4168bb936d183193a3a42b3919bbcc1c3d63cced8311df3acb94c0285ff2b66135e57d82397c68c352a17f177acdbbc35baefb498
+DIST boinc-7.18.1.tar.gz 50851883 BLAKE2B 64d321c8c56d7c34a08646dc16de5ddbb9b8e4be57b673fa77515845d967e28b5cf1fda677293e2fc8cf36a18ac0b7e7feebfbd8e434ebed41b8280c7395950d SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
-EBUILD boinc-7.16.17.ebuild 6282 BLAKE2B 326a3daa89b417bdb9cb79ba3b8db8de2a9cf2c2228dd5a9ad78b72471c9b264e73c89ec04efb85e57fd4250496e1331b948270a156d88b42594bfef385b866d SHA512 fcb1154ad85cdefe4c8d225d10c57a6033f48355e45963ae2d460ee61ebc5d1704f739d6b21bb300620ecc92cc8d24e58558e860b4405c93beb43c0416fe52c0
-EBUILD boinc-9999.ebuild 6297 BLAKE2B ad35d6ef1ddc1996c3e16b94ce9ad239bf26c13a6256eaf7f6e731503950f93e47ab431c8ceb09f74f4ad2507239a117bfdbc8ea702b3d85fcc842d5feeee632 SHA512 5b1523e5dacb46928f025e011230302194494b277287b76f4cf4878ec829ab640e8110c28d93958f3460661a81308900c7bd40804c3bdb69d46dbdcddde57a84
+EBUILD boinc-7.18.1-r2.ebuild 6009 BLAKE2B 6556adeaef0fc726f66b251ae3c2027c2fb1ca694101bfd6b79287e51672b2c194c43aa411697c728f22146436a409bfb6d61b165eff7e58e21c1341d7dc5cab SHA512 4ec715bf6741c583d4f6dd268ecf2ce0fe7e1789052398f27bbdf44c1ed46d925fd6eea77ea553155687751ad098ffa4530ea8026325214b4d9c991f7f7d3fec
+EBUILD boinc-9999.ebuild 6208 BLAKE2B 44f05ed72eeb616eb0e9ee8daab1774e54b5258978e304ec15df03323b78bd0794c2ef62effcfa5a3e7108f18bdafaa84b903e98bed84ca4c13a2e3383ffa481 SHA512 a83d0ea229d080e27da9ea440a18d5a209ba9ce05abe31c1f649c6ffe274058fcda6283a70b6fb5ce43b2f92f0651caf8d3330bffe722b181cf081674c7daca2
 MISC metadata.xml 1013 BLAKE2B e84dc107eefa027eba8f6b9848b92c9e5d49c4f83523487922c5a3d8981d728fac6b11f4cce59625ca3aac62cfa822eded87bee7203a613dadc8fe0ab4d08148 SHA512 ebefa76522aab3b7a78a4cd06e20522b7cd4677bdc821969d4a407dbf0c6c58a6a6943a71a55b6d37ed4881d4e03c677f4698064acc518f1b898a014d7a65172
diff --git a/sci-misc/boinc/boinc-7.16.17.ebuild b/sci-misc/boinc/boinc-7.18.1-r2.ebuild
index 44f5b5d810ad..cc883b7b84a7 100644
--- a/sci-misc/boinc/boinc-7.16.17.ebuild
+++ b/sci-misc/boinc/boinc-7.18.1-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV=$(ver_cut 1-2)
 WX_GTK_VER=3.0-gtk3
 
-inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils
+inherit autotools desktop flag-o-matic linux-info wxwidgets xdg-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="https://boinc.ssl.berkeley.edu/"
+HOMEPAGE="https://boinc.berkeley.edu/"
 
 SRC_URI="X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
 if [[ ${PV} == *9999 ]] ; then
@@ -30,28 +30,26 @@ REQUIRED_USE="^^ ( curl_ssl_gnutls 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.
 DEPEND="
-	acct-group/boinc
 	acct-user/boinc
 	>=app-misc/ca-certificates-20080809
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-2.1
 		>=x11-drivers/nvidia-drivers-180.22
 	)
+	dev-libs/openssl:=
 	net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-	sys-apps/util-linux
 	sys-libs/zlib
 	X? (
-		dev-db/sqlite:3
+		dev-libs/glib:2
 		media-libs/freeglut
-		virtual/jpeg:0=
+		media-libs/libjpeg-turbo:=
 		x11-libs/gtk+:3
-		x11-libs/libICE
 		>=x11-libs/libnotify-0.7
-		x11-libs/libSM
-		x11-libs/libXi
-		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libxcb:=
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-		virtual/jpeg
+		x11-libs/xcb-util
 	)
 "
 BDEPEND="app-text/docbook-xml-dtd:4.4
@@ -59,7 +57,9 @@ BDEPEND="app-text/docbook-xml-dtd:4.4
 	sys-devel/gettext
 	X? ( virtual/imagemagick-tools[png,tiff] )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
+	sys-apps/util-linux
 	!app-admin/quickswitch
 "
 
@@ -92,22 +92,12 @@ 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
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
 	eautoreconf
-
-	# bug #732024
-	if test "x$(get_libdir)" = "xlib64"; then
-	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
-	fi
 }
 
 src_configure() {
diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index 897b7f6af916..7f348a89ae3c 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MY_PV=7.16
+# For live ebuilds this should be set to the latest available patch in ${FILESDIR}
+# It does not need to reflect the actual internal version reported by BOINC unless that patch is broken.
+MY_PV=7.18
 WX_GTK_VER=3.0-gtk3
 
-inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils
+inherit autotools desktop flag-o-matic linux-info wxwidgets xdg-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="https://boinc.ssl.berkeley.edu/"
+HOMEPAGE="https://boinc.berkeley.edu/"
 
 SRC_URI="X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
 if [[ ${PV} == *9999 ]] ; then
@@ -29,38 +31,38 @@ REQUIRED_USE="^^ ( curl_ssl_gnutls 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
+DEPEND="
 	acct-user/boinc
 	>=app-misc/ca-certificates-20080809
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-2.1
 		>=x11-drivers/nvidia-drivers-180.22
 	)
+	dev-libs/openssl:=
 	net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
 	sys-apps/util-linux
 	sys-libs/zlib
 	X? (
-		dev-db/sqlite:3
+		dev-libs/glib:2
 		media-libs/freeglut
-		virtual/jpeg:0=
+		media-libs/libjpeg-turbo:=
 		x11-libs/gtk+:3
-		x11-libs/libICE
 		>=x11-libs/libnotify-0.7
-		x11-libs/libSM
-		x11-libs/libXi
-		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libxcb:=
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-		virtual/jpeg
+		x11-libs/xcb-util
 	)
 "
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.4
+BDEPEND="app-text/docbook-xml-dtd:4.4
 	app-text/docbook2X
 	sys-devel/gettext
 	X? ( virtual/imagemagick-tools[png,tiff] )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
+	sys-apps/util-linux
 	!app-admin/quickswitch
 "
 
@@ -93,22 +95,12 @@ 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
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
 	eautoreconf
-
-	# bug #732024
-	if test "x$(get_libdir)" = "xlib64"; then
-	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
-	fi
 }
 
 src_configure() {
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
deleted file mode 100644
index c9750a03b666..000000000000
--- a/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- 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-7.16-fix_webview.patch b/sci-misc/boinc/files/boinc-7.18-fix_webview.patch
index 4f58b2725b31..0b1f82e1f628 100644
--- a/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
+++ b/sci-misc/boinc/files/boinc-7.18-fix_webview.patch
@@ -1,6 +1,8 @@
---- 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 @@
+This patch is an update to the existing fix_webview.patch for 7.18
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1262,7 +1262,7 @@ else
      CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
  fi
  
diff --git a/sci-misc/boinc/files/boinc.conf b/sci-misc/boinc/files/boinc.conf
index 22fcca0d3001..856be30a2402 100644
--- a/sci-misc/boinc/files/boinc.conf
+++ b/sci-misc/boinc/files/boinc.conf
@@ -2,7 +2,9 @@
 
 # Owner of BOINC process (must be existing)
 USER="boinc"
-GROUP="boinc"
+# Group of the BOINC process. Defaults to the user's primary group if
+# not set.
+#GROUP="boinc"
 
 # Directory with runtime data: Work units, project binaries, user info etc.
 RUNTIMEDIR="/var/lib/boinc"
diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in
index 763b69694444..9ac9b11a930d 100644
--- a/sci-misc/boinc/files/boinc.init.in
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="attach resume suspend"
@@ -91,12 +91,12 @@ opencl_check() {
 env_check() {
 	# Make sure the configuration is sane
 	: ${USER:="boinc"}
-	: ${GROUP:="boinc"}
+	: ${GROUP:="$(id -ng ${USER})"}
 	: ${RUNTIMEDIR:="/var/lib/boinc"}
 	: ${BOINCBIN:="$(which boinc_client)"}
 	: ${BOINC_PIDFILE:="/var/run/boinc_client.pid"}
 	: ${BOINCCMD:="$(which /usr/bin/boinccmd)"}
-	: ${ALLOW_REMOTE_RPC:="yes"}
+	: ${ALLOW_REMOTE_RPC:="no"}
 	: ${NICELEVEL:="19"}
 	# ARGS is not checked, it could have been explicitly set
 	# to be empty by the user.
diff --git a/sci-misc/boinc/files/fix_webview.patch b/sci-misc/boinc/files/fix_webview.patch
deleted file mode 100644
index 6c141eb7c829..000000000000
--- a/sci-misc/boinc/files/fix_webview.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2016-07-06 11:16:41.000000000 +0200
-+++ b/configure.ac	2016-07-06 11:45:51.088155620 +0200
-@@ -1250,7 +1250,7 @@
-     CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
- fi
- 
--CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}"
-+CLIENTGUILIBS="${WX_LIBS} $($WX_CONFIG_WITH_ARGS --libs webview) ${SQLITE3_LIBS}"
- 
- if test "${enable_client_release}" = "yes" ; then
-    if test "x${WX_LIBS_STATIC}" = "x" ; then
diff --git a/sci-misc/jupyterlab-desktop-bin/Manifest b/sci-misc/jupyterlab-desktop-bin/Manifest
index 0b88173003fb..4745044b23b0 100644
--- a/sci-misc/jupyterlab-desktop-bin/Manifest
+++ b/sci-misc/jupyterlab-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST jupyterlab-desktop-bin-3.3.2.2.rpm 316224896 BLAKE2B 93f2345f67648f5269b9a7c6f37a1a3275a787d8a8ee082c95270ec52cabbe037eaf968af3f27e2fafe6a6ccf1393755eb586bc26790a1703056c5ab764500dd SHA512 a3bdef78c1823c8aa734db3496c7ff8f2c56d77b13aef3d36364160f13ad6b9cde8c6b66ddb66fb386f50325fb04a62fec85bce1110a49df9f4cd3f257751941
-EBUILD jupyterlab-desktop-bin-3.3.2.2.ebuild 1673 BLAKE2B 1b363dd88558fae13ec6889c515f89db135204c27868c14000e8e1a57d12118a895018ddf09f95b51976963a30fe5c1c4964af3f5ec73506239f32d8068ae70d SHA512 d69d6cfcc0c7a7ffab816fe5c6edcdbd870b4a876296e65c29bdac5792a4036f439ad56630994a303923ec7f8ce7f91b546dfeaf6c907f41a2973361ae5addfc
+DIST jupyterlab-desktop-bin-3.3.4.2.rpm 317104304 BLAKE2B d983738b3f0e8bf25014e5c4dca2eb0ccfd5be238d2376a3703a2f5347687d1737b97fed8cf5a8937a1b2258bc26bb6fb4311624fbd76d690c88f74569b4c2d3 SHA512 d444865a2a51d10d27ffb8f98f137151eaccc8901dadbdb34794fd705cc395b33ee789ad921fa03300ff31657805e51a61656f3ece35c98843737d751512637c
+EBUILD jupyterlab-desktop-bin-3.3.4.2.ebuild 1673 BLAKE2B 1b363dd88558fae13ec6889c515f89db135204c27868c14000e8e1a57d12118a895018ddf09f95b51976963a30fe5c1c4964af3f5ec73506239f32d8068ae70d SHA512 d69d6cfcc0c7a7ffab816fe5c6edcdbd870b4a876296e65c29bdac5792a4036f439ad56630994a303923ec7f8ce7f91b546dfeaf6c907f41a2973361ae5addfc
 MISC metadata.xml 430 BLAKE2B 1bd3f621bb4d25086cc80c5b44a7eef4a61f58c1f56c7cb91ca4e39b8a5e7d5fdd37e912e48d99ee6ba6a19de1c61252b4ebe3afd554d487c549d22597c376fc SHA512 b99b088cb0bdcfdaa9d584fb580b12a754f30a378fdede655f7723075e81948fc57f9aad11a59944b164eb8c9c24f6f0828e95c5a227766e985778900ea08079
diff --git a/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-3.3.2.2.ebuild b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-3.3.4.2.ebuild
index 15bdd61754eb..15bdd61754eb 100644
--- a/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-3.3.2.2.ebuild
+++ b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-3.3.4.2.ebuild