From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R101H-0001k7-Oh for garchives@archives.gentoo.org; Tue, 06 Sep 2011 18:05:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 743D121C050; Tue, 6 Sep 2011 18:04:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 38D9721C050 for ; Tue, 6 Sep 2011 18:04:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 975C51B4026 for ; Tue, 6 Sep 2011 18:04:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AB15580042 for ; Tue, 6 Sep 2011 18:04:57 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <5ac6dea03a20b7d9f470d69f9652b0568f649ac5.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/, app-admin/eselect/ X-VCS-Repository: proj/sci X-VCS-Files: app-admin/eselect/ChangeLog app-admin/eselect/files/eselect-alternatives.patch X-VCS-Directories: app-admin/eselect/files/ app-admin/eselect/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 5ac6dea03a20b7d9f470d69f9652b0568f649ac5 Date: Tue, 6 Sep 2011 18:04:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f00ff495ad916a4b939c751051c97d10 commit: 5ac6dea03a20b7d9f470d69f9652b0568f649ac5 Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Tue Sep 6 18:04:48 2011 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Sep 6 18:04:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D5ac6dea0 prefix fix and number update --- app-admin/eselect/ChangeLog | 4 + app-admin/eselect/files/eselect-alternatives.patch | 65 ++++++++++++--= ----- 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index c48d200..5c16c2f 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.179 2= 011/01/22 21:38:52 ulm Exp $ =20 + 06 Sep 2011; S=C3=A9bastien Fabbro + files/eselect-alternatives.patch: + Updated to newer eclectic alternatives. Fixed a prefix thanks Francois= Bissey + *eselect-1.2.17-r1 (06 Sep 2011) =20 06 Sep 2011; S=C3=A9bastien Fabbro diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-adm= in/eselect/files/eselect-alternatives.patch index 9914980..a21632b 100644 --- a/app-admin/eselect/files/eselect-alternatives.patch +++ b/app-admin/eselect/files/eselect-alternatives.patch @@ -1,6 +1,6 @@ Index: libs/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- libs/Makefile.am (revision 803) +--- libs/Makefile.am (revision 837) +++ libs/Makefile.am (working copy) @@ -1,6 +1,7 @@ eselectlibsdir =3D $(datadir)/$(PACKAGE_NAME)/libs/ @@ -30,7 +30,7 @@ Index: libs/Makefile.am @$(dosed) $< > $@ Index: bin/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- bin/Makefile.am (revision 803) +--- bin/Makefile.am (revision 837) +++ bin/Makefile.am (working copy) @@ -4,6 +4,7 @@ dosed =3D @SED@ -e 's,\@BASH\@,$(BASH),g' \ @@ -42,7 +42,7 @@ Index: bin/Makefile.am % : %.in Index: bin/eselect.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- bin/eselect.in (revision 803) +--- bin/eselect.in (revision 837) +++ bin/eselect.in (working copy) @@ -22,10 +22,15 @@ # Where are modules installed by default? @@ -64,8 +64,8 @@ Index: bin/eselect.in # Look in this place for libraries ESELECT_CORE_PATH=3D"${ESELECT_DATA_PATH}/libs" --- libs/alternatives.bash.in.orig 1970-01-01 01:00:00.000000000 +0100 -+++ libs/alternatives.bash.in 2010-12-15 19:37:54.000000000 +0000 -@@ -0,0 +1,533 @@ ++++ libs/alternatives.bash.in 2011-09-06 18:55:43.000000000 +0100 +@@ -0,0 +1,550 @@ +# Copyright 2008 Mike Kelly +# Copyright 2009 David Leverton +# Copyright 2010 Bo =C3=98rsted Andresen @@ -75,7 +75,7 @@ Index: bin/eselect.in +inherit config output path-manipulation + +ALTERNATIVESDIR_ROOTLESS=3D"@sysconfdir@/env.d/alternatives" -+ALTERNATIVESDIR=3D"${EROOT}${ALTERNATIVESDIR_ROOTLESS}" ++ALTERNATIVESDIR=3D"${ALTERNATIVESDIR_ROOTLESS}" + +get_current_provider() { + local dieprefix=3D"Could not determine current provider for ${ALTER= NATIVE}" @@ -244,29 +244,36 @@ Index: bin/eselect.in + +describe_set_options() { + echo "--force : overwrite or remove existing non-symlink files (but= not directories) if necessary" -+ echo " : the name of the provider to use" ++ echo " : the name of the provider to use or the index of = the provider preceeded by a dash" +} + +do_set() { + [[ -z "${ALTERNATIVE}" ]] && die "Need to set ALTERNATIVE in the es= elect module" + -+ local force=3D ++ local force provider providers + if [[ ${1} =3D=3D --force ]]; then + force=3Dyes + shift + fi + -+ local provider=3D"${1}" -+ [[ -z "${provider}" ]] && die -q "Missing required parameter 'provi= der'" -+ if is_number "${provider}" ; then -+ local providers=3D( $(get_providers) ) -+ (( ${provider} <=3D ${#providers[@]} )) || die -q "The given pr= ovider (${provider}) does not exist" -+ provider=3D${providers[${provider}-1]} ++ if [[ ${1} =3D=3D -+([[:digit:]]) ]]; then ++ providers=3D( $(get_providers) ) ++ (( ${1#-} <=3D ${#providers[@]} )) || die -q "The given provide= r with index (${1#-}) does not exist" ++ provider=3D${providers[${1#-}-1]} ++ else ++ provider=3D"${1}" + fi ++ [[ -z "${provider}" ]] && die -q "Missing required parameter 'provi= der'" + local dieprefix=3D"Could not set provider ${provider} for alternati= ve ${ALTERNATIVE}" + -+ [[ -d ${ALTERNATIVESDIR}/${ALTERNATIVE}/${provider} ]] \ -+ || die -q "The given provider (${provider}) does not exist" ++ if [[ ! -d ${ALTERNATIVESDIR}/${ALTERNATIVE}/${provider} ]] ; then ++ if is_number ${provider} ; then ++ providers=3D( $(get_providers) ) ++ [[ -n ${providers[${1#-}-1]} ]] && ++ die -q "The given provider (${provider}) does not exist= , did you mean -${provider} (${providers[${1#-}-1]})?" ++ fi ++ die -q "The given provider (${provider}) does not exist" ++ fi + + local symlink newsymlinks=3D() oldsymlinks=3D() + @@ -542,26 +549,36 @@ Index: bin/eselect.in +describe_script_options() { + echo "--sh : use Bourne shell syntax (default)" + echo "--csh : use C shell syntax" -+ echo " : the provider to use (if not specified, use the s= ystem default)" ++ echo " : the provider to use or the index of the provider= preceeded by a dash (if not specified, use the system default)" +} + +do_script() { + [[ -z "${ALTERNATIVE}" ]] && die "Need to set ALTERNATIVE in the es= elect module" -+ local syntax=3Dsh ++ local syntax=3Dsh provider providers + if [[ ${1} =3D=3D --sh ]]; then + shift + elif [[ ${1} =3D=3D --csh ]]; then + syntax=3Dcsh + shift + fi -+ local provider=3D${1} ++ ++ if [[ ${1} =3D=3D -+([[:digit:]]) ]]; then ++ providers=3D( $(get_providers) ) ++ (( ${1#-} <=3D ${#providers[@]} )) || die -q "The given provide= r with index (${1#-}) does not exist" ++ provider=3D${providers[${1#-}-1]} ++ else ++ provider=3D"${1}" ++ fi + [[ -z "${provider}" ]] && die -q "Missing required parameter 'provi= der'" -+ if is_number "${provider}" ; then -+ local providers=3D( $(get_providers) ) -+ (( ${provider} <=3D ${#providers[@]} )) || die -q "The given pr= ovider (${provider}) does not exist" -+ provider=3D${providers[${provider}-1]} ++ ++ if [[ ! -d ${ALTERNATIVESDIR}/${ALTERNATIVE}/${provider} ]] ; then ++ if is_number ${provider} ; then ++ providers=3D( $(get_providers) ) ++ [[ -n ${providers[${1#-}-1]} ]] && ++ die -q "The given provider (${provider}) does not exist= , did you mean -${provider} (${providers[${1#-}-1]})?" ++ fi ++ die -q "The given provider (${provider}) does not exist" + fi -+ [[ -d ${ALTERNATIVESDIR}/${ALTERNATIVE}/${provider} ]] || die -q "T= he given provider (${provider}) does not exist" + + local variables=3D( PATH LD_LIBRARY_PATH MANPATH ) + [[ -n ${!default_*} ]] && local ${!default_*}