gentoo resync : 02.02.2022

4 files changed, 5 insertions, 54 deletions

diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index c8dfda750cbc..79d67115a080 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,10 +1,8 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468 SHA512 498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
-DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a SHA512 649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 EBUILD resin-servlet-api-3.0.25-r1.ebuild 809 BLAKE2B 3abb178b156dff27a40a39ad9764b9ae1b13cef98b5bc87ec66455e4bffa386e2d787ee07bce268cc7993f3095502addec8684b3bf75e87d0eeb597d480ecc04 SHA512 14afa86b24af0a961600a50904f02cf2fca0b8d87456265e77868c749228140a481eab377ee229abd37c79886ddb31c44f2d799c6a8d6159eeee43982759bf63
-EBUILD resin-servlet-api-4.0.27-r2.ebuild 1063 BLAKE2B 742020b2f3abef7af58a7a76322760ce12649ad31b63218cd4b505d931c0925fe6deb9ecfc5eba7932a731bc0d45f18612f391d615576db391b1fcbb9dfb8a1d SHA512 e96ca44533e321901b733621da9d24251589a83f0e7f34c4dcff10caeca2d4380658d6f43a188bbd28cef2ec45145a69cb7f57c54fa2d1081c13b6cabe9ccd0f
-EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
-EBUILD resin-servlet-api-4.0.46-r1.ebuild 1063 BLAKE2B e94b0bf2467dd09bb70f35ea2f53515a55dd4664ca1ee7d667d38a7c11e1993f0308dd17ffa47ca238a7d852fd10681dee7fbcc2f08594be0f7fa7a69cc7a269 SHA512 3f95b347a8dcc1b33a201ad9210188f1cb133ac946598fdfeb468c7aa19cd607d340feb4676e4497ec21ed8d9afdbc97058e959333dff67bc26c250dc7682c20
+EBUILD resin-servlet-api-4.0.27-r2.ebuild 1060 BLAKE2B c31b4051fc5c63884b42fb8dd94e2e69eb4d203f2735306d3d3379ef9a3014479fc2e2e0fd9db6250c73c59fa3ac0422533004e8770c5f3f6bbb80d85fa7d5be SHA512 3ae168d7d78c5a9a20e9d0b0516ef4f02a1285301e9fc06953f97ab666d7a0b2e79ece901e5df48d67e7f1911691fa4e0b1f586bc8a3ccc59bb8141546316643
+EBUILD resin-servlet-api-4.0.46-r1.ebuild 1060 BLAKE2B 089c853ea094b32d92fdfd134870e23b0f10cc08d05b503fd89d45120a5b6e3045a03f4a4de97abae387a4f91aea5a615775549ff4d5fdcf7d4bdf4a76c14ae3 SHA512 7c46120c9b5dbc2ee9d2ba3f4c4174f834cc4f9a2d57ee02b6dca1eaaad833a650a6bfcc481425e482e6e0106b77facf32387c2527212ae9425716c025d366a0
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
index e0bc4f832070..62ce67795aea 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
deleted file mode 100644
index 62503ad641b1..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-java_prepare() {
-	cd "${S}"
-	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-	java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
index 4e73714c0d20..3bab35a2b31c 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-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
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"