[gentoo-commits] eselect r396 - in trunk: man modules

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-03-24 21:09:53 +0000 (Tue, 24 Mar 2009)
New Revision: 396

Modified:
   trunk/man/ctags.eselect.5
   trunk/man/emacs.eselect.5
   trunk/modules/ctags.eselect
   trunk/modules/emacs.eselect
Log:
Sync from eselect-emacs-1.8 version.

Modified: trunk/man/ctags.eselect.5
===================================================================
--- trunk/man/ctags.eselect.5	2008-10-29 14:31:45 UTC (rev 395)
+++ trunk/man/ctags.eselect.5	2009-03-24 21:09:53 UTC (rev 396)
@@ -1,29 +1,37 @@
-.\" Copyright 1999-2008 Gentoo Foundation
+.\" Copyright 2007-2008 Gentoo Foundation
 .\" Distributed under the terms of the GNU General Public License v2
 .\" $Id$
 .\"
-.TH "ESELECT" "5" "May 2008" "Gentoo Linux" "eselect"
-.SH "NAME"
+.TH ESELECT 5 "December 2008" "Gentoo Linux" eselect
+.SH NAME
 ctags.eselect, etags.eselect \- The ctags and etags management module
 for Gentoo's eselect
-.SH "SYNOPSIS"
-\fBeselect ctags\fR [\fBhelp\fR|\fBusage\fR]
+.SH SYNOPSIS
+.B eselect ctags
+.RB [ help | usage ]
 .br
-\fBeselect ctags list\fR
+.B eselect ctags list
 .br
-\fBeselect ctags set\fR \fItarget\fR
+.B eselect ctags set
+.I target
 .br
-\fBeselect ctags show\fR
+.B eselect ctags show
 .br
-\fBeselect ctags update\fR
-.SH "DESCRIPTION"
-\fBeselect\fR is Gentoo's configuration and management tool. It features
-modules that care for the individual administrative tasks.
+.B eselect ctags update
+.SH DESCRIPTION
+.B eselect
+is Gentoo's configuration and management tool.  It features modules
+that care for the individual administrative tasks.
 
-The \fBctags\fR and \fBetags\fR eselect modules share a common syntax,
-therefore this man page collectively refers to them as \fBctags\fR.
-.SH "ACTION: LIST"
-\fBeselect ctags list\fR
+The
+.B ctags
+and
+.B etags
+eselect modules share a common syntax, therefore this man page
+collectively refers to them as
+.BR ctags .
+.SH ACTION: LIST
+.B eselect ctags list
 .br
 List all installed ctags versions.
 
@@ -33,31 +41,34 @@
 .br
   [1]   ctags-emacs-22 *
   [2]   exuberant-ctags
-.SH "ACTION: SET"
-\fBeselect ctags set\fR \fItarget\fR
+.SH ACTION: SET
+.B eselect ctags set
+.I target
 .br
-Activates the selected ctags version. \fItarget\fR can be either an
-identification number given by \fBeselect ctags list\fR or the name of
-one installed version.
+Activate the selected ctags version.
+.I target
+can be either an identification number given by
+.B eselect ctags list
+or the name of one installed version.
 
 # eselect ctags set 2
 .br
 Switching ctags to exuberant-ctags ...
-.SH "ACTION: SHOW"
-\fBeselect ctags show\fR
+.SH ACTION: SHOW
+.B eselect ctags show
 .br
-Prints the currently activated ctags version.
+Print the currently activated ctags version.
 
 # eselect ctags show
 .br
 Current target of symlink:
 .br
   exuberant-ctags
-.SH "ACTION: UPDATE"
-\fBeselect ctags update\fR
+.SH ACTION: UPDATE
+.B eselect ctags update
 .br
-Update the ctags symlink. For an update only the version is changed,
-but not the provider (i.e. Emacs vs Exuberant). At the moment only
+Update the ctags symlink.  For an update only the version is changed,
+but not the provider (i.e. Emacs vs Exuberant).  At the moment only
 (X)Emacs offers several concurrent versions.
 
 # eselect ctags update
@@ -65,17 +76,22 @@
 Switching ctags to exuberant-ctags ...
 .br
 Switching etags to etags-emacs-22 ...
-.SH "BUGS"
-Under FreeBSD, \fBeselect ctags\fR does not work since \fBctags\fR is
-a real binary, owned by package freebsd-ubin. (\fBeselect etags\fR
+.SH BUGS
+Under FreeBSD,
+.B eselect ctags
+does not work since
+.B ctags
+is a real binary, owned by package freebsd-ubin.
+.RB ( "eselect etags"
 does work though.)
 
-\fBeselect etags\fR does not display any valid targets if there is no
-Emacs variant installed. This is a feature.
-.SH "AUTHOR"
+.B eselect etags
+does not display any valid targets if there is no Emacs variant
+installed.  This is a feature.
+.SH AUTHOR
 Ulrich Mueller <ulm@g.o>
-.SH "SEE ALSO"
+.SH SEE ALSO
 .BR eselect (1),
 .BR emacs.eselect (5)
-.SH "REVISION"
+.SH REVISION
 $Id$

Modified: trunk/man/emacs.eselect.5
===================================================================
--- trunk/man/emacs.eselect.5	2008-10-29 14:31:45 UTC (rev 395)
+++ trunk/man/emacs.eselect.5	2009-03-24 21:09:53 UTC (rev 396)
@@ -1,25 +1,29 @@
-.\" Copyright 1999-2008 Gentoo Foundation
+.\" Copyright 2007-2008 Gentoo Foundation
 .\" Distributed under the terms of the GNU General Public License v2
 .\" $Id$
 .\"
-.TH "ESELECT" "5" "May 2008" "Gentoo Linux" "eselect"
-.SH "NAME"
+.TH ESELECT 5 "December 2008" "Gentoo Linux" eselect
+.SH NAME
 emacs.eselect \- The Emacs management module for Gentoo's eselect
-.SH "SYNOPSIS"
-\fBeselect emacs\fR [\fBhelp\fR|\fBusage\fR]
+.SH SYNOPSIS
+.B eselect emacs
+.RB [ help | usage ]
 .br
-\fBeselect emacs list\fR
+.B eselect emacs list
 .br
-\fBeselect emacs set\fR \fItarget\fR
+.B eselect emacs set
+.I target
 .br
-\fBeselect emacs show\fR
+.B eselect emacs show
 .br
-\fBeselect emacs update\fR [\fIifunset\fR]
-.SH "DESCRIPTION"
-\fBeselect\fR is Gentoo's configuration and management tool. It features
-modules that care for the individual administrative tasks.
-.SH "ACTION: LIST"
-\fBeselect emacs list\fR
+.B eselect emacs update
+.RI [ ifunset ]
+.SH DESCRIPTION
+.B eselect
+is Gentoo's configuration and management tool.  It features modules
+that care for the individual administrative tasks.
+.SH ACTION: LIST
+.B eselect emacs list
 .br
 List all installed Emacs versions and even informs you if XEmacs has
 been found on your system.
@@ -31,12 +35,18 @@
   [1]   emacs-18
   [2]   emacs-21 *
   [3]   emacs-22
-.SH "ACTION: SET"
-\fBeselect emacs set\fR \fItarget\fR
+.SH ACTION: SET
+.B eselect emacs set
+.I target
 .br
-Activates the selected Emacs version. \fItarget\fR can be either an
-identification number given by \fBeselect emacs list\fR or the name of
-one installed version.
+Activate the selected Emacs version.
+.I target
+can be either an identification number given by
+.B eselect emacs list
+or the name of one installed version.  To avoid runtime issues with
+incompatible byte-code from the previously selected Emacs version, run 
+.B emacs-updater -a rebuild
+to remerge all needed packages.
 
 # eselect emacs set 3
 .br
@@ -45,22 +55,23 @@
 Switching ctags to ctags-emacs-22 ...
 .br
 Switching etags to etags-emacs-22 ...
-.SH "ACTION: SHOW"
-\fBeselect emacs show\fR
+.SH ACTION: SHOW
+.B eselect emacs show
 .br
-Prints the currently activated Emacs version.
+Print the currently activated Emacs version.
 
 # eselect emacs show
 .br
 Current target of GNU Emacs symlink:
 .br
   emacs-22
-.SH "ACTION: UPDATE"
-\fBeselect emacs update\fR [\fIifunset\fR]
+.SH ACTION: UPDATE
+.B eselect emacs update
+.RI [ ifunset ]
 .br
-Update the emacs symlink to the last available version. If option
-[\fIifunset\fR] is given, an existing implementation is not
-overridden.
+Update the emacs symlink to the last available version.  If option
+.I ifunset
+is given, an existing implementation is not overridden.
 
 # eselect emacs update
 .br
@@ -69,12 +80,12 @@
 Switching ctags to ctags-emacs-22 ...
 .br
 Switching etags to etags-emacs-22 ...
-.SH "AUTHORS"
-Christian Faulhammer <opfer@g.o>
+.SH AUTHORS
+Christian Faulhammer <fauli@g.o>
 .br
 Ulrich Mueller <ulm@g.o>
-.SH "SEE ALSO"
+.SH SEE ALSO
 .BR eselect (1),
 .BR ctags.eselect (5)
-.SH "REVISION"
+.SH REVISION
 $Id$

Modified: trunk/modules/ctags.eselect
===================================================================
--- trunk/modules/ctags.eselect	2008-10-29 14:31:45 UTC (rev 395)
+++ trunk/modules/ctags.eselect	2009-03-24 21:09:53 UTC (rev 396)
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 2005-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
@@ -19,11 +19,15 @@
 # do_set(): Set a version to be target of the symlink.
 # do_update(): Set the target to the "best" available version. See below.
 
-# This module is used for ctags and etags
-#CTAGS=$(basename ${BASH_SOURCE%.*})
+# This module is used for ctags and etags.
+# Determine our name from ESELECT_MODULE_NAME, with BASH_SOURCE as fallback.
+#CTAGS=${ESELECT_MODULE_NAME:-$(basename "${BASH_SOURCE[0]%.*}")}
 CTAGS=ctags
 
-DESCRIPTION="Manage /usr/bin/${CTAGS} implementations"
+bindir=/usr/bin
+man1dir=/usr/share/man/man1
+
+DESCRIPTION="Manage ${bindir}/${CTAGS} implementations"
 MAINTAINER="emacs@g.o"
 SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
@@ -35,12 +39,12 @@
 	# currently active Emacs version (selected by emacs.eselect)
 	# The logic here is the same as in emacs.eselect, don't change it!
 	local emacs
-	if [[ -L "${ROOT}/usr/bin/emacs" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/emacs") ]]; then
-		emacs=$(basename $(canonicalise "${ROOT}/usr/bin/emacs") )
-		[[ -f "${ROOT}/usr/bin/${CTAGS}-${emacs}" ]] && echo ${CTAGS}-${emacs}
-	elif [[ -f "${ROOT}/usr/bin/xemacs" ]]; then
-		[[ -f "${ROOT}/usr/bin/${CTAGS}-xemacs" ]] && echo ${CTAGS}-xemacs
+	if [[ -L "${ROOT}${bindir}/emacs" && \
+		  -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
+		emacs=$(basename $(readlink "${ROOT}${bindir}/emacs") )
+		[[ -f "${ROOT}${bindir}/${CTAGS}-${emacs}" ]] && echo ${CTAGS}-${emacs}
+	elif [[ -f "${ROOT}${bindir}/xemacs" ]]; then
+		[[ -f "${ROOT}${bindir}/${CTAGS}-xemacs" ]] && echo ${CTAGS}-xemacs
 	elif [[ ${CTAGS} == etags ]]; then
 		# We are called as etags module, but no (X)Emacs is installed.
 		# Return an empty list in this case, because we don't want
@@ -50,31 +54,31 @@
 	fi
 
 	# Exuberant ctags
-	[[ -f "${ROOT}"/usr/bin/exuberant-ctags ]] && echo exuberant-ctags
+	[[ -f "${ROOT}${bindir}/exuberant-ctags" ]] && echo exuberant-ctags
 }
 
 remove_symlinks() {
 	# Remove existing symlinks to binary and man page
-	rm -f "${ROOT}"/usr/bin/${CTAGS}
-	rm -f "${ROOT}"/usr/share/man/man1/${CTAGS}.1*
+	rm -f "${ROOT}${bindir}/${CTAGS}" \
+		"${ROOT}${man1dir}"/${CTAGS}.1*
 }
 
 set_bin_symlinks() {
 	# Set symlink to binary
 	local target=${1}
-	ln -s "${target}" "${ROOT}/usr/bin/${CTAGS}" \
-		|| die "Couldn't set ${target} ${ROOT}/usr/bin/${CTAGS} symlink"
+	ln -s "${target}" "${ROOT}${bindir}/${CTAGS}" \
+		|| die "Couldn't set ${target} ${ROOT}${bindir}/${CTAGS} symlink"
 }
 
 set_man_symlinks() {
 	# Set symlink to man page
 	local target=${1} extension i
-	for i in "${ROOT}"/usr/share/man/man1/${target}.1*; do
+	for i in "${ROOT}${man1dir}"/${target}.1*; do
 		if [[ -f ${i} ]]; then
 			# target file exists; determine compress extension
 			extension=${i##*/${target}.1}
 			ln -s "${target}.1${extension}" \
-				"${ROOT}/usr/share/man/man1/${CTAGS}.1${extension}"
+				"${ROOT}${man1dir}/${CTAGS}.1${extension}"
 		fi
 	done
 }
@@ -92,7 +96,7 @@
 	fi
 
 	# is the target valid, i.e. does a ctags binary with this name exist?
-	[[ -f "${ROOT}/usr/bin/${target}" ]] \
+	[[ -f "${ROOT}${bindir}/${target}" ]] \
 		|| die -q "Target \"${1}\" doesn't appear to be valid!"
 
 	echo "Switching ${CTAGS} to ${target} ..."
@@ -104,7 +108,7 @@
 
 test_for_root() {
 	# checks if the user has rights to modify /usr/bin/
-	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
+	[[ -w "${ROOT}${bindir}" ]] || die -q "You need root privileges!"
 }
 
 ### show action ###
@@ -117,11 +121,11 @@
 	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
 
 	write_list_start "Current target of ${CTAGS} symlink:"
-	if [[ -L "${ROOT}/usr/bin/${CTAGS}" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/${CTAGS}") ]]; then
+	if [[ -L "${ROOT}${bindir}/${CTAGS}" && \
+		  -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
 		write_kv_list_entry \
-			$(basename $(canonicalise "${ROOT}/usr/bin/${CTAGS}") ) ""
-	elif [[ -e "${ROOT}/usr/bin/${CTAGS}" ]]; then
+			$(basename $(readlink "${ROOT}${bindir}/${CTAGS}") ) ""
+	elif [[ -e "${ROOT}${bindir}/${CTAGS}" ]]; then
 		write_kv_list_entry \
 			"(not a symlink or target of symlink does not exist)" ""
 	else
@@ -145,7 +149,7 @@
 		for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
 			# Display a star to indicate the currently chosen version
 			[[ ${targets[${i}]} = \
-				$(basename $(canonicalise "${ROOT}/usr/bin/${CTAGS}") ) ]] \
+				$(basename $(readlink "${ROOT}${bindir}/${CTAGS}") ) ]] \
 				&& targets[${i}]="${targets[${i}]} $(highlight '*')"
 		done
 		write_list_start "Available ${CTAGS} symlink targets:"
@@ -174,9 +178,9 @@
 	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
-	if [[ -e "${ROOT}/usr/bin/${CTAGS}" && ! -L "${ROOT}/usr/bin/${CTAGS}" ]]
+	if [[ -e "${ROOT}${bindir}/${CTAGS}" && ! -L "${ROOT}${bindir}/${CTAGS}" ]]
 	then
-		die -q "Sorry, ${ROOT}/usr/bin/${CTAGS} exists but is not a symlink"
+		die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
 	fi
 
 	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
@@ -194,15 +198,15 @@
 	test_for_root
 
 	local current=""
-	if [[ -L "${ROOT}/usr/bin/${CTAGS}" ]]; then
-		current=$(basename $(canonicalise "${ROOT}/usr/bin/${CTAGS}") )
-		if [[ ! -e $(canonicalise "${ROOT}/usr/bin/${CTAGS}") ]]; then
+	if [[ -L "${ROOT}${bindir}/${CTAGS}" ]]; then
+		current=$(basename $(readlink "${ROOT}${bindir}/${CTAGS}") )
+		if [[ ! -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
 			# clean up dead symlinks
 			remove_symlinks || die -q "Couldn't remove existing symlink"
 		fi
-	elif [[ -e "${ROOT}/usr/bin/${CTAGS}" ]]; then
+	elif [[ -e "${ROOT}${bindir}/${CTAGS}" ]]; then
 		if ! [[ ${CTAGS} == ctags && $(uname) == FreeBSD ]]; then
-			die -q "Sorry, ${ROOT}/usr/bin/${CTAGS} exists but is not a symlink"
+			die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
 		fi
 		# On FreeBSD ctags is a real file, installed by freebsd-ubin
 		current=nolink

Modified: trunk/modules/emacs.eselect
===================================================================
--- trunk/modules/emacs.eselect	2008-10-29 14:31:45 UTC (rev 395)
+++ trunk/modules/emacs.eselect	2009-03-24 21:09:53 UTC (rev 396)
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 2005-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
@@ -20,44 +20,49 @@
 # do_update(): Set the target to the highest version available
 #	(optionally: only if not set)
 
-DESCRIPTION="Manage /usr/bin/emacs version"
+bindir=/usr/bin
+man1dir=/usr/share/man/man1
+infodir=/usr/share/info
+envdir=/etc/env.d
+
+DESCRIPTION="Manage ${bindir}/emacs version"
 MAINTAINER="emacs@g.o"
 SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
 # ctags and etags are handled in their own module
 BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
-MANPAGELIST="emacs emacsclient gfdl"
+MANPAGELIST="emacs emacsclient ebrowse gfdl"
 
 find_targets() {
 	# Return the list of available Emacs binaries
 	local j
-	for j in "${ROOT}"/usr/bin/emacs-[0-9]*; do
+	for j in "${ROOT}${bindir}"/emacs-[0-9]*; do
 		[[ -f ${j} ]] && basename ${j}
 	done
 }
 
 remove_infopath() {
 	# When cleaning symlinks this takes care of the info documentation settings
-	rm -f "${ROOT}/etc/env.d/50emacs"
+	rm -f "${ROOT}${envdir}/50emacs"
 }
 
 # Define INFOPATH environment variable in env file
 set_infopath() {
-	[[ -d "${ROOT}"/usr/share/info/${1} ]] || return 1
-	echo "INFOPATH=/usr/share/info/${1}" > "${ROOT}/etc/env.d/50emacs"
+	[[ -d "${ROOT}${infodir}/${1}" ]] || return 1
+	echo "INFOPATH=${infodir}/${1}" > "${ROOT}${envdir}/50emacs"
 }
 
 remove_symlinks() {
 	# Remove existing symlinks to binaries, man pages,
 	# and the env file (own function)
 	local f
-	rm -f "${ROOT}"/usr/bin/emacs
+	rm -f "${ROOT}${bindir}/emacs"
 	for f in ${BINARYLIST}; do
-		rm -f "${ROOT}"/usr/bin/${f}
+		rm -f "${ROOT}${bindir}/${f}"
 	done
 	for f in ${MANPAGELIST}; do
-		rm -f "${ROOT}"/usr/share/man/man1/${f}.1*
+		rm -f "${ROOT}${man1dir}"/${f}.1*
 	done
 	remove_infopath
 }
@@ -67,9 +72,9 @@
 	local target=${1} f
 	for f in ${BINARYLIST}; do
 		# set symlink only if target binary actually exists
-		if [[ -f "${ROOT}/usr/bin/${f}-${target}" ]]; then
-			ln -s "${f}-${target}" "${ROOT}/usr/bin/${f}" ||
-				die "Couldn't set ${f}-${target} ${ROOT}/usr/bin/${f} symlink"
+		if [[ -f "${ROOT}${bindir}/${f}-${target}" ]]; then
+			ln -s "${f}-${target}" "${ROOT}${bindir}/${f}" ||
+				die "Couldn't set ${f}-${target} ${ROOT}${bindir}/${f} symlink"
 		fi
 	done
 }
@@ -78,12 +83,12 @@
 	# Set symlinks to man pages
 	local target=${1} extension f i
 	for f in ${MANPAGELIST}; do
-		for i in "${ROOT}"/usr/share/man/man1/${f}-${target}.1*; do
+		for i in "${ROOT}${man1dir}"/${f}-${target}.1*; do
 			if [[ -f ${i} ]]; then
 				# target file exists; determine compress extension
 				extension=${i##*/${f}-${target}.1}
 				ln -s "${f}-${target}.1${extension}" \
-					"${ROOT}/usr/share/man/man1/${f}.1${extension}"
+					"${ROOT}${man1dir}/${f}.1${extension}"
 			fi
 		done
 	done
@@ -91,7 +96,7 @@
 
 set_symlinks() {
 	# Set symlinks to binaries and man pages, update info path
-	local target="${1}" targets
+	local target="${1}" nomain="${2}" targets
 	# target may be specified by its name or its index
 	if is_number "${target}"; then
 		# numeric index, find the target's name
@@ -102,16 +107,16 @@
 	fi
 
 	# is the target valid, i.e. does an Emacs binary with this name exist?
-	[[ -f "${ROOT}/usr/bin/${target}" ]] \
+	[[ -f "${ROOT}${bindir}/${target}" ]] \
 		|| die -q "Target \"${1}\" doesn't appear to be valid!"
 
 	echo "Switching emacs to ${target} ..."
 	remove_symlinks || die -q "Couldn't remove existing symlink"
 	# the main /usr/bin/emacs symlink is only set for Emacs binaries
 	# (but not for other providers of auxiliary programs, e.g., XEmacs)
-	if [[ ${target} == emacs-* ]]; then
-		ln -s "${target}" "${ROOT}/usr/bin/emacs" \
-			|| die "Couldn't set ${target} ${ROOT}/usr/bin/emacs symlink"
+	if [[ -z ${nomain} ]]; then
+		ln -s "${target}" "${ROOT}${bindir}/emacs" \
+			|| die "Couldn't set ${target} ${ROOT}${bindir}/emacs symlink"
 	fi
 	set_bin_symlinks "${target}"
 	set_man_symlinks "${target}"
@@ -127,7 +132,7 @@
 xemacs_info() {
 	# This is just informational to tell that XEmacs has been found,
 	# a wish from graaff
-	if [[ -e "${ROOT}/usr/bin/xemacs" ]]; then
+	if [[ -e "${ROOT}${bindir}/xemacs" ]]; then
 		echo
 		write_list_start "XEmacs is also installed"
 	fi
@@ -135,15 +140,15 @@
 
 vim_info() {
 	# Don't take this too serious
-	if [[ -e "${ROOT}/usr/bin/vi" ]]; then
+	if [[ -e "${ROOT}${bindir}/vi" ]]; then
 		echo
-		write_list_start "Vi found, your system is in real trouble now!"
+		write_list_start "Vi found, your system is in real trouble now! ;)"
 	fi
 }
 
 test_for_root() {
 	# checks if the user has rights to modify /usr/bin/
-	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
+	[[ -w "${ROOT}${bindir}" ]] || die -q "You need root privileges!"
 }
 
 ### show action ###
@@ -155,12 +160,12 @@
 do_show() {
 	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
 
-	write_list_start "Current target of GNU Emacs symlink:"
-	if [[ -L "${ROOT}/usr/bin/emacs" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/emacs") ]]; then
+	write_list_start "Current target of Emacs symlink:"
+	if [[ -L "${ROOT}${bindir}/emacs" && \
+		  -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
 		write_kv_list_entry \
-			$(basename $(canonicalise "${ROOT}/usr/bin/emacs") ) ""
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
+			$(basename $(readlink "${ROOT}${bindir}/emacs") ) ""
+	elif [[ -e "${ROOT}${bindir}/emacs" ]]; then
 		write_kv_list_entry \
 			"(not a symlink or target of symlink does not exist)" ""
 	else
@@ -186,10 +191,10 @@
 		for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
 			# Display a star to indicate the currently chosen version
 			[[ ${targets[${i}]} = \
-				$(basename $(canonicalise "${ROOT}/usr/bin/emacs") ) ]] \
+				$(basename $(readlink "${ROOT}${bindir}/emacs") ) ]] \
 				&& targets[${i}]="${targets[${i}]} $(highlight '*')"
 		done
-		write_list_start "Available GNU Emacs symlink targets:"
+		write_list_start "Available Emacs symlink targets:"
 		write_numbered_list "${targets[@]}"
 	else
 		write_kv_list_entry "(none found)" ""
@@ -217,8 +222,8 @@
 	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
-	if [[ -e "${ROOT}/usr/bin/emacs" && ! -L "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Sorry, ${ROOT}/usr/bin/emacs exists but is not a symlink"
+	if [[ -e "${ROOT}${bindir}/emacs" && ! -L "${ROOT}${bindir}/emacs" ]]; then
+		die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
 	fi
 
 	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
@@ -243,22 +248,23 @@
 	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
-	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		[[ ${1} == *if*unset && -e $(canonicalise "${ROOT}/usr/bin/emacs") ]] \
+	if [[ -L "${ROOT}${bindir}/emacs" ]]; then
+		[[ ${1} == *if*unset \
+			&& -e $(canonicalise "${ROOT}${bindir}/emacs") ]] \
 			&& return
 		# this is not redundant: "update" is called in pkg_postrm() of emacs
 		# and should clean up any dead symlinks if no valid target exists
 		remove_symlinks || die -q "Couldn't remove existing symlink"
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Sorry, ${ROOT}/usr/bin/emacs exists but is not a symlink"
+	elif [[ -e "${ROOT}${bindir}/emacs" ]]; then
+		die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
 	fi
 
 	local targets=( $(find_targets) )
 	if [[ ${#targets[@]} -gt 0 ]]; then
 		set_symlinks ${#targets[@]} || die -q "Couldn't set a new symlink"
-	elif [[ -f "${ROOT}/usr/bin/xemacs" ]]; then
+	elif [[ -f "${ROOT}${bindir}/xemacs" ]]; then
 		# no Emacs target found -- link ctags, etags etc. to XEmacs versions
-		set_symlinks xemacs
+		set_symlinks xemacs nomain
 	fi
 
 	# ctags symlinks are handled in an own module now