diff options
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/eselect/ChangeLog | 4 | ||||
| -rw-r--r-- | app-admin/eselect/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/eselect/files/eselect-alternatives.patch | 65 |
3 files changed, 46 insertions, 25 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index c48d200e8..5c16c2f03 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 2011/01/22 21:38:52 ulm Exp $ + 06 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org> + files/eselect-alternatives.patch: + Updated to newer eclectic alternatives. Fixed a prefix thanks Francois Bissey + *eselect-1.2.17-r1 (06 Sep 2011) 06 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org> diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest index b24135b38..a9fa9c8b5 100644 --- a/app-admin/eselect/Manifest +++ b/app-admin/eselect/Manifest @@ -1,4 +1,4 @@ -AUX eselect-alternatives.patch 21936 RMD160 0fc1c038dd2c01a400274e502a422d2cd50f8582 SHA1 b40b41a36ce72c623834c1fff23ac4c0ce817ab3 SHA256 97733d6b2284c60b04cdeee77bd7433b698ccea8ef93ab34dd515fbbdc43c274 +AUX eselect-alternatives.patch 22660 RMD160 cc3089cf935ed08030f3a256f471ceaef4521e5f SHA1 c7d812be41c72a745fa2a45c5a3bd68102ac7915 SHA256 bd464d40ec449adbb5118a4a4276e5ee15d6675346da75109bae79d7ed971a91 DIST eselect-1.2.17.tar.bz2 169990 RMD160 c97c8a147f3d737de12c4aa4993a17734464d85d SHA1 fd5721e49eb4705b66bda387eb70fe45ca3b72ba SHA256 37724f875bb13b8998f699bf56a59c55a0d9987943216ab784926a550aa8d138 EBUILD eselect-1.2.17-r1.ebuild 1791 RMD160 565bfa7529d77f06738a2db79bb5072ed5e01293 SHA1 4aa4163b9ef8c0df29d012454956b2ca842dcff0 SHA256 b4e9e6938a6620f87689c2ae0a432ee110955ce8cecfcd1a5cd2a28ecdc39971 MISC ChangeLog 25816 RMD160 ef50c978ecbbc028ac697749e0ed94ce18dd8291 SHA1 cb3d3175aac310ba57cc43c5909dfa673290da9a SHA256 b7f9827a68956b0cf3f3ba918eb2ca6ac16962c4aae3318048e45844dcf17e02 diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-admin/eselect/files/eselect-alternatives.patch index 991498053..a21632bc7 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 =================================================================== ---- libs/Makefile.am (revision 803) +--- libs/Makefile.am (revision 837) +++ libs/Makefile.am (working copy) @@ -1,6 +1,7 @@ eselectlibsdir = $(datadir)/$(PACKAGE_NAME)/libs/ @@ -30,7 +30,7 @@ Index: libs/Makefile.am @$(dosed) $< > $@ Index: bin/Makefile.am =================================================================== ---- bin/Makefile.am (revision 803) +--- bin/Makefile.am (revision 837) +++ bin/Makefile.am (working copy) @@ -4,6 +4,7 @@ dosed = @SED@ -e 's,\@BASH\@,$(BASH),g' \ @@ -42,7 +42,7 @@ Index: bin/Makefile.am % : %.in Index: bin/eselect.in =================================================================== ---- 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="${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 Ørsted Andresen @@ -75,7 +75,7 @@ Index: bin/eselect.in +inherit config output path-manipulation + +ALTERNATIVESDIR_ROOTLESS="@sysconfdir@/env.d/alternatives" -+ALTERNATIVESDIR="${EROOT}${ALTERNATIVESDIR_ROOTLESS}" ++ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOTLESS}" + +get_current_provider() { + local dieprefix="Could not determine current provider for ${ALTERNATIVE}" @@ -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 "<provider> : the name of the provider to use" ++ echo "<provider> : 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 eselect module" + -+ local force= ++ local force provider providers + if [[ ${1} == --force ]]; then + force=yes + shift + fi + -+ local provider="${1}" -+ [[ -z "${provider}" ]] && die -q "Missing required parameter 'provider'" -+ if is_number "${provider}" ; then -+ local providers=( $(get_providers) ) -+ (( ${provider} <= ${#providers[@]} )) || die -q "The given provider (${provider}) does not exist" -+ provider=${providers[${provider}-1]} ++ if [[ ${1} == -+([[:digit:]]) ]]; then ++ providers=( $(get_providers) ) ++ (( ${1#-} <= ${#providers[@]} )) || die -q "The given provider with index (${1#-}) does not exist" ++ provider=${providers[${1#-}-1]} ++ else ++ provider="${1}" + fi ++ [[ -z "${provider}" ]] && die -q "Missing required parameter 'provider'" + local dieprefix="Could not set provider ${provider} for alternative ${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=( $(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=() oldsymlinks=() + @@ -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 "<provider> : the provider to use (if not specified, use the system default)" ++ echo "<provider> : 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 eselect module" -+ local syntax=sh ++ local syntax=sh provider providers + if [[ ${1} == --sh ]]; then + shift + elif [[ ${1} == --csh ]]; then + syntax=csh + shift + fi -+ local provider=${1} ++ ++ if [[ ${1} == -+([[:digit:]]) ]]; then ++ providers=( $(get_providers) ) ++ (( ${1#-} <= ${#providers[@]} )) || die -q "The given provider with index (${1#-}) does not exist" ++ provider=${providers[${1#-}-1]} ++ else ++ provider="${1}" ++ fi + [[ -z "${provider}" ]] && die -q "Missing required parameter 'provider'" -+ if is_number "${provider}" ; then -+ local providers=( $(get_providers) ) -+ (( ${provider} <= ${#providers[@]} )) || die -q "The given provider (${provider}) does not exist" -+ provider=${providers[${provider}-1]} ++ ++ if [[ ! -d ${ALTERNATIVESDIR}/${ALTERNATIVE}/${provider} ]] ; then ++ if is_number ${provider} ; then ++ providers=( $(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 "The given provider (${provider}) does not exist" + + local variables=( PATH LD_LIBRARY_PATH MANPATH ) + [[ -n ${!default_*} ]] && local ${!default_*} |