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 1Si7h6-0003Jp-Vy for garchives@archives.gentoo.org; Fri, 22 Jun 2012 17:30:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 124E5E093A; Fri, 22 Jun 2012 17:29:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C267AE090A for ; Fri, 22 Jun 2012 17:29:25 +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 45D3C1B403C 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 069EAE544A 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: <1181427718.8c9d5ceb1423b1afec6ed9fc1f03f80c900933a2.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:eselect-emacs-1.1 commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: ChangeLog Makefile emacs.eselect env-emacs.eselect X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 8c9d5ceb1423b1afec6ed9fc1f03f80c900933a2 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: 7b172aac-e064-42fd-8675-301593964500 X-Archives-Hash: 5a26ad3f504477cdc2943a0f635129af commit: 8c9d5ceb1423b1afec6ed9fc1f03f80c900933a2 Author: Ulrich M=C3=BCller gentoo org> AuthorDate: Sat Jun 9 22:21:58 2007 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sat Jun 9 22:21:58 2007 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/emacs-tools.g= it;a=3Dcommit;h=3D8c9d5ceb Support for --no-ldconfig option in env-emacs.eselect. svn path=3D/emacs-extra/eselect-emacs/; revision=3D381 --- ChangeLog | 7 +++++++ Makefile | 2 +- emacs.eselect | 4 ++-- env-emacs.eselect | 30 +++++++++++++++++++++++------- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a60973..60e9870 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-10 Ulrich Mueller + + * env-emacs.eselect: New file, taken from env.eselect of + eselect-1.0.9, extended to support the --no-ldconfig option. + + * Makefile (DISTFILES): env-emacs.eselect added. + 2007-06-05 Christian Faulhammer =20 * added an additional die for remove_symlinks() in set_symlinks() diff --git a/Makefile b/Makefile index bb830ff..a6b6b73 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PV =3D $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*= \([0-9.]*\).*/\1/;q' \ ChangeLog) P =3D $(PN)-$(PV) =20 -DISTFILES =3D emacs.eselect emacs.eselect.5 +DISTFILES =3D emacs.eselect env-emacs.eselect emacs.eselect.5 =20 =20 .PHONY: all dist clean diff --git a/emacs.eselect b/emacs.eselect index 13349b2..5bb00c8 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 update >/dev/null + #do_action env-emacs update --no-ldconfig >/dev/null env-update --no-ldconfig =20 return 0 @@ -129,7 +129,7 @@ xemacs_info() { # a wish from graaff if [[ -e "${ROOT}/usr/bin/xemacs" ]]; then echo - write_list_start "XEmacs is also available" + write_list_start "XEmacs is also installed" fi } =20 diff --git a/env-emacs.eselect b/env-emacs.eselect index 5b977bf..a441941 100644 --- a/env-emacs.eselect +++ b/env-emacs.eselect @@ -5,7 +5,8 @@ inherit config multilib =20 DESCRIPTION=3D"Manage environment variables set in /etc/env.d/" -MAINTAINER=3D"kugelfang@gentoo.org" +#MAINTAINER=3D"kugelfang@gentoo.org" +MAINTAINER=3D"emacs@gentoo.org" SVN_DATE=3D'$Date$' VERSION=3D$(svn_date_to_version "${SVN_DATE}" ) =20 @@ -106,6 +107,7 @@ 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 @@ -261,6 +263,7 @@ describe_update_parameters() { =20 describe_update_options() { echo "makelinks : Specify \"makelinks\" to force updating of links" + echo "--no-ldconfig : Do not run ldconfig" } =20 do_update() { @@ -270,14 +273,27 @@ do_update() { else touch ${ROOT}/etc/profile.env fi -=09 + + # handle --no-ldconfig option, bug #172475 + local mlinks noldconfig + while [[ ${1} ]]; do + case ${1} in + makelinks) mlinks=3D1 ;; + --no-ldconfig) noldconfig=3D1 ;; + *) die -q "Unknown parameter ${1}" ;; + esac + shift + done + # Create configuration files create_profile_env - create_ld_so_conf - [[ -e ${ROOT}/usr/sbin/prelink ]] && create_prelink_conf - makelinks=3D$( ( need_links || [[ ${1} =3D=3D makelinks ]] ) && echo "-= X" ) - update_ldcache ${makelinks} - =09 + if [[ -z "${noldconfig}" ]]; then + create_ld_so_conf + [[ -e ${ROOT}/usr/sbin/prelink ]] && create_prelink_conf + makelinks=3D$( ( need_links || [[ "${mlinks}" ]] ) && echo "-X" ) + update_ldcache ${makelinks} + fi + # fix up ${ENVPROFILE} cp ${ENVPROFILE} ${ENVPROFILE/.env/.csh} sed -i \