Adding metadata

15 files changed, 99 insertions, 174 deletions

diff --git a/dev-java/angus-activation/angus-activation-1.0.0.ebuild b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
index 5b1f08a8969d..effcb2f8468a 100644
--- a/dev-java/angus-activation/angus-activation-1.0.0.ebuild
+++ b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 60f04d138934..bb4c017ae94d 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,2 +1 @@
-DIST c3p0-0.9.5.1.src.tgz 839657 BLAKE2B b8cf89ecb5b3766852355cdeb234698b0d1d8327233152e2e51ddcfe4a6e3be5f0fe4cc12a70d0df90d8ead90b3506b405f267f83bbb4a2a0ea1ac9d86051c64 SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
deleted file mode 100644
index 15e63cf24a7e..000000000000
--- a/dev-java/c3p0/c3p0-0.9.5.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="http://c3p0.sourceforge.net/"
-
-MY_P="${P}.src"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/mchange-commons:0"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/junit:4
-	)
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
-	java-pkg_clean
-	java-pkg_jar-from --into lib/ mchange-commons
-	java-pkg_jar-from --into lib/ log4j
-
-}
-
-EANT_TEST_TARGET="junit-tests"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "build/${P}.jar"
-	dodoc README-SRC
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc src/java/com/mchange/v2
-	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
-}
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
index fd97f8c6e6d3..a65d10630f90 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j:0
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
new file mode 100644
index 000000000000..7db4511aecd1
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -0,0 +1,68 @@
+# 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 mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz --slot 2.1 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester-2.1-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-digester:commons-digester:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	>=dev-java/commons-beanutils-1.9.4:1.7
+	>=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	pushd src/test/java || die
+		# Exclusions according to 212,215 pom.xml
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			! -name "Abstract*.java" ! -name "TestBean.java" \
+			! -name "TestRule.java" ! -name "TestRuleSet.java" \
+			-name "*TestCase.java" -o -name "*Test.java")
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index 06deb19ee89a..bc1c053be9b8 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,2 +1 @@
-DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
 DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
deleted file mode 100644
index efb519edd970..000000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
-HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
-SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S=${WORKDIR}/activation-${PV}
-
-EANT_BUILD_TARGET="activation.jar"
-
-DOCS=( AUTHORS ChangeLog )
-
-src_install() {
-	java-pkg_dojar activation.jar
-	einstalldocs
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc source/*
-}
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
index 6d6fbdfc459a..4af0a6d691ba 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/jackson/Manifest b/dev-java/jackson/Manifest
deleted file mode 100644
index 2152b09306d9..000000000000
--- a/dev-java/jackson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jackson-core-2.9.10.tar.gz 416803 BLAKE2B 9d8efc39b09b9619da301dc7fec3bd6339133c3fea3af46bbd77530883662b3b1d4ba2536cb8bd7ff7609a79ae6cfce135a3a5d75076bb7884e5e2878ac0107b SHA512 26b22e3fa60190877f5227c936ee32fdb4014347307904b140a6c787bb732df598b0ed48e7014cb6e51172abe52783e4d866f135706c8ebc77e24bdf087e9e71
diff --git a/dev-java/jackson/jackson-2.9.10.ebuild b/dev-java/jackson/jackson-2.9.10.ebuild
deleted file mode 100644
index b495fe7cf278..000000000000
--- a/dev-java/jackson/jackson-2.9.10.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}-core/archive/${PN}-core-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-core-${PN}-core-${PV}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e 's:@projectartifactid@:jackson-core:g' \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/{CREDITS,VERSION}-2.x
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson/metadata.xml b/dev-java/jackson/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jackson/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
new file mode 100644
index 000000000000..a2885e33f5ac
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
+SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+
+S="${WORKDIR}/${PN}-${PN}-8808a39"
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index 3420d2a1d621..dd39ef8af0bf 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.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="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index b88719b4f10d..6abc0507c74b 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.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="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 7939e8969570..a88cbd296c0a 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"