summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-10-27 20:32:54 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-10-27 20:34:04 +0000
commit1b35cbda0e4eb4d759ee1038e1c59f2bfa725cce (patch)
tree9de490161327faae1281c86d06040ffd62335871
parentdev-java/jsr305: Clean up old. (diff)
downloadgentoo-1b35cbda.tar.gz
gentoo-1b35cbda.tar.bz2
gentoo-1b35cbda.zip
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@gentoo.org>
-rw-r--r--dev-java/guava/guava-13.0.1-r3.ebuild6
-rw-r--r--dev-java/guava/guava-14.0.1.ebuild8
-rw-r--r--dev-java/guava/guava-15.0.ebuild8
-rw-r--r--dev-java/guava/guava-16.0.1.ebuild8
-rw-r--r--dev-java/guava/guava-17.0.ebuild8
-rw-r--r--dev-java/guava/guava-18.0.ebuild8
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 b29b74c5cd66..e048dc3f9ba2 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 3dcbc4a576cf..0a7d17f1a020 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 28aac3df2740..511bca4b6a68 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 6f6c46b11c76..e3d99f816aba 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 4cd108577c1d..8ebfe1f7ca65 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 4f13f4070653..12979a4db65a 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