gentoo resync : 17.07.2021

25 files changed, 33 insertions, 115 deletions

diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0cecbd800c7d..7694d9615447 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.38 b/metadata/md5-cache/virtual/dist-kernel-5.10.38
deleted file mode 100644
index 73a7794e3873..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.38
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.38 ~sys-kernel/gentoo-kernel-bin-5.10.38 ~sys-kernel/vanilla-kernel-5.10.38 )
-SLOT=0/5.10.38
-_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.44 b/metadata/md5-cache/virtual/dist-kernel-5.10.44
deleted file mode 100644
index fd85debef0c0..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.44
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.44 ~sys-kernel/gentoo-kernel-bin-5.10.44 ~sys-kernel/vanilla-kernel-5.10.44 )
-SLOT=0/5.10.44
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.45 b/metadata/md5-cache/virtual/dist-kernel-5.10.45
deleted file mode 100644
index 022f0b1cf12c..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.45
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.45 ~sys-kernel/gentoo-kernel-bin-5.10.45 ~sys-kernel/vanilla-kernel-5.10.45 )
-SLOT=0/5.10.45
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.47 b/metadata/md5-cache/virtual/dist-kernel-5.10.47
index c9493ab29d32..dc674456eb8d 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.47
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.47
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.47 ~sys-kernel/gentoo-kernel-bin-5.10.47 ~sys-kernel/vanilla-kernel-5.10.47 )
 SLOT=0/5.10.47
-_md5_=3c8f423a93a67dff00cfa7548459db74
+_md5_=c5791419f38d013507695e09c730fb4b
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.46 b/metadata/md5-cache/virtual/dist-kernel-5.10.50
index a53afb895289..60c6c5211f2f 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.46
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.50
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.46 ~sys-kernel/gentoo-kernel-bin-5.10.46 ~sys-kernel/vanilla-kernel-5.10.46 )
-SLOT=0/5.10.46
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.50 ~sys-kernel/gentoo-kernel-bin-5.10.50 ~sys-kernel/vanilla-kernel-5.10.50 )
+SLOT=0/5.10.50
 _md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.10 b/metadata/md5-cache/virtual/dist-kernel-5.12.10
deleted file mode 100644
index fe642003ba62..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.10
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.10 ~sys-kernel/gentoo-kernel-bin-5.12.10 ~sys-kernel/vanilla-kernel-5.12.10 )
-SLOT=0/5.12.10
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.11 b/metadata/md5-cache/virtual/dist-kernel-5.12.11
deleted file mode 100644
index 5717f7e602ed..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.11
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.11 ~sys-kernel/gentoo-kernel-bin-5.12.11 ~sys-kernel/vanilla-kernel-5.12.11 )
-SLOT=0/5.12.11
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.12 b/metadata/md5-cache/virtual/dist-kernel-5.12.12
deleted file mode 100644
index 7dd32384a38f..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.12
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.12 ~sys-kernel/gentoo-kernel-bin-5.12.12 ~sys-kernel/vanilla-kernel-5.12.12 )
-SLOT=0/5.12.12
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.13 b/metadata/md5-cache/virtual/dist-kernel-5.12.13
deleted file mode 100644
index d948a851d862..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.13
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.13 ~sys-kernel/gentoo-kernel-bin-5.12.13 ~sys-kernel/vanilla-kernel-5.12.13 )
-SLOT=0/5.12.13
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.12.14 b/metadata/md5-cache/virtual/dist-kernel-5.12.14
deleted file mode 100644
index daa733471f5a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.12.14
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.14 ~sys-kernel/gentoo-kernel-bin-5.12.14 ~sys-kernel/vanilla-kernel-5.12.14 )
-SLOT=0/5.12.14
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.43 b/metadata/md5-cache/virtual/dist-kernel-5.12.17
index e42d5cccbd9b..b5862e89a982 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.43
+++ b/metadata/md5-cache/virtual/dist-kernel-5.12.17
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.43 ~sys-kernel/gentoo-kernel-bin-5.10.43 ~sys-kernel/vanilla-kernel-5.10.43 )
-SLOT=0/5.10.43
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.12.17 ~sys-kernel/gentoo-kernel-bin-5.12.17 ~sys-kernel/vanilla-kernel-5.12.17 )
+SLOT=0/5.12.17
 _md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.120 b/metadata/md5-cache/virtual/dist-kernel-5.4.120
deleted file mode 100644
index 65ba1919583d..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.120
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.120 ~sys-kernel/gentoo-kernel-bin-5.4.120 ~sys-kernel/vanilla-kernel-5.4.120 )
-SLOT=0/5.4.120
-_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.125 b/metadata/md5-cache/virtual/dist-kernel-5.4.125
deleted file mode 100644
index d08fc61cad55..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.125
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.125 ~sys-kernel/gentoo-kernel-bin-5.4.125 ~sys-kernel/vanilla-kernel-5.4.125 )
-SLOT=0/5.4.125
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.126 b/metadata/md5-cache/virtual/dist-kernel-5.4.126
deleted file mode 100644
index 7eefdaff1ef4..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.126
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.126 ~sys-kernel/gentoo-kernel-bin-5.4.126 ~sys-kernel/vanilla-kernel-5.4.126 )
-SLOT=0/5.4.126
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.128 b/metadata/md5-cache/virtual/dist-kernel-5.4.128
deleted file mode 100644
index 4070628309b0..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.128
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.128 ~sys-kernel/gentoo-kernel-bin-5.4.128 ~sys-kernel/vanilla-kernel-5.4.128 )
-SLOT=0/5.4.128
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.129 b/metadata/md5-cache/virtual/dist-kernel-5.4.129
index b2de6731ac68..1d05a5a52def 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.129
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.129
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.129 ~sys-kernel/gentoo-kernel-bin-5.4.129 ~sys-kernel/vanilla-kernel-5.4.129 )
 SLOT=0/5.4.129
-_md5_=fbd9cdacb9673c96feaf6d5ab26b7101
+_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.127 b/metadata/md5-cache/virtual/dist-kernel-5.4.132
index 586b36c5505a..640b476c281a 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.127
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.132
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.127 ~sys-kernel/gentoo-kernel-bin-5.4.127 ~sys-kernel/vanilla-kernel-5.4.127 )
-SLOT=0/5.4.127
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.132 ~sys-kernel/gentoo-kernel-bin-5.4.132 ~sys-kernel/vanilla-kernel-5.4.132 )
+SLOT=0/5.4.132
 _md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/fam-0-r1 b/metadata/md5-cache/virtual/fam-0-r1
index 2ab3e2155841..8da0fe6e616e 100644
--- a/metadata/md5-cache/virtual/fam-0-r1
+++ b/metadata/md5-cache/virtual/fam-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual package to choose between gamin and fam
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=app-admin/gamin-0.1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-admin/fam-2.7.0-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aacb2e41db6365c1622fc04110b622c4
+_md5_=37f1876011c3c1af21df2547aace661f
diff --git a/metadata/md5-cache/virtual/gsasl-2 b/metadata/md5-cache/virtual/gsasl-2
index c890743764ff..31dc37ecc1a5 100644
--- a/metadata/md5-cache/virtual/gsasl-2
+++ b/metadata/md5-cache/virtual/gsasl-2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU SASL library
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 SLOT=0
-_md5_=216aa61ac8f49669570c990e9d577ed6
+_md5_=8d302de255e3bde7f01fc779296285a9
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r5 b/metadata/md5-cache/virtual/jdk-1.8.0-r5
deleted file mode 100644
index 0a2d2ff48e44..000000000000
--- a/metadata/md5-cache/virtual/jdk-1.8.0-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Development Kit (JDK)
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
-RDEPEND=|| ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 )
-SLOT=1.8
-_md5_=830cc8aa044be132445b66dcc845ecfa
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r6 b/metadata/md5-cache/virtual/jdk-1.8.0-r6
new file mode 100644
index 000000000000..170c2264f0c6
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-1.8.0-r6
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=7
+IUSE=headless-awt
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+RDEPEND=|| ( dev-java/openjdk-bin:8[headless-awt=] dev-java/openjdk:8[headless-awt=] dev-java/icedtea-bin:8[headless-awt=] dev-java/icedtea:8[headless-awt=] )
+SLOT=1.8
+_md5_=acd6a359020da66943924a643c924e19
diff --git a/metadata/md5-cache/virtual/jdk-11-r1 b/metadata/md5-cache/virtual/jdk-11-r1
deleted file mode 100644
index 523fa858ab6e..000000000000
--- a/metadata/md5-cache/virtual/jdk-11-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Development Kit (JDK)
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] )
-SLOT=11
-_md5_=dc8a9b532b7b9d43bef8cfada4edc530
diff --git a/metadata/md5-cache/virtual/jdk-11-r2 b/metadata/md5-cache/virtual/jdk-11-r2
new file mode 100644
index 000000000000..ac945ad14d39
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-11-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=7
+IUSE=headless-awt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+),headless-awt=] dev-java/openjdk:11[gentoo-vm(+),headless-awt=] )
+SLOT=11
+_md5_=de8fb76c9f83004ac2b4b436145b2c8a
diff --git a/metadata/md5-cache/virtual/szip-2.1 b/metadata/md5-cache/virtual/szip-2.1
index 2b6093a44eaa..52bce0577cb8 100644
--- a/metadata/md5-cache/virtual/szip-2.1
+++ b/metadata/md5-cache/virtual/szip-2.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for szip compression drop-in replacements
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+EAPI=8
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( sci-libs/libaec[szip] sci-libs/szip )
 SLOT=0/2
-_md5_=3370a29553f9a1db483c2d7fc48d1bd4
+_md5_=39f259b8ea991db36c7ef7c0e7beeac4