Adding metadata

8 files changed, 8 insertions, 164 deletions

diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
deleted file mode 100644
index 290591108534..000000000000
--- a/dev-java/commons-jxpath/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
deleted file mode 100644
index af6d503a2289..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+++ /dev/null
@@ -1,62 +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 mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-jxpath-1.3-r5.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-jxpath:commons-jxpath:1.3"
-# Tests depend on mockrunner-jdk1.3-j2ee1 which we don't have
-# JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="https://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-beanutils:commons-beanutils:1.7.0 -> >=dev-java/commons-beanutils-1.9.4:1.7
-# jdom:jdom:1.0 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/commons-beanutils:1.7
-	dev-java/jdom:0
-	java-virtuals/servlet-api:3.0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:jsp-api:2.0 -> !!!groupId-not-found!!!
-# javax.servlet:servlet-api:2.4 -> !!!groupId-not-found!!!
-# xerces:xercesImpl:2.4.0 -> >=dev-java/xerces-2.12.0:2
-# xml-apis:xml-apis:1.3.04 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? com.mockrunner:mockrunner-jdk1.3-j2ee1.3:0.4 -> !!!groupId-not-found!!!
-# test? junit:junit:3.8.1 -> >=dev-java/junit-3.8.2:0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/xerces:2"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {LICENSE,NOTICE}.txt )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_CLASSPATH_EXTRA="xerces-2"
-JAVA_SRC_DIR="src/java"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-jxpath/metadata.xml b/dev-java/commons-jxpath/metadata.xml
deleted file mode 100644
index c1a9559efdc4..000000000000
--- a/dev-java/commons-jxpath/metadata.xml
+++ /dev/null
@@ -1,13 +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>
- <longdescription>
-		A Java-based implementation of XPath 1.0 that, in addition to XML processing, can inspect/modify Java object graphs (the library's explicit purpose) and even mixed Java/XML structures.
-	</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index f5637ac0f050..1ad02aaacb18 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -133,16 +133,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
 }
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
index a4b8f09c61e6..d7196756904f 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
@@ -304,16 +304,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
 }
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild
index 609e01017aa2..42efea848da4 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild
@@ -1,42 +1,36 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
-HOMEPAGE="http://wiki.osgi.org/wiki/Release_4.3"
-SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
+HOMEPAGE="https://docs.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
 
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-CDEPEND="dev-java/glassfish-persistence:0
+CP_DEPEND="
+	dev-java/glassfish-persistence:0
 	dev-java/osgi-core-api:0
 	dev-java/osgi-foundation:0
 	dev-java/tomcat-servlet-api:4.0"
 
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
 BDEPEND="app-arch/unzip"
 
 JAVA_SRC_DIR="OSGI-OPT/src"
 
-JAVA_GENTOO_CLASSPATH="
-	osgi-core-api
-	osgi-foundation
-	glassfish-persistence
-	tomcat-servlet-api-4.0
-"
-
 src_prepare() {
 	default
 	rm -r org || die
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index 6866d35d3195..11837950982d 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,2 +1 @@
 DIST sbt-1.3.10.tgz 57609786 BLAKE2B 35285d141d8ad38a8e15cc3dd18947fa34dbe307ce1fbdd267a0902ff7f5757a0ab80d56eb241c8bea79c4a13c270efb65a552a039416a6f571b6cd214739819 SHA512 93832c0eec51422d6db63078c722578cbad21e4611ca868e835471fb988ad225e8abdea47c6dcf6e19117db9598bc75296100d9dc7ba0d605b70adc592efb925
-DIST sbt-1.3.2.tgz 51817549 BLAKE2B ccb362b8cec867c64a04eba48982a9d339250d3ab51afb72fbbb7fe29406c6565d386ab0e02887007922f4134481b4ee764b63eb69300d7aa06dffd43a91a225 SHA512 2402f781962b80a46c63ac3aba0b2bb2b55ae509bb6b591d840385765dbf73cb6e5b40c12e6b95db2d8f4e77caeda32aad5a701a6439bde41ca3166d50f4b9b2
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
deleted file mode 100644
index 21e538c44abb..000000000000
--- a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala"
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-src_prepare() {
-	default
-	java-pkg_init_paths_
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -v bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt || die
-
-	insinto "${dest}/lib"
-	doins bin/*
-
-	insinto "${dest}"
-	doins -r conf
-
-	fperms 0755 "${dest}/lib/sbt"
-	dosym "${dest}/lib/sbt" /usr/bin/sbt
-}