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 ADD16158064 for ; Thu, 9 May 2024 11:08:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00A262BC04D; Thu, 9 May 2024 11:08:54 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3DFE2BC04D for ; Thu, 9 May 2024 11:08:54 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14FC23408DD for ; Thu, 9 May 2024 11:08:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C8761A41 for ; Thu, 9 May 2024 11:08:52 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1715252824.347500e184776a92004e54f4df6196a94f68f652.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/guice/guice-5.1.0-r1.ebuild dev-java/guice/guice-5.1.0.ebuild X-VCS-Directories: dev-java/guice/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 347500e184776a92004e54f4df6196a94f68f652 X-VCS-Branch: master Date: Thu, 9 May 2024 11:08:52 +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: e0f0c668-a5cb-4d63-8537-c12447f2ecfa X-Archives-Hash: 0442eeed7edff57e2128b0f2fbd4c7ff commit: 347500e184776a92004e54f4df6196a94f68f652 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed May 8 21:44:22 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu May 9 11:07:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347500e1 dev-java/guice: adjust ${CDEPEND} -> ${CP_DEPEND} Also some code cleanup Closes: https://bugs.gentoo.org/931594 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36614 Signed-off-by: Florian Schmaus gentoo.org> .../{guice-5.1.0.ebuild => guice-5.1.0-r1.ebuild} | 34 ++++------------------ 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild similarity index 50% rename from dev-java/guice/guice-5.1.0.ebuild rename to dev-java/guice/guice-5.1.0-r1.ebuild index e1ee08998250..4f2610fff44c 100644 --- a/dev-java/guice/guice-5.1.0.ebuild +++ b/dev-java/guice/guice-5.1.0-r1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom core/pom.xml --download-uri https://github.com/google/guava/archive/v30.1.1.tar.gz --slot 5 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x866" --ebuild guice-5.1.0.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above" HOMEPAGE="https://github.com/google/guice" SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="4" @@ -23,32 +21,17 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Most of the test dependencies are missing in Gentoo. RESTRICT="test" -# Common dependencies -# POM: core/pom.xml -# aopalliance:aopalliance:1.0 -> >=dev-java/aopalliance-1.0:1 -# com.google.guava:guava:30.1-jre -> >=dev-java/guava-30.1.1:0 -# javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0 -# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9 - CP_DEPEND=" dev-java/aopalliance:1 dev-java/asm:9 + dev-java/error-prone-annotations:0 dev-java/guava:0 dev-java/javax-inject:0 " -# Compile dependencies -# POM: core/pom.xml -# test? biz.aQute:bnd:0.0.384 -> !!!groupId-not-found!!! -# test? com.google.guava:guava-testlib:30.1-jre -> >=dev-java/guava-testlib-30.1.1:0 -# test? com.google.truth:truth:0.45 -> !!!groupId-not-found!!! -# test? javax.inject:javax.inject-tck:1 -> !!!artifactId-not-found!!! -# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4 -# test? org.apache.felix:org.apache.felix.framework:3.0.5 -> !!!groupId-not-found!!! - DEPEND=" >=virtual/jdk-1.8:* - ${CDEPEND} + ${CP_DEPEND} test? ( dev-java/guava-testlib:0 ) @@ -60,8 +43,6 @@ RDEPEND=" DOCS=( {COPYING,{CONTRIBUTING,README}.md} ) -S="${WORKDIR}/${P}" - JAVA_SRC_DIR=( "core/src" ) JAVA_RESOURCE_DIRS=( "core/res" ) @@ -70,12 +51,7 @@ JAVA_TEST_SRC_DIR=( "core/test" ) JAVA_TEST_RESOURCE_DIRS=( "core/test" ) src_prepare() { - default + java-pkg-2_src_prepare mkdir -p "core/res/com/google/inject/" || die cp core/{src,res}/com/google/inject/BUILD || die } - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -}