1 |
commit: 6fa8fa7ed9cc68b79c45298dfd8f5ba800513ffb |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 14 12:26:26 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 14 12:26:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa8fa7e |
7 |
|
8 |
dev-java/maven-bin: dropped versions 3.5.x |
9 |
|
10 |
according to following page it seems that version 3.6.0 replaces versions 3.5.x: |
11 |
https://maven.apache.org/docs/history.html |
12 |
|
13 |
versions 3.5 and 3.6 collide when creating debug information as they contain |
14 |
same libraries (bug #675384) |
15 |
|
16 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
17 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
18 |
|
19 |
dev-java/maven-bin/Manifest | 2 - |
20 |
dev-java/maven-bin/maven-bin-3.5.0.ebuild | 109 ------------------------------ |
21 |
dev-java/maven-bin/maven-bin-3.5.4.ebuild | 109 ------------------------------ |
22 |
3 files changed, 220 deletions(-) |
23 |
|
24 |
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest |
25 |
index 92bc6d4e0a3..b5c682866c2 100644 |
26 |
--- a/dev-java/maven-bin/Manifest |
27 |
+++ b/dev-java/maven-bin/Manifest |
28 |
@@ -6,7 +6,5 @@ DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5c |
29 |
DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 |
30 |
DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 |
31 |
DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 |
32 |
-DIST apache-maven-3.5.0-bin.tar.gz 8534562 BLAKE2B 200f7c012e2704c9057d4987a295b0fa9a5787d59707415259445952ae05963a7d333e6fc2eae88689161181077d2b9a9b2398b5baacc6527e76ed83d6068198 SHA512 d5a520ca8765ddbc86dca71249c602e2f798dedcc7430bc4979dd01918464c8dc69b694ec0dbbeeff6044179e1b98fce72af952663dd49503203d9742e328f3b |
33 |
-DIST apache-maven-3.5.4-bin.tar.gz 8842660 BLAKE2B e56e22c2f9e51d47ff34b8516eb3d14d4ca2adddb36c800cfba5cb4e68c19c3c7df7d544c1e81c7be004fe5ceeee24f78b904f68b30b768aaf09562d804b61c3 SHA512 2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86 |
34 |
DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f |
35 |
DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 |
36 |
|
37 |
diff --git a/dev-java/maven-bin/maven-bin-3.5.0.ebuild b/dev-java/maven-bin/maven-bin-3.5.0.ebuild |
38 |
deleted file mode 100644 |
39 |
index 034526da052..00000000000 |
40 |
--- a/dev-java/maven-bin/maven-bin-3.5.0.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,109 +0,0 @@ |
43 |
-# Copyright 1999-2018 Gentoo Authors |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=6 |
47 |
- |
48 |
-inherit java-pkg-2 |
49 |
- |
50 |
-MY_PN=apache-${PN%%-bin} |
51 |
-MY_PV=${PV/_alpha/-alpha-} |
52 |
-MY_P="${MY_PN}-${MY_PV}" |
53 |
-MY_MV="${PV%%.*}" |
54 |
- |
55 |
-DESCRIPTION="Project Management and Comprehension Tool for Java" |
56 |
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" |
57 |
-HOMEPAGE="https://maven.apache.org/" |
58 |
- |
59 |
-LICENSE="Apache-2.0" |
60 |
-SLOT="3.5" |
61 |
-KEYWORDS="~amd64 ~x86" |
62 |
- |
63 |
-# TODO: Needs further resolution: |
64 |
-# |
65 |
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850 |
66 |
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436 |
67 |
-# |
68 |
-CDEPEND=" |
69 |
- dev-java/juel:0 |
70 |
- dev-java/log4j:0 |
71 |
- dev-java/jsoup:0 |
72 |
- dev-java/jsr250:0 |
73 |
- dev-java/commons-io:1 |
74 |
- dev-java/aopalliance:1 |
75 |
- dev-java/commons-cli:1 |
76 |
- dev-java/javax-inject:0 |
77 |
- dev-java/osgi-core-api:0 |
78 |
- dev-java/commons-logging:0 |
79 |
- java-virtuals/interceptor-api:0 |
80 |
- java-virtuals/servlet-api:3.0" |
81 |
- |
82 |
-DEPEND=" |
83 |
- ${CDEPEND} |
84 |
- app-eselect/eselect-java |
85 |
- || ( dev-java/commons-logging:0 dev-java/log4j:0 ) |
86 |
- >=virtual/jdk-1.7" |
87 |
- |
88 |
-RDEPEND=" |
89 |
- ${CDEPEND} |
90 |
- >=virtual/jre-1.7" |
91 |
- |
92 |
-S="${WORKDIR}/${MY_P}" |
93 |
- |
94 |
-MAVEN="${PN}-${SLOT}" |
95 |
-MAVEN_SHARE="/usr/share/${MAVEN}" |
96 |
- |
97 |
-MAVEN_DEPENDENCIES=( |
98 |
- juel |
99 |
- jsoup |
100 |
- log4j |
101 |
- jsr250 |
102 |
- javax-inject |
103 |
- commons-io-1 |
104 |
- osgi-core-api |
105 |
- aopalliance-1 |
106 |
- commons-cli-1 |
107 |
- commons-logging |
108 |
- interceptor-api |
109 |
- servlet-api-3.0 |
110 |
-) |
111 |
- |
112 |
-java_prepare() { |
113 |
- rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die |
114 |
- |
115 |
- chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die |
116 |
- |
117 |
- # Symlink jars. |
118 |
- cd lib || die |
119 |
- |
120 |
- # Link deps. |
121 |
- for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do |
122 |
- java-pkg_jar-from "${mvn_dep}" |
123 |
- done |
124 |
-} |
125 |
- |
126 |
-# TODO: We should use jars from packages, instead of what is bundled. |
127 |
-src_install() { |
128 |
- dodir "${MAVEN_SHARE}" |
129 |
- |
130 |
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" |
131 |
- |
132 |
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar |
133 |
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar |
134 |
- |
135 |
- dodoc NOTICE README.txt |
136 |
- |
137 |
- dodir /usr/bin |
138 |
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} |
139 |
- |
140 |
- # See bug #342901. |
141 |
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die |
142 |
- doenvd "${T}/25${MAVEN}" |
143 |
-} |
144 |
- |
145 |
-pkg_postinst() { |
146 |
- eselect maven update mvn-${SLOT} |
147 |
-} |
148 |
- |
149 |
-pkg_postrm() { |
150 |
- eselect maven update |
151 |
-} |
152 |
|
153 |
diff --git a/dev-java/maven-bin/maven-bin-3.5.4.ebuild b/dev-java/maven-bin/maven-bin-3.5.4.ebuild |
154 |
deleted file mode 100644 |
155 |
index 034526da052..00000000000 |
156 |
--- a/dev-java/maven-bin/maven-bin-3.5.4.ebuild |
157 |
+++ /dev/null |
158 |
@@ -1,109 +0,0 @@ |
159 |
-# Copyright 1999-2018 Gentoo Authors |
160 |
-# Distributed under the terms of the GNU General Public License v2 |
161 |
- |
162 |
-EAPI=6 |
163 |
- |
164 |
-inherit java-pkg-2 |
165 |
- |
166 |
-MY_PN=apache-${PN%%-bin} |
167 |
-MY_PV=${PV/_alpha/-alpha-} |
168 |
-MY_P="${MY_PN}-${MY_PV}" |
169 |
-MY_MV="${PV%%.*}" |
170 |
- |
171 |
-DESCRIPTION="Project Management and Comprehension Tool for Java" |
172 |
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" |
173 |
-HOMEPAGE="https://maven.apache.org/" |
174 |
- |
175 |
-LICENSE="Apache-2.0" |
176 |
-SLOT="3.5" |
177 |
-KEYWORDS="~amd64 ~x86" |
178 |
- |
179 |
-# TODO: Needs further resolution: |
180 |
-# |
181 |
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850 |
182 |
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436 |
183 |
-# |
184 |
-CDEPEND=" |
185 |
- dev-java/juel:0 |
186 |
- dev-java/log4j:0 |
187 |
- dev-java/jsoup:0 |
188 |
- dev-java/jsr250:0 |
189 |
- dev-java/commons-io:1 |
190 |
- dev-java/aopalliance:1 |
191 |
- dev-java/commons-cli:1 |
192 |
- dev-java/javax-inject:0 |
193 |
- dev-java/osgi-core-api:0 |
194 |
- dev-java/commons-logging:0 |
195 |
- java-virtuals/interceptor-api:0 |
196 |
- java-virtuals/servlet-api:3.0" |
197 |
- |
198 |
-DEPEND=" |
199 |
- ${CDEPEND} |
200 |
- app-eselect/eselect-java |
201 |
- || ( dev-java/commons-logging:0 dev-java/log4j:0 ) |
202 |
- >=virtual/jdk-1.7" |
203 |
- |
204 |
-RDEPEND=" |
205 |
- ${CDEPEND} |
206 |
- >=virtual/jre-1.7" |
207 |
- |
208 |
-S="${WORKDIR}/${MY_P}" |
209 |
- |
210 |
-MAVEN="${PN}-${SLOT}" |
211 |
-MAVEN_SHARE="/usr/share/${MAVEN}" |
212 |
- |
213 |
-MAVEN_DEPENDENCIES=( |
214 |
- juel |
215 |
- jsoup |
216 |
- log4j |
217 |
- jsr250 |
218 |
- javax-inject |
219 |
- commons-io-1 |
220 |
- osgi-core-api |
221 |
- aopalliance-1 |
222 |
- commons-cli-1 |
223 |
- commons-logging |
224 |
- interceptor-api |
225 |
- servlet-api-3.0 |
226 |
-) |
227 |
- |
228 |
-java_prepare() { |
229 |
- rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die |
230 |
- |
231 |
- chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die |
232 |
- |
233 |
- # Symlink jars. |
234 |
- cd lib || die |
235 |
- |
236 |
- # Link deps. |
237 |
- for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do |
238 |
- java-pkg_jar-from "${mvn_dep}" |
239 |
- done |
240 |
-} |
241 |
- |
242 |
-# TODO: We should use jars from packages, instead of what is bundled. |
243 |
-src_install() { |
244 |
- dodir "${MAVEN_SHARE}" |
245 |
- |
246 |
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" |
247 |
- |
248 |
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar |
249 |
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar |
250 |
- |
251 |
- dodoc NOTICE README.txt |
252 |
- |
253 |
- dodir /usr/bin |
254 |
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} |
255 |
- |
256 |
- # See bug #342901. |
257 |
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die |
258 |
- doenvd "${T}/25${MAVEN}" |
259 |
-} |
260 |
- |
261 |
-pkg_postinst() { |
262 |
- eselect maven update mvn-${SLOT} |
263 |
-} |
264 |
- |
265 |
-pkg_postrm() { |
266 |
- eselect maven update |
267 |
-} |