From e25cca877ca5b331892b043b3666927b612c0b52 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Sat, 12 Sep 2015 09:32:09 +0000
Subject: dev-java/guava: Revert all changes made so far and set up a hard
 dependency on Java 7. Fixes bug 560042.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/guava/guava-13.0.1-r1.ebuild | 27 ---------------------------
 dev-java/guava/guava-13.0.1-r2.ebuild | 27 ---------------------------
 dev-java/guava/guava-13.0.1-r3.ebuild | 26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 54 deletions(-)
 delete mode 100644 dev-java/guava/guava-13.0.1-r1.ebuild
 delete mode 100644 dev-java/guava/guava-13.0.1-r2.ebuild
 create mode 100644 dev-java/guava/guava-13.0.1-r3.ebuild

(limited to 'dev-java/guava')

diff --git a/dev-java/guava/guava-13.0.1-r1.ebuild b/dev-java/guava/guava-13.0.1-r1.ebuild
deleted file mode 100644
index 0471a5049c4..00000000000
--- a/dev-java/guava/guava-13.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://code.google.com/p/guava-libraries/"
-SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="13"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-CDEPEND="
-	dev-java/jsr305:0
-	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-13.0.1-r2.ebuild b/dev-java/guava/guava-13.0.1-r2.ebuild
deleted file mode 100644
index 2d8d4719e12..00000000000
--- a/dev-java/guava/guava-13.0.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://code.google.com/p/guava-libraries/"
-SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="13"
-KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-CDEPEND="
-	dev-java/jsr305:0
-	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.7"
-
-JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
new file mode 100644
index 00000000000..b29b74c5cd6
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1-r3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DEPEND="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${DEPEND}
+	virtual/jre:1.7"
+DEPEND="${DEPEND}
+	app-arch/unzip
+	virtual/jdk:1.7" # https://github.com/google/guava/issues/1738
+JAVA_GENTOO_CLASSPATH="jsr305"
-- 
cgit v1.2.1