From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78D9615800F for ; Fri, 27 Jan 2023 08:32:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C858E09DF; Fri, 27 Jan 2023 08:32:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 863F1E09DF for ; Fri, 27 Jan 2023 08:32:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83EA83410D4 for ; Fri, 27 Jan 2023 08:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2C3C828 for ; Fri, 27 Jan 2023 08:32:19 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1674808280.c487c0b91014d50154ac079a803f43cabf8ef2dd.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/felix-framework/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild dev-java/felix-framework/felix-framework-7.0.5.ebuild X-VCS-Directories: dev-java/felix-framework/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: c487c0b91014d50154ac079a803f43cabf8ef2dd X-VCS-Branch: master Date: Fri, 27 Jan 2023 08:32:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3205b100-f297-4bce-a696-d0a67e8e8edc X-Archives-Hash: 86190158a99e3557b0ebfee428a89e4d commit: c487c0b91014d50154ac079a803f43cabf8ef2dd Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jan 26 09:59:54 2023 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Signed-off-by: Miroslav Šulc 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/p' pom.xml \