gentoo resync : 20.10.2021

5 files changed, 41 insertions, 2 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index c5e7edd091d8..174c4809d092 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index db1ca44b5d7b..1f4af6fd6013 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-java-0.4.2.tar.bz2 13782 BLAKE2B 10fd7faa3759f5b0d52c04bcd5a9f1c438814f4b477c12d2f0843c146d10cd8f7db43594ca4dc29de85bc33864fe1b205c69f9d2dc10c739ca1d50071fac6aad SHA512 dbb9ff873cf3073f60ba783e32b5a75c88114f790643d4a898db5429d04452f64cc5757a1ec2fb7c33beee1fc4509abeb7016f112c2bc75543a4250a85cb19cb
+DIST eselect-java-0.4.3.tar.bz2 13799 BLAKE2B 353035ef1c0b3e1cd79021c9198bedf29fdcb3f13fdfb2e5a8384796f2a48236d671f07d7657409273dd1f52e37272d91383d2a14d64ed0cedb686a8e277b009 SHA512 40b10768f00f03c49e1b60aab615658ac1d986444aaf487ca74f7c14edb5dce62d85fc3ce049e857d0ec2eaea496afa17c45de59e7179331f112eb51cbe451e5
 EBUILD eselect-java-0.4.2.ebuild 1184 BLAKE2B 237d0a89ebebf52faadbf3739766fcc8c3b09ac2192249014ab609ddc493b513b95de93977b7a98fc676d6080b992547214ca4f642707f774e31355d9d563bc3 SHA512 a64163e41759b096592d7632994c19d4c5e0e04ef9be9c9712fd101c11a7cf98a893c51af51889a4f94c147f96d274f5b5e35d2704da78f68e5249700bab9036
+EBUILD eselect-java-0.4.3.ebuild 1134 BLAKE2B 8fdeb7331947a28be9db307e9785b1fa35c14458b742be7a93bc681bf196022c334cde546776a7a6ded66d52f6341ac309cd2728cfd2b2a545647d2a6e20cfca SHA512 daf0358f17c6f0493d44005c202c27c06e38ee7f95ea53bab92631df21964ca820757abeb231f1f9657805916473729a1d90ace4b674c803dcbec0be6ff441dc
 MISC metadata.xml 256 BLAKE2B 06034a9ec5059f1276335c4e4c5ec5203bccdecd555ff0c8c1d9d19db69f1540efc0c2265f4598fcd207d1b656a390c34908acd72600176a202d76ce64605270 SHA512 94123950f1f7bc7ec13f90d1c3f9f4c04deb2ac8997673683acf491733eb329a8b67658bd2fcfd11d2648823cbe4493ba14f0e549f711b477086d7ac98400e4e
diff --git a/app-eselect/eselect-java/eselect-java-0.4.3.ebuild b/app-eselect/eselect-java/eselect-java-0.4.3.ebuild
new file mode 100644
index 000000000000..a680ad3c189c
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.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"
+
+RDEPEND="
+	!app-eselect/eselect-maven
+	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-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 233b4e3f2342..c0648bf2b681 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -4,6 +4,6 @@ DIST ruby.eselect-20191222.xz 2000 BLAKE2B ec89dca67730ff3c6acba8906f9436866b45c
 DIST ruby.eselect-20201225.xz 2008 BLAKE2B 1471c174dddda5078f54b39b46d78dd0a5a2e23b19185d3c833f870b94809c4e7a642bb987d2213e9f99799c7669f0cbeca77dcefe381804f9aa91e197ed499c SHA512 e5b6ff18a7e1a7e3d902b59d27a558499fb87008abe51c3901430ebeaaacd1c1ebc6b782d6eb083d0d2abb5f0fd7cf712b42b451342cbeccceabb8d17859668c
 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-20191222.ebuild 653 BLAKE2B 39fdb60a88a6141e8944007e90e9424e6dfd6b708120aa0831f368a61942a8e6d459709dac9ca2d6904dddb96ccd247c1fcdf1829725e266f84b21938c80a18b SHA512 1737189b6c35fe8cfa82aa6877b8b1aa1ee39081540316b00b32706932c31560355e6a1ca1ed81c092a89695e9d2ca7d56a7afffaf09d0e9bafa403344d9fa44
 EBUILD eselect-ruby-20201225.ebuild 667 BLAKE2B 8099fd217a6e8823e535c8dce429b7179038912d7a2c36fc75f3386897db3868cc94b11d587dbc345144c0a9b7d7765970a1784bfdbf4b69dc5f419e06d6ef00 SHA512 291d22cbd51e986ffda457ad670ddfea3374694b369b5889b1f154f58fb29ecc3505cb6e02addb942d00bfbabfc384e6f8ee0ed3f4df3063a8a3621dd5634b05
 MISC metadata.xml 271 BLAKE2B ba1244de4ef19fe62ff4c24356d879f136972737333f8cb217b4b7ec8377c9eab52c0775ceb464b203167dd2a02245e5c5f4235b1eca422eb8e9432939e26d94 SHA512 71c167a5edafa5ca0d3fe6c97dd82c6e0fbbfdb4f7d4a85b19d2f96583d5a02e14f153c331345459bc448ccd8a387dd37034a56d2153a67b71056c7ca142c0cf
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
index 587297ffbb97..a666bef2a72b 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20191222.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 ~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"