gentoo resync : 23.09.2020

17 files changed, 38 insertions, 58 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index cab52e259a03..d1da6897964c 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 6b883554bd82..8fb175de5b10 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,4 +1,3 @@
-EBUILD jdk-1.8.0-r3.ebuild 399 BLAKE2B 1f8011caa1acb3c714998f0d2f85657c0233e97c967cd4eaacc8f7dd86b2a2c38d3aab684ea59cf2f08ffb127ec612b72a637b07e5d89ae6edcf383029a6707f SHA512 800077616fbc5101605143dd2d2cefb296de0cf9f54bb41ab3f09f6672bb6bac7ae2cef6a5ba65aa73b93bd5b518c2eda8ad30c9b7fbcef9d1785db2dde2dc8d
-EBUILD jdk-1.8.0-r4.ebuild 474 BLAKE2B 7432bc5a55ec3e59254d389a8d9bbff22611a30fbfc3e15464b0d171432e84ab8974413516c48c38f660e3e1aabc8f1b0e834d8091d4e4cdcccb8b9f07f6a936 SHA512 bba3bcb4849aeba88b5d5f2ebc3428393813b03579182d7b5cf971b1a6aeaa458924e0da8cf40621662db1a6bbb1afa682b76331a600ff6c37c994c21bfd96d8
-EBUILD jdk-11.ebuild 364 BLAKE2B c44c4a193945dd07f271e5894235577d86453961fd5fb0251f9ca9202e405835ed5d460e8d871864a8dcdec6896c89c0a714c2a78af37c4c7230dfc0984b5c0a SHA512 4edd6302773a65eaa581e05032a1a7f8c867f566ed122c7bb8ee1dccbf588823e54a9908386aa0711478273bae0077a2f4fde8fd1c55a9ac14e3a03573b0f916
+EBUILD jdk-1.8.0-r5.ebuild 412 BLAKE2B 199dff482faa3f17b9f3f41e9e4ceb5f31f47b4a8da74a9310fef8c0e1cbcc935ef5d386e131bc2306d28a3c61bcf7870ad1e878ebd932b22184ff3d659d84e7 SHA512 3946a668bc116beeddf9608304279cc941825fc16991470be52aff7f86d79c4796fdda071272cd1933c3b78b0b36f4b715a5d4ed7193c102e37303651ce6385a
+EBUILD jdk-11-r1.ebuild 320 BLAKE2B afe18794e5b998b9c09ba77b554a160c0ee4041f9ee87cbc32d17242c03bed968fae47413760da5474d204f974365f95a8ee4d3c12bfa2413cc4f3c2d22bae7a SHA512 e6093468ac7127de8bafb4b4f5309dee990b1916bc6e835d4eafb9c9c9b0686fd6805dd02dbb260262eb64147772900321165793da858c50e66e49df86728444
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jdk/jdk-1.8.0-r4.ebuild b/virtual/jdk/jdk-1.8.0-r4.ebuild
deleted file mode 100644
index 4c4dec17876a..000000000000
--- a/virtual/jdk/jdk-1.8.0-r4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-
-RDEPEND="|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-		dev-java/openjdk-bin:8[gentoo-vm(+)]
-		dev-java/openjdk:8[gentoo-vm(+)]
-		dev-java/oracle-jdk-bin:1.8
-	)"
diff --git a/virtual/jdk/jdk-1.8.0-r3.ebuild b/virtual/jdk/jdk-1.8.0-r5.ebuild
index 29946e2b7fac..714e6853a531 100644
--- a/virtual/jdk/jdk-1.8.0-r3.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r5.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.8"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="|| (
+		dev-java/openjdk-bin:8
+		dev-java/openjdk:8
 		dev-java/icedtea-bin:8
 		dev-java/icedtea:8
-		dev-java/oracle-jdk-bin:1.8
-	)"
+)"
diff --git a/virtual/jdk/jdk-11.ebuild b/virtual/jdk/jdk-11-r1.ebuild
index ece992cf94d9..4548106d09bf 100644
--- a/virtual/jdk/jdk-11.ebuild
+++ b/virtual/jdk/jdk-11-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 RDEPEND="|| (
 		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
 		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		dev-java/oracle-jdk-bin:${SLOT}[gentoo-vm(+)]
-	)"
+)"
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 1350293aad15..b5cfc14d28e2 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,4 +1,3 @@
-EBUILD jre-1.8.0-r1.ebuild 379 BLAKE2B 4e35789a6f87dd7e76a62a2b8a8a477a59a13968ac0e613c419bfb90d72d2372082e5948cb5086b33117c5ba391b2f1102055bdc3e23aa8e4b3ae089e92ed105 SHA512 43cda60d964ea06a6ed494c4a3a8f067802d258f09be50edfa111c2fb04a7c1c86310339d39a38b67b661647505bd8d386fb5d645c543554a886a818fb5a5d8c
-EBUILD jre-1.8.0-r2.ebuild 418 BLAKE2B cce3fde916d2647aefbc8a0742f573ff42c42293294355128649846e0a70f47c799c98cb827402a5b24ac4ecebef1887dd373c14726664543359aca244bda884 SHA512 55cc9f0ff22991428d021e4a139695a90be5acf9a7b1a07e9905f1a8eda3e25c6c53e2b6e5eb601762134d844aa46909326b6d098e7a43bd349267b90c3f99bb
-EBUILD jre-11-r1.ebuild 353 BLAKE2B a5860fd569169adf49eabe2f23012af6054bf8fe8e28070bc0cfdc3365e02b10acc601056698022d154ba7d77e72a2f54c83dbc094a7572e0ee7d1cadc55416f SHA512 cc797f854731cf1fdb3b1001dd71b2e6234f2567a00ca1f1b8f3ffa3f6493fb976107d04380e135e951a1420dc21811b8dec95f75646937d4d88ad281231e2fa
+EBUILD jre-1.8.0-r3.ebuild 371 BLAKE2B 95d02d7c33aa27da97f1c0a606ae7cdf98c44780553afdeea9c1849a4a5b7db325a8255a1cf332667fcc73ed84d410b6d0395a37153e89e152e0fb9ee8540976 SHA512 062c9795c48a27d479a5eb49fe34c7d957a90950178209b055e5246c97d15b16807436e759aab063344cf9cea7a514c2d2ed544d898e9680a0f80985720d0ca3
+EBUILD jre-11-r2.ebuild 309 BLAKE2B 8e7122f9553999b5be2e96b35b8f27f1725335722dbe6e9ca600c6f0fd35fded12e3b1d52a9c2226a3ebcfba1caeb62359d7e184637792ee63e29f94ad1c3157 SHA512 67c40b8ccbcf03ff91d834bb03fb5f51a0ee7b453e9b116d4120839484669bb610f9acfd9c9180d24dd399e99b9e7db0828fb52a34598256363dbe49028c469f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jre/jre-1.8.0-r1.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild
deleted file mode 100644
index 119ffbd103c7..000000000000
--- a/virtual/jre/jre-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-
-RDEPEND="|| (
-		virtual/jdk:1.8
-		dev-java/oracle-jre-bin:1.8
-	)"
diff --git a/virtual/jre/jre-1.8.0-r2.ebuild b/virtual/jre/jre-1.8.0-r3.ebuild
index 4b0e1e98bd24..225cc8dbc8fa 100644
--- a/virtual/jre/jre-1.8.0-r2.ebuild
+++ b/virtual/jre/jre-1.8.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.8"
@@ -9,6 +9,5 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 
 RDEPEND="|| (
 		virtual/jdk:1.8
-		dev-java/openjdk-jre-bin:8[gentoo-vm(+)]
-		dev-java/oracle-jre-bin:1.8
-	)"
+		dev-java/openjdk-jre-bin:8
+)"
diff --git a/virtual/jre/jre-11-r1.ebuild b/virtual/jre/jre-11-r2.ebuild
index fbc640b49acc..53052a2bd68c 100644
--- a/virtual/jre/jre-11-r1.ebuild
+++ b/virtual/jre/jre-11-r2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 RDEPEND="|| (
 		virtual/jdk:${SLOT}
 		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/oracle-jre-bin:${SLOT}[gentoo-vm(+)]
-	)"
+)"
diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest
index ddd9cc6d6a76..98f03a411bd8 100644
--- a/virtual/libusb/Manifest
+++ b/virtual/libusb/Manifest
@@ -1,4 +1,4 @@
 EBUILD libusb-0-r2.ebuild 382 BLAKE2B ef63b79fc89b4f2e5b2d7417a7eeced5e53613fbd67058ff51290e5bdfb3ffd094dcc44c3411224e2441aeec378b45d1a2fde3bbb27052053cc1266eddbd307e SHA512 05724d4dd0a1cd5066308cca24b1130dc8509a77fdd47943e3a54e11d1f05099abf0c4833c8dba7744210d5ef38ce7498856e1563c2cb4e21c4737edf057ed77
 EBUILD libusb-1-r1.ebuild 398 BLAKE2B b25809708647dcce8765a13b5bf222be2fc40e1a33e7637e9aac3eb701ffbd706e41a65dd7135baf44c1a2898276fdfb1fc842604c43e573e1d3667a6f2eb319 SHA512 45e0fad6b24b0da1a3d948ce0353689fec65705aff758efcfe8c1bb6c2152d859c37a66797a513f9fc53ddc38fd4c8a7620d5ba8c80afca16d55a53821ec1b8e
-EBUILD libusb-1-r2.ebuild 555 BLAKE2B 0958e8f342234cd0dc9f9c34ed0948f5d1ba098a97cdda58e786098a1682a9ba8c60dcf14769de977f1e97c6e53a1dd8054c11220abda7484a4b5712b9becb93 SHA512 200d18a405210deb5a134b3b0b0849ef27808f72fc1d269249c55952db3d2f28138d903897e81e57add6285832fdb76e70cb26364c2a8a1bfea6ed08dcf5e12c
+EBUILD libusb-1-r2.ebuild 554 BLAKE2B 2e56cf3612866c33d8f2b5a642373955adf17213fdbf3df6bf2a586b3d0e65252e37e520da55ac1d008b40550a61a8df580ad07975a8fe584406459f6a0ab9f0 SHA512 8306bc71b0d003bb3cef9d079a7b45c4fbfd2af221aafc9e1fdf16d5e795986493bd2d60d85c06ba3434971c87a04546fc24d85460e1c6c5200cbca57cb4c227
 MISC metadata.xml 258 BLAKE2B a6fcc3580b114ca2b15b760b7e31af88ff854dbfe58715bdf35264771f6aa99f96eadbbb91d005905bf255f26e75d3b0a16ff9c04085c41d7466aaa4b11b90f7 SHA512 e1a07b8724003615826aa66143a03801309fd54fcc2a0f23075c13ca61d4ed35f1d105ea2b447845e2a3d917a84fa81f4f1d1cab6ba3b8d7f7e0ea025387ddf1
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index 525b5bfabba5..2522db44a912 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libusb"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="udev"
 
 # We force a recent libusb so that downstream consumers of virtual/libusb
diff --git a/virtual/mailx/Manifest b/virtual/mailx/Manifest
index 35cc1763516f..4b4328320d19 100644
--- a/virtual/mailx/Manifest
+++ b/virtual/mailx/Manifest
@@ -1,3 +1,4 @@
 EBUILD mailx-1.ebuild 382 BLAKE2B 17fea3055a19e68dd0fb4658fc4e40745196f2869188bfa2b4b848d46e9a949b286e1e7561586beda974dea5b02eb59b588efe2fe4c2b9b91d6d17dcc7a1652b SHA512 5878706435f45e6bfc67ecf54e88b869e7ec0045a2a13a35b423413bfc5995e3a60e2a99a69422b28e43ef93bfd2fa2a79b4d65a41228671737c7c7f3d8a1580
 EBUILD mailx-2.ebuild 414 BLAKE2B f2c391b1347564b37fb59d86f8df5d4e93970d2083b41835468697c0dad7cb867e8938b413c4abde086b3547429f535e945a0b72179be8e7f793f1eedf9e3131 SHA512 cea9b1604f4e21e4473ab8b99bd7c7d70a03de6022517e11b7d926f9836d1bbd482f75dc2b7e4a3a52bab5668e56d1c1e8c0f3cf8b26b7a4d3b7394d1b0eb79e
+EBUILD mailx-3.ebuild 393 BLAKE2B f1ae13b1f03e8d4737ea6ece1321977f028599bea671eec9537f14cff091b21a782a580b4cab7e35c24cc0d0ea386f3cb7ec30be136788a4ed2f39ccbae91389 SHA512 2d4a27dd07946fe3de4cf0f0944d855df6c2655812991826ce0b5c3a87d21cc12a3d88ac0fe70b13c60a97632d8a5126dc3c1e7292f44a6bb881f7e94706d089
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/mailx/mailx-3.ebuild b/virtual/mailx/mailx-3.ebuild
new file mode 100644
index 000000000000..bbc538574cbc
--- /dev/null
+++ b/virtual/mailx/mailx-3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for mail implementations"
+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"
+
+RDEPEND="|| (	net-mail/mailutils
+				mail-client/mailx
+				mail-client/s-nail )"
diff --git a/virtual/python-cffi/Manifest b/virtual/python-cffi/Manifest
index 0a40aa2ab4b2..0ffeccf01106 100644
--- a/virtual/python-cffi/Manifest
+++ b/virtual/python-cffi/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-cffi-0.ebuild 583 BLAKE2B ec2bc45f0ec539df749667d5258724330c94bed602cf7db73e75ccbab872144d784bb547b021ca2aa603306e945092d5e4041bfb3bc12609b7c1baa61af3ba92 SHA512 97d8cbd4cf20f287e661e33af6943163814d2a76cf3fb6e0868f0db3ef071c1fba59656b15d887365b2060d01e80dffdabf3056744f5adddeacddbee01510491
+EBUILD python-cffi-1.ebuild 573 BLAKE2B 015001198e1b4f51381aba9e8ad861480bc891156b29ced8b173c84fd8bc24732bbf24810fffb7d65cf2b962c4ab5f7b7a1db00dfc8b9f3dd3089bd566ec3d50 SHA512 23d8eacdd6ee0187d7035bebe3efd0f313d12b87a8eaf8480ab734b32ba3e85c1c6e75fd6af00eb51ed9b68e4c841852cea684ab476c8b823026e567fee71f48
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-1.ebuild
index 8f345d399adc..46dd20bde9dc 100644
--- a/virtual/python-cffi/python-cffi-0.ebuild
+++ b/virtual/python-cffi/python-cffi-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-greenlet/Manifest b/virtual/python-greenlet/Manifest
index d0e4ec39b331..d66c9642f38d 100644
--- a/virtual/python-greenlet/Manifest
+++ b/virtual/python-greenlet/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-greenlet-1.0-r1.ebuild 473 BLAKE2B 200c3418ee9ecf7c9a50469ef9520e2cb108ee67f878ef25a9ad282127d4e66f1a4a35ef5371338d4928e8371999068b720e548529ca553163a0905eb0df34f9 SHA512 c9dd8e0bcdf6dc6a8933b40a9780558884c3fd0bd6b07253bdacf6f99b6f2588ee18f2c723379f725b71fd7c6ab88c975abcc47741a7ac3c22e4c260b4d68091
+EBUILD python-greenlet-1.0-r2.ebuild 463 BLAKE2B 00ba26ac8000fb9ae397335510f497cbcf9d9088b5b197c1bf9c003d6df50d9ca5ddfba140f826976bfecd0cc8b73147020e1680554d1b7ac64a46b348a35224 SHA512 9e69e47a7919b6562999ae084200333df0eef7fa373337edba5799bbf55b65c39648397067a65bfc20408a6bb3b07d84076bdc4824a32065fedcda0c93655800
 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-r2.ebuild
index f452e5f894fb..988c8b2aaddf 100644
--- a/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit python-r1