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 1Si7hR-0003Sv-J5 for garchives@archives.gentoo.org; Fri, 22 Jun 2012 17:31:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EA42E09EA; Fri, 22 Jun 2012 17:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1FEE0E09EA for ; Fri, 22 Jun 2012 17:29:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5685C1B4046 for ; Fri, 22 Jun 2012 17:29:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 36AD8E544C for ; Fri, 22 Jun 2012 17:29:23 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1181481585.0cfc840128ce934df925a71e246b4c033ed6c303.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:eselect-emacs-1.1 commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: emacs.eselect env-emacs.eselect X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 0cfc840128ce934df925a71e246b4c033ed6c303 X-VCS-Branch: eselect-emacs-1.1 Date: Fri, 22 Jun 2012 17:29:23 +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: 598d75a5-37f5-489a-8111-e4a647e4fe50 X-Archives-Hash: 1d6d4e3d7e3597f24584aa0031d10b8f commit: 0cfc840128ce934df925a71e246b4c033ed6c303 Author: Ulrich M=C3=BCller gentoo org> AuthorDate: Sun Jun 10 13:19:45 2007 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sun Jun 10 13:19:45 2007 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/emacs-tools.g= it;a=3Dcommit;h=3D0cfc8401 Workaround for bug #172472. svn path=3D/emacs-extra/eselect-emacs/; revision=3D382 --- emacs.eselect | 2 +- env-emacs.eselect | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/emacs.eselect b/emacs.eselect index 5bb00c8..0b0a9a4 100644 --- a/emacs.eselect +++ b/emacs.eselect @@ -118,7 +118,7 @@ set_symlinks() { set_infopath "${target}" =20 # update /etc/profile.env from /etc/env.d files - #do_action env-emacs update --no-ldconfig >/dev/null + #do_action env-emacs update --no-ldconfig env-update --no-ldconfig =20 return 0 diff --git a/env-emacs.eselect b/env-emacs.eselect index a441941..c791ca3 100644 --- a/env-emacs.eselect +++ b/env-emacs.eselect @@ -40,6 +40,13 @@ LDMTIMEDB=3D"${ROOT}/var/lib/eselect/env/ld-mtimedb" # Keep all stored LDPATHS ESELECT_LDPATH=3D( ) =20 +# workaround for bug #172472 +load_config_ () { + [[ ${#@} -eq 2 ]] || die + local ${2} + load_config ${@} +} + # is_envd_file() # Return successfuly when file can be sourced. is_envfile() { @@ -69,13 +76,13 @@ update_envvar_classes() { for envfile in ${envfiles[@]} ; do is_envfile ${envfile} || continue =20 - value=3D$(load_config ${envfile} COLON_SEPARATED) + value=3D$(load_config_ ${envfile} COLON_SEPARATED) for x in ${value} ; do has ${x} ${PATH_CLASS} && continue PATH_CLASS=3D"${PATH_CLASS} ${x}" done =20 - value=3D$(load_config ${envfile} SPACE_SEPARATED) + value=3D$(load_config_ ${envfile} SPACE_SEPARATED) for x in ${value} ; do has ${x} ${SPACE_CLASS} && continue SPACE_CLASS=3D"${SPACE_CLASS} ${x}" @@ -107,15 +114,14 @@ create_profile_env() { -e '/^#/d' -e '/^\s*$/d' -e '/^.*=3D/s/^\([^=3D]*\)=3D.*/\1/' \ ${envfile}) [[ -z ${vars} ]] && continue - local ${vars} # workaround for bug #172472 for var in ${vars} ; do # Colon separated?... if has ${var} ${PATH_CLASS} ; then - store=3D$(load_config ${tmpprofile} ${var}) + store=3D$(load_config_ ${tmpprofile} ${var}) if [[ -z ${store} ]] ; then - store=3D$(load_config ${envfile} ${var}) + store=3D$(load_config_ ${envfile} ${var}) else - items=3D"$(load_config ${envfile} ${var})" + items=3D"$(load_config_ ${envfile} ${var})" items=3D( ${items//:/ } ) for item in ${items[@]} ; do has ${item} ${store//:/ } && continue @@ -127,11 +133,11 @@ create_profile_env() { fi # Space separated!... if has ${var} ${SPACE_CLASS} ; then - store=3D( $(load_config ${tmpprofile} ${var}) ) + store=3D( $(load_config_ ${tmpprofile} ${var}) ) if [[ -z ${store[@]} ]] ; then - store=3D( $(load_config ${envfile} ${var}) ) + store=3D( $(load_config_ ${envfile} ${var}) ) else - items=3D( $(load_config ${envfile} ${var}) ) + items=3D( $(load_config_ ${envfile} ${var}) ) for item in ${items[@]} ; do has ${item} ${store[@]} && continue store=3D( ${store[@]} ${item} ) @@ -144,12 +150,12 @@ create_profile_env() { store_config \ ${tmpprofile} \ ${var} \ - "$(load_config ${envfile} ${var})" + "$(load_config_ ${envfile} ${var})" done =09 has LDPATH ${vars} || continue # Store LDPATH for later processing - items=3D$(load_config ${envfile} LDPATH) + items=3D$(load_config_ ${envfile} LDPATH) items=3D( ${items//:/ } ) for item in ${items[@]} ; do has ${item} ${LDPATH[@]} && continue=20 @@ -194,10 +200,10 @@ create_prelink_conf() { [[ -e ${ROOT}/${x} ]] && str=3D"${str}-l /${x}\n" [[ -e ${ROOT}/usr/${x} ]] && str=3D"${str}-l /usr/${x}\n" done - prelink_mask=3D$(load_config ${ENVPROFILE} PRELINK_PATH_MASK) + prelink_mask=3D$(load_config_ ${ENVPROFILE} PRELINK_PATH_MASK) prelink_mask=3D( ${prelink_mask//:/ } ) - prelink=3D"$(load_config ${ENVPROFILE} PATH)" - prelink=3D"${prelink} $(load_config ${ENVPROFILE} PRELINK_PATH)" + prelink=3D"$(load_config_ ${ENVPROFILE} PATH)" + prelink=3D"${prelink} $(load_config_ ${ENVPROFILE} PRELINK_PATH)" prelink=3D( ${prelink//:/ } ${ESELECT_LDPATH[@]} ) for x in ${prelink[@]} ; do has ${x} ${prelink_mask} && continue @@ -219,7 +225,7 @@ need_links() { y=3D${y//-/_} y=3D${y//./_} y=3D${y//+/_} - oldmtime=3D$(load_config ${LDMTIMEDB} "mtime${y}") + oldmtime=3D$(load_config_ ${LDMTIMEDB} "mtime${y}") newmtime=3D$(stat -c %Y ${x} 2> /dev/null) if [[ ${oldmtime} !=3D ${newmtime} ]] ; then ret=3D0