Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/guava/
Date: Tue, 27 Oct 2015 20:36:10
Message-Id: 1445978044.1b35cbda0e4eb4d759ee1038e1c59f2bfa725cce.monsieurp@gentoo
1 commit: 1b35cbda0e4eb4d759ee1038e1c59f2bfa725cce
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 20:32:54 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 20:34:04 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b35cbda
7
8 dev-java/guava: Stable for amd64. Stable for x86 using the ALLARCHES policy.
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
12
13 dev-java/guava/guava-13.0.1-r3.ebuild | 6 +++---
14 dev-java/guava/guava-14.0.1.ebuild | 8 ++++----
15 dev-java/guava/guava-15.0.ebuild | 8 ++++----
16 dev-java/guava/guava-16.0.1.ebuild | 8 ++++----
17 dev-java/guava/guava-17.0.ebuild | 8 ++++----
18 dev-java/guava/guava-18.0.ebuild | 8 ++++----
19 6 files changed, 23 insertions(+), 23 deletions(-)
20
21 diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
22 index b29b74c..e048dc3 100644
23 --- a/dev-java/guava/guava-13.0.1-r3.ebuild
24 +++ b/dev-java/guava/guava-13.0.1-r3.ebuild
25 @@ -15,12 +15,12 @@ LICENSE="Apache-2.0"
26 SLOT="13"
27 KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
28
29 -DEPEND="
30 +CDEPEND="
31 dev-java/jsr305:0
32 java-virtuals/jdk-with-com-sun:0"
33 -RDEPEND="${DEPEND}
34 +RDEPEND="${CDEPEND}
35 virtual/jre:1.7"
36 -DEPEND="${DEPEND}
37 +DEPEND="${CDEPEND}
38 app-arch/unzip
39 virtual/jdk:1.7" # https://github.com/google/guava/issues/1738
40 JAVA_GENTOO_CLASSPATH="jsr305"
41
42 diff --git a/dev-java/guava/guava-14.0.1.ebuild b/dev-java/guava/guava-14.0.1.ebuild
43 index 3dcbc4a..0a7d17f 100644
44 --- a/dev-java/guava/guava-14.0.1.ebuild
45 +++ b/dev-java/guava/guava-14.0.1.ebuild
46 @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
47
48 LICENSE="Apache-2.0"
49 SLOT="14"
50 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
51 +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
52
53 -COMMON_DEP="
54 +CDEPEND="
55 dev-java/javax-inject:0
56 dev-java/jsr305:0
57 java-virtuals/jdk-with-com-sun:0"
58 -RDEPEND="${COMMON_DEP}
59 +RDEPEND="${CDEPEND}
60 || ( virtual/jre:1.7 virtual/jre:1.6 )"
61 -DEPEND="${COMMON_DEP}
62 +DEPEND="${CDEPEND}
63 app-arch/unzip
64 virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
65
66
67 diff --git a/dev-java/guava/guava-15.0.ebuild b/dev-java/guava/guava-15.0.ebuild
68 index 28aac3d..511bca4 100644
69 --- a/dev-java/guava/guava-15.0.ebuild
70 +++ b/dev-java/guava/guava-15.0.ebuild
71 @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
72
73 LICENSE="Apache-2.0"
74 SLOT="15"
75 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
76 +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
77
78 -COMMON_DEP="
79 +CDEPEND="
80 dev-java/javax-inject:0
81 dev-java/jsr305:0
82 java-virtuals/jdk-with-com-sun:0"
83 -RDEPEND="${COMMON_DEP}
84 +RDEPEND="${CDEPEND}
85 || ( virtual/jre:1.7 virtual/jre:1.6 )"
86 -DEPEND="${COMMON_DEP}
87 +DEPEND="${CDEPEND}
88 app-arch/unzip
89 virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
90
91
92 diff --git a/dev-java/guava/guava-16.0.1.ebuild b/dev-java/guava/guava-16.0.1.ebuild
93 index 6f6c46b..e3d99f8 100644
94 --- a/dev-java/guava/guava-16.0.1.ebuild
95 +++ b/dev-java/guava/guava-16.0.1.ebuild
96 @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
97
98 LICENSE="Apache-2.0"
99 SLOT="16"
100 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
101 +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
102
103 -COMMON_DEP="
104 +CDEPEND="
105 dev-java/javax-inject:0
106 dev-java/jsr305:0
107 java-virtuals/jdk-with-com-sun:0"
108 -RDEPEND="${COMMON_DEP}
109 +RDEPEND="${CDEPEND}
110 || ( virtual/jre:1.7 virtual/jre:1.6 )"
111 -DEPEND="${COMMON_DEP}
112 +DEPEND="${CDEPEND}
113 app-arch/unzip
114 virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
115
116
117 diff --git a/dev-java/guava/guava-17.0.ebuild b/dev-java/guava/guava-17.0.ebuild
118 index 4cd1085..8ebfe1f 100644
119 --- a/dev-java/guava/guava-17.0.ebuild
120 +++ b/dev-java/guava/guava-17.0.ebuild
121 @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
122
123 LICENSE="Apache-2.0"
124 SLOT="17"
125 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
126 +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
127
128 -COMMON_DEP="
129 +CDEPEND="
130 dev-java/javax-inject:0
131 dev-java/jsr305:0
132 java-virtuals/jdk-with-com-sun:0"
133 -RDEPEND="${COMMON_DEP}
134 +RDEPEND="${CDEPEND}
135 || ( virtual/jre:1.7 virtual/jre:1.6 )"
136 -DEPEND="${COMMON_DEP}
137 +DEPEND="${CDEPEND}
138 app-arch/unzip
139 virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635
140
141
142 diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
143 index 4f13f40..12979a4 100644
144 --- a/dev-java/guava/guava-18.0.ebuild
145 +++ b/dev-java/guava/guava-18.0.ebuild
146 @@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
147
148 LICENSE="Apache-2.0"
149 SLOT="18"
150 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
151 +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
152
153 -COMMON_DEP="
154 +CDEPEND="
155 dev-java/javax-inject:0
156 dev-java/jsr305:0
157 java-virtuals/jdk-with-com-sun:0"
158 -RDEPEND="${COMMON_DEP}
159 +RDEPEND="${CDEPEND}
160 || ( virtual/jre:1.7 virtual/jre:1.6 )"
161 -DEPEND="${COMMON_DEP}
162 +DEPEND="${CDEPEND}
163 app-arch/unzip
164 virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635