Add support for brief output mode, bug 292101. Remove intermediate version.

Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 36 insertions, 35 deletions

diff --git a/app-admin/eselect-maven/ChangeLog b/app-admin/eselect-maven/ChangeLog
index 020f358d750e..7ee743af848b 100644
--- a/app-admin/eselect-maven/ChangeLog
+++ b/app-admin/eselect-maven/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-maven
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/ChangeLog,v 1.7 2010/02/26 17:17:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/ChangeLog,v 1.8 2010/02/28 19:31:03 ulm Exp $
+
+*eselect-maven-0.2 (28 Feb 2010)
+
+  28 Feb 2010; Ulrich Mueller <ulm@gentoo.org> -eselect-maven-0.1-r1.ebuild,
+  +eselect-maven-0.2.ebuild, +files/maven-0.2.eselect, -files/maven.eselect-1:
+  Add support for brief output mode, bug 292101. Remove intermediate version.
 
 *eselect-maven-0.1-r1 (26 Feb 2010)
 
diff --git a/app-admin/eselect-maven/Manifest b/app-admin/eselect-maven/Manifest
index f98a38b2040c..efeb1a9d3068 100644
--- a/app-admin/eselect-maven/Manifest
+++ b/app-admin/eselect-maven/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX maven-0.2.eselect 3756 RMD160 7103857aedf3f6a64b9caa470059853723113c8d SHA1 298e66372b96dcf266b8b6a351557c5ae11dd864 SHA256 4bb50475a8582ca7aacfc98c6a41731ccf3693e39044a90a9fb4926cf1425e50
 AUX maven.eselect 3973 RMD160 5ce8a91cf1df5eddd5444d0a8b17e4e6b02efc2e SHA1 48b49b1a490dee9784d26cb1559550c9a7cbe0fd SHA256 936763f3e8c3eb051414185cd0d54dd86059f2d176eb1078a8856d4bca6b0944
-AUX maven.eselect-1 3960 RMD160 46523ecda0cf9ff9709ada633a6c9c3581b73153 SHA1 d52f08655ee4836ac00432265759b27260187c75 SHA256 e8c855517e64ce9a46462afd3679376e01db2ddcea2947e2ac55be95ecf824a3
-EBUILD eselect-maven-0.1-r1.ebuild 790 RMD160 f47691251427f1efc0970e43bbda2c45919e0a3b SHA1 e35415173f1316e2c96d3dea7dd0bc98fdc29437 SHA256 65dcf5b8ff32d04016b7d5e43dbd38cebe3f94d5f406c9a5bf32f7067b9689df
 EBUILD eselect-maven-0.1.ebuild 714 RMD160 0efc421f79cf151f681676f3e2e759c6604f4750 SHA1 105ecc293c1d60f2dad6468f690166878fe3e42b SHA256 642012becdb40b08102f4a79c78a08104ca3472b7e259aa957d8917ec0f95c0d
-MISC ChangeLog 1413 RMD160 ecab0d8332adbb326d6f33f90ae657717f441225 SHA1 7231d72cac6b9307e961e2f834882f1d138a6edc SHA256 28047a47a1a3b3df3ff0308f847ba2c91443b05960f252cdba05ee2441dde8ff
+EBUILD eselect-maven-0.2.ebuild 738 RMD160 23f682bd681b1bfc03943f91707cc6160eebe999 SHA1 6f94b8a31b15b2bbc9fb0e253ff24fa498d73a91 SHA256 86ec5ea5c43565b482eabf526a0e1ba0f35d8e9bebf80997a3a31be257c2b9ea
+MISC ChangeLog 1678 RMD160 c949dd5d727ae272248c56c9f3cd749d365c7697 SHA1 65306c1cf0c096e6679f5f510114f3ff61062a16 SHA256 cd3a4af444d2e6e086d1ce80f97c72423c6d7b084196416c243a9be948179048
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuKxIkACgkQOeoy/oIi7uzz2gCeNXXoWcjMq0l4OqasEKHOVBMn
+FvUAnAoqtsuEf05QxpZkrCrAzV8M9+YI
+=wchh
+-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-maven/eselect-maven-0.1-r1.ebuild b/app-admin/eselect-maven/eselect-maven-0.2.ebuild
index b7d8de7a1c15..1b6653f384f8 100644
--- a/app-admin/eselect-maven/eselect-maven-0.1-r1.ebuild
+++ b/app-admin/eselect-maven/eselect-maven-0.2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.1-r1.ebuild,v 1.1 2010/02/26 17:17:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.2.ebuild,v 1.1 2010/02/28 19:31:04 ulm Exp $
 
 EAPI=3
 
 DESCRIPTION="Manages Maven symlinks"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
@@ -21,12 +22,8 @@ PDEPEND="
 	dev-java/maven-bin:2.0
 )"
 
-src_unpack() {
-	mkdir "${S}"
-	cp "${FILESDIR}"/maven.eselect-1 "${S}"/maven.eselect || die
-}
-
 src_install() {
 	insinto /usr/share/eselect/modules
-	doins "${S}"/maven.eselect || die
+	newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
+		|| die "newins failed"
 }
diff --git a/app-admin/eselect-maven/files/maven.eselect-1 b/app-admin/eselect-maven/files/maven-0.2.eselect
index af32b0426ee3..caac8be9083b 100644
--- a/app-admin/eselect-maven/files/maven.eselect-1
+++ b/app-admin/eselect-maven/files/maven-0.2.eselect
@@ -1,10 +1,11 @@
+# -*-eselect-*-  vim: ft=eselect
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: maven.eselect-1,v 1.1 2010/02/26 17:17:38 grobian Exp $
+# $Id: maven-0.2.eselect,v 1.1 2010/02/28 19:31:04 ulm Exp $
 
 DESCRIPTION="Manage Maven targets"
-MAINTAINER="jieryn@gmail.com"
-VERSION="0.1"
+MAINTAINER="java@gentoo.org"
+VERSION="0.2"
 
 MVN="${EROOT}/usr/bin/mvn"
 
@@ -24,7 +25,7 @@ find_target() {
 	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
 		targets=( $(find_targets ) )
 		[[ -z "${targets}" ]] && die -q "No targets found!"
-		target=${targets[$(( ${target} - 1 ))]}
+		target=${targets[target-1]}
 	fi
 
 	if [[ "${target}" = mvn-[0-9]* ]] && [[ -f "${EROOT}/usr/bin/${target}" ]] ; then
@@ -49,8 +50,7 @@ get_target() {
 set_symlink() {
 	local target=$(find_target "${1}")
 	remove_symlink
-	ln -s "${target}" "${MVN}" || \
-		die "Couldn't set ${target} symlink."
+	ln -s "${target}" "${MVN}" || die "Couldn't set ${target} symlink."
 }
 
 ### show action ###
@@ -90,23 +90,13 @@ do_list() {
 	local i targets
 	targets=( $(find_targets) )
 
-	if [[ -n ${targets[@]} ]] ; then
-		local canonicalised basename
-
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			canonicalised=$(canonicalise "${MVN}")
-			basename=$(basename "${canonicalised}")
-
-			if [[ "${targets[${i}]}" = "${basename}" ]] ; then
-				targets[${i}]="${targets[${i}]} $(highlight '*')"
-			fi
-		done
+	for (( i = 0; i < ${#targets[@]}; i++ )); do
+		[[ ${targets[i]} = $(basename "$(canonicalise "${MVN}")") ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+	done
 
-		write_list_start "Available Maven targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
+	write_list_start "Available Maven targets:"
+	write_numbered_list -m "(none found)" "${targets[@]}"
 }
 
 ### set action ###
@@ -183,5 +173,3 @@ do_update() {
 		fi
 	fi
 }
-
-# vim: set ft=eselect :