[gentoo-commits] proj/emacs-tools:eselect-emacs-1.1 commit in: /

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     8c9d5ceb1423b1afec6ed9fc1f03f80c900933a2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  9 22:21:58 2007 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 22:21:58 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=8c9d5ceb

Support for --no-ldconfig option in env-emacs.eselect.

svn path=/emacs-extra/eselect-emacs/; revision=381

---
 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  <ulm@gentoo.org>
+
+	* 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  <opfer@gentoo.org>
 
 	* 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 = $(shell sed '/^[ \t]*\* .*[Vv]ersion/!d;s/[^0-9.]*\([0-9.]*\).*/\1/;q' \
 	ChangeLog)
 P = $(PN)-$(PV)
 
-DISTFILES = emacs.eselect emacs.eselect.5
+DISTFILES = emacs.eselect env-emacs.eselect emacs.eselect.5
 
 
 .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}"
 
 	# 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
 
 	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
 }
 

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
 
 DESCRIPTION="Manage environment variables set in /etc/env.d/"
-MAINTAINER="kugelfang@gentoo.org"
+#MAINTAINER="kugelfang@gentoo.org"
+MAINTAINER="emacs@gentoo.org"
 SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
@@ -106,6 +107,7 @@ create_profile_env() {
 			-e '/^#/d' -e '/^\s*$/d' -e '/^.*=/s/^\([^=]*\)=.*/\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() {
 
 describe_update_options() {
 	echo "makelinks : Specify \"makelinks\" to force updating of links"
+	echo "--no-ldconfig : Do not run ldconfig"
 }
 
 do_update() {
@@ -270,14 +273,27 @@ do_update() {
 	else
 		touch ${ROOT}/etc/profile.env
 	fi
-	
+
+	# handle --no-ldconfig option, bug #172475
+	local mlinks noldconfig
+	while [[ ${1} ]]; do
+		case ${1} in
+			makelinks) mlinks=1 ;;
+			--no-ldconfig) noldconfig=1 ;;
+			*) 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=$( ( need_links || [[ ${1} == makelinks ]] ) && echo "-X" )
-	update_ldcache ${makelinks}
-		
+	if [[ -z "${noldconfig}" ]]; then
+		create_ld_so_conf
+		[[ -e ${ROOT}/usr/sbin/prelink ]] && create_prelink_conf
+		makelinks=$( ( need_links || [[ "${mlinks}" ]] ) && echo "-X" )
+		update_ldcache ${makelinks}
+	fi
+
 	# fix up ${ENVPROFILE}
 	cp ${ENVPROFILE} ${ENVPROFILE/.env/.csh}
 	sed -i \