Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-maven/, app-eselect/eselect-maven/files/
Date: Thu, 25 Feb 2016 19:55:34
Message-Id: 1456430001.ecc4faa4abfa5bc5e2e99e8419a4e4e520581413.chewi@gentoo
1 commit: ecc4faa4abfa5bc5e2e99e8419a4e4e520581413
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 25 19:53:21 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 25 19:53:21 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc4faa4
7
8 app-eselect/eselect-maven: Remove obsolete package
9
10 .../eselect-maven/eselect-maven-0.2-r1.ebuild | 30 ----
11 .../eselect-maven/eselect-maven-0.2-r3.ebuild | 30 ----
12 app-eselect/eselect-maven/files/maven-0.2.eselect | 175 ---------------------
13 app-eselect/eselect-maven/metadata.xml | 8 -
14 4 files changed, 243 deletions(-)
15
16 diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r1.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r1.ebuild
17 deleted file mode 100644
18 index a338747..0000000
19 --- a/app-eselect/eselect-maven/eselect-maven-0.2-r1.ebuild
20 +++ /dev/null
21 @@ -1,30 +0,0 @@
22 -# Copyright 1999-2016 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -
26 -EAPI=3
27 -
28 -DESCRIPTION="Manages Maven symlinks"
29 -HOMEPAGE="https://www.gentoo.org/"
30 -SRC_URI=""
31 -
32 -LICENSE="GPL-2"
33 -SLOT="0"
34 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
35 -IUSE=""
36 -
37 -RDEPEND=">=app-admin/eselect-1.2.8
38 - !<dev-java/maven-bin-2.0.10-r1:2.1
39 - !app-eselect/eselect-java"
40 -PDEPEND="
41 -|| (
42 - dev-java/maven-bin:3.0
43 - dev-java/maven-bin:2.2
44 - dev-java/maven-bin:2.0
45 -)"
46 -
47 -src_install() {
48 - insinto /usr/share/eselect/modules
49 - newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
50 - || die "newins failed"
51 -}
52
53 diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild
54 deleted file mode 100644
55 index 1029d2d..0000000
56 --- a/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild
57 +++ /dev/null
58 @@ -1,30 +0,0 @@
59 -# Copyright 1999-2015 Gentoo Foundation
60 -# Distributed under the terms of the GNU General Public License v2
61 -# $Id$
62 -
63 -EAPI=5
64 -
65 -DESCRIPTION="Manages Maven symlinks"
66 -HOMEPAGE="https://www.gentoo.org/"
67 -SRC_URI=""
68 -
69 -LICENSE="GPL-2"
70 -SLOT="0"
71 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
72 -IUSE=""
73 -
74 -RDEPEND=">=app-admin/eselect-1.2.8
75 - !<dev-java/maven-bin-2.0.10-r1:2.1
76 - !app-eselect/eselect-java"
77 -PDEPEND="
78 -|| (
79 - dev-java/maven-bin:3.1
80 - dev-java/maven-bin:3.2
81 - dev-java/maven-bin:3.3
82 -)"
83 -
84 -src_install() {
85 - insinto /usr/share/eselect/modules
86 - newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
87 - || die "newins failed"
88 -}
89
90 diff --git a/app-eselect/eselect-maven/files/maven-0.2.eselect b/app-eselect/eselect-maven/files/maven-0.2.eselect
91 deleted file mode 100644
92 index bdc35c9..0000000
93 --- a/app-eselect/eselect-maven/files/maven-0.2.eselect
94 +++ /dev/null
95 @@ -1,175 +0,0 @@
96 -# -*-eselect-*- vim: ft=eselect
97 -# Copyright 1999-2015 Gentoo Foundation
98 -# Distributed under the terms of the GNU General Public License v2
99 -# $Id$
100 -
101 -DESCRIPTION="Manage Maven targets"
102 -MAINTAINER="java@g.o"
103 -VERSION="0.2"
104 -
105 -MVN="${EROOT}/usr/bin/mvn"
106 -
107 -# find a list of mvn symlink targets, best first.
108 -find_targets() {
109 - for f in $(ls -r "${MVN}"-[0-9]* 2> /dev/null) ; do
110 - if [[ -f "${f}" ]] ; then
111 - echo $(basename "${f}")
112 - fi
113 - done
114 -}
115 -
116 -# get a named or numbered target.
117 -find_target() {
118 - local target=${1}
119 -
120 - if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
121 - targets=( $(find_targets ) )
122 - [[ -z "${targets}" ]] && die -q "No targets found!"
123 - target=${targets[target-1]}
124 - fi
125 -
126 - if [[ "${target}" = mvn-[0-9]* ]] && [[ -f "${EROOT}/usr/bin/${target}" ]] ; then
127 - echo ${target}
128 - else
129 - die -q "Target \"${1}\" doesn't appear to be valid!"
130 - fi
131 -}
132 -
133 -# try to remove the mvn symlink.
134 -remove_symlink() {
135 - rm "${MVN}" &>/dev/null
136 -}
137 -
138 -# determine the current target.
139 -get_target() {
140 - local canonicalised=$(canonicalise "${MVN}")
141 - echo $(basename "${canonicalised}")
142 -}
143 -
144 -# set the Maven symlink.
145 -set_symlink() {
146 - local target=$(find_target "${1}")
147 - remove_symlink
148 - ln -s "${target}" "${MVN}" || die "Couldn't set ${target} symlink."
149 -}
150 -
151 -### show action ###
152 -
153 -describe_show() {
154 - echo "Show current Maven target"
155 -}
156 -
157 -do_show() {
158 - if [[ ${#} -gt 0 ]]; then
159 - die -q "No parameters allowed."
160 - fi
161 -
162 - if [[ -L "${MVN}" ]] ; then
163 - get_target
164 - return 0
165 - elif [[ -e "${MVN}" ]] ; then
166 - echo "(not a symlink)" >&2
167 - return 1
168 - else
169 - echo "(unset)" >&2
170 - return 1
171 - fi
172 -}
173 -
174 -### list action ###
175 -
176 -describe_list() {
177 - echo "List available Maven targets"
178 -}
179 -
180 -do_list() {
181 - if [[ ${#} -gt 0 ]]; then
182 - die -q "Usage error: no parameters allowed."
183 - fi
184 -
185 - local i targets
186 - targets=( $(find_targets) )
187 -
188 - for (( i = 0; i < ${#targets[@]}; i++ )); do
189 - [[ ${targets[i]} = $(basename "$(canonicalise "${MVN}")") ]] \
190 - && targets[i]=$(highlight_marker "${targets[i]}")
191 - done
192 -
193 - write_list_start "Available Maven targets:"
194 - write_numbered_list -m "(none found)" "${targets[@]}"
195 -}
196 -
197 -### set action ###
198 -
199 -describe_set() {
200 - echo "Set a new Maven target"
201 -}
202 -
203 -describe_set_options() {
204 - echo "target : Target name or number (from 'list' action)"
205 -}
206 -
207 -describe_set_parameters() {
208 - echo "<target>"
209 -}
210 -
211 -do_set() {
212 - if [[ $# -gt 1 ]]; then
213 - die -q "Too many parameters. Expected only one."
214 - fi
215 -
216 - local target=${1}
217 -
218 - if [[ -z "${target}" ]] ; then
219 - die -q "You didn't give me a target name or number."
220 - elif [[ -L "${MVN}" ]] ; then
221 - if ! remove_symlink ; then
222 - die -q "Can't remove existing Maven provider."
223 - elif ! set_symlink "${1}" ; then
224 - die -q "Can't set new Maven provider."
225 - fi
226 - elif [[ -e "${MVN}" ]] ; then
227 - write_warning_msg "Can't set a new Maven provider. There's a file in the way at ${MVN}. You can try removing it manually, and then re-running this command."
228 - else
229 - set_symlink "${target}" || die -q "Wasn't able to set a new provider."
230 - fi
231 -}
232 -
233 -### update action ###
234 -
235 -describe_update() {
236 - echo "Set the Maven target to the latest if the current target is invalid or if the given target is the latest"
237 -}
238 -
239 -describe_update_options() {
240 - echo "target (optional) : Target name (from 'list' action)"
241 -}
242 -
243 -describe_update_parameters() {
244 - echo "<target>"
245 -}
246 -
247 -do_update() {
248 - if [[ $# -gt 1 ]] ; then
249 - die -q "Too many parameters. Expected only one."
250 - fi
251 -
252 - # For pkg_postrm
253 - if [[ ! $(find_targets) ]]; then
254 - remove_symlink
255 - return
256 - fi
257 -
258 - local canonicalised=$(canonicalise "${MVN}")
259 -
260 - if [[ ! -L "${MVN}" ]] || [[ ! -f "${canonicalised}" ]] ; then
261 - do_set 1
262 - elif [[ -n "${1}" ]] ; then
263 - # Check whether target name is valid.
264 - find_target "${1}" > /dev/null
265 -
266 - if [[ "${1}" == "$(find_target 1)" ]] ; then
267 - do_set 1
268 - fi
269 - fi
270 -}
271
272 diff --git a/app-eselect/eselect-maven/metadata.xml b/app-eselect/eselect-maven/metadata.xml
273 deleted file mode 100644
274 index 952a4b9..0000000
275 --- a/app-eselect/eselect-maven/metadata.xml
276 +++ /dev/null
277 @@ -1,8 +0,0 @@
278 -<?xml version="1.0" encoding="UTF-8"?>
279 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
280 -<pkgmetadata>
281 - <maintainer type="project">
282 - <email>java@g.o</email>
283 - <name>Java</name>
284 - </maintainer>
285 -</pkgmetadata>