* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2024-05-09 11:08 Florian Schmaus
0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-05-09 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 347500e184776a92004e54f4df6196a94f68f652
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed May 8 21:44:22 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36614
Signed-off-by: Florian Schmaus <flow <AT> 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
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2023-12-08 9:53 Miroslav Šulc
0 siblings, 0 replies; 21+ messages in thread
From: Miroslav Šulc @ 2023-12-08 9:53 UTC (permalink / raw
To: gentoo-commits
commit: bd70aa976072a170fe7af06876da93382b323b15
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Oct 12 13:51:11 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 09:47:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd70aa97
dev-java/guice: remove google-code upstream metadata
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33413
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/guice/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
index fbbc13fd826c..a8f059e86374 100644
--- a/dev-java/guice/metadata.xml
+++ b/dev-java/guice/metadata.xml
@@ -6,7 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="google-code">google-guice</remote-id>
<remote-id type="github">google/guice</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2022-06-07 18:56 Arthur Zamarin
0 siblings, 0 replies; 21+ messages in thread
From: Arthur Zamarin @ 2022-06-07 18:56 UTC (permalink / raw
To: gentoo-commits
commit: b5cd29a9c43fd85884a48855020d59ea56a7cfe4
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jun 7 18:41:04 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 18:56:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cd29a9
dev-java/guice: drop 4.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25798
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/guice/Manifest | 1 -
dev-java/guice/guice-4.1.ebuild | 51 -----------------------------------------
2 files changed, 52 deletions(-)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 843d1f08107c..0f624b6899a8 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1 @@
-DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
deleted file mode 100644
index a73ec4a039fc..000000000000
--- a/dev-java/guice/guice-4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="https://github.com/google/guice/"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-RESTRICT="test"
-
-CP_DEPEND="dev-java/aopalliance:1
- >=dev-java/asm-5:4
- >=dev-java/cglib-3.1:3
- dev-java/guava:20
- dev-java/javax-inject:0"
-
-RDEPEND=">=virtual/jre-1.7
- ${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
- ${CP_DEPEND}"
-
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- default
-
- # Where could we get this FREAKIN jar?
- java-pkg_clean ! -name "bnd-*.jar"
-}
-
-src_compile() {
- EANT_BUILD_TARGET="compile manifest" java-pkg-2_src_compile
- jar cfm ${PN}.jar build/META-INF/MANIFEST.MF -C build/classes . || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- dodoc {CONTRIBUTING,README}.md
- use source && java-pkg_dosrc core/src/*
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2022-06-07 18:32 Arthur Zamarin
0 siblings, 0 replies; 21+ messages in thread
From: Arthur Zamarin @ 2022-06-07 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 8eb2ba211d824797ef0a544b55c281dcba37f384
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 18:32:35 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 18:32:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb2ba21
dev-java/guice: Stabilize 5.1.0 arm64, #833327
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/guice/guice-5.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index 59b803decaed..84818e25d077 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2022-06-07 18:32 Arthur Zamarin
0 siblings, 0 replies; 21+ messages in thread
From: Arthur Zamarin @ 2022-06-07 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 07b62ff4f6f9b945708a7673d5cd8716f9c102b1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 18:32:39 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 18:32:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b62ff4
dev-java/guice: Stabilize 5.1.0 ppc64, #833327
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/guice/guice-5.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index 84818e25d077..e1ee08998250 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2022-05-17 9:24 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2022-05-17 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 1c3d9db66e2f91b0612dd81964f854fdb1efcc67
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 09:23:47 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 17 09:23:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3d9db6
dev-java/guice: x86 stable wrt bug #833327
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/guice/guice-5.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index dd9bb5373e8d..59b803decaed 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2022-05-11 12:54 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2022-05-11 12:54 UTC (permalink / raw
To: gentoo-commits
commit: d3a3abba90449f5af92515326837ebdbf31ed7c2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 12:54:19 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 11 12:54:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a3abba
dev-java/guice: amd64 stable wrt bug #833327
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/guice/guice-5.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index d4345e50897c..dd9bb5373e8d 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2022-04-27 11:08 Florian Schmaus
0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2022-04-27 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 22da87cc899d037cf200c0ea1dd19c45189a0841
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 22 14:22:40 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 11:08:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22da87cc
dev-java/guice: Bump to 5.1.0
Closes: https://bugs.gentoo.org/833327
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25106
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/guice/Manifest | 1 +
dev-java/guice/guice-5.1.0.ebuild | 81 +++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 4349f0bee98f..843d1f08107c 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1 +1,2 @@
DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
+DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
new file mode 100644
index 000000000000..d4345e50897c
--- /dev/null
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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"
+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"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+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/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}
+ test? (
+ dev-java/guava-testlib:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
+
+S="${WORKDIR}/${P}"
+
+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() {
+ default
+ 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
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2021-12-22 18:47 Arthur Zamarin
0 siblings, 0 replies; 21+ messages in thread
From: Arthur Zamarin @ 2021-12-22 18:47 UTC (permalink / raw
To: gentoo-commits
commit: beec3aff34f9ed10082204c4b6415598c5a7d82c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 18:35:54 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 18:45:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beec3aff
dev-java/guice: Keyword 4.1 arm, #828049
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/guice/guice-4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index 571a460abed8..a73ec4a039fc 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2021-11-15 19:41 Agostino Sarubbo
0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2021-11-15 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 3b06e1594313f1f0bfb2cf76646251034b84be61
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 19:41:18 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 19:41:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b06e159
dev-java/guice: ppc64 stable wrt bug #822930
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/guice/guice-4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index eae84b6f3479..571a460abed8 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2021-11-11 2:22 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-11-11 2:22 UTC (permalink / raw
To: gentoo-commits
commit: 87ba1a186c3f4a5005f8db33738ed0aa6ccd0cad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 02:21:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 02:22:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ba1a18
dev-java/guice: Stabilize 4.1 arm64, #822930
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/guice/guice-4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index c0a7d2f86ac..eae84b6f347 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2021-10-19 0:15 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-10-19 0:15 UTC (permalink / raw
To: gentoo-commits
commit: 4e082d948f71d901adb82151eb1ce6ae9cccc841
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 00:14:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 00:14:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e082d94
dev-java/guice: Keyword 4.1 arm64, #802609
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/guice/guice-4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index f1239b6deef..c0a7d2f86ac 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2021-07-24 15:22 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-07-24 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 4bee288dc40ef75aef35babbb43a019b402e7a16
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 24 15:21:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 24 15:21:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bee288d
dev-java/guice: Keyword 4.1 ppc64, #802609
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/guice/guice-4.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index f6bb9b55758..f1239b6deef 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2017-08-31 19:55 James Le Cuirot
0 siblings, 0 replies; 21+ messages in thread
From: James Le Cuirot @ 2017-08-31 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 86b9b9cdb160f23f7bdad4f1841ffa18c727b4fe
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 19:53:05 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 19:55:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b9b9cd
dev-java/guice: 4.1 stable on amd64 and x86 using ALLARCHES
Package-Manager: Portage-2.3.8, Repoman-2.3.2
dev-java/guice/guice-4.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index a916e2f0cdd..f6bb9b55758 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2017-08-31 19:55 James Le Cuirot
0 siblings, 0 replies; 21+ messages in thread
From: James Le Cuirot @ 2017-08-31 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 8d9df599d7e638c6ac5f9ecdf849373250f53e4a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 19:54:12 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 19:55:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9df599
dev-java/guice: Remove old 4.0
Package-Manager: Portage-2.3.8, Repoman-2.3.2
dev-java/guice/Manifest | 1 -
dev-java/guice/guice-4.0.ebuild | 75 -----------------------------------------
2 files changed, 76 deletions(-)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index b2625456c16..85b87a53e96 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1 @@
-DIST guice-4.0.tar.gz 23103592 SHA256 353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512 45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40 WHIRLPOOL 7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df
DIST guice-4.1.tar.gz 23212767 SHA256 77650231a0b12c0f0551202ae4dcfc1a4364e090f461cc3d21616d45bfc49537 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00 WHIRLPOOL 9566d12d7cc001f7ddc0b3b972d06664f246a44d0dc0c2c02435f544417781c2f3cb7cce0fc21846297736f79ed59011aaaf2d2b65b08220c3d45acfdba8c76b
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
deleted file mode 100644
index 432869d3327..00000000000
--- a/dev-java/guice/guice-4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="https://github.com/google/guice/"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/aopalliance:1
- dev-java/asm:4
- dev-java/guava:18
- >=dev-java/cglib-3.1:3
- >=dev-java/jarjar-1.4:1
- dev-java/javax-inject:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-
-RESTRICT="test"
-
-JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
- asm-4
- cglib-3
- guava-18
- javax-inject
- aopalliance-1
-"
-
-java_prepare() {
- # Where could we get this FREAKIN jar?
- cp ./lib/build/bnd-0.0.384.jar "${T}" || die
-
- find . -name '*.jar' -exec rm -v {} + || die
- find . -name '*.class' -exec rm -v {} + || die
-
- cp "${T}"/*.jar ./lib/build/ || die
-
- java-pkg_jar-from --into lib cglib-3 cglib.jar cglib-3.1.jar
- java-pkg_jar-from --into lib/build cglib-3 cglib.jar cglib-3.1.jar
-
- java-pkg_jar-from --into lib asm-4
- java-pkg_jar-from --into lib/build asm-4
- java-pkg_jar-from --into lib/build asm-4 asm.jar asm-5.0.3.jar
-
- java-pkg_jar-from --into lib guava-18
- java-pkg_jar-from --into lib javax-inject
- java-pkg_jar-from --into lib aopalliance-1
-}
-
-src_compile() {
- ANT_TASKS="jarjar-1" \
- java-pkg-2_src_compile
-}
-
-src_install() {
- java-pkg_newjar build/dist/"${PN}"-snapshot.jar "${PN}".jar
- use source && java-pkg_dosrc core/src/com
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2016-11-22 0:01 James Le Cuirot
0 siblings, 0 replies; 21+ messages in thread
From: James Le Cuirot @ 2016-11-22 0:01 UTC (permalink / raw
To: gentoo-commits
commit: eed931b35b231cdef3cc76fad7c27736eddd0ffb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 23:56:51 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 00:00:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed931b3
dev-java/guice: Bump to 4.1, EAPI bump, avoid jarjar dependency
Package-Manager: portage-2.3.2
dev-java/guice/Manifest | 1 +
dev-java/guice/guice-4.1.ebuild | 52 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 53592b0..b262545 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1 +1,2 @@
DIST guice-4.0.tar.gz 23103592 SHA256 353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512 45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40 WHIRLPOOL 7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df
+DIST guice-4.1.tar.gz 23212767 SHA256 77650231a0b12c0f0551202ae4dcfc1a4364e090f461cc3d21616d45bfc49537 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00 WHIRLPOOL 9566d12d7cc001f7ddc0b3b972d06664f246a44d0dc0c2c02435f544417781c2f3cb7cce0fc21846297736f79ed59011aaaf2d2b65b08220c3d45acfdba8c76b
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
new file mode 100644
index 00000000..b1ec6fe
--- /dev/null
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="https://github.com/google/guice/"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+CP_DEPEND="dev-java/aopalliance:1
+ >=dev-java/asm-5:4
+ >=dev-java/cglib-3.1:3
+ dev-java/guava:20
+ dev-java/javax-inject:0"
+
+RDEPEND=">=virtual/jre-1.7
+ ${CP_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+ ${CP_DEPEND}"
+
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+ default
+
+ # Where could we get this FREAKIN jar?
+ java-pkg_clean ! -name "bnd-*.jar"
+}
+
+src_compile() {
+ EANT_BUILD_TARGET="compile manifest" java-pkg-2_src_compile
+ jar cfm ${PN}.jar build/META-INF/MANIFEST.MF -C build/classes . || die
+}
+
+src_install() {
+ java-pkg_dojar ${PN}.jar
+ dodoc {CONTRIBUTING,README}.md
+ use source && java-pkg_dosrc core/src/*
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2016-03-14 21:04 James Le Cuirot
0 siblings, 0 replies; 21+ messages in thread
From: James Le Cuirot @ 2016-03-14 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 064cfae85683cbaa992140e510a4dab9d1ac4ada
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 20:42:09 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 21:04:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064cfae8
dev-java/guice: 4.0 stable on amd64 and x86 using ALLARCHES
Package-Manager: portage-2.2.28
dev-java/guice/guice-4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
index 6049aeb..2190ef9 100644
--- a/dev-java/guice/guice-4.0.ebuild
+++ b/dev-java/guice/guice-4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2016-01-22 21:51 James Le Cuirot
0 siblings, 0 replies; 21+ messages in thread
From: James Le Cuirot @ 2016-01-22 21:51 UTC (permalink / raw
To: gentoo-commits
commit: cadbd36b36b59cebf30315179050b4cef14dd34d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 21:51:04 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 21:51:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cadbd36b
dev-java/guice: Use a sane distfile name
Package-Manager: portage-2.2.27
dev-java/guice/Manifest | 2 +-
dev-java/guice/guice-4.0.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 4b076b0..23f8e3e 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1,2 @@
-DIST 4.0.zip 23619064 SHA256 162f10637cd76d34b1bdcccff7f721424928ecdf1e15dc04270f0fa6a5f8953c SHA512 db4021518a7868fa3387686a701fa5e464b92f69f6a2e4a6a8d85c13b665da22c1cacfdb36caa0de484ad03321280fde9ad5ec9725c66c6bb455575b03915344 WHIRLPOOL 36d426f4a604b8dd0c51b42df4e6e5acd8e05391c1acf4cb90731331a8e1126d09e14c0264b6854fac14632ed11bcc45bad0f0fafc076023488f0684b7a6c55f
DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
+DIST guice-4.0.tar.gz 23103592 SHA256 353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512 45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40 WHIRLPOOL 7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
index 56820e0..6049aeb 100644
--- a/dev-java/guice/guice-4.0.ebuild
+++ b/dev-java/guice/guice-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
HOMEPAGE="https://github.com/google/guice/"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.zip"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2015-08-16 15:10 Justin Lecher
0 siblings, 0 replies; 21+ messages in thread
From: Justin Lecher @ 2015-08-16 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 5403c0bbd52ebc3bac7518aea18aa241aa69ffe1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 14:55:40 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 15:10:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5403c0bb
dev-java/guice: Updating remote-id in metadata.xml
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-java/guice/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
index 32433bd..b8ec531 100644
--- a/dev-java/guice/metadata.xml
+++ b/dev-java/guice/metadata.xml
@@ -4,6 +4,6 @@
<herd>java</herd>
<upstream>
<remote-id type="google-code">google-guice</remote-id>
+ <remote-id type="github">google/guice</remote-id>
</upstream>
</pkgmetadata>
-
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2015-08-16 0:45 Patrice Clement
0 siblings, 0 replies; 21+ messages in thread
From: Patrice Clement @ 2015-08-16 0:45 UTC (permalink / raw
To: gentoo-commits
commit: efccd1654212a75f4e0ddf646a44e22046ddf4ca
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 01:42:58 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 01:45:21 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efccd165
dev-java/guice: Drop buggy version. Fixes bug 556934.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/guice/Manifest | 1 -
dev-java/guice/guice-3.0-r1.ebuild | 50 --------------------------------------
2 files changed, 51 deletions(-)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index b826a07..4b076b0 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,2 @@
DIST 4.0.zip 23619064 SHA256 162f10637cd76d34b1bdcccff7f721424928ecdf1e15dc04270f0fa6a5f8953c SHA512 db4021518a7868fa3387686a701fa5e464b92f69f6a2e4a6a8d85c13b665da22c1cacfdb36caa0de484ad03321280fde9ad5ec9725c66c6bb455575b03915344 WHIRLPOOL 36d426f4a604b8dd0c51b42df4e6e5acd8e05391c1acf4cb90731331a8e1126d09e14c0264b6854fac14632ed11bcc45bad0f0fafc076023488f0684b7a6c55f
DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
-DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
diff --git a/dev-java/guice/guice-3.0-r1.ebuild b/dev-java/guice/guice-3.0-r1.ebuild
deleted file mode 100644
index 82d861c..0000000
--- a/dev-java/guice/guice-3.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="http://code.google.com/p/google-guice/"
-SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/aopalliance:1
- dev-java/javax-inject:0
- dev-java/asm:3
- dev-java/cglib:3"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}-src/"
-
-JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-3,javax-inject"
-
-java_prepare() {
- find . -name '*.jar' -exec rm -v {} + || die
- find . -name '*.class' -exec rm -v {} + || die
- epatch "${FILESDIR}"/${PV}-common.xml.patch
- epatch "${FILESDIR}"/${PV}-build.xml.patch
-}
-
-src_install() {
- java-pkg_dojar build/${PN}.jar
- use source && java-pkg_dosrc core/src/com
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
@ 2015-08-16 0:45 Patrice Clement
0 siblings, 0 replies; 21+ messages in thread
From: Patrice Clement @ 2015-08-16 0:45 UTC (permalink / raw
To: gentoo-commits
commit: af6dc05cb33d5d9c8131569c6008374dce360e3e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 01:41:15 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 01:45:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6dc05c
dev-java/guice: Version bump. Fixes bug 556934.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/guice/Manifest | 1 +
dev-java/guice/guice-4.0.ebuild | 76 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 4599a87..b826a07 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1,3 @@
+DIST 4.0.zip 23619064 SHA256 162f10637cd76d34b1bdcccff7f721424928ecdf1e15dc04270f0fa6a5f8953c SHA512 db4021518a7868fa3387686a701fa5e464b92f69f6a2e4a6a8d85c13b665da22c1cacfdb36caa0de484ad03321280fde9ad5ec9725c66c6bb455575b03915344 WHIRLPOOL 36d426f4a604b8dd0c51b42df4e6e5acd8e05391c1acf4cb90731331a8e1126d09e14c0264b6854fac14632ed11bcc45bad0f0fafc076023488f0684b7a6c55f
DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
new file mode 100644
index 0000000..56820e0
--- /dev/null
+++ b/dev-java/guice/guice-4.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="https://github.com/google/guice/"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/aopalliance:1
+ dev-java/asm:4
+ dev-java/guava:18
+ >=dev-java/cglib-3.1:3
+ >=dev-java/jarjar-1.4:1
+ dev-java/javax-inject:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+RESTRICT="test"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+ asm-4
+ cglib-3
+ guava-18
+ javax-inject
+ aopalliance-1
+"
+
+java_prepare() {
+ # Where could we get this FREAKIN jar?
+ cp ./lib/build/bnd-0.0.384.jar "${T}" || die
+
+ find . -name '*.jar' -exec rm -v {} + || die
+ find . -name '*.class' -exec rm -v {} + || die
+
+ cp "${T}"/*.jar ./lib/build/ || die
+
+ java-pkg_jar-from --into lib cglib-3 cglib.jar cglib-3.1.jar
+ java-pkg_jar-from --into lib/build cglib-3 cglib.jar cglib-3.1.jar
+
+ java-pkg_jar-from --into lib asm-4
+ java-pkg_jar-from --into lib/build asm-4
+ java-pkg_jar-from --into lib/build asm-4 asm.jar asm-5.0.3.jar
+
+ java-pkg_jar-from --into lib guava-18
+ java-pkg_jar-from --into lib javax-inject
+ java-pkg_jar-from --into lib aopalliance-1
+}
+
+src_compile() {
+ ANT_TASKS="jarjar-1" \
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ java-pkg_newjar build/dist/"${PN}"-snapshot.jar "${PN}".jar
+ use source && java-pkg_dosrc core/src/com
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2024-05-09 11:08 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-09 11:08 [gentoo-commits] repo/gentoo:master commit in: dev-java/guice/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2023-12-08 9:53 Miroslav Šulc
2022-06-07 18:56 Arthur Zamarin
2022-06-07 18:32 Arthur Zamarin
2022-06-07 18:32 Arthur Zamarin
2022-05-17 9:24 Agostino Sarubbo
2022-05-11 12:54 Agostino Sarubbo
2022-04-27 11:08 Florian Schmaus
2021-12-22 18:47 Arthur Zamarin
2021-11-15 19:41 Agostino Sarubbo
2021-11-11 2:22 Sam James
2021-10-19 0:15 Sam James
2021-07-24 15:22 Sam James
2017-08-31 19:55 James Le Cuirot
2017-08-31 19:55 James Le Cuirot
2016-11-22 0:01 James Le Cuirot
2016-03-14 21:04 James Le Cuirot
2016-01-22 21:51 James Le Cuirot
2015-08-16 15:10 Justin Lecher
2015-08-16 0:45 Patrice Clement
2015-08-16 0:45 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox