gentoo resync : 24.07.2021

10 files changed, 9 insertions, 50 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 008c6a752abf..182e123d0d74 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index aa53aa9183bd..6f995dc7b782 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -1,6 +1,6 @@
 AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
 AUX blas.eselect-0.2 4948 BLAKE2B 1d96b09958669a85b6276ebe29f146cd592c141b11454c0c981c24e6a93f17779399300bfe540aa89c11f2399ef6a716728e3e2297e0cab8a1652b96a0c5ca94 SHA512 f312bb665fd70ec479fcd1e2fe11b50ccf8b6e80b8513e41a648328f521e7fc0639e83bc615afa177f780d3ec3d37ebee0c4755d2d03a3a604d71562791b4b11
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
-EBUILD eselect-blas-0.1.ebuild 689 BLAKE2B 7bb2bcf30dd97d8480cf4e8077129c524552d289b6c84849f977e04bb018c91ed716af61bb3fb352e878c317db75ac71a2ffec9b165447355cc8a5e6c4374c9c SHA512 02d513868d21e3ec1230d2c535fb41fc09087642f839403f3d0d56d27fee8bfd7f5852487256cf7c95371117dcefdeaf565338fee7f59fe0ac79c464d341c43b
+EBUILD eselect-blas-0.1.ebuild 689 BLAKE2B 23bbb495d1f9342c175b3ecc140826651ec58e023651956134a34a60f2a314d050ad347bad30ec148162df420a905dd176723e4722b5ee771cbc9fcc62ba4fbb SHA512 5755c6c01cad17e28223072a16277f9dd98fbec7e90eefb8056b5f18b213d68aa474a28419b4104b5a94d2e8f5ff7623808c65d45ea22d1196cc0af3008caded
 EBUILD eselect-blas-0.2.ebuild 678 BLAKE2B 3874dd3f30eb085da351d6f38ba67eeb4f514bd57e852e098d8758c97bf02b1f1753a7773112cdb5662b37fed4cd1e37c4d103189f60940b28d5439ce10f1a25 SHA512 be3737a7edf93bf739c26c14456c9a71a48cd012beaee1020d62e6c48ecbf4492e5c43a446e91d3a5e030aabfd79afd53607d767044c42db292fdb2b983298ca
 MISC metadata.xml 277 BLAKE2B f7ddd373063940f565a3c424a8cc9a3e092d44389a56930db8a875b880d5a6b2ecf644d4605342199f3dde5332caf903bf094daa554bd9abac6919230e371e21 SHA512 970154fcadc29300b663def3d2b5c46b1cb934694850e67ebb72cd9a5d838b602690379db0eac0cb013f618d977e2141df4dee89d0c5fefeb2b672a7dc86ab17
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index 786faf501089..ef334a1730a1 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="BLAS module for eselect"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index 41e9929fc239..c3af9791fea4 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-java-0.4.0.tar.xz 13412 BLAKE2B da3df5c342b1632d1cc597909283cfcb7cb71d4bff04c2aa3253110f06b8addc5121efe1a50409f2b297c70c4f816a385a0199e68821acb6c48e3065d3097b37 SHA512 a1bdb2554e4dc78d980cab80591f6e0c537f983ae78d2ca98bda8f5292cf749fa5a9983dc51c6576176566f2fcc255ca40b04c26bd1b5d7f1db2d12b76048567
 DIST eselect-java-0.4.2.tar.bz2 13782 BLAKE2B 10fd7faa3759f5b0d52c04bcd5a9f1c438814f4b477c12d2f0843c146d10cd8f7db43594ca4dc29de85bc33864fe1b205c69f9d2dc10c739ca1d50071fac6aad SHA512 dbb9ff873cf3073f60ba783e32b5a75c88114f790643d4a898db5429d04452f64cc5757a1ec2fb7c33beee1fc4509abeb7016f112c2bc75543a4250a85cb19cb
-EBUILD eselect-java-0.4.0.ebuild 1181 BLAKE2B f7b7c669bf6c2b509ef9c8d5fb9035375fe465abeb69098a1c40c060d42efe9cb59b006dcf368cb79fcfe4467af171c4fc0892a0e548d05f82ad35f34d612e6a SHA512 178f5835e1a30de24eeab918cd867ccce91b51622ca538c27134310ef71b9145124184b04dac4c5d79d8fe01ab060757331f9ba7b405e6183c72a2c3535b5a64
-EBUILD eselect-java-0.4.2.ebuild 1188 BLAKE2B 486fdd3b745a58a65139a625e4660ae1cc523a23ba4727b2cae5b0196a1a087196ab3e9cb1747d411bcd050b3d33981dd4b4350bb4efabbbe27ad5475f51aa54 SHA512 62a088ae4954a6cd2e2bbb5147042a8831c1d239159575d947f1e3d74ac53c922518a1ca9c9e863ec088543a6210e39e824c8d0ea9f6445ec6a32fef7b68b08b
+EBUILD eselect-java-0.4.2.ebuild 1184 BLAKE2B 237d0a89ebebf52faadbf3739766fcc8c3b09ac2192249014ab609ddc493b513b95de93977b7a98fc676d6080b992547214ca4f642707f774e31355d9d563bc3 SHA512 a64163e41759b096592d7632994c19d4c5e0e04ef9be9c9712fd101c11a7cf98a893c51af51889a4f94c147f96d274f5b5e35d2704da78f68e5249700bab9036
 MISC metadata.xml 255 BLAKE2B 10c56d3b58749cf6fa1ba350b10fdc53f7e7f6cc877224a1c098191a558770c904da2e97116396d8f50fdfbc71577a83d050de2411efeab4d89ec573f01fa36c SHA512 8ba7144e6402ba28e3c4a96edcfca7484aad1a5ae1908584a5c8abc98c26edbb58741b8c440c5f28288bf98be00453e32488cbf52f15474c25621a1a988a28d9
diff --git a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
deleted file mode 100644
index 6e4e7b76ac3e..000000000000
--- a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	!app-eselect/eselect-ecj
-	!app-eselect/eselect-maven
-	!<dev-java/java-config-2.2
-	app-admin/eselect"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ ${REMOVED} = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
diff --git a/app-eselect/eselect-java/eselect-java-0.4.2.ebuild b/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
index 1e1db97bf426..4a0b02d9ccbb 100644
--- a/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-ecj
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 203ffba00b56..1a00fa37bf60 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
 DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68
-EBUILD eselect-repository-10.ebuild 975 BLAKE2B 2c20086412e71e0fccaea146bc9aaf79b0d81e81fa51a3ef2d048baed86175a4ea0d92e849c80e2a71befdf116e759518fcf095944b784a430c21693c7fcec5a SHA512 58c67bd341b3edfdc09b0eb4234b07700d6b18c921dd8c30e4055ee7bd63ffef19ad0addea87d21ccf52285d3e1d9fc8eb3e214fc6d6711d831baeedffd0a8ed
+EBUILD eselect-repository-10.ebuild 969 BLAKE2B a4122bc0eb40145e010eea9ec409384b15942dc4a5fe34b2b04ff49883d81cb84e8687f5cce7c90c51b7387fc5ac4722e401b915b429ea40df868dd83b315e23 SHA512 497bbbfe2a9bdd6015a61eab9b40e062824beb50e59fc9850dc76dd9bd1389aecdacbc6d3c1536776d6dbbe406a47d78f9ab713c5ba92127ba1108d8b3e87697
 EBUILD eselect-repository-11.ebuild 1133 BLAKE2B e5b8008ced2b478c424cdcca871c8f1746a20c5d519495811b1fe551149ba50c16f0e435b3ce7e4ed49c47830c5f9360b8ac87a273855a1f60bea6e279a37835 SHA512 65c1360324945f1cba4c4b2c5d6abb32bf08b0dc547ce424fc12884cf64043c080183b5ab59da3486c14ace6f589d2a0e10334369b8134d4ebd072f17bf85ae9
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-10.ebuild b/app-eselect/eselect-repository/eselect-repository-10.ebuild
index b0b71d29e522..17abf1b7a558 100644
--- a/app-eselect/eselect-repository/eselect-repository-10.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1
 
 DESCRIPTION="Manage repos.conf via eselect"
@@ -18,7 +18,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="${PYTHON_DEPS}
 	app-admin/eselect
 	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
 	')
 	net-misc/wget"
 
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index a1095323a756..8f748f28844b 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -5,5 +5,5 @@ DIST ruby.eselect-20201225.xz 2008 BLAKE2B 1471c174dddda5078f54b39b46d78dd0a5a2e
 EBUILD eselect-ruby-20170723.ebuild 660 BLAKE2B f99f0a670cf3b8072f559d32f55c4e4084cda34be9792ad32897e80906a1e003399960a23e2e5f2bb6d44b6d730ff41e9e5a57176e26e3d9e22586311702f358 SHA512 b80d231e5251aaa9d8d1c43be530318f00b66a7a2b233067bfe13e51134a7767831499c68d797eb0086941812d2933c54645d62b5ed09e0d2902e0d1ec17b0ed
 EBUILD eselect-ruby-20190121.ebuild 659 BLAKE2B 44da41f3cb85c9055523e37d013055156fef7f0d77e12d95dec973f361b02e34599cfdff89bce040f5033c6105b32f306f1f171fa1a182a2a7ad6feb45d642b8 SHA512 6a4919551a48048f4123ea846983a14187fa599ea5e632cdf69fc54c80603d567fac710ab0d25b8211d043d2fd57db63d5c472b86a6615dcacb114adc40d58db
 EBUILD eselect-ruby-20191222.ebuild 660 BLAKE2B 612ef4f87880d2e1bd92cde6a11945cf13018494ba6851d1ba576c8da5335f746cbce823e6e28e09d6c30d35cc1ae25fd891a21f5784d62029d777525313febc SHA512 f2afe5357484f1c9e43caadb2358fec9ba3b46a748ce9d505669b1cebaee57a1081f5bd3860835f7e705125ffcd5f6c5df8fb1dfe2fd315f4c53ca20df4f0410
-EBUILD eselect-ruby-20201225.ebuild 660 BLAKE2B 612ef4f87880d2e1bd92cde6a11945cf13018494ba6851d1ba576c8da5335f746cbce823e6e28e09d6c30d35cc1ae25fd891a21f5784d62029d777525313febc SHA512 f2afe5357484f1c9e43caadb2358fec9ba3b46a748ce9d505669b1cebaee57a1081f5bd3860835f7e705125ffcd5f6c5df8fb1dfe2fd315f4c53ca20df4f0410
+EBUILD eselect-ruby-20201225.ebuild 667 BLAKE2B 8099fd217a6e8823e535c8dce429b7179038912d7a2c36fc75f3386897db3868cc94b11d587dbc345144c0a9b7d7765970a1784bfdbf4b69dc5f419e06d6ef00 SHA512 291d22cbd51e986ffda457ad670ddfea3374694b369b5889b1f154f58fb29ecc3505cb6e02addb942d00bfbabfc384e6f8ee0ed3f4df3063a8a3621dd5634b05
 MISC metadata.xml 270 BLAKE2B e0b0821f9b433f500d524e196c1959cdffd4f3a2208df4910dfe38a9a094093adf261eb432abfcd482b3f6c2674e13989e34080bc5a1d0ffcbd0131906786aa6 SHA512 a513d4e935263d67c39c625e11e91f6b88ecc0bdad483bba666b0046bdfe7f8cddfad6eabdace4c7d02dff9503de06da158f0186a3a894325d515a6d6e216cb3
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
index 587297ffbb97..f065856acf72 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"