gentoo resync : 28.04.2021

4 files changed, 83 insertions, 50 deletions

diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 91d03fe4d387..212e07fa4422 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,5 +1,4 @@
-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
-EBUILD bcel-6.0_rc3.ebuild 1207 BLAKE2B 99192e908a274cc224f30452a28edd6931f31a570204f51aa1023e6498e062476610485ff9cb2006dd54235522f52bdcd6dab3e7136d45855ccad845450ddf8c SHA512 ebab70ad29898ef6494147629cb08d843da4c566faaea64941e8293ecec8151f8c1ffd745d082d8155f63c008b4209202b887ee14423d3e7f093ed24dda96e14
-EBUILD bcel-6.5.0.ebuild 1080 BLAKE2B 7ad26bbfccedbf4375c23027b47458175134ef9a05fd48099ccd869c2c4bbea0e243becfeeb3664dcf80084fa5e7a3ee2fa247ee7668376e154d3e74b9e9a568 SHA512 fc8783e11bb675ea899fbb651a8a49fcc5e72f52a52e0f45cae0f3588babf8fba44da1eddd2ff54d386dc2a09416fbabeb4b6c6901d265d06496f14d75d43054
+EBUILD bcel-6.5.0-r1.ebuild 2866 BLAKE2B 25feebba95342fac816e5995a9ef4a79655299bb82a6d66df4cd92ca70a87e813526328aae1cfc52fc644a0e7270d3036f20c4d31136a827b042a29043f06412 SHA512 e4372d8efbbec49f8247540a26b40813b95957f67daac00045c6cb0ded9f199894a18c0e5144ff35942c492f94def02c9b6e149241ca67baf0f8f1c3401cd236
+EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
 MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
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-r1.ebuild b/dev-java/bcel/bcel-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..183c85a56fa3
--- /dev/null
+++ b/dev-java/bcel/bcel-6.5.0-r1.ebuild
@@ -0,0 +1,80 @@
+# 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://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0-r1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.bcel:bcel:6.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+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"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? net.java.dev.jna:jna:5.5.0 -> !!!groupId-not-found!!!
+# test? net.java.dev.jna:jna-platform:5.5.0 -> !!!groupId-not-found!!!
+# test? org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	!arm? (
+		!arm64? (
+			!ppc64? (
+				test? (
+					dev-java/commons-collections:4
+					dev-java/commons-lang:3.6
+					dev-java/jna:4
+					dev-java/jmh-core:0
+					dev-java/oracle-javamail:0
+				)
+			)
+		)
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+RESTRICT="!test? ( test ) arm? ( test ) arm64? ( test ) ppc64? ( test )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+	# Invalid test class
+	"org.apache.bcel.data.AnonymousClassTest"
+	"org.apache.bcel.verifier.tests.TestArray01"
+	"org.apache.bcel.verifier.tests.TestArrayAccess01"
+	"org.apache.bcel.verifier.tests.TestArrayAccess02Creator"
+	"org.apache.bcel.verifier.tests.TestArrayAccess03Creator"
+	"org.apache.bcel.verifier.tests.TestArrayAccess04Creator"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeInterface01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeStatic01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01"
+	"org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02"
+	"org.apache.bcel.verifier.tests.TestReturn01Creator"
+	"org.apache.bcel.verifier.tests.TestReturn02"
+	"org.apache.bcel.verifier.tests.TestCreator"
+	"org.apache.bcel.verifier.tests.TestReturn03Creator"
+)
diff --git a/dev-java/bcel/bcel-6.5.0.ebuild b/dev-java/bcel/bcel-6.5.0.ebuild
index a16085388107..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:*