dev-java/jruby: fixed bug #386653

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 6a33fea665db9d9088e9e18e5d06b7b3e3854930..a7b3689d2a859a3a287461672d399701868eeb11 100644 (file)
--- 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/Manifest b/dev-java/jruby/Manifest
index 141a0b1349e9bdbc8d390968503a5b84642b88f6..0f750787b4435396653ea0f7669db0d9e3c80b81 100644 (file)
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.5.1/build.xml.patch 916 RMD160 813663ea2f391ed36df4c185e7b8ad8726f35890 SHA1 72f0bdd4ee48f8abb602bcda6b05a1a34b288f2e SHA256 761a8835a43511f5c62fff5f3afa4ab05abf17d2c25348c91088ff6eb17f5d2e
 AUX 1.5.1/testfixes.patch 2490 RMD160 5cd23b036543075e718a7fdc3214e36d21cf6e90 SHA1 261879b1f7bdaaba2b8426ebf403883611906864 SHA256 457ad13912dc8131ddbf60c9afc7227e38e77fb2c389f3c3dde3cc7162dd6148
 AUX 10jruby 22 RMD160 ac56025539a2bbb7a1506a2df958c73cc1c3aba9 SHA1 caf6b109c0a7cfa53a1e470ba0ca5f27a6578723 SHA256 fb1240cfedd315ba3772830abbc238eb3061088fcf70eb4df7e9a99d92f124e4
@@ -21,13 +18,6 @@ EBUILD jruby-1.4.1.ebuild 5998 RMD160 208b070013917131cc2b1fdf31ee38d038212a68 S
 EBUILD jruby-1.5.2-r1.ebuild 5991 RMD160 c6d8fb7b61dd530e7ec6e6703e066c24f306ea5c SHA1 2732485cdcd5d8a2ec62632e03c3ff929bf1f9ba SHA256 5a1bde40da907e466e09ae4f8ee207c8019a6b4b7b85bb2bd63ff647f5a535cd
 EBUILD jruby-1.5.2.ebuild 5988 RMD160 fde151524377a1cd48accb0778a2d6ecc77a4bbf SHA1 31d7cccb02d15273a61f6052e1e0436c10b4fdba SHA256 1c0839a925f9fc7d25148ceeb776abce26351b6196712ba55d22572cabb66971
 EBUILD jruby-1.5.3.ebuild 6206 RMD160 d5dcd3884fcb76c069237a38fb7af7adf7dbaabf SHA1 2ed7f31ae65b196d52bb07f5164e829d33beb957 SHA256 d9ae2e1895ecf07dc32cda587bec28199e4ee23b071f2d2da00256790866b459
-EBUILD jruby-1.5.6.ebuild 6175 RMD160 f1ff956127486469722f45809ba9593906ddbc12 SHA1 22d1e3a58906cce364ee75409ed5a17651d52868 SHA256 4d228781f376e8cf5a7a8831b9070ca4ca224d0fe1b2be36ef9e35761dcce5c6
-MISC ChangeLog 14102 RMD160 0213d9b3248c9b534ce4ec354fefa448d75b2c04 SHA1 1a995681863b0c5c01ff8d5e84966f53c7b3f77a SHA256 45f36642dc77a2d472b8867a945caf3cb5acbdf4d9d1a37c9e2b219a3587df35
+EBUILD jruby-1.5.6.ebuild 6175 RMD160 b36494f1a6ac8a8eede19295dd232eab319bd07e SHA1 f470dc94162f1d33fb1d5f1d68c77704d7ac7d01 SHA256 740bccc78a4130e3824678e06c46e8f8c665e41ee1cc077f01e70da3ce354613
+MISC ChangeLog 14283 RMD160 fb7d0a0a248894ee10e17698e499c758339af6d5 SHA1 bb484edf18948d91d2ca1cd2ab0c69bbbb9375f5 SHA256 57e51c83b5e84e69ba03cc991947393c2a72e78bda26160a1ba36c3daf7f6eaa
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk33r8IACgkQkKaRLQcq0GLkTQCfVXr74m3dhtF8CRHCTbJvkwvn
-5P8AnRObBKzaDZxy1PgDtk8Nnd6KwpzG
-=Cqqb
------END PGP SIGNATURE-----

diff --git a/dev-java/jruby/jruby-1.5.6.ebuild b/dev-java/jruby/jruby-1.5.6.ebuild
index 1b90c1ab1dc7cbbdd1a30a4e870b6d0a6429fa6e..40df780c06a9bd296b9675d11239c4d491ef86d0 100644 (file)
--- 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