Bump everyone to java-config 2.2.

4 files changed, 13 insertions, 9 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 062549c9753e..be33093842fe 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1609 2015/05/09 19:51:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1610 2015/05/09 22:20:44 chewi Exp $
+
+  09 May 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass,
+  java-virtuals-2.eclass, java-vm-2.eclass:
+  Bump everyone to java-config 2.2.
 
   09 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
   graphite support was dropped from gcc-4.7
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index d8754beb56d0..2eacd19283fc 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.160 2015/05/02 20:23:56 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.161 2015/05/09 22:20:44 chewi Exp $
 
 # @ECLASS: java-utils-2.eclass
 # @MAINTAINER:
@@ -43,7 +43,7 @@ has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
 # This is a convience variable to be used from the other java eclasses. This is
 # the version of java-config we want to use. Usually the latest stable version
 # so that ebuilds can use new features without depending on specific versions.
-JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
+JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0 ${JAVA_PKG_PORTAGE_DEP}"
 has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
 
 # @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass
index 6356f1542018..720a9020418e 100644
--- a/eclass/java-virtuals-2.eclass
+++ b/eclass/java-virtuals-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.9 2012/07/18 19:13:23 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.10 2015/05/09 22:20:44 chewi Exp $
 
 # @ECLASS: java-virtuals-2.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@
 
 inherit java-utils-2
 
-DEPEND=">=dev-java/java-config-2.1.6"
+DEPEND=">=dev-java/java-config-2.2.0"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 5f69833defd6..6c3600acdb92 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -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/eclass/java-vm-2.eclass,v 1.48 2015/03/31 18:43:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.49 2015/05/09 22:20:44 chewi Exp $
 
 # @ECLASS: java-vm-2.eclass
 # @MAINTAINER:
@@ -15,8 +15,8 @@ inherit eutils fdo-mime multilib pax-utils prefix
 EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm
 
 RDEPEND="
-	=dev-java/java-config-2*
-	|| ( app-eselect/eselect-java <dev-java/java-config-2.2 )"
+	>=dev-java/java-config-2.2.0
+	app-eselect/eselect-java"
 DEPEND="${RDEPEND}"
 has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"