gentoo resync : 29.12.2022

6 files changed, 4 insertions, 67 deletions

diff --git a/java-virtuals/servlet-api/Manifest b/java-virtuals/servlet-api/Manifest
index a433804e9672..eff2ffdd0a1e 100644
--- a/java-virtuals/servlet-api/Manifest
+++ b/java-virtuals/servlet-api/Manifest
@@ -1,8 +1,5 @@
 EBUILD servlet-api-2.3-r1.ebuild 507 BLAKE2B c11c057f8c4661e8f1cdf3b6a2bc1d7dbdc111d590585324af0d0309ae06ce1e105b5472cc1d61ad137134d32b0ce1cc3e010adcd55d0a8deda4187b99d4365a SHA512 d4ad7ae7ab7414016dd67fbd6ad7d1b233ec36e1426ffdf73724d94bc403c731f00a80176fb9984036d9ac57add98feef28f24f21a777e65230e95bf391c46c4
 EBUILD servlet-api-2.4-r1.ebuild 517 BLAKE2B b33f5346772f75da3b39155c0a7f894bdd548e467bea328a731c2f29dadf3777d6785a24a6dca7229ebd7350dddb09876e6da5edd0eabe9df4831c8f594a8ce3 SHA512 282840241eeda00511453efc64a3acfe1ca8552234b0727a71fa98d181e39ac49a506b9c591f9a4b375b7d8ead7cb30d386d9b9c3cac5e08775850ad5bd10ca7
-EBUILD servlet-api-2.5-r2.ebuild 459 BLAKE2B 8147a71ba44199a15a87eeb42facd0c2e2ec7450a5970e36ba1fad35c9a0598e08d353b09cb7e0a6529e7cd88149827bff66c049453773819bba1183cddbed9f SHA512 50e01d162f4eefa7d6e4bc3b6e889f5dff9caf47db4bd6fe3a0bee8cc81a38bbddebbfba0bf1553ee074baffc33a6e0c7076a13d80ec18703219ea23cc994733
-EBUILD servlet-api-3.0-r2.ebuild 497 BLAKE2B 006e40db3725ab3478eed648f7b0fb0f9d97d19df7713d27e11c73c818e72e0eb138edc83d6d2363ef1ffde0a4f3c866819b3eb6329a3383154a8986ced94ca7 SHA512 2deec1eb1e2225499f2630af0d621e9f876252b9ae3c429c2112839d6cc46d890f07d1489c0416b5eb20c6c8fa994d962dc8e925918ffd2f545edc24f82e0574
-EBUILD servlet-api-3.0-r3.ebuild 489 BLAKE2B d51e0f772422fbbcbe91469e8ed79db844570346c057aae70f5abe0b3a5885f60b7f20bbeda2e5b33570eb5e265601387542b1aa26041b47613bc6d2491f1b7d SHA512 77d91bfe3e09002cbfeab2242d4d3b48608fd1947da60cf268fa2b54226d2e637fd248051eef0389dece936efff2ca04f55b4025e266bb3c9fe60abb361290da
-EBUILD servlet-api-3.1-r1.ebuild 483 BLAKE2B c121298a3ba4932936b641ab7004d2aefec058c8afb8f97dd0490fcee4e6d70066654b9d80af28353b550080d704f5251d594fedf31ccc0d920ea711430aedcd SHA512 b1f998150e98583c4603399514c2e796bd446f41e5461c83de03827f8e2d0c917ccb7a67a8b86fb65ea57c4aa6b7543da6b90e45b2bfe1f0e3239aa461a7361d
-EBUILD servlet-api-3.1-r2.ebuild 476 BLAKE2B 277f81253a006e989e44ddf4b51baeae65262d767e6e0afb29af360925b83446c41c043860923c397329dfc41470180c3531ded46b3c0638a6385e00e33523b5 SHA512 10ab74d251fffbb2e247857251aa4147597d1a44653e7a032a1f38849b178b28a90b273f61f54965ab7b82527e209aa26fe5ce4cd0703f7481387ab18f5b869b
+EBUILD servlet-api-3.0-r3.ebuild 485 BLAKE2B c5cbbf5dd4c334eb96782fd9e6d0e4f2b0eef97610ce4205c99c17d9ace9004b01cd28e1104d3c808d0e75a1fac2d0f17dc37c14f2e5b0add0e9f7303c978d5b SHA512 0e8f623416d893fc9f78270e2b171c553942f54e0230f6ffb27fd19c91ac544bee0120e6218d3dcc488939041a639822325b8fe3ccd26fef3aeffa0b27a6f2ed
+EBUILD servlet-api-3.1-r2.ebuild 472 BLAKE2B bbc29977dab9d6a4f1142ca4e3bcff32c1eef9eadca6fd730fbae2846389b5c886fdcff4696db79b9a8f4ee5f86c709633fa281b50ae964258268aa6f09bbbc6 SHA512 25ab016d7826ddd22242a9877f40c7040f25080ad65ceae6662d0a76d42718440d095e11a788ea0d71df78289b100b19d5764fa37c90dc64b6b6f079f905f9f6
 MISC metadata.xml 380 BLAKE2B 6ef98eb776a396476590b98bfb1cc5175c667fa8b61f817f7abfaaba1357fd84ac8db354b6581f4652cb22568c350a50480bd7207b07764bdbbddab241192160 SHA512 57696fb31e0136f6b79db369053a43ec31722fce0a2b0834eb6172b95dbe6cca0cc61320e4242c3d673ff23901f1b2dcc5dd24060c39ebb5d0c9f545801fa986
diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
deleted file mode 100644
index bb8cd60fac8d..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r2.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r2.ebuild
deleted file mode 100644
index 1768e38b7fb4..000000000000
--- a/java-virtuals/servlet-api/servlet-api-3.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r3.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r3.ebuild
index a3f5367f5a08..c8d2eb912bda 100644
--- a/java-virtuals/servlet-api/servlet-api-3.0-r3.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.0-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
 
 RDEPEND="|| (
 		dev-java/tomcat-servlet-api:${SLOT}
diff --git a/java-virtuals/servlet-api/servlet-api-3.1-r1.ebuild b/java-virtuals/servlet-api/servlet-api-3.1-r1.ebuild
deleted file mode 100644
index 73a2c05b650e..000000000000
--- a/java-virtuals/servlet-api/servlet-api-3.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild b/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild
index a43fba0827f4..3ffd164566c1 100644
--- a/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="|| (
 		dev-java/tomcat-servlet-api:${SLOT}