Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/maven-bin/
Date: Thu, 22 Nov 2018 18:43:06
Message-Id: 1542912173.3e692161ab7428fec21657e9b42ce510a1307a7e.fordfrog@gentoo
1 commit: 3e692161ab7428fec21657e9b42ce510a1307a7e
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 22 18:42:25 2018 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 22 18:42:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e692161
7
8 dev-java/maven-bin: version bumps
9
10 bumped slots 3.0 and 3.5 and added slot 3.6
11
12 Package-Manager: Portage-2.3.52, Repoman-2.3.12
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 dev-java/maven-bin/Manifest | 3 +
16 dev-java/maven-bin/maven-bin-3.0.5.ebuild | 58 ++++++++++++++++
17 dev-java/maven-bin/maven-bin-3.5.4.ebuild | 109 ++++++++++++++++++++++++++++++
18 dev-java/maven-bin/maven-bin-3.6.0.ebuild | 109 ++++++++++++++++++++++++++++++
19 4 files changed, 279 insertions(+)
20
21 diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
22 index 56bf85e93ee..92bc6d4e0a3 100644
23 --- a/dev-java/maven-bin/Manifest
24 +++ b/dev-java/maven-bin/Manifest
25 @@ -1,9 +1,12 @@
26 DIST apache-maven-2.0.11-bin.tar.bz2 2104711 BLAKE2B 4bc6272957f3e258135d4efacacc625f63522a7e0277e3383ec27a9906e8e4b41cb606d44b30ba870fa5c05d79a45d26af9af00cbffb7615087949c2eec563f7 SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de
27 DIST apache-maven-2.2.1-bin.tar.bz2 2839688 BLAKE2B 64427a0e8925c7ec4567a96878c389635aaf578a6569825749fb5786ee7566654d5e6583d40cced8e3585b72bc1cee70567388cddf32393ff1fb5962a4ad96eb SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7
28 DIST apache-maven-3.0.4-bin.tar.gz 4873043 BLAKE2B 6cdbc6362dfd766f8e14298873f574fff1a6b4c4e29011a234ff7f3f0d2350a7fe7ff26dd68d486b68d84ba575d77324d0cb950e0cea91894a2f0ce81da0f7de SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c
29 +DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5dae7955956f95a383c93342bcd3b823e4355fd446150df60b19fc5754b4b19ca4f38bc11357e061e31b0a66b927611a5a6f SHA512 748c7deb8f56dd968a4dbc289b012adea3621f7b3847dc19004995c2f540bae68fb100c0f28caa57b0f9d15b74ae81eaa27c71e342342aa57afe23b41e80d35f
30 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
31 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
32 DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5
33 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
34 DIST apache-maven-3.5.0-bin.tar.gz 8534562 BLAKE2B 200f7c012e2704c9057d4987a295b0fa9a5787d59707415259445952ae05963a7d333e6fc2eae88689161181077d2b9a9b2398b5baacc6527e76ed83d6068198 SHA512 d5a520ca8765ddbc86dca71249c602e2f798dedcc7430bc4979dd01918464c8dc69b694ec0dbbeeff6044179e1b98fce72af952663dd49503203d9742e328f3b
35 +DIST apache-maven-3.5.4-bin.tar.gz 8842660 BLAKE2B e56e22c2f9e51d47ff34b8516eb3d14d4ca2adddb36c800cfba5cb4e68c19c3c7df7d544c1e81c7be004fe5ceeee24f78b904f68b30b768aaf09562d804b61c3 SHA512 2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86
36 +DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
37 DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0
38
39 diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
40 new file mode 100644
41 index 00000000000..e97007ba6b0
42 --- /dev/null
43 +++ b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
44 @@ -0,0 +1,58 @@
45 +# Copyright 1999-2018 Gentoo Authors
46 +# Distributed under the terms of the GNU General Public License v2
47 +
48 +EAPI="6"
49 +
50 +inherit java-pkg-2
51 +
52 +MY_PN=apache-${PN%%-bin}
53 +MY_P="${MY_PN}-${PV}"
54 +MY_MV="${PV%%.*}"
55 +
56 +DESCRIPTION="Project Management and Comprehension Tool for Java"
57 +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
58 +HOMEPAGE="https://maven.apache.org/"
59 +
60 +LICENSE="Apache-2.0"
61 +SLOT="3.0"
62 +KEYWORDS="~amd64 ~x86"
63 +IUSE=""
64 +
65 +DEPEND="app-eselect/eselect-java"
66 +RDEPEND=">=virtual/jdk-1.5
67 + ${DEPEND}"
68 +
69 +S="${WORKDIR}/${MY_P}"
70 +
71 +MAVEN=${PN}-${SLOT}
72 +MAVEN_SHARE="/usr/share/${MAVEN}"
73 +
74 +java_prepare() {
75 + rm -v "${S}"/bin/*.bat || die
76 + chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
77 +}
78 +
79 +# TODO we should use jars from packages, instead of what is bundled
80 +src_install() {
81 + dodir "${MAVEN_SHARE}"
82 + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
83 +
84 + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
85 +
86 + dodoc NOTICE.txt README.txt
87 +
88 + dodir /usr/bin
89 + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
90 +
91 + # bug #342901
92 + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
93 + doenvd "${T}/25${MAVEN}"
94 +}
95 +
96 +pkg_postinst() {
97 + eselect maven update mvn-${SLOT}
98 +}
99 +
100 +pkg_postrm() {
101 + eselect maven update
102 +}
103
104 diff --git a/dev-java/maven-bin/maven-bin-3.5.4.ebuild b/dev-java/maven-bin/maven-bin-3.5.4.ebuild
105 new file mode 100644
106 index 00000000000..034526da052
107 --- /dev/null
108 +++ b/dev-java/maven-bin/maven-bin-3.5.4.ebuild
109 @@ -0,0 +1,109 @@
110 +# Copyright 1999-2018 Gentoo Authors
111 +# Distributed under the terms of the GNU General Public License v2
112 +
113 +EAPI=6
114 +
115 +inherit java-pkg-2
116 +
117 +MY_PN=apache-${PN%%-bin}
118 +MY_PV=${PV/_alpha/-alpha-}
119 +MY_P="${MY_PN}-${MY_PV}"
120 +MY_MV="${PV%%.*}"
121 +
122 +DESCRIPTION="Project Management and Comprehension Tool for Java"
123 +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
124 +HOMEPAGE="https://maven.apache.org/"
125 +
126 +LICENSE="Apache-2.0"
127 +SLOT="3.5"
128 +KEYWORDS="~amd64 ~x86"
129 +
130 +# TODO: Needs further resolution:
131 +#
132 +# - https://bugs.gentoo.org/show_bug.cgi?id=472850
133 +# - https://bugs.gentoo.org/show_bug.cgi?id=477436
134 +#
135 +CDEPEND="
136 + dev-java/juel:0
137 + dev-java/log4j:0
138 + dev-java/jsoup:0
139 + dev-java/jsr250:0
140 + dev-java/commons-io:1
141 + dev-java/aopalliance:1
142 + dev-java/commons-cli:1
143 + dev-java/javax-inject:0
144 + dev-java/osgi-core-api:0
145 + dev-java/commons-logging:0
146 + java-virtuals/interceptor-api:0
147 + java-virtuals/servlet-api:3.0"
148 +
149 +DEPEND="
150 + ${CDEPEND}
151 + app-eselect/eselect-java
152 + || ( dev-java/commons-logging:0 dev-java/log4j:0 )
153 + >=virtual/jdk-1.7"
154 +
155 +RDEPEND="
156 + ${CDEPEND}
157 + >=virtual/jre-1.7"
158 +
159 +S="${WORKDIR}/${MY_P}"
160 +
161 +MAVEN="${PN}-${SLOT}"
162 +MAVEN_SHARE="/usr/share/${MAVEN}"
163 +
164 +MAVEN_DEPENDENCIES=(
165 + juel
166 + jsoup
167 + log4j
168 + jsr250
169 + javax-inject
170 + commons-io-1
171 + osgi-core-api
172 + aopalliance-1
173 + commons-cli-1
174 + commons-logging
175 + interceptor-api
176 + servlet-api-3.0
177 +)
178 +
179 +java_prepare() {
180 + rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
181 +
182 + chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
183 +
184 + # Symlink jars.
185 + cd lib || die
186 +
187 + # Link deps.
188 + for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
189 + java-pkg_jar-from "${mvn_dep}"
190 + done
191 +}
192 +
193 +# TODO: We should use jars from packages, instead of what is bundled.
194 +src_install() {
195 + dodir "${MAVEN_SHARE}"
196 +
197 + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
198 +
199 + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
200 + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
201 +
202 + dodoc NOTICE README.txt
203 +
204 + dodir /usr/bin
205 + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
206 +
207 + # See bug #342901.
208 + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
209 + doenvd "${T}/25${MAVEN}"
210 +}
211 +
212 +pkg_postinst() {
213 + eselect maven update mvn-${SLOT}
214 +}
215 +
216 +pkg_postrm() {
217 + eselect maven update
218 +}
219
220 diff --git a/dev-java/maven-bin/maven-bin-3.6.0.ebuild b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
221 new file mode 100644
222 index 00000000000..a7e55b1b599
223 --- /dev/null
224 +++ b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
225 @@ -0,0 +1,109 @@
226 +# Copyright 1999-2018 Gentoo Authors
227 +# Distributed under the terms of the GNU General Public License v2
228 +
229 +EAPI=6
230 +
231 +inherit java-pkg-2
232 +
233 +MY_PN=apache-${PN%%-bin}
234 +MY_PV=${PV/_alpha/-alpha-}
235 +MY_P="${MY_PN}-${MY_PV}"
236 +MY_MV="${PV%%.*}"
237 +
238 +DESCRIPTION="Project Management and Comprehension Tool for Java"
239 +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
240 +HOMEPAGE="https://maven.apache.org/"
241 +
242 +LICENSE="Apache-2.0"
243 +SLOT="3.6"
244 +KEYWORDS="~amd64 ~x86"
245 +
246 +# TODO: Needs further resolution:
247 +#
248 +# - https://bugs.gentoo.org/show_bug.cgi?id=472850
249 +# - https://bugs.gentoo.org/show_bug.cgi?id=477436
250 +#
251 +CDEPEND="
252 + dev-java/juel:0
253 + dev-java/log4j:0
254 + dev-java/jsoup:0
255 + dev-java/jsr250:0
256 + dev-java/commons-io:1
257 + dev-java/aopalliance:1
258 + dev-java/commons-cli:1
259 + dev-java/javax-inject:0
260 + dev-java/osgi-core-api:0
261 + dev-java/commons-logging:0
262 + java-virtuals/interceptor-api:0
263 + java-virtuals/servlet-api:3.0"
264 +
265 +DEPEND="
266 + ${CDEPEND}
267 + app-eselect/eselect-java
268 + || ( dev-java/commons-logging:0 dev-java/log4j:0 )
269 + >=virtual/jdk-1.7"
270 +
271 +RDEPEND="
272 + ${CDEPEND}
273 + >=virtual/jre-1.7"
274 +
275 +S="${WORKDIR}/${MY_P}"
276 +
277 +MAVEN="${PN}-${SLOT}"
278 +MAVEN_SHARE="/usr/share/${MAVEN}"
279 +
280 +MAVEN_DEPENDENCIES=(
281 + juel
282 + jsoup
283 + log4j
284 + jsr250
285 + javax-inject
286 + commons-io-1
287 + osgi-core-api
288 + aopalliance-1
289 + commons-cli-1
290 + commons-logging
291 + interceptor-api
292 + servlet-api-3.0
293 +)
294 +
295 +java_prepare() {
296 + rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
297 +
298 + chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
299 +
300 + # Symlink jars.
301 + cd lib || die
302 +
303 + # Link deps.
304 + for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
305 + java-pkg_jar-from "${mvn_dep}"
306 + done
307 +}
308 +
309 +# TODO: We should use jars from packages, instead of what is bundled.
310 +src_install() {
311 + dodir "${MAVEN_SHARE}"
312 +
313 + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
314 +
315 + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
316 + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
317 +
318 + dodoc NOTICE README.txt
319 +
320 + dodir /usr/bin
321 + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
322 +
323 + # See bug #342901.
324 + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
325 + doenvd "${T}/25${MAVEN}"
326 +}
327 +
328 +pkg_postinst() {
329 + eselect maven update mvn-${SLOT}
330 +}
331 +
332 +pkg_postrm() {
333 + eselect maven update
334 +}