[gentoo-commits] repo/gentoo:master commit in: dev-java/felix-framework/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     c487c0b91014d50154ac079a803f43cabf8ef2dd
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jan 26 09:59:54 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 08:31:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c487c0b9

dev-java/felix-framework: switch dependency asm:4 -> asm:9

also put java-pkg-2_src_prepare instead of "default"
(preparing for bug #780585)

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...ramework-7.0.5.ebuild => felix-framework-7.0.5-r1.ebuild} | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
similarity index 91%
rename from dev-java/felix-framework/felix-framework-7.0.5.ebuild
rename to dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
index df163b2381bb..11539e0d1f65 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Implementation of the OSGi R8 core framework specification"
 HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html"
 SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -42,7 +40,7 @@ DEPEND="
 	dev-java/osgi-annotation:0
 	dev-java/felix-resolver:0
 	test? (
-		dev-java/asm:4
+		dev-java/asm:9
 		dev-java/easymock:2.5
 		dev-java/mockito:0
 	)
@@ -52,8 +50,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-S="${WORKDIR}/org.apache.felix.framework-${PV}"
-
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -62,7 +58,7 @@ JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	# 58,91 pom.xml
 	cat > src/main/java/module-info.java <<-EOF
 		$( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \