Adding metadata

8 files changed, 150 insertions, 35 deletions

diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 4bec07068b8b..c48b772e49be 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/log4j-12-api:2"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..21ab78c440d6
--- /dev/null
+++ b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.assertj:assertj-core:2.3.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that provides a fluent interface for writing assertions"
+HOMEPAGE="https://joel-costigliola.github.io/assertj/"
+SRC_URI="https://github.com/assertj/assertj-core/archive/assertj-core-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="2"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="cglib-3,junit-4"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {CONTRIBUTING,README}.md
+}
diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
new file mode 100644
index 000000000000..3310d4809efd
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="https://commons.apache.org/proper/commons-bsf/"
+SRC_URI="mirror://apache/commons/bsf/source/${PN}-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# If you add new ones, add them to ant-apache-bsf too for use dependencies
+IUSE="javascript python tcl"
+
+CDEPEND="
+	python? (
+		dev-java/jython:2.7
+	)
+	javascript? (
+		dev-java/rhino:1.6
+	)
+	tcl? (
+		dev-java/jacl:0
+	)
+	dev-java/xalan:0
+	dev-java/commons-logging:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	default
+	rm -v lib/*.jar || die
+	rm samples/*/*.class || die
+
+	java-ant_ignore-system-classes
+
+	# somebody forgot to add them to source tarball... fetched from svn
+	cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
+
+	# Silence javadoc.
+	java-ant_xml-rewrite -f build.xml -c \
+		-e javadoc \
+		-a failonerror \
+		-v no
+
+	# http://bugs.jython.org/issue1814
+	# Also, bsf is an old project (2011) and hasn't officially taken the leap to
+	# jython-2.7. This patch fixes the issue.
+	eapply "${FILESDIR}"/${P}-PyJavaInstance.patch
+}
+
+src_compile() {
+	local pkgs="commons-logging,xalan"
+	local antflags="-Dxalan.present=true"
+
+	if use python; then
+		antflags="${antflags} -Djython.present=true"
+		pkgs="${pkgs},jython-2.7"
+	fi
+	if use javascript; then
+		antflags="${antflags} -Drhino.present=true"
+		pkgs="${pkgs},rhino-1.6"
+	fi
+	if use tcl; then
+		antflags="${antflags} -Djacl.present=true"
+		pkgs="${pkgs},jacl"
+	fi
+
+	local cp="$(java-pkg_getjars ${pkgs})"
+	eant -Dgentoo.classpath="${cp}" ${antflags} jar
+
+	# stupid clean
+	mv build/lib/${PN}.jar "${S}" || die
+	use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
+
+	dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+
+	java-pkg_register-optional-dependency bsh,groovy-1,jruby
+}
+
+pkg_postinst() {
+	elog "Support for python, javascript, and tcl is controlled via USE flags."
+	elog "Also, following languages can be supported just by installing"
+	elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
+	elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
+}
diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
index bef35c168e48..4e8c4de7b015 100644
--- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
+++ b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
@@ -1,5 +1,5 @@
---- src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
-+++ src/org/apache/bsf/engines/jython/JythonEngine.java	2015-07-04 08:04:55.230000000 +0000
+--- a/src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
++++ b/src/org/apache/bsf/engines/jython/JythonEngine.java	2015-07-04 08:04:55.230000000 +0000
 @@ -26,7 +26,7 @@
  import org.apache.bsf.util.BSFFunctions;
  import org.python.core.Py;
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
index e92b09fe1e3f..98864fd2a92e 100644
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/log4j-12-api:2"
 
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
index 37cd9c8a0c6c..8ce50e91dc26 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -15,7 +15,7 @@ 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"
 
 # Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
deleted file mode 100644
index 3f30d6b9c176..000000000000
--- a/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xpp3:xpp3:1.1.4c"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An implementation of XMLPULL V1 API"
-HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-JAVA_RESOURCE_DIRS="resources"
-
-src_prepare() {
-	default
-	mkdir "resources" || die
-	cp -r "META-INF" "resources" || die
-}
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
index e354c18fd748..8a6c69a8706a 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # Restriction to java 1.8
 # Otherwise jdk 11+ would fail to build javadoc: