From 0870e2ffc095e423e9e56da8e95e0a3216251d24 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Sun, 4 May 2025 18:48:01 +0200
Subject: [PATCH] dev-java/guice: update dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds dev-java/jsr305 to runtime classpath. This is needed
after adjusting guava's dependencies where jsr305 was wrongly added to
CP_DEPEND.

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 dev-java/guice/guice-5.1.0-r1.ebuild |  2 +-
 dev-java/guice/guice-5.1.0-r2.ebuild | 58 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 dev-java/guice/guice-5.1.0-r2.ebuild

diff --git a/dev-java/guice/guice-5.1.0-r1.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild
index 5bc330f4392f3..b1fb569155434 100644
--- a/dev-java/guice/guice-5.1.0-r1.ebuild
+++ b/dev-java/guice/guice-5.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-java/guice/guice-5.1.0-r2.ebuild b/dev-java/guice/guice-5.1.0-r2.ebuild
new file mode 100644
index 0000000000000..d5bb78b074dd9
--- /dev/null
+++ b/dev-java/guice/guice-5.1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.inject:guice:5.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+# Most of the test dependencies are missing in Gentoo.
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/aopalliance:1
+	dev-java/asm:0
+	>=dev-java/error-prone-annotations-2.41.0:0
+	dev-java/guava:0
+	dev-java/javax-inject:0
+	dev-java/jsr305:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/guava-testlib:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
+
+JAVA_SRC_DIR=( "core/src" )
+JAVA_RESOURCE_DIRS=( "core/res" )
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,junit-4"
+JAVA_TEST_SRC_DIR=( "core/test" )
+JAVA_TEST_RESOURCE_DIRS=( "core/test" )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "core/res/com/google/inject/" || die
+	cp core/{src,res}/com/google/inject/BUILD || die
+}