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

(Portage version: 2.2_rc63/cvs/Linux i686)

3 files changed, 21 insertions, 25 deletions

diff --git a/app-admin/eselect-ecj/ChangeLog b/app-admin/eselect-ecj/ChangeLog
index 981935e24c88..bf239b247fb9 100644
--- a/app-admin/eselect-ecj/ChangeLog
+++ b/app-admin/eselect-ecj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-ecj
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.6 2010/02/28 18:11:02 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.7 2010/02/28 18:52:01 ulm Exp $
+
+*eselect-ecj-0.5 (28 Feb 2010)
+
+  28 Feb 2010; Ulrich Mueller <ulm@gentoo.org> -eselect-ecj-0.4.ebuild,
+  -files/ecj-0.4.eselect, +eselect-ecj-0.5.ebuild, +files/ecj-0.5.eselect:
+  Add support for brief output mode, bug 292101. Remove intermediate version.
 
 *eselect-ecj-0.4 (28 Feb 2010)
 
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.4.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.5.ebuild
index 2b575aa43e05..4ff13fcf2131 100644
--- a/app-admin/eselect-ecj/eselect-ecj-0.4.ebuild
+++ b/app-admin/eselect-ecj/eselect-ecj-0.5.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.4.ebuild,v 1.1 2010/02/28 18:11:02 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.5.ebuild,v 1.1 2010/02/28 18:52:01 ulm Exp $
 
 EAPI=1
 
 DESCRIPTION="Manages ECJ symlinks"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=app-admin/eselect-1.2"
+RDEPEND=">=app-admin/eselect-1.2.3"
 PDEPEND="
 || (
 	dev-java/eclipse-ecj:3.5
diff --git a/app-admin/eselect-ecj/files/ecj-0.4.eselect b/app-admin/eselect-ecj/files/ecj-0.5.eselect
index 196c111ffcb5..ba09435952e8 100644
--- a/app-admin/eselect-ecj/files/ecj-0.4.eselect
+++ b/app-admin/eselect-ecj/files/ecj-0.5.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: ecj-0.4.eselect,v 1.1 2010/02/28 18:11:03 abcd Exp $
+# $Id: ecj-0.5.eselect,v 1.1 2010/02/28 18:52:00 ulm Exp $
 
 DESCRIPTION="Manage ECJ targets"
-MAINTAINER="chewi@aura-online.co.uk"
-VERSION="0.4"
+MAINTAINER="java@gentoo.org"
+VERSION="0.5"
 
 ECJ="${EROOT}/usr/bin/ecj"
 
@@ -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}" = ecj-[0-9]* ]] && [[ -f "${EROOT}/usr/bin/${target}" ]] ; then
@@ -90,23 +91,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 "${ECJ}")
-			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 "${ECJ}")") ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+	done
 
-		write_list_start "Available ECJ targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
+	write_list_start "Available ECJ targets:"
+	write_numbered_list -m "(none found)" "${targets[@]}"
 }
 
 ### set action ###
@@ -183,5 +174,3 @@ do_update() {
 		fi
 	fi
 }
-
-# vim: set ft=eselect :