gentoo resync : 02.02.2022

5 files changed, 5 insertions, 50 deletions

diff --git a/java-virtuals/servlet-api/Manifest b/java-virtuals/servlet-api/Manifest
index 35c7b1a79ff1..f8ae664053ea 100644
--- a/java-virtuals/servlet-api/Manifest
+++ b/java-virtuals/servlet-api/Manifest
@@ -1,7 +1,5 @@
-EBUILD servlet-api-2.3-r1.ebuild 512 BLAKE2B de5c6550de9f73ab6a51947163ab7b594699025e2c8b01cc1635cff6263d64b6be6b05bfd74bc703b0ccf66bbed795424af8cecf22ce6458cd64a5158a4f4ebe SHA512 f69a8aa09a4fcbafd66ee728e50f98c0482a70801f20c14009950486d0dd8e6dbc1e1a7183317b4b6147dd5a29747033d7e56fd20cb9e5f57a49c4bb496af354
-EBUILD servlet-api-2.3.ebuild 508 BLAKE2B 4e2d33f8ef020d00c1e8e1c8764cd59644209bf335bf237987063ce480ed4b935f18e325d1bbeaebba204131c0f0148d218a022b420b1fa25b32dc49849364c8 SHA512 0c05dbcc20e06e46b803b4dc2dc1316a5a119fe50d607687a8f2e32b741b82af8ba0f64485caadf58c238ffc2ad011107e14e6dc0cd387b8df57b8e2f72a86b7
-EBUILD servlet-api-2.4-r1.ebuild 522 BLAKE2B 9d9f4f5077aaaed06bad3872091ad1458ce3adc60ad25caffc91239cae9fad1f76a92a5b5b46bd5e9948d585515e4e75a3222623e1658ee5b4b33c08935c546c SHA512 28ce182752652563687766c92c617c06bd23e0fe5e1ce493b2ab03cc347e9c4576c55a57a0726025caec7f49f0dbafdd0aa65bb897b1fd0f79e26b616579ba05
-EBUILD servlet-api-2.4.ebuild 538 BLAKE2B 26f249cb8dd2502fa82a6a8e19166669a6b7f052358be32b4408e69b607f9420f16d52e3223624c748842a04ab14bd687041f5322e553d83978240905f1a0bda SHA512 8dccf5d5f143ce4dd24e020f3147b9e0a32e236d19f1e4f149cd5ce23b9f67920d68393ae6e977eb8a089a82a361f262cce772d6c990320a21fc2a6262722bbd
+EBUILD servlet-api-2.3-r1.ebuild 509 BLAKE2B 6c48322a4944606000db1a194147b32138ea5fb276fedba2c119df2d3045b11aeb947d2d410a96a8d39042d5cfbca9eb66d760453ee8ffaba9595febff577a6c SHA512 2ad13b5b525ed20005ef546b52c11d97fae066bbbb27b5fefc0f7db120444595bfd8568c5e7f907855c4efe8f88c59edbe403ec400187401bb0fcd94121c11e6
+EBUILD servlet-api-2.4-r1.ebuild 519 BLAKE2B 9ae845bd350c987531fa9bc07059a6a491d0374c5a88b9a440fba3869d76ae77fbb230932e153366ee7541d09c3ee042562045f95ff3faa5e59e1925e270cea6 SHA512 2f381e3783c36ba9b44cc66f6046f79988d16a57df41adc9ee6083f811f276552da153cce17517b86de60f290c799b92387299802f25129d0a2cbb57eb995055
 EBUILD servlet-api-2.5-r2.ebuild 460 BLAKE2B d7a96daf6a1ab93451eced12f0c0e88b2fa620b569e11b2eb646e5793c072356db8cedc4a7dbecdf5aaab61dee2844134fb15eef10ec4b2fcfb64d50e6a2945f SHA512 f23c008e287603871dcb87d1254b7677e8bbdc35b4a9e9239498191b5d8606c7ec07fab4af8b2d8b786acd29a716ff62890d9057eb6713191dd2785d0ac53f93
 EBUILD servlet-api-3.0-r2.ebuild 497 BLAKE2B 66383db43a20d3e388c0713f229f326ae6f3126805223ad644675ccd740f30536d9910ead11f29ea281a901ac8440fe0a6b376637a1f19b762babc209e3a0587 SHA512 6174ff23e17337c490fae1b32d44f211f55b5d7958556c3a2aee8ab35976251f62d17d7cd8ae9adc7816d742e74f562beb1bf4d3f3d0cc9d15c146665436ba58
 EBUILD servlet-api-3.1-r1.ebuild 484 BLAKE2B 6eb187f1626aa9415aef7b9c66ad131c73039fd941c60cb8babf4f337faa90138a1c90df3f61a293f31c4aa3c44899d59e2d463fe80fa6d5ee1d4b4e330dfa67 SHA512 9d7486d3d08d1586914d7e68c97335664f390e52d24ec757b8ebb2f20f4e2655dea100d64cf12a9985f24bdd92185d0b1832d3bd5377bddd453ecc611f429af7
diff --git a/java-virtuals/servlet-api/servlet-api-2.3-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.3-r1.ebuild
index e8b2b7b56285..d74ba5f3df91 100644
--- a/java-virtuals/servlet-api/servlet-api-2.3-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
 DEPEND=""
diff --git a/java-virtuals/servlet-api/servlet-api-2.3.ebuild b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
deleted file mode 100644
index 4edbe38be357..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
-DEPEND=""
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild
index bfe570bc9f45..247935e53ff6 100644
--- a/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="http://java.sun.com/products/servlet/"
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| (
 		dev-java/tomcat-servlet-api:${SLOT}
diff --git a/java-virtuals/servlet-api/servlet-api-2.4.ebuild b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
deleted file mode 100644
index b16e41d1f1df..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-DEPEND=""
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"