Clean up following release of Emacs 22.1.

Package-Manager: portage-2.1.2.9

6 files changed, 12 insertions, 504 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index ab6a20dfccce..c4b1ba2c318e 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.129 2007/06/01 18:42:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.130 2007/06/02 13:01:02 ulm Exp $
+
+  02 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.99.ebuild,
+  -emacs-cvs-22.0.9999-r10.ebuild:
+  Clean up following release of Emacs 22.1.
 
   01 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
   emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index d2878e08f4e7..9d75c6a135f9 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -30,24 +30,15 @@ MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 DIST emacs-22.0.97.tar.gz 37900456 RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 SHA1 60a50581ac93fc850225a929cc0c04dec0e51f36 SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b
-DIST emacs-22.0.99.tar.gz 38105148 RMD160 f405bfd29ede30103485cf4b39f00f6d8de28fed SHA1 95c699a9d09027a96c09dfebbf7c027dce4adbd3 SHA256 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15
 DIST emacs-22.0.990.tar.gz 38184881 RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 SHA1 d6ccf5ae41e3d3382fd43c0524ea660a497f9053 SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c
 EBUILD emacs-cvs-22.0.97.ebuild 6715 RMD160 fc3feebf814f6063a7ba2cdcebb42d90237b8afc SHA1 81e9412cc902a06a0a86a5660175044447cacafc SHA256 2c6dd9da54cd723a8a4d83f02c50921b8cc7e4b83c8a4d9a0b3e68c030585bdd
 MD5 55f44f9de99ae865353616c46c357a0c emacs-cvs-22.0.97.ebuild 6715
 RMD160 fc3feebf814f6063a7ba2cdcebb42d90237b8afc emacs-cvs-22.0.97.ebuild 6715
 SHA256 2c6dd9da54cd723a8a4d83f02c50921b8cc7e4b83c8a4d9a0b3e68c030585bdd emacs-cvs-22.0.97.ebuild 6715
-EBUILD emacs-cvs-22.0.99.ebuild 7535 RMD160 8253d130485408770e88d299aef47950d1676532 SHA1 c9ef0e46629acc3ea90608b3e7559f0490fb4826 SHA256 37c7bd6f8315772ff982ff0f0bbbd9ae60be26708221afe0f226c4660fb2823e
-MD5 f0256b140915feea9cf39ff361a41607 emacs-cvs-22.0.99.ebuild 7535
-RMD160 8253d130485408770e88d299aef47950d1676532 emacs-cvs-22.0.99.ebuild 7535
-SHA256 37c7bd6f8315772ff982ff0f0bbbd9ae60be26708221afe0f226c4660fb2823e emacs-cvs-22.0.99.ebuild 7535
 EBUILD emacs-cvs-22.0.990.ebuild 7426 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 SHA1 da90a70b6efed5d35b8ed09e46b4d611bb0b55d4 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e
 MD5 923a512c786c0f667600a277ddf7070e emacs-cvs-22.0.990.ebuild 7426
 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 emacs-cvs-22.0.990.ebuild 7426
 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e emacs-cvs-22.0.990.ebuild 7426
-EBUILD emacs-cvs-22.0.9999-r10.ebuild 7752 RMD160 93694d721e9600c297063df15d02fd38156fcb7f SHA1 77bdf6a60afc908b694eaddf5eb352feb1c01516 SHA256 98fa162f0e4e0119da45306c4864fadc708be9a3aec6381729d4e1b4b6d3b1eb
-MD5 a6fba09e21b1428745f5746188cbf406 emacs-cvs-22.0.9999-r10.ebuild 7752
-RMD160 93694d721e9600c297063df15d02fd38156fcb7f emacs-cvs-22.0.9999-r10.ebuild 7752
-SHA256 98fa162f0e4e0119da45306c4864fadc708be9a3aec6381729d4e1b4b6d3b1eb emacs-cvs-22.0.9999-r10.ebuild 7752
 EBUILD emacs-cvs-22.1.50.ebuild 7631 RMD160 06cf846fec45d33fb810b4446978d6bd7dd8044f SHA1 a1e8961e0ddc7708d5accd01230ced85e3650ebc SHA256 0b01b620fbe7759ee73e902dafdfb6bf1d9797c8533e2fa60a8ccd962d0f1953
 MD5 b44764abcad352a2b7bc0e9f09ae227c emacs-cvs-22.1.50.ebuild 7631
 RMD160 06cf846fec45d33fb810b4446978d6bd7dd8044f emacs-cvs-22.1.50.ebuild 7631
@@ -60,10 +51,10 @@ EBUILD emacs-cvs-23.0.0-r6.ebuild 7825 RMD160 59f8d552e539e5ba89d03c2b1955331e0f
 MD5 e9121edb8470236dfbf135dc37b82043 emacs-cvs-23.0.0-r6.ebuild 7825
 RMD160 59f8d552e539e5ba89d03c2b1955331e0fe08c2c emacs-cvs-23.0.0-r6.ebuild 7825
 SHA256 7281b0c89d5585b1dc89f81364cab338356becbca354d69786652f3cd7f7ca39 emacs-cvs-23.0.0-r6.ebuild 7825
-MISC ChangeLog 25279 RMD160 d0361569986c38e9367b03f4b42807e066aca723 SHA1 7ba7e8215f8d04fc0361364bed36a937c2013da5 SHA256 af1c5e9f4bdd53b92c2c6ac29faabf08d4872e9de71bb2276a3118780936cebf
-MD5 82f7de28bd4e7d8e939c8e778fffdea5 ChangeLog 25279
-RMD160 d0361569986c38e9367b03f4b42807e066aca723 ChangeLog 25279
-SHA256 af1c5e9f4bdd53b92c2c6ac29faabf08d4872e9de71bb2276a3118780936cebf ChangeLog 25279
+MISC ChangeLog 25433 RMD160 59e260e6e4d1c11775332263219b83501a461f31 SHA1 dc922cf82a27bfef60dd3fe9f2a56514a5d1a2b2 SHA256 24a86f90a227a6b88f05ef7a323974b85e20ad2af30ee935267e006874232502
+MD5 892585ab8cf42102d385dfce9a9e0b2a ChangeLog 25433
+RMD160 59e260e6e4d1c11775332263219b83501a461f31 ChangeLog 25433
+SHA256 24a86f90a227a6b88f05ef7a323974b85e20ad2af30ee935267e006874232502 ChangeLog 25433
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -71,15 +62,9 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 a45c1cc2431a74255c981575cf033f94 files/digest-emacs-cvs-22.0.97 247
 RMD160 1a034da94a1d0ea15deae209e53da79099b0ed97 files/digest-emacs-cvs-22.0.97 247
 SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/digest-emacs-cvs-22.0.97 247
-MD5 4dd2110cd9b9df0f3378769222d4a79a files/digest-emacs-cvs-22.0.99 247
-RMD160 a2718e7178826e47bb7821ef9f6165d8b25559a5 files/digest-emacs-cvs-22.0.99 247
-SHA256 aa8d54b09b722e8720e8efe10c45d3efd315dc8b7c89c0ab57877601f3327e8e files/digest-emacs-cvs-22.0.99 247
 MD5 07fa6d117472cfb4f75c1d00ec300709 files/digest-emacs-cvs-22.0.990 250
 RMD160 46f7fa259ce23c2a8ee97d9cc5e88b8f93d29b60 files/digest-emacs-cvs-22.0.990 250
 SHA256 00f87abb7a35a8ee4f7f6624fb1ac8e567fe7977dcd7405d603e754122ddb5c4 files/digest-emacs-cvs-22.0.990 250
-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.1.50 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.1.50 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.1.50 0
@@ -92,7 +77,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGYGiOOeoy/oIi7uwRAi+EAKCtn0DGsyaZ4n7ENFfQbiJCU95e/wCfdNWy
-W7agFJvIRtL47AfZcH5XpA8=
-=6Iyu
+iD8DBQFGYWoYOeoy/oIi7uwRAkKCAKDc4qH19D+tREgqcMJmfOXvbO+TaQCeNTx9
+TVE2WJ34Wgi1BtoL99zQLNo=
+=QTBr
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild
deleted file mode 100644
index 3e0c882ffcc4..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild
+++ /dev/null
@@ -1,230 +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.99.ebuild,v 1.5 2007/05/15 15:02:26 ulm Exp $
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-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"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/editor"
-
-SLOT="22"
-# FULL_VERSION keeps the full version number, which is needed in order to
-# determine some path information correctly for copy/move operations later on
-FULL_VERSION="${PV}"
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
-S="${WORKDIR}/emacs-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	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}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.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 alsa && ! use sound; then
-		echo
-		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
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
-		# Emacs upstream thinks this should be standard policy on all
-		# distributions
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_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
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			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"
-		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
-
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
-	# system (has been reported upstream)
-	use hesiod && myconf="${myconf} --with-hesiod"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	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
-
-	# move man pages to the correct place
-	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, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >00emacs-cvs-${SLOT}-gentoo.el <<EOF
-(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-X    (setq find-function-C-source-directory
-X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
-	fi
-
-	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/emacs-${SLOT} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f ${ROOT}${infodir}/dir{,.*}
-	for f in ${ROOT}${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
-	done
-	echo
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-
-	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"
-		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 on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	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() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
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
deleted file mode 100644
index 975b48e0653e..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ /dev/null
@@ -1,248 +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-r10.ebuild,v 1.21 2007/06/01 18:42:08 ulm Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="EMACS_22_BASE"
-ECVS_LOCALNAME="emacs-22"
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI=""
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="22"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? (
-		$X_DEPEND
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? (
-					lesstif? ( x11-libs/lesstif )
-					!lesstif? ( x11-libs/openmotif )
-				)
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/editor"
-
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-	echo
-	einfo "Emacs version number is ${FULL_VERSION}"
-	echo
-
-	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}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.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 alsa && ! use sound; then
-		echo
-		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
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_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
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			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"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --with-x-toolkit=motif"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-gtk"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
-	# the build system (has been reported upstream)
-	use hesiod && myconf="${myconf} --with-hesiod"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--infodir=/usr/share/info/emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
-		mv ${i} ${i}.info || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	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, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<EOF
-(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-X    (setq find-function-C-source-directory
-X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-EOF
-		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/emacs-${SLOT} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f ${ROOT}${infodir}/dir{,.*}
-	for f in ${ROOT}${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
-	done
-	echo
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-
-	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"
-		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 on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	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() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.99 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.99
deleted file mode 100644
index 87795999f711..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.99
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f0f6c5e4163113f5e292e7b03b078aa9 emacs-22.0.99.tar.gz 38105148
-RMD160 f405bfd29ede30103485cf4b39f00f6d8de28fed emacs-22.0.99.tar.gz 38105148
-SHA256 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15 emacs-22.0.99.tar.gz 38105148
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r10 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r10
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r10
+++ /dev/null