dev-java/guava: fixed bug #519268

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F)

7 files changed, 33 insertions, 26 deletions

diff --git a/dev-java/guava/ChangeLog b/dev-java/guava/ChangeLog
index cc958451fa5e..84dbaf72cba9 100644
--- a/dev-java/guava/ChangeLog
+++ b/dev-java/guava/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/guava
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/ChangeLog,v 1.14 2014/11/28 14:50:25 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/ChangeLog,v 1.15 2015/02/21 19:12:22 fordfrog Exp $
+
+  21 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> guava-13.0.1.ebuild,
+  guava-14.0.1.ebuild, guava-15.0.ebuild, guava-16.0.1.ebuild,
+  guava-17.0.ebuild, guava-18.0.ebuild:
+  restricted all ebuilds to compile just with jdk:1.7 and run with jre:1.7 or
+  jre:1.6 because of using proprietary sun.misc.Unsafe which is not present in
+  jdk:1.8 (bug #519268)
 
   28 Nov 2014; Tim Harder <radhermit@gentoo.org> guava-18.0.ebuild,
   metadata.xml:
diff --git a/dev-java/guava/guava-13.0.1.ebuild b/dev-java/guava/guava-13.0.1.ebuild
index 1c2ea0d123fc..6d159543254b 100644
--- a/dev-java/guava/guava-13.0.1.ebuild
+++ b/dev-java/guava/guava-13.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-13.0.1.ebuild,v 1.1 2013/03/07 04:05:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-13.0.1.ebuild,v 1.2 2015/02/21 19:12:22 fordfrog Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -19,9 +19,9 @@ COMMON_DEP="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
 DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+	virtual/jdk:1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
 
 JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-14.0.1.ebuild b/dev-java/guava/guava-14.0.1.ebuild
index 9f63b0f241bc..0fea538016b4 100644
--- a/dev-java/guava/guava-14.0.1.ebuild
+++ b/dev-java/guava/guava-14.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-14.0.1.ebuild,v 1.1 2013/03/26 04:21:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-14.0.1.ebuild,v 1.2 2015/02/21 19:12:22 fordfrog Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ COMMON_DEP="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
 DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+	virtual/jdk:1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
 
 JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-15.0.ebuild b/dev-java/guava/guava-15.0.ebuild
index bb88c4c36936..fd36818b7910 100644
--- a/dev-java/guava/guava-15.0.ebuild
+++ b/dev-java/guava/guava-15.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-15.0.ebuild,v 1.1 2013/09/25 23:40:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-15.0.ebuild,v 1.2 2015/02/21 19:12:22 fordfrog Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ COMMON_DEP="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
 DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+	virtual/jdk:1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
 
 JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-16.0.1.ebuild b/dev-java/guava/guava-16.0.1.ebuild
index ff5c3aaf18c8..e6e75feac72f 100644
--- a/dev-java/guava/guava-16.0.1.ebuild
+++ b/dev-java/guava/guava-16.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-16.0.1.ebuild,v 1.1 2014/02/13 08:49:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-16.0.1.ebuild,v 1.2 2015/02/21 19:12:22 fordfrog Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ COMMON_DEP="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
 DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+	virtual/jdk:1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
 
 JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-17.0.ebuild b/dev-java/guava/guava-17.0.ebuild
index 16c1db804901..9d24d36b9dc3 100644
--- a/dev-java/guava/guava-17.0.ebuild
+++ b/dev-java/guava/guava-17.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-17.0.ebuild,v 1.1 2014/04/25 05:53:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-17.0.ebuild,v 1.2 2015/02/21 19:12:22 fordfrog Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ COMMON_DEP="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
 DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+	virtual/jdk:1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
 
 JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index 4ac60192c6f4..5fbbfa2fede0 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-18.0.ebuild,v 1.2 2014/11/28 14:50:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-18.0.ebuild,v 1.3 2015/02/21 19:12:22 fordfrog Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ COMMON_DEP="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
 DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+	virtual/jdk:1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
 
 JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"