commit: 1b35cbda0e4eb4d759ee1038e1c59f2bfa725cce
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 20:32:54 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 20:34:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b35cbda
dev-java/guava: Stable for amd64. Stable for x86 using the ALLARCHES policy.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/guava/guava-13.0.1-r3.ebuild | 6 +++---
dev-java/guava/guava-14.0.1.ebuild | 8 ++++----
dev-java/guava/guava-15.0.ebuild | 8 ++++----
dev-java/guava/guava-16.0.1.ebuild | 8 ++++----
dev-java/guava/guava-17.0.ebuild | 8 ++++----
dev-java/guava/guava-18.0.ebuild | 8 ++++----
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild
b/dev-java/guava/guava-13.0.1-r3.ebuild
index b29b74c..e048dc3 100644
--- a/dev-java/guava/guava-13.0.1-r3.ebuild
+++ b/dev-java/guava/guava-13.0.1-r3.ebuild
@@ -15,12 +15,12 @@ LICENSE="Apache-2.0"
SLOT="13"
KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-DEPEND="
+CDEPEND="
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
virtual/jre:1.7"
-DEPEND="${DEPEND}
+DEPEND="${CDEPEND}
app-arch/unzip
virtual/jdk:1.7" # https://github.com/google/guava/issues/1738
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 3dcbc4a..0a7d17f 100644
--- a/dev-java/guava/guava-14.0.1.ebuild
+++ b/dev-java/guava/guava-14.0.1.ebuild
@@ -13,15 +13,15 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
LICENSE="Apache-2.0"
SLOT="14"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-COMMON_DEP="
+CDEPEND="
dev-java/javax-inject:0
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
app-arch/unzip
virtual/jdk:1.7" #
https://code.google.com/p/guava-libraries/issues/detail?id=635
diff --git a/dev-java/guava/guava-15.0.ebuild b/dev-java/guava/guava-15.0.ebuild
index 28aac3d..511bca4 100644
--- a/dev-java/guava/guava-15.0.ebuild
+++ b/dev-java/guava/guava-15.0.ebuild
@@ -13,15 +13,15 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
LICENSE="Apache-2.0"
SLOT="15"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-COMMON_DEP="
+CDEPEND="
dev-java/javax-inject:0
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
app-arch/unzip
virtual/jdk:1.7" #
https://code.google.com/p/guava-libraries/issues/detail?id=635
diff --git a/dev-java/guava/guava-16.0.1.ebuild
b/dev-java/guava/guava-16.0.1.ebuild
index 6f6c46b..e3d99f8 100644
--- a/dev-java/guava/guava-16.0.1.ebuild
+++ b/dev-java/guava/guava-16.0.1.ebuild
@@ -13,15 +13,15 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
LICENSE="Apache-2.0"
SLOT="16"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-COMMON_DEP="
+CDEPEND="
dev-java/javax-inject:0
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
app-arch/unzip
virtual/jdk:1.7" #
https://code.google.com/p/guava-libraries/issues/detail?id=635
diff --git a/dev-java/guava/guava-17.0.ebuild b/dev-java/guava/guava-17.0.ebuild
index 4cd1085..8ebfe1f 100644
--- a/dev-java/guava/guava-17.0.ebuild
+++ b/dev-java/guava/guava-17.0.ebuild
@@ -13,15 +13,15 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
LICENSE="Apache-2.0"
SLOT="17"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-COMMON_DEP="
+CDEPEND="
dev-java/javax-inject:0
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
app-arch/unzip
virtual/jdk:1.7" #
https://code.google.com/p/guava-libraries/issues/detail?id=635
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index 4f13f40..12979a4 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -13,15 +13,15 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
LICENSE="Apache-2.0"
SLOT="18"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-COMMON_DEP="
+CDEPEND="
dev-java/javax-inject:0
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
app-arch/unzip
virtual/jdk:1.7" #
https://code.google.com/p/guava-libraries/issues/detail?id=635
