Adding metadata

16 files changed, 69 insertions, 166 deletions

diff --git a/dev-java/asm-analysis/asm-analysis-9.1.ebuild b/dev-java/asm-analysis/asm-analysis-9.1.ebuild
index 75683d81ab30..4fbdb6554d9e 100644
--- a/dev-java/asm-analysis/asm-analysis-9.1.ebuild
+++ b/dev-java/asm-analysis/asm-analysis-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-analysis:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm-commons/asm-commons-9.1.ebuild b/dev-java/asm-commons/asm-commons-9.1.ebuild
index 47ceb6a135cd..66b8a6ec335e 100644
--- a/dev-java/asm-commons/asm-commons-9.1.ebuild
+++ b/dev-java/asm-commons/asm-commons-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-commons:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm-tree/asm-tree-9.1.ebuild b/dev-java/asm-tree/asm-tree-9.1.ebuild
index 2bfd7ac66a44..01e3400a43ae 100644
--- a/dev-java/asm-tree/asm-tree-9.1.ebuild
+++ b/dev-java/asm-tree/asm-tree-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-tree:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm-util/asm-util-9.1.ebuild b/dev-java/asm-util/asm-util-9.1.ebuild
index ab7c52e86c38..8986257ddeec 100644
--- a/dev-java/asm-util/asm-util-9.1.ebuild
+++ b/dev-java/asm-util/asm-util-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-util:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild
index 671695dc8120..f4ae85d5b7d8 100644
--- a/dev-java/asm/asm-9.1.ebuild
+++ b/dev-java/asm/asm-9.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm:9.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
index 7f9f07a500c5..cdc28a662b51 100644
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
@@ -1,5 +1,5 @@
---- jni/GNUmakefile
-+++ jni/GNUmakefile
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
 @@ -41,6 +41,7 @@
  JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
  
@@ -37,8 +37,8 @@
  
  ifeq ($(OS), darwin)
  build_ffi = \
---- libtest/GNUmakefile
-+++ libtest/GNUmakefile
+--- a/libtest/GNUmakefile
++++ b/libtest/GNUmakefile
 @@ -44,8 +44,8 @@
  # Compiler/linker flags from:
  #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 4eff1caf02bb..6c6b7d259e42 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit epatch java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="An optimized Java interface to libffi"
 HOMEPAGE="https://github.com/jnr/jffi"
@@ -18,16 +18,18 @@ KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 CDEPEND="dev-libs/libffi:0="
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
+# java 1.8 is needed because javah is called which is not in newer jdks
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
+	virtual/jdk:1.8
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/junit:4
 	)"
 
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.8-makefile.patch
 	"${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
@@ -35,10 +37,10 @@ PATCHES=(
 
 RESTRICT="test"
 
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+src_prepare() {
+	default
 
-	epatch "${PATCHES[@]}"
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
 
 	# misc fixes for Darwin
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -59,7 +61,7 @@ java_prepare() {
 			jni/GNUmakefile || die
 	fi
 
-	find "${WORKDIR}" -iname '*.jar' -delete || die
+	java-pkg_clean
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
@@ -71,9 +73,9 @@ src_compile() {
 		package com.kenai.jffi;
 		public final class Version {
 			private Version() {}
-			public static final int MAJOR = $(get_version_component_range 1);
-			public static final int MINOR = $(get_version_component_range 2);
-			public static final int MICRO = $(get_version_component_range 3);
+			public static final int MAJOR = $(ver_cut 1);
+			public static final int MINOR = $(ver_cut 2);
+			public static final int MICRO = $(ver_cut 3);
 		}
 	EOF
 
@@ -92,7 +94,7 @@ src_compile() {
 		SRC_DIR=jni
 		JNI_DIR=jni
 		BUILD_DIR=build/jni
-		VERSION=$(get_version_component_range 1-2)
+		VERSION=$(ver_cut 1-2)
 		USE_SYSTEM_LIBFFI=1
 		CCACHE=
 		-f jni/GNUmakefile
@@ -114,7 +116,7 @@ src_install() {
 	local libname=".so"
 
 	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
 
 	# must by after _doso to have JAVA_PKG_LIBDEST set
 	cat > boot.properties <<-EOF
diff --git a/dev-java/jnr-a64asm/Manifest b/dev-java/jnr-a64asm/Manifest
new file mode 100644
index 000000000000..39aaf7f815d3
--- /dev/null
+++ b/dev-java/jnr-a64asm/Manifest
@@ -0,0 +1 @@
+DIST jnr-a64asm-1.0.0.tar.gz 29247 BLAKE2B d5b2dbdbee3d50e466d164a7b5f62ad5ea99eeb810c38bacbd5ec21f8ba57d28ed442846903e85ef771e2a4ca80c77f2beb558fb03b1b6996384e26f69731474 SHA512 16ab336e60d6bf5e6478ed4fd8144c7e1eb1aa23089927e34adcbd2f0b3fdaedfc0e5026545bfd69d8a6a030479342088fcb86657a007e9ac9ba7a08830aa858
diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
new file mode 100644
index 000000000000..a1c6f07ac18e
--- /dev/null
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-a64asm-1.0.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-a64asm:1.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A pure-java A64 assembler"
+HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jnr-a64asm/metadata.xml b/dev-java/jnr-a64asm/metadata.xml
new file mode 100644
index 000000000000..a63267abaf71
--- /dev/null
+++ b/dev-java/jnr-a64asm/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
index 304b608ca557..4cf9bc564824 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-x86asm:1.0.2"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 6146d21f38a9..14d9453f2dae 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,2 @@
 DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
-DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
-DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
deleted file mode 100644
index 3f19ad05eede..000000000000
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN}${PV%%.*}"
-MY_P="${MY_PN}-r${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="junit:junit:4.12"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://junit.org/"
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
-
-java_prepare() {
-	rm -v lib/*.jar || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
-	use examples && java-pkg_doexamples src/test/java/org/junit/samples
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
deleted file mode 100644
index 471d0ae7d575..000000000000
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}${PV%%.*}"
-MY_P="${MY_PN}-r${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="junit:junit:4.13.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
-SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-CDEPEND="
-	dev-java/hamcrest-core:1.3
-	dev-java/hamcrest-library:1.3
-	"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-
-src_prepare() {
-	default
-	rm -v lib/*.jar || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
-	use examples && java-pkg_doexamples src/test/java/org/junit/samples
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 6798eae5ebae..b705a57d89bb 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,2 +1 @@
-DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193
 DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
diff --git a/dev-java/objenesis/objenesis-1.3-r1.ebuild b/dev-java/objenesis/objenesis-1.3-r1.ebuild
deleted file mode 100644
index 83197bba73a8..000000000000
--- a/dev-java/objenesis/objenesis-1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A small Java library with one purpose: To instantiate a new object of a class"
-HOMEPAGE="https://objenesis.googlecode.com/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	unpack ${A}
-	unzip "${S}"/${P}-sources.jar -d "${S}"/src || die
-}