gentoo resync : 30.05.2020

12 files changed, 10 insertions, 46 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index fb2c06fc7e5a..784b5a52a52d 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/blas/Manifest b/virtual/blas/Manifest
index c83e872ec614..eecb006ec7ea 100644
--- a/virtual/blas/Manifest
+++ b/virtual/blas/Manifest
@@ -1,5 +1,5 @@
 EBUILD blas-1.0.ebuild 418 BLAKE2B 06e6925626b426d8122cac589a641077f8a965a0702e407560667e2f0e4952f9884118e5609cffffcd23e475c2aeed80ab81129c8d401e7ea52570d8bf908c26 SHA512 124bb8aefb390c196c90b7fcd1d7bab79cd68fdaa3524900272bb38f0dcff50f47c96ff537bfdab0983c85e0d481cb199e4c1daed5b138c2b36a4b57fce21b43
 EBUILD blas-3.6.ebuild 415 BLAKE2B 79d32456f521e4b87414f847e0bdf3032634dcb1c0b010c57de9e427b775cd713dc6408d1d08c0beb6d96a90da398dcbd61c011e502fb4f15f35e040ef49eea1 SHA512 dceacfce30730e45460f4a66b02ecd14cd86829b375bc9d0db37f3fca869e86577f13f6654d955ca3333377b165ae7594217c5e1eb38cc9e4fa1b9460363a8cc
 EBUILD blas-3.7.ebuild 422 BLAKE2B ad004e317814cfa401671931a94bdda919dfc466bdfbcb5a250750784f5c8e488a1bddd9e277389699c8707c64d92c3c191952468b2a1306c7f2c7d21e9c9185 SHA512 86df4421344eb08cecc6d4d2deefc03467bec5f8fe64b9205eba04a8d536b1910795ccb45edf200d9d05866166eb5b0e956dff2c166319b5a87683ff18e6f882
-EBUILD blas-3.8.ebuild 551 BLAKE2B c21601030ca62f83f755c4f2b8eb957c649757dd86dd6acf0fb3798b091d7a699514396bdb8b7424c846a1d0a33ad77277591d29d2cfb31b2584f58f4521956c SHA512 a4f56d2abfefdfb2b3e6e72f1e347bf1f7cb0110b60fba9f02686314849164373a785d4f5c1820ff2e16f484fdb167cae23d0ea558db8e28afe62fe6803ec372
+EBUILD blas-3.8.ebuild 550 BLAKE2B 04246d9ad902101616db63b872abd7e6f2a015a884fa4e126e81a1ead61bb6ea8779b05aa417a1d3f690b4a6a11d4c5a9795fdb3c8adfcd2893a60861a2f509a SHA512 c23000662af1881aabb9ef0c9e3dc6ddf80f51d129b60a09586c424dfd8dc1a54ad37653cad67953d1510e533c592fb9d8d5025fffb9b809d9717922f5fbff67
 MISC metadata.xml 522 BLAKE2B fbaf0c9e2e5611db496efd183e8429dcf90a2b7926c9d4baf9be38736f15127b3e721dc0b9a6323ccde12e9fb55fd8438e6fdb75105cb5aea610687a9d11d8d0 SHA512 b9a3489350524b32015a1af2a1a955e407111ddd8d09384ccfa92d423ba7bcba3c45d1a43821715aa67fe177709295151f9046217a7c6010213d0e0ceef82074
diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild
index 23e3a118b04d..c0c2cb297a4e 100644
--- a/virtual/blas/blas-3.8.ebuild
+++ b/virtual/blas/blas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/lapack/Manifest b/virtual/lapack/Manifest
index e14f3fbc5558..75348805a5f9 100644
--- a/virtual/lapack/Manifest
+++ b/virtual/lapack/Manifest
@@ -2,5 +2,5 @@ EBUILD lapack-3.0.ebuild 333 BLAKE2B 88a1d115019e2daa742e2aae6df01e353b9ddba011c
 EBUILD lapack-3.1.ebuild 406 BLAKE2B 59dd90ee1c90b2a9758e6a59f3e370f8d00ebbd83b016e1de80c266935f2d0f420dc91b2446e7636fbe7a390f43b7a92194a36c05ebeff4c3846bd59b59a2f56 SHA512 fb7ad055ea2228cc26ded7a1a28a593ee2230ce180db6a13ccf9be0fa2a1d6948ddd913ae078b2ad616ebaf1c21f96316121b2047e6d7627142a7e6fd5d69881
 EBUILD lapack-3.6.ebuild 411 BLAKE2B e645fb35c0c4d292fcedbbceae29fcdf4a448c8e343e6d412faa57b1deab5c7d46a31ef695c17e6063c6b75f6e060bf7be4c337a9347dafebddc77c3c0bc4a99 SHA512 c243ac0fd76b22dd73d4ca634441260fdfae2069da94c371f6a238e2272ff68cbe76e79025613a70a1d2f5c9f7cd4049cad1a2bdc8609569fa3deb660fad2f82
 EBUILD lapack-3.7.ebuild 418 BLAKE2B 82e25aaaa91c9f0715dc8333e74592e3638c87741b6c3fe88b822da2bfb669eb1cb351af6de6fe56f38a61bc140abd6351dea1a532ef435be2cd280e420eacab SHA512 6a94d1cb5fe4feb155f5dab2b022bbda9c212c7ca6961be393958f0fa03e557e03873fce025d5688d7b8fe3d934ba26b09e518625429f17394b834bcaff9ec6f
-EBUILD lapack-3.8.ebuild 529 BLAKE2B 8ffd9950678f23e765ac538b208ad4e1a58b4bb27af374bf349800188bc6de67fab2ce50638588065b1c5c15d82ff00bae9cf496e244ac553d17cead82fb07b8 SHA512 3060bdac0945bf80fe4f34f6e49797288500763338843f387ab75227e052df7d0840cd7aeba7306a9cd0b70d3ac7ccb1c095abd1a6af68d8a07505e19de79cb0
+EBUILD lapack-3.8.ebuild 528 BLAKE2B 3cd05252f0de3d23f309cddb538ca5b4179ef0e08561c25216591a85520412997f6e314616ce8c2386a2fd96e4b0f626fe1540c4794dff0455d4934f232f50db SHA512 812827a890368608643e044142cc67f75b869ec380d56a5e1fcbe0a157c88683b53e5fe989891edb901a1a81b1f98a85edbbbee0da4e79cc695562058b91cfa0
 MISC metadata.xml 512 BLAKE2B 4fbd9b4b12e1bc72c6b031655b1b9cf39837e5afb995129dbcff75ce741b6d523d5ec81401b8992dbd501bd340da864416f960fa9fb4f0dee3e59096160ddc7e SHA512 3baf1a95b1ab22dae8d3ae0492c6116d1ca8e2b780d4b8f047e01eb3edd12753cff367f0022a7d6e1f926d4afba45892d0cd8be6ecef61a0e9bf4e7f2b023b3f
diff --git a/virtual/lapack/lapack-3.8.ebuild b/virtual/lapack/lapack-3.8.ebuild
index 949be235a01b..1ebca7e02d4d 100644
--- a/virtual/lapack/lapack-3.8.ebuild
+++ b/virtual/lapack/lapack-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 679a0965de6d..918320a2abf6 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,3 +1,2 @@
-EBUILD opencl-2.ebuild 1258 BLAKE2B 8719496fdf06af7e5049c5bbf78360fc7bf2b330ce82c49ac3561a0516aeffaa5de1c374335867a97c1efc3f144247abc6150461b2dcea6df01bf2c40fa68123 SHA512 9de56a00eeda95723e37b93cc5ae8b249748f22b72a5264438195887fa7f6b35561bba8bc5a5d0f8dfe99290aec19a1fd19294fef0d2ebfe5abbaad98edef9a4
-EBUILD opencl-3-r1.ebuild 1370 BLAKE2B e047fefb8aa436c4c413ecc367f0a985d303eb51bff1ea472a6303382c5bae09ac5573ff3ada1595a48423cd432080e9d0d7d39a3deb9fb0a3cb111bc0226f03 SHA512 9ff675f9829d1eb7e7deb184f66c24ce41ae87112713ef9436fb3cb3f23fba7fedbbda77041fa2af33c1377fc47fdd0ed1c8be8432c696c59110820a66ec2d34
+EBUILD opencl-3-r1.ebuild 1369 BLAKE2B 9805bc459b0a6972f93b0ad8be56cc36f376417bce7b1b7f455307094aae94bed37d230b5ae6f0e0e860ba25308382035b51a4f76f5d16f6ab26fb38d76739af SHA512 bd3260ba9dd9c5e2e8d4d4bfae91691c1155ce48398b0016c863f0c3ddd1b9f94d154ea8f1f8b299bb892566f98ed03a19c12b5e6af0c11e925d11f48f307f63
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild
deleted file mode 100644
index 51ea03746dee..000000000000
--- a/virtual/opencl/opencl-2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for OpenCL implementations"
-SLOT="0"
-KEYWORDS="amd64 x86"
-CARDS=( amdgpu i965 nvidia r600 radeonsi )
-IUSE="${CARDS[@]/#/video_cards_}"
-
-# intel-neo, intel-ocl-sdk and rocm-opencl-runtime are abi_x86_64-only
-# ocl-icd is essentially a dummy/you-are-on-your-own provider - it installs
-# header files to include in the source code and a library to link against
-# but does not support any actual devices
-RDEPEND="app-eselect/eselect-opencl
-	|| (
-		video_cards_i965? (
-			abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) )
-		)
-		video_cards_amdgpu? ( || (
-			abi_x86_64? ( !abi_x86_32? ( dev-libs/rocm-opencl-runtime ) )
-			dev-libs/amdgpu-pro-opencl[${MULTILIB_USEDEP}] ) )
-		video_cards_nvidia? ( || (
-			>=x11-drivers/nvidia-drivers-290.10-r2[uvm(-)]
-			>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] ) )
-		video_cards_r600? (
-			>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] )
-		video_cards_radeonsi? (
-			>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] )
-		abi_x86_64? ( !abi_x86_32? ( dev-util/intel-ocl-sdk ) )
-		dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-	)"
diff --git a/virtual/opencl/opencl-3-r1.ebuild b/virtual/opencl/opencl-3-r1.ebuild
index f7caed35760a..8b108a5fbc65 100644
--- a/virtual/opencl/opencl-3-r1.ebuild
+++ b/virtual/opencl/opencl-3-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenCL API"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="|| ( dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 	dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] )"
diff --git a/virtual/python-cffi/Manifest b/virtual/python-cffi/Manifest
index 4740d2e17e13..455f7cead24a 100644
--- a/virtual/python-cffi/Manifest
+++ b/virtual/python-cffi/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-cffi-0.ebuild 574 BLAKE2B 906b5cb00a590837a1da80b3a86501bbad41f842edc1768c3d5190aa233fa01b7321dd0e9ad2d41107143e1bfee3c0916b56dbefc0a98ee540e8aca236680a37 SHA512 cc015c39d598ac3345e06ce9effeefda617ea0fa257355eddd7d2a4225b8001057118bc962cc65fc694691941f17e6443190f821fc06666a4a91a6675200166d
+EBUILD python-cffi-0.ebuild 576 BLAKE2B 417d51623222a928666026c8f13aa9e1408c21be208c3d7f17fe9e7bca202e31bda82f91ca60fbdf768599d7bcd3565680ede014200c93de32a58afd0e33461c SHA512 40495adc8bd1ed1ba77850f35f6997fb54ef589e7f9d9c2e9b8f90749f9e8d6b35ca35c81e64f50033b547bb69b5098bbff3c171c24388b79fcee85e87d6856e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild
index 4c6293743c18..01c7f68dacf8 100644
--- a/virtual/python-cffi/python-cffi-0.ebuild
+++ b/virtual/python-cffi/python-cffi-0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-greenlet/Manifest b/virtual/python-greenlet/Manifest
index 3a775bfa7232..d0e4ec39b331 100644
--- a/virtual/python-greenlet/Manifest
+++ b/virtual/python-greenlet/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-greenlet-1.0-r1.ebuild 471 BLAKE2B 3b7f9be76ac465a8177b34d9318466450c5eb24f5992cb7bc15fa04b2772d0a141f2495937318248423eb7f95062443ec275f7dd56bb37958ebeee3eda244784 SHA512 2137c852db13b78d85559b2979a6468eee4988200774dadefdb754417c3b7be028fba25e857744d94a11de0fd132a10b9d01a028f3cee931ed3da44b16d3211b
+EBUILD python-greenlet-1.0-r1.ebuild 473 BLAKE2B 200c3418ee9ecf7c9a50469ef9520e2cb108ee67f878ef25a9ad282127d4e66f1a4a35ef5371338d4928e8371999068b720e548529ca553163a0905eb0df34f9 SHA512 c9dd8e0bcdf6dc6a8933b40a9780558884c3fd0bd6b07253bdacf6f99b6f2588ee18f2c723379f725b71fd7c6ab88c975abcc47741a7ac3c22e4c260b4d68091
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild b/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
index 00e373fb83ca..f452e5f894fb 100644
--- a/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
 inherit python-r1