gentoo auto-resync : 05:02:2023 - 15:17:02

9 files changed, 9 insertions, 157 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1b1b40246b76..7cd1f4ed53f3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 9e535b05691e..afdf39ed90e5 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,5 +1,3 @@
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
-DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
 EBUILD jackrabbit-webdav-2.10.1-r3.ebuild 1338 BLAKE2B 9c0e4faa7969dbf8fb921c3f3906925f9db2bc25aedaabb8b50bf2e2330cc30576625042bbda6f9b6c7cb05f9ab488e4f00ebbe9beb3a86a49d2d36ca841bf18 SHA512 510c5cf5c93720e64a67ba3b88088429d1ff7ddbc44f616f061a388d6d6f4a2d63195fafefadc12db8f3dd8a9d262db07973f8525b0897cc835942693bef04ec
-EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2069 BLAKE2B 784996564d2181b4c3cb7b551f16f2a2fb03fdfdc06f860870ba2282959be84d517f2ed48f0d48de712d32a68509dee0a84f8cdaf20ed10ad2d7b5fe2a631a51 SHA512 39f1cbd79bfd4787640f0191685cddcdd722157212fbf586deba7c7884e52041e8292f20fe77a061899252812c1b8427020c43be6d4978f3cac952444aad3107
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
deleted file mode 100644
index 378c64394006..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.halifax.rwth-aachen.de/gentoo/distfiles/3b/jackrabbit-2.21.7-src.zip --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jackrabbit-webdav-2.21.7.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.jackrabbit:jackrabbit-webdav:2.21.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Generic WebDAV Library"
-HOMEPAGE="https://jackrabbit.apache.org"
-SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.httpcomponents:httpclient:4.5.13 -> >=dev-java/commons-httpclient-4.5.13:4
-# org.apache.httpcomponents:httpcore:4.4.14 -> >=dev-java/httpcore-4.4.14:0
-# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	dev-java/httpcomponents-client:4
-	dev-java/httpcore:0
-	dev-java/osgi-annotation-versioning:0
-	dev-java/slf4j-api:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.osgi:org.osgi.annotation:6.0.0 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-annotation-versioning:0
-	java-virtuals/servlet-api:3.1"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/jackrabbit-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="httpcomponents-client-4,httpcore,osgi-annotation-versioning,servlet-api-3.1,slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=( "src/main/resources" "src/main/appended-resources" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 04a734b9287f..82d05ee7d67d 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,3 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-EBUILD javahelp-2.0.05_p20170719-r1.ebuild 1675 BLAKE2B 0c59fde199d25bdcb85ea6eab3b8c49ba18328bd07323262d19aaaee0ec7fe9b1203ddb807f4fc765e007873043081adf21940189c0d4c6cb34e53f70fd48251 SHA512 e873859d2f6bfbf531dd231bde326fbf151b1fba085c1156a497447456b837b82acb62b65bd99850124ab8044b2d848c650c48d5cf2c2456055f32f2c2b4478a
-MISC metadata.xml 625 BLAKE2B b63396d9a8f628c5965eb8eb15071f56456605ce28d247fc191ef808db0f14c464149d3d3bcee746d058addf3d9eed7d12ae59ac94a1d7b0ac4a45f75ccb8b68 SHA512 a1878d27bdb64c2d1ecf2c8107158f8852486d22a5473d852e7a993c63475be17cd13a47de1fd5b29cdcc72dacf09259473b253822c10cddbf2e8dfea8a1fa82
+EBUILD javahelp-2.0.05_p20170719-r2.ebuild 1671 BLAKE2B b888661cec8fb5809bad3659fd3350ffc915b27aa3d9291eed88f0a0194aa702358639c7546840a56b20664565bc9442748b25164bf8418b92cab82e2322dab7 SHA512 f5182e636d07e823fc4314fe077a539e86af3d7e265884b62b42dc176dc13d48924d9491a80dd0bcfcbee7f951f3db770880a14099c11f9fb52135fe515b9fe1
+MISC metadata.xml 705 BLAKE2B 99d50e7e4960fd92f1b9f34d830ee22246f88c5224beb09eb581fa10b128753985c991b22a002eb8cc6ecb599475d0d88a50cfeb76734a4d687fc3c34d88686b SHA512 c20f79d6b27ea89d68d8f9655804986827e4bb5fff86b525047d8b34cb1c30c051af76d732da63a38ee9b311e78fdaaa4e3e2fa1232cde0230b7e75f6af37b6f
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
index d617465487ec..19a57920dc55 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
-CDEPEND="java-virtuals/servlet-api:2.4"
+CDEPEND="dev-java/tomcat-servlet-api:2.4"
 
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
@@ -30,8 +30,8 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 _eant() {
 	local \
-		servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
-		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
+		servlet_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)
 
 	eant \
 		-f javahelp_nbproject/build.xml \
diff --git a/dev-java/javahelp/metadata.xml b/dev-java/javahelp/metadata.xml
index 308f2cfd932c..1bce4ec84d8e 100644
--- a/dev-java/javahelp/metadata.xml
+++ b/dev-java/javahelp/metadata.xml
@@ -12,4 +12,7 @@
 		implementation of that specification. The JavaHelp system open source
 		project includes the source to the reference implementation.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">javaee/javahelp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 79d67115a080..b1cf9319373a 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,8 +1,3 @@
-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.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 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-3.0.25-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
deleted file mode 100644
index aacd27267893..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="2.4"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/resin-${PV}"
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-PATCHES=(
-	"${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
-)
-
-src_prepare() {
-	default
-	mkdir lib || die
-}
-
-src_install() {
-	java-pkg_newjar "lib/jsdk-24.jar"
-	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-}
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
deleted file mode 100644
index 3bab35a2b31c..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="https://caucho.com"
-SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_prepare() {
-	default
-	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"
-}