diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2015-04-23 06:52:14 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2015-04-23 06:52:14 +0000 |
| commit | 8a34877763f015fc139cb320c6e5b9bc2623f864 (patch) | |
| tree | 222173a027488fce9f12a0450bb6fc59ab7af2dc /dev-java/guice | |
| parent | Drop old (diff) | |
| download | gentoo-2-8a34877763f015fc139cb320c6e5b9bc2623f864.tar.gz gentoo-2-8a34877763f015fc139cb320c6e5b9bc2623f864.tar.bz2 gentoo-2-8a34877763f015fc139cb320c6e5b9bc2623f864.zip | |
dev-java/guice: guice-2.0-r1 does not build with jdk 1.8
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F)
Diffstat (limited to 'dev-java/guice')
| -rw-r--r-- | dev-java/guice/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/guice/guice-2.0-r1.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-java/guice/ChangeLog b/dev-java/guice/ChangeLog index 5ccd19612954..d97c06c1a86e 100644 --- a/dev-java/guice/ChangeLog +++ b/dev-java/guice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/guice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.4 2015/04/11 22:25:47 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.5 2015/04/23 06:52:14 fordfrog Exp $ + + 23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org> guice-2.0-r1.ebuild: + guice-2.0-r1 does not build with jdk 1.8 *guice-3.0-r1 (11 Apr 2015) *guice-2.0-r1 (11 Apr 2015) diff --git a/dev-java/guice/guice-2.0-r1.ebuild b/dev-java/guice/guice-2.0-r1.ebuild index 6ce1b8243fa2..6b734130c9fb 100644 --- a/dev-java/guice/guice-2.0-r1.ebuild +++ b/dev-java/guice/guice-2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0-r1.ebuild,v 1.1 2015/04/11 22:25:47 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0-r1.ebuild,v 1.2 2015/04/23 06:52:14 fordfrog Exp $ EAPI="5" @@ -21,9 +21,9 @@ IUSE="" COMMON_DEPEND="dev-java/aopalliance:1 dev-java/asm:3 dev-java/cglib:3" -RDEPEND=">=virtual/jre-1.6 +RDEPEND="|| ( virtual/jre:1.6 virtual/jre:1.7 ) ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.6 +DEPEND="|| ( virtual/jdk:1.6 virtual/jdk:1.7 ) ${COMMON_DEPEND}" S="${WORKDIR}/${P}-src/" |