Adding metadata

6 files changed, 4 insertions, 149 deletions

diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild
index d1d0486dd712..e79a4cbf5562 100644
--- a/dev-java/ant/ant-1.10.14-r3.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -76,6 +76,7 @@ RDEPEND="
 	!dev-java/ant-apache-log4j
 	!dev-java/ant-apache-xalan2
 	!dev-java/ant-commons-logging
+	!<dev-java/ant-core-1.10.14
 	!dev-java/ant-swing
 	!dev-java/ant-junit4
 	!dev-java/ant-testutil
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index 36f278a4dca6..a1e33e84d946 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.15"
 
 BDEPEND="
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
deleted file mode 100644
index fbd6934fc695..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_PN="ecj"
-DMF="R-${PV}-202003050155"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.15"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	default
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# JavaCore is not distributed in the jar
-	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
-		-e 's|JavaCore.getOptions()||g' \
-		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index d8bef250aefc..2cde3036d250 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.26"
 
 BDEPEND="
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
deleted file mode 100644
index 4ad6e3222bb1..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_PN="ecj"
-DMF="R-${PV}-202211231800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.26"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11:*"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-17:*
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	default
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# JavaCore is not distributed in the jar
-	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
-		-e 's|JavaCore.getOptions()||g' \
-		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205.ebuild
index fda4c5cc15d8..b38dc12dd901 100644
--- a/dev-java/json/json-20240205.ebuild
+++ b/dev-java/json/json-20240205.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
 
 LICENSE="JSON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*