Test for previous symlink and eselect the same SLOT. Other minor changes.

Package-Manager: portage-2.1.2.4

7 files changed, 57 insertions, 261 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index a4772c3b43e7..67c0d4447242 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.109 2007/04/19 05:56:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.110 2007/04/20 19:45:36 ulm Exp $
+
+  20 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.98.ebuild,
+  -emacs-cvs-22.0.9999-r7.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Test for previous symlink and eselect the same SLOT, also for live CVS
+  ebuild. Added braces to variable name; split some long lines. Removed old
+  broken revision.
 
   19 Apr 2007; Ulrich Mueller <ulm@gentoo.org>
   +files/emacs-cvs-Xaw3d-headers.patch, emacs-cvs-22.0.98.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 564572977094..2da2647614b7 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -31,30 +31,26 @@ EBUILD emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092c
 MD5 992f42942a9163e96939d9832756f0ea emacs-cvs-22.0.97.ebuild 6643
 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb emacs-cvs-22.0.97.ebuild 6643
 SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7 emacs-cvs-22.0.97.ebuild 6643
-EBUILD emacs-cvs-22.0.98.ebuild 7481 RMD160 1eb029ef00f271db90d4febed986369f69a343da SHA1 4356c1010ad89bd64183fe4f65d0141d9a84e075 SHA256 53e092c48476ae5325ab632290e6203f5d146aab17e7befa34c3c17588687bf3
-MD5 b0e153a300e9d9e150b626a4f9d61a56 emacs-cvs-22.0.98.ebuild 7481
-RMD160 1eb029ef00f271db90d4febed986369f69a343da emacs-cvs-22.0.98.ebuild 7481
-SHA256 53e092c48476ae5325ab632290e6203f5d146aab17e7befa34c3c17588687bf3 emacs-cvs-22.0.98.ebuild 7481
-EBUILD emacs-cvs-22.0.9999-r10.ebuild 7642 RMD160 a425617358a03e8a958ffaa6374b8af59ae0992b SHA1 12da347a522257729b1356a03142364e0a22a30c SHA256 89d920389e1b938921c5f410d04817e37bacea03c32be6dc2f0dc1dbee97ca7e
-MD5 9833fbbc5e8863a8a4d45ae04516126d emacs-cvs-22.0.9999-r10.ebuild 7642
-RMD160 a425617358a03e8a958ffaa6374b8af59ae0992b emacs-cvs-22.0.9999-r10.ebuild 7642
-SHA256 89d920389e1b938921c5f410d04817e37bacea03c32be6dc2f0dc1dbee97ca7e emacs-cvs-22.0.9999-r10.ebuild 7642
-EBUILD emacs-cvs-22.0.9999-r7.ebuild 6703 RMD160 c2b8e50a2bbaec24da57c657828a300ca7f89a02 SHA1 6a424818c1f6916e9537c714395c85fc1822d8ae SHA256 16c3c5158661e34dfe1272c69866870746ed485ae6380e3fce15eb89e15852cc
-MD5 23bc6272300e02899268cfcc339e27b8 emacs-cvs-22.0.9999-r7.ebuild 6703
-RMD160 c2b8e50a2bbaec24da57c657828a300ca7f89a02 emacs-cvs-22.0.9999-r7.ebuild 6703
-SHA256 16c3c5158661e34dfe1272c69866870746ed485ae6380e3fce15eb89e15852cc emacs-cvs-22.0.9999-r7.ebuild 6703
+EBUILD emacs-cvs-22.0.98.ebuild 7538 RMD160 cef34069050bec208090861de3349b269ea55b96 SHA1 af85856a1d7ced9473372f986a6d9b18c476fd4f SHA256 e85b3d2f3e6c732deab6d8f67c10b7a9d05b0517774b518d95bee7c130fa7f63
+MD5 b3d225ba4b0a4cd119e32bd2d0c55dfb emacs-cvs-22.0.98.ebuild 7538
+RMD160 cef34069050bec208090861de3349b269ea55b96 emacs-cvs-22.0.98.ebuild 7538
+SHA256 e85b3d2f3e6c732deab6d8f67c10b7a9d05b0517774b518d95bee7c130fa7f63 emacs-cvs-22.0.98.ebuild 7538
+EBUILD emacs-cvs-22.0.9999-r10.ebuild 7860 RMD160 f3361801f884ea884086d231eee8d3f43e8385d2 SHA1 ffc128d102c47ded208a7e4b5f957a834e45757d SHA256 2c62f1fd38c6ea5d24cc550916a882876e6fc348fe8727332dd2e70c7f7898f7
+MD5 aaa6ae72c62651d913fef37c708cfb1b emacs-cvs-22.0.9999-r10.ebuild 7860
+RMD160 f3361801f884ea884086d231eee8d3f43e8385d2 emacs-cvs-22.0.9999-r10.ebuild 7860
+SHA256 2c62f1fd38c6ea5d24cc550916a882876e6fc348fe8727332dd2e70c7f7898f7 emacs-cvs-22.0.9999-r10.ebuild 7860
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5772 RMD160 1db592d913958bf735dc481392a8521ffa4a98de SHA1 b938b32260ebf39f8cab7897bb7155fbfed6167f SHA256 932b97d355c334bf4f5f27c16b6dc5b1dc041ddaf92a9aa8e8effe7aa4be40f3
 MD5 eb38b95a554cbae3617e204bbb52ea1d emacs-cvs-23.0.0-r1.ebuild 5772
 RMD160 1db592d913958bf735dc481392a8521ffa4a98de emacs-cvs-23.0.0-r1.ebuild 5772
 SHA256 932b97d355c334bf4f5f27c16b6dc5b1dc041ddaf92a9aa8e8effe7aa4be40f3 emacs-cvs-23.0.0-r1.ebuild 5772
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7875 RMD160 850b21e25947737f45d271db170460a7db4f5a88 SHA1 37ed47bb975e851c5050dbd27466de18d103fcfe SHA256 e4a2b1b53c3267095f88020b2f1778d29d127782e0094b735f4133b4d0eb97d0
-MD5 bc6966219e860052f7c2dd37f7094df8 emacs-cvs-23.0.0-r6.ebuild 7875
-RMD160 850b21e25947737f45d271db170460a7db4f5a88 emacs-cvs-23.0.0-r6.ebuild 7875
-SHA256 e4a2b1b53c3267095f88020b2f1778d29d127782e0094b735f4133b4d0eb97d0 emacs-cvs-23.0.0-r6.ebuild 7875
-MISC ChangeLog 21579 RMD160 3e3dcaf9a49ee7a9b50e8d14a62a9365f7995682 SHA1 e62d80686859739d5c765a5f65b22ad52b2b5fe0 SHA256 15975732da1aa5d6a44d7a57cb3667e1194ffd6efe240beebd8af674217469f9
-MD5 048942841244299a35a7cde8fffe530e ChangeLog 21579
-RMD160 3e3dcaf9a49ee7a9b50e8d14a62a9365f7995682 ChangeLog 21579
-SHA256 15975732da1aa5d6a44d7a57cb3667e1194ffd6efe240beebd8af674217469f9 ChangeLog 21579
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7932 RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874ded389 SHA1 9463eba9178940aa3bea7ef1abae7dcb19bf467c SHA256 507155608ef4df8cabe02088d1aaa1db84a50646dfda6a3b71e40b746e3a109d
+MD5 ac223f62f36fda9dc3eb0be0d781cc5a emacs-cvs-23.0.0-r6.ebuild 7932
+RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874ded389 emacs-cvs-23.0.0-r6.ebuild 7932
+SHA256 507155608ef4df8cabe02088d1aaa1db84a50646dfda6a3b71e40b746e3a109d emacs-cvs-23.0.0-r6.ebuild 7932
+MISC ChangeLog 21917 RMD160 c10b55f8e75e51b89e9d82e2e6c2237e462ef154 SHA1 ce22f81c66fb674f77241f77ad2cf19d575c6e2e SHA256 936cce8275a799ccebcf1c39efa33dc7930279bd75bd54e568ec102052bc4c91
+MD5 e83efb34b600a4ce4ffb4ead31329bf3 ChangeLog 21917
+RMD160 c10b55f8e75e51b89e9d82e2e6c2237e462ef154 ChangeLog 21917
+SHA256 936cce8275a799ccebcf1c39efa33dc7930279bd75bd54e568ec102052bc4c91 ChangeLog 21917
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -68,9 +64,6 @@ SHA256 753b26a456c597fb729acb3697a511848094901478febd88498f463a8eddb39f files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r10 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r10 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r10 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r7 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r7 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0
@@ -80,7 +73,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGJwUFOeoy/oIi7uwRAv9mAKCrGiy3yYnUVVGN/nB4DCSQZbR9LwCfedbf
-z7p63i5piBwSuttS8Mvp7eg=
-=t0Wm
+iD8DBQFGKRjnOeoy/oIi7uwRAheXAKCmSEX+ByCUu8j9UfXH8MRDHGN/0gCgr21k
+E3t79j/ip92p2FzeDaqioIk=
+=Csx2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
index fbd6aa5c74c2..2f12db2c0048 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.6 2007/04/19 05:56:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.7 2007/04/20 19:45:36 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -12,7 +12,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
 
-RESTRICT="$RESTRICT nostrip"
+RESTRICT="${RESTRICT} nostrip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
 
@@ -81,7 +81,8 @@ src_compile() {
 
 	if use alsa && ! use sound; then
 		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
 		echo
 		myconf="${myconf} --with-sound"
 	else
@@ -216,9 +217,10 @@ pkg_postinst() {
 	fi
 
 	echo
-	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
-	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
-	elog "stable release"
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module. Man and info pages are automatically"
+	elog "redirected, so you are to test emacs-cvs along with the stable"
+	elog "release. \"man emacs.eselect\" for details."
 }
 
 pkg_postrm() {
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index 84fbfc879a83..c213f75e4318 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.6 2007/04/19 05:56:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.7 2007/04/20 19:45:36 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -93,7 +93,8 @@ src_compile() {
 
 	if use alsa && ! use sound; then
 		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
 		echo
 		myconf="${myconf} --with-sound"
 	else
@@ -211,7 +212,13 @@ pkg_postinst() {
 
 	elisp-site-regen
 	emacs-infodir-rebuild
-	eselect emacs update --if-unset
+
+	if [[ "$(readlink ${ROOT}/usr/bin/emacs)" == emacs.emacs-${SLOT}* ]]; then
+		# transition from pre-eselect revision
+		eselect emacs set emacs-${SLOT}
+	else
+		eselect emacs update --if-unset
+	fi
 
 	if use X; then
 		elog "You need to install some fonts for Emacs. Under monolithic"
@@ -222,9 +229,10 @@ pkg_postinst() {
 	fi
 
 	echo
-	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
-	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
-	elog "stable release"
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module. Man and info pages are automatically"
+	elog "redirected, so you are to test emacs-cvs along with the stable"
+	elog "release. \"man emacs.eselect\" for details."
 }
 
 pkg_postrm() {
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild
deleted file mode 100644
index 14ef6d6c56ee..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r7.ebuild,v 1.2 2007/04/04 13:26:16 grobian Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit alternatives autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell source tiff toolkit-scroll-bars X Xaw3d "
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
-
-DEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( $X_DEPEND )
-	X? ( gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	alsa? ( media-sound/alsa-headers )
-	gzip-el? ( app-arch/gzip  )
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.97"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-S="${WORKDIR}/emacs"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} --with-xpm"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		elif use lesstif; then
-			einfo "Configuring to build with lesstif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	if use aqua; then
-		einfo "Configuring to build with Carbon Emacs"
-		econf \
-			--enable-carbon-app=/Applications/Gentoo \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			 || die "econf carbon emacs failed"
-	else
-		econf \
-			--program-suffix=.emacs-${SLOT} \
-			--without-carbon \
-			${myconf} || die "econf emacs failed"
-	fi
-
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
-
-	if use aqua ; then
-		einfo "Installing Carbon Emacs..."
-		dodir /Applications/Gentoo/Emacs.app
-		pushd mac/Emacs.app
-		tar -chf - . | ( cd "${D}/Applications/Gentoo/Emacs.app"; tar -xf -)
-		popd
-	fi
-
-	# fix info documentation
-	einfo "Fixing info documentation..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	insinto /etc/env.d
-	cat >"${D}"/etc/env.d/50emacs-cvs-${SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${SLOT}
-EOF
-	einfo "Fixing manpages..."
-	for m in  "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
-	done
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	if use source; then
-		insinto /usr/share/emacs/${SLOT}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
-(when (substring emacs-version 0 (length "${SLOT}"))
-  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
-EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
-	fi
-
-	dodoc BUGS ChangeLog README
-}
-
-update-alternatives() {
-	# extract the suffix of the manpages to determine the correct compression program
-	local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
-	# this creates symlinks for binaries and man pages, so the correct ones in a slotted
-	# environment can be accessed
-	for i in emacs emacsclient etags ctags b2m ebrowse \
-		rcs-checkin grep-changelog ;
-	do
-		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
-	done
-
-	for j in emacs emacsclient etags ctags
-	do
-		alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
-	done
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
-
-	update-alternatives
-	elisp-site-regen
-
-	# ecompress from Portage 2.2.* does auto-compression
-	# which is not desired for the dir file, so remove it to
-	# let it be recreated
-	rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
-
-	if use X; then
-		elog "You need to install some fonts for Emacs.	 Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
-		elog "Emacs requirements under X11."
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index 19141a61b8c9..c3843f6a2e37 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.5 2007/04/19 05:56:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.6 2007/04/20 19:45:36 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -18,7 +18,7 @@ SRC_URI=""
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
 
-RESTRICT="$RESTRICT nostrip"
+RESTRICT="${RESTRICT} nostrip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
 
@@ -94,7 +94,8 @@ src_compile() {
 
 	if use alsa && ! use sound; then
 		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
 		echo
 		myconf="${myconf} --with-sound"
 	else
@@ -226,9 +227,10 @@ pkg_postinst() {
 	fi
 
 	echo
-	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
-	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
-	elog "stable release"
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module. Man and info pages are automatically"
+	elog "redirected, so you are to test emacs-cvs along with the stable"
+	elog "release. \"man emacs.eselect\" for details."
 }
 
 pkg_postrm() {
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r7 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r7
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r7
+++ /dev/null