gentoo resync : 04.05.2021

8 files changed, 27 insertions, 14 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index b4bb6cf53d6e..58b04b73e8b3 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 3eb7859c0e11..48630448d1cf 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -6,7 +6,7 @@ AUX fix_webview.patch 413 BLAKE2B cd33a6a72395d2c43b7126d4999d11102548184cd22a2b
 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.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
+EBUILD boinc-7.16.14.ebuild 6373 BLAKE2B 17bd68d2d63907c3fd0072b61fffd1e4ba56f7dce860686b1c9aa94c33c4c1ed361fe4f9cfc1b50b4cd8fa73204acce43453abddf213b376d67bbdf5430bf697 SHA512 df5e37cd444e7243957c05d4474c8b4f8f5e393ba60f04f17def0202bd999b3001f07ad6a8f73a427dab00f3d1bbb06c9e8c6c0901d55c1b24ec23c662f10a81
+EBUILD boinc-7.16.16.ebuild 6307 BLAKE2B 049eeea9f4ec125072a69536429b681dbbde4bc36177186be00e6f9be18e15a1f82e68999af34bac9a4bef47807389e820b3ea17938643318a474b777aa488af SHA512 35f5efd335b85efb5ce3b502763e096db6b47efaf6ada92c37be1c513c656d4e35aa92f378bad6a84b7c89317e10a69adaad1fd1ee91658c5d9cba8cdc918d8c
+EBUILD boinc-9999.ebuild 6297 BLAKE2B ad35d6ef1ddc1996c3e16b94ce9ad239bf26c13a6256eaf7f6e731503950f93e47ab431c8ceb09f74f4ad2507239a117bfdbc8ea702b3d85fcc842d5feeee632 SHA512 5b1523e5dacb46928f025e011230302194494b277287b76f4cf4878ec829ab640e8110c28d93958f3460661a81308900c7bd40804c3bdb69d46dbdcddde57a84
 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 3f403c0a77fc..97890ccde30f 100644
--- a/sci-misc/boinc/boinc-7.16.14.ebuild
+++ b/sci-misc/boinc/boinc-7.16.14.ebuild
@@ -23,9 +23,9 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
+IUSE="X cuda curl_ssl_gnutls +curl_ssl_openssl"
 
-REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
+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.
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 		>=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(-)]
+	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? (
diff --git a/sci-misc/boinc/boinc-7.16.16.ebuild b/sci-misc/boinc/boinc-7.16.16.ebuild
index 213bded49211..5ed095399806 100644
--- a/sci-misc/boinc/boinc-7.16.16.ebuild
+++ b/sci-misc/boinc/boinc-7.16.16.ebuild
@@ -23,9 +23,9 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
+IUSE="X cuda curl_ssl_gnutls +curl_ssl_openssl"
 
-REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
+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.
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 		>=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(-)]
+	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? (
diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index 6040de51a820..897b7f6af916 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -23,9 +23,9 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
+IUSE="X cuda curl_ssl_gnutls +curl_ssl_openssl"
 
-REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
+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.
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 		>=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(-)]
+	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? (
diff --git a/sci-misc/flashdot/Manifest b/sci-misc/flashdot/Manifest
index 0881b5804088..c80836d4b4d4 100644
--- a/sci-misc/flashdot/Manifest
+++ b/sci-misc/flashdot/Manifest
@@ -1,4 +1,5 @@
 AUX flashdot-1.1.4-gsl-ocaml.patch 1045 BLAKE2B 43809e76d518a755cc9bb2e0a0eca1d4e54cd749081f710a34ef96bc4af201452673a25b8a5e431839d148cbab10f69638c5b98539b9d969d262026677efccdc SHA512 010edd228c29189bb07eec81ec3b0ceb968ccfa99f6cf85d1d1b2b1b8b2af040b674e75fdf57662cdbb6ca076b9ea02d5164530ef91012bb3e9ea89de9457f0b
+AUX flashdot-1.1.4-ocaml-4.09.patch 317 BLAKE2B 5ae01d53e63c0a5d9f8dc7ddb25be09229ae2d9cf444fec40b92e6d13cee212c8714aa3a8d40cdd60c20e0e19a6c5e87d869c73cd1071df0890c22e3e94d8190 SHA512 7e7f4c7cd7ce2e4c4eceb5d547f46454aca73df7ba8e96c62269c624f565656a8b2223ff966bd2c736fc27d2c69a1adbe4bed4fe72c7f659440df40f011997b3
 DIST flashdot-1.1.4.tar.bz2 464763 BLAKE2B bed4b23ad21a8526714820ebf113e53a775dff39c0fcd3cdde847fb0a46ffbde5cd3f62ae2b92584ff1ad5c3b1b0a939130c3a182905b16503b60c1321a90e78 SHA512 2c7f803ca002f8a2d9205a6148c3bf602aa79c04fb67444cdfb23626706777d8463739f119ff124b58f7dc30c75750f95045fab4059540936082cfda7deea8c0
-EBUILD flashdot-1.1.4-r1.ebuild 754 BLAKE2B 3300ce3057744242675a563b3668c4145549f2fb8a3e1fdbb2b1201dba5c4c259eec424965dcffc5bd4a821b97fd435d392d65db21f0e16fbca7775d9484c61e SHA512 b27605e2c5a6e87d3dc1c63e96c10c73f32c5c1caf980def8fbe3759e7e75989dfc4c606c9f2c1ed1c81790fc89f707162aa0dbf0fe39e49dd17a354fee8a1cb
+EBUILD flashdot-1.1.4-r1.ebuild 788 BLAKE2B bc146d68b8e3892179236564c2cc943ff27857af8881ec65eee7211a82dc61346aea494d52dee4ac72a88d6abed9e9400307187181694e314df8ec2c0bd46ab3 SHA512 864f3d728fcfd6495ce7bdbc30d0dbd0d74081c611a5398c025936928c2dbf3376e56825e2df564f70a9bbcb726b8e45e958e6ce16faf3fea0b1eca6c5fa9900
 MISC metadata.xml 423 BLAKE2B 4f675af27277d8b0e3986f1a31d0815063d4cb5cc2de7f4a7e998fb4e7ab429fd3bf6a1797814437d5d35f516ace9c394c4edb24b768be5878218b58481d418a SHA512 b0e5a076e61cb0563cf6a5d9dd5254d96c7c1a00cf1a9a92404757073faae35e902b8c18a311f4aabe6ff1c22eee9cdeace76037b1de5c75000c28e6bfa33ae4
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
new file mode 100644
index 000000000000..8b00b86d52b7
--- /dev/null
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
@@ -0,0 +1,11 @@
+--- a/fls/fls.ml	2021-04-26 16:24:25.363442099 +0200
++++ b/fls/fls.ml	2021-04-26 20:10:54.965405870 +0200
+@@ -750,7 +750,7 @@
+ 		match input inp s 0 1024 with
+ 		0 -> Buffer.contents res
+ 		| n -> 
+-			Buffer.add_substring res s 0 n;
++			Buffer.add_subbytes res s 0 n;
+ 			fill_buff ()
+ 	in
+ 	let s = fill_buff () in
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index 97b4fd7fac5b..8d31eba90241 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-gsl-ocaml.patch"
+	"${FILESDIR}"/${P}-ocaml-4.09.patch
 )
 
 src_prepare() {