Adding metadata

11 files changed, 186 insertions, 98 deletions

diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
new file mode 100644
index 000000000000..aaee170b76c1
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Apple eAWT and eIO APIs for Java on Mac OS X"
+HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
+SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
+
+LICENSE="Apple"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S=${WORKDIR}/AppleJavaExtensions
+
+src_install() {
+	dodoc README.txt
+	java-pkg_dojar AppleJavaExtensions.jar
+}
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 1050fd7db142..293f425488f6 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,2 +1 @@
-DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
deleted file mode 100644
index 29554308da99..000000000000
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV="${PV//./_}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="BCEL_${MY_PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
-HOMEPAGE="http://commons.apache.org/bcel/"
-SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/commons-${PN}-${MY_P}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ../{NOTICE,README,RELEASE-NOTES}.txt
-}
-
-src_test() {
-	cd test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*TestCase.java" ! -name "Abstract*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -g -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/bcel/bcel-6.5.0.ebuild b/dev-java/bcel/bcel-6.5.0.ebuild
index 5cbceb0bb20d..b4fcd293facd 100644
--- a/dev-java/bcel/bcel-6.5.0.ebuild
+++ b/dev-java/bcel/bcel-6.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
 SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index be542192d8d5..b1138e4df534 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1,3 @@
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
+DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
diff --git a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index c364ebdd0230..6890318a4927 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,22 +15,13 @@ LICENSE="JDOM"
 SLOT="1.1"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-CDEPEND="
-	dev-java/jdom:0
-	dev-java/dom4j:1"
-
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	jdom
-	dom4j-1
-"
+	>=virtual/jdk-1.8:*"
 
 JAVA_SRC_DIR="org"
 
@@ -41,5 +32,8 @@ src_prepare() {
 	# require jaxen to depend on xom, we end up in a circular dep.
 	# I fear though that removing those classes might bite us somewhere down
 	# the line...
-	rm -rv org/jaxen/xom || die
+	rm -rv org/jaxen/{dom4j,jdom,xom} || die
+
+	# this is now part of jdk
+	rm -rv org/w3c || die
 }
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
deleted file mode 100644
index 77b073b118a4..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/xom:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	xom
-	jdom
-	dom4j-1
-"
diff --git a/dev-java/jaxen/jaxen-1.2.0.ebuild b/dev-java/jaxen/jaxen-1.2.0.ebuild
new file mode 100644
index 000000000000..a3bec68c55bb
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 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/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java."
+HOMEPAGE="http://www.cafeconleche.org/jaxen/"
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend on jaxen
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# POM: pom.xml
+# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	>=dev-java/xerces-2.12.0:2
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}"
+
+DOCS=( "${P}"/{LICENSE.txt,README.md} )
+
+JAVA_CLASSPATH_EXTRA="xerces-2"
+JAVA_SRC_DIR="${P}/src/java/main"
+
+src_prepare() {
+	default
+
+	# solve cyclic deps by removing these dirs
+	# dom4j, jdom and xom depend on jaxen
+	# https://bugs.gentoo.org/739894#c9
+	rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{dom4j,jdom,xom} || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 679b45f3b62c..2a4c459fafe7 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,3 +1,4 @@
 DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
 DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
+DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
diff --git a/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
new file mode 100644
index 000000000000..ef897ae004c9
--- /dev/null
+++ b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
@@ -0,0 +1,22 @@
+diff --git a/XOM/src/nu/xom/tests/XSLTransformTest.java b/XOM/src/nu/xom/tests/XSLTransformTest.java
+index 443c058..56f7b6e 100644
+--- a/XOM/src/nu/xom/tests/XSLTransformTest.java
++++ b/XOM/src/nu/xom/tests/XSLTransformTest.java
+@@ -765,7 +765,7 @@ public class XSLTransformTest extends XOMTestCase {
+         
+     } 
+     
+-    
++    /*
+     public void testIllegalTransform() 
+       throws XSLException, ParsingException, IOException {
+         
+@@ -784,7 +784,7 @@ public class XSLTransformTest extends XOMTestCase {
+         }
+         
+     }
+-
++    */
+     
+     public void testRemapPrefixToSameURI() 
+       throws IOException, ParsingException, XSLException { 
diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild
new file mode 100644
index 000000000000..58e85eac158a
--- /dev/null
+++ b/dev-java/xom/xom-1.3.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Object Model"
+HOMEPAGE="https://xom.nu"
+SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+CDEPEND="
+	dev-java/jaxen:1.2
+	dev-java/xerces:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	dev-java/junit:0
+	>=virtual/jdk-1.8:*"
+
+JAVA_GENTOO_CLASSPATH="jaxen-1.2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-invalid-test.patch"
+)
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	# removing directories based on build.xml
+	rm -rv XOM/src/nu/xom/benchmarks/ || die
+	rm -rv XOM/src/nu/xom/integrationtests/ || die
+	rm -rv XOM/src/nu/xom/samples/ || die
+	rm -rv XOM/src/nu/xom/tools/ || die
+
+	# reorganize the code and resources so that it goes well with java-pkg-simple
+	mkdir -pv ${JAVA_SRC_DIR} ${JAVA_RESOURCE_DIRS} ${JAVA_TEST_SRC_DIR}/nu/xom || die
+	mv -v XOM/src/nu/xom/tests ${JAVA_TEST_SRC_DIR}/nu/xom/ || die
+	mv -v XOM/data . || die
+	pushd XOM/src || die
+	for file in $(find -type f -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_SRC_DIR}" || die
+	done
+	for file in $(find -type f ! -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_RESOURCE_DIRS}" || die
+	done
+	popd
+}