Adding metadata

6 files changed, 28 insertions, 232 deletions

diff --git a/dev-java/logback-core/logback-core-1.2.11.ebuild b/dev-java/logback-core/logback-core-1.2.11.ebuild
deleted file mode 100644
index 954b29679ba8..000000000000
--- a/dev-java/logback-core/logback-core-1.2.11.ebuild
+++ /dev/null
@@ -1,116 +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://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="ch.qos.logback:logback-core:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-core module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0
-
-CP_DEPEND="
-	dev-java/javax-mail:0
-	dev-java/janino:0
-	dev-java/jansi:0
-	java-virtuals/servlet-api:3.1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/assertj-core:2
-		dev-java/joda-time:0
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-2,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-	sed \
-		-e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
-		-i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
-
-	# Ignore test failing under Java 16
-	# See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
-	fi
-}
-
-src_test() {
-	# 67,73 logback-core/pom.xml
-	# <excludes>
-	#   <exclude>**/All*Test.java</exclude>
-	#   <exclude>**/PackageTest.java</exclude>
-	#   <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven -->
-	#   <exclude>**/ConsoleAppenderTest.java</exclude>
-	#   <!--<exclude>**/TimeBasedRollingTest.java</exclude>-->
-	# </excludes>
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*Test.java" \
-			! -wholename "**/All*Test.java" \
-			! -wholename "**/PackageTest.java" \
-			! -name "AbstractAppenderTest.java" \
-			! -name "AbstractPatternLayoutBaseTest.java" \
-			! -name "AbstractSocketAppenderIntegrationTest.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
-
-	# accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
index 96fc4a9564e1..60134da57091 100644
--- a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
@@ -9,7 +9,7 @@ MAVEN_ID="com.google.protobuf:protobuf-java:3.21.9"
 # https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/pom.xml#L35-L39"
 # JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit edo java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
 HOMEPAGE="https://developers.google.com/protocol-buffers/"
@@ -44,17 +44,25 @@ JAVA_TEST_SRC_DIR="core/src/test/java"
 src_prepare() {
 	default
 	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
 	# Copy resources from ../src/google/protobuf according to
 	# https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/pom.xml#L45-L61
-	mkdir -p core/src/main/resources/google/protobuf/compiler || die
-	cp {../src,core/src/main/resources}/google/protobuf/compiler/plugin.proto || die
-	cp ../src/google/protobuf/{any,api,descriptor,duration,empty,field_mask,source_context,struct,timestamp,type,wrappers}.proto \
-		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	local core_proto
+	for core_proto in "${core_protos[@]}"; do
+		cp "../src/google/protobuf/${core_proto}.proto" \
+		   "${JAVA_RESOURCE_DIRS}/google/protobuf" \
+			|| die
+	done
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
 
 	# Generate 146 .java files according to
-	# https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/generate-sources-build.xml
-	for proto in any api compiler/plugin descriptor duration empty field_mask source_context struct timestamp type wrappers; do
-		"${BROOT}/usr/bin/protoc" \
-			--java_out=core/src/main/java -I../src ../src/google/protobuf/$proto.proto || die
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
+	for core_proto in "${core_protos[@]}" compiler/plugin; do
+		edo "${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
 	done
 }
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index ab4856250e05..f269a7bc8533 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -12,7 +12,7 @@ MAVEN_ID="com.google.protobuf:${PN}:3.21.7"
 # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
 # JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit edo java-pkg-2 java-pkg-simple
 
 PARENT_PN="${PN/-java/}"
 PARENT_PV="${PV}"
@@ -92,14 +92,18 @@ src_prepare() {
 	# Copy resources from ../src/google/protobuf according to
 	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
 	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
-	cp "../src/google/protobuf/${core_protos[@]}.proto" \
-		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	local core_proto
+	for core_proto in "${core_protos[@]}"; do
+		cp "../src/google/protobuf/${core_proto}.proto" \
+		   "${JAVA_RESOURCE_DIRS}/google/protobuf" \
+			|| die
+	done
 	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
 
 	# Generate 146 .java files according to
 	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
-	for proto in "${core_protos[@]}" compiler/plugin; do
-		"${BROOT}/usr/bin/protoc" \
-			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	for core_proto in "${core_protos[@]}" compiler/plugin; do
+		edo "${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
 	done
 }
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 46448b6655c3..6bc5cde3f70c 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -9,6 +9,5 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
-DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
 DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
index acb0d6c5fcea..0d28b0e15cd3 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild
deleted file mode 100644
index f1c865a27bec..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild
+++ /dev/null
@@ -1,99 +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-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}