commit: e25cca877ca5b331892b043b3666927b612c0b52 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Sat Sep 12 09:32:09 2015 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 09:32:30 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25cca87
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 <AT> gentoo.org> dev-java/guava/guava-13.0.1-r1.ebuild | 27 ---------------------- ...ava-13.0.1-r2.ebuild => guava-13.0.1-r3.ebuild} | 11 ++++----- 2 files changed, 5 insertions(+), 33 deletions(-) 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 0471a50..0000000 --- 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-r3.ebuild similarity index 82% rename from dev-java/guava/guava-13.0.1-r2.ebuild rename to dev-java/guava/guava-13.0.1-r3.ebuild index 2d8d471..b29b74c 100644 --- a/dev-java/guava/guava-13.0.1-r2.ebuild +++ b/dev-java/guava/guava-13.0.1-r3.ebuild @@ -15,13 +15,12 @@ LICENSE="Apache-2.0" SLOT="13" KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -CDEPEND=" +DEPEND=" dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0" -RDEPEND="${CDEPEND} - >=virtual/jre-1.7" -DEPEND="${CDEPEND} +RDEPEND="${DEPEND} + virtual/jre:1.7" +DEPEND="${DEPEND} app-arch/unzip - >=virtual/jdk-1.7" - + virtual/jdk:1.7" # https://github.com/google/guava/issues/1738 JAVA_GENTOO_CLASSPATH="jsr305"
