gentoo auto-resync : 10:05:2024 - 00:01:13

2 files changed, 6 insertions, 30 deletions

diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 15750a886786..d98a8bb97754 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,3 @@
 DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
-EBUILD guice-5.1.0.ebuild 2278 BLAKE2B 90567214c17a2e34c10ae83432e5f2cdd031ee325dcc381114df2c3b6c4bfbd3727b51bc37a722c27b5a3ab4f9fc621bc259aba3d1c03d8b4d21ef25442dc911 SHA512 7a1efdf154ccd4d96dc4c574fd9657a3863966706477b56be1bc71679829c25e69f87c9facca30a80d420b0ecacb066329746731d49f8f2064a41f4092f1413a
+EBUILD guice-5.1.0-r1.ebuild 1269 BLAKE2B ac1018a4791388265e2087c4f4960a40c41697143bc5aa7d8f04462a10f5da4d6ce3bfd058a9384db783a84dae11d32c3053ef68b52902b101940bfdb3ab874d SHA512 8ae8dd4b234df3bb7c4aa323db7295fcb330eba3aec8bbbbc26258a4fd154073c9d6da701d990c6e63a8be02028b01727ad93aa51824fa1504325f055a2695a3
 MISC metadata.xml 314 BLAKE2B 096514ea3c668f82136fd956ee4df0fce9ed6c7b1b1b29988851c5e1e07a280df67186c7b036cc7db0440b668734068e08bf7d9465663a793e92bfda954b3a69 SHA512 24ccdea007adffcc8f5d26bd9dfaf19fb1b7ce74f936d2ac37e23874e68ae165310a3485ca1779698ede0b00f4549ed1c32b36f2eb61da1589c4e5f89090d460
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/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
-}