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

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

4 files changed, 27 insertions, 31 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/Manifest b/app-admin/eselect-ecj/Manifest
index 2c0e1f1e9bbc..d0bff2005547 100644
--- a/app-admin/eselect-ecj/Manifest
+++ b/app-admin/eselect-ecj/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ecj-0.4.eselect 3961 RMD160 69f893bda58874b6f4145a6e15792fe4634452eb SHA1 ed959b1468bcae5a045c7e3f20b9eeb424f66c8d SHA256 c1d3f5f0ffc48891e5cdec3363dc6a00fa542e2fc8e330d3d6599c22f93efaf7
+AUX ecj-0.5.eselect 3755 RMD160 b0314d70962de39f1f4acf49a51f8ca1cd34b4d5 SHA1 4f3ccec82c152f2351c25452d7ec0bf85dba7c5a SHA256 48e2b8d7779cba5228a871e411f4d234707ee588a0bd70345e4ac330622ce8fa
 AUX ecj.eselect 3960 RMD160 9547fe4fd121414ff0a199a9aa196c5bff6d4f7f SHA1 1ab678117ec9df5cd0841f887e973b6e7e3d8895 SHA256 8124d5a2989584ad923c5914f4e52a846fc76670a7990a4ca3f763aeafaf726b
 EBUILD eselect-ecj-0.3.ebuild 650 RMD160 45ca2a4ddb56ba22a0c4e287bea083be9a1d2f81 SHA1 addec9b2257de06d1940abf2311ff32f1dc6b2e7 SHA256 80881cf36a78647991a17f7571c4f8b2d921a15798780569539ded8ade64f745
-EBUILD eselect-ecj-0.4.ebuild 734 RMD160 3f2f06bc490cd058e75e9a2da86725e835aa43a0 SHA1 5baba7f6c70be43d59d368919b24bdc2da9a6226 SHA256 6c0de20d303f13cf5faff0fca685646c8e0783a58f6e824952abe9df24b0f2a0
-MISC ChangeLog 1080 RMD160 fdd22dc05859a7f4343ee22e50d1e2e8ddbb80c8 SHA1 301018abd0c3075ef04544ced58330035e42fd7e SHA256 a131fa708a74eb5e3638bec67d824a083e292c039051463e44d45e19ebb2db52
+EBUILD eselect-ecj-0.5.ebuild 736 RMD160 bda9a91517e49e3b9b91c28d9b53b37081db4100 SHA1 57428ca6ac7f77e9c19dcc216afe938843fab0ff SHA256 043019c22f81d1e82b0b3da000e902205a270392c9ce3ba8cadcf0b4a64674ce
+MISC ChangeLog 1337 RMD160 0bf9d738e628f9fc68d5b626047668343ce37c77 SHA1 208c3619298ad25376b9201c312b45b59e0c7658 SHA256 b81c3cc162bac0f27df63148392fa986cee044cd2d8a4b0c6698784ee63295ad
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuKsb8ACgkQOypDUo0oQOpchQCfX2FCy5+5OHbsmwmNxK54i5jr
-a5cAn2bqDzxMeKUlnO5aAD7i9gzdRI5i
-=6TgG
+iEYEARECAAYFAkuKu2QACgkQOeoy/oIi7uxpgQCdGS+BE9z893D9wqhkxrchVpYB
+k2sAoLAu3AxmVP0ZSQlivVGdOW1MGSC6
+=ZHID
 -----END PGP SIGNATURE-----
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 :