diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-10-19 01:25:10 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-10-19 01:25:10 +0000 |
| commit | 7dc3d1bdca7c47f0955408c12d8c8fe746163c0c (patch) | |
| tree | 6f3c671037424825233a43feb1d921b64fa08e3c /dev-java | |
| parent | New pygobject:3 (and compatible 2.28.6-r50), moved from the gnome overlay. (diff) | |
| download | gentoo-2-7dc3d1bdca7c47f0955408c12d8c8fe746163c0c.tar.gz gentoo-2-7dc3d1bdca7c47f0955408c12d8c8fe746163c0c.tar.bz2 gentoo-2-7dc3d1bdca7c47f0955408c12d8c8fe746163c0c.zip | |
dev-java/jruby: fixed bug #386653
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jruby/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.5.6.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 6a33fea665db..a7b3689d2a85 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.75 2011/06/14 18:59:32 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.76 2011/10/19 01:25:10 fordfrog Exp $ + + 19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> jruby-1.5.6.ebuild: + JDK 7 changes the way it handles method overloading so restricting + compilation to JDK 6 (bug #386653) 14 Jun 2011; Markus Meier <maekke@gentoo.org> jruby-1.5.6.ebuild: amd64/x86 stable, bug #370709 diff --git a/dev-java/jruby/jruby-1.5.6.ebuild b/dev-java/jruby/jruby-1.5.6.ebuild index 1b90c1ab1dc7..40df780c06a9 100644 --- a/dev-java/jruby/jruby-1.5.6.ebuild +++ b/dev-java/jruby/jruby-1.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.3 2011/10/19 01:25:10 fordfrog Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -38,7 +38,7 @@ RDEPEND="${CDEPEND} >=virtual/jre-1.6" DEPEND="${CDEPEND} - >=virtual/jdk-1.6 + virtual/jdk:1.6 test? ( dev-java/ant-junit4:0 dev-java/ant-trax:0 |