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>

diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
index b29b74c5cd660294c638f9a2965d3bd2d9635bc1..e048dc3f9ba20cb0d771b720a2dc1caaa9005c01 100644 (file)
--- 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 3dcbc4a576cfb54983c4272197ba52eae0981c8a..0a7d17f1a0200c898db76c5b4b13db35d3fa456a 100644 (file)
--- 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 28aac3df27406237a303e80a7fa4333acb8772d3..511bca4b6a68d7c89b13a353539096242559ee0c 100644 (file)
--- 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 6f6c46b11c76a89f8bf472b77e8b51da857e0c83..e3d99f816aba6af3970790b776ed1ccdae8e1822 100644 (file)
--- 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 4cd108577c1d6ebc2a94bf4151b889e966303eca..8ebfe1f7ca65d2173526075fec9670167bcc88fa 100644 (file)
--- 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 4f13f40706536b6ccac232260fb5206aefc86ef5..12979a4db65a5ccc899b6b10b6284a029f858a4b 100644 (file)
--- 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