From: Christian Faulhammer <fauli@gentoo.org>
Date: Fri, 5 Jan 2007 13:49:00 +0000 (+0000)
Subject: punt old versions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4c8d8f9624b49e57333583663cdeb543aeefe93;p=gentoo.git

punt old versions
Package-Manager: portage-2.1.1-r2
---

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 584956436e43..b9c60cd9e2af 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -45,22 +45,6 @@ AUX xft-xfaces-fixcrash.patch 631 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad4
 MD5 2e8d8757cc9ed43a0ffe56c8dbcb93df files/xft-xfaces-fixcrash.patch 631
 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad48 files/xft-xfaces-fixcrash.patch 631
 SHA256 1924c52d328a846eaa1ef78766cbabeb5fcfe5427d42ca4de3d5d6a646e46b33 files/xft-xfaces-fixcrash.patch 631
-EBUILD emacs-cvs-22.0.50-r1.ebuild 5902 RMD160 774ce7098425636c190ec6392e39fbd698cd25eb SHA1 fdc641ca71c93b1d803cc636591d122bf2260443 SHA256 ee3135380e18793731460bf1e7fdfd49b51b9566dc556562592af410ae7ac0d8
-MD5 f0756af862b825d76bba1038935926b5 emacs-cvs-22.0.50-r1.ebuild 5902
-RMD160 774ce7098425636c190ec6392e39fbd698cd25eb emacs-cvs-22.0.50-r1.ebuild 5902
-SHA256 ee3135380e18793731460bf1e7fdfd49b51b9566dc556562592af410ae7ac0d8 emacs-cvs-22.0.50-r1.ebuild 5902
-EBUILD emacs-cvs-22.0.50-r2.ebuild 5667 RMD160 08160668ed3fb04403c4e548430f2d53a80bca55 SHA1 4b2c6ddcfa0debc5226f6f6c94bafb229228dc17 SHA256 f109229610bbc841d665819f192785f8dae11400c6d3e2face2067697af6cd9a
-MD5 53fac4bcb3b5ccfd522499c9fb1da9ad emacs-cvs-22.0.50-r2.ebuild 5667
-RMD160 08160668ed3fb04403c4e548430f2d53a80bca55 emacs-cvs-22.0.50-r2.ebuild 5667
-SHA256 f109229610bbc841d665819f192785f8dae11400c6d3e2face2067697af6cd9a emacs-cvs-22.0.50-r2.ebuild 5667
-EBUILD emacs-cvs-22.0.50-r3.ebuild 5307 RMD160 b703c9c77645ed3676c9339c9d42882c8eda8009 SHA1 b3d94e188d34691c1520c8c559ae94a17290382a SHA256 970c5325e12a1b0f27bc1325fa3455b396f2f3955cba164c0dd65ade8f91d9b1
-MD5 d83b36ceddd7edbb544423d98a0e018d emacs-cvs-22.0.50-r3.ebuild 5307
-RMD160 b703c9c77645ed3676c9339c9d42882c8eda8009 emacs-cvs-22.0.50-r3.ebuild 5307
-SHA256 970c5325e12a1b0f27bc1325fa3455b396f2f3955cba164c0dd65ade8f91d9b1 emacs-cvs-22.0.50-r3.ebuild 5307
-EBUILD emacs-cvs-22.0.90.ebuild 5383 RMD160 a2489d2fe0cfe15d1926bd14952a7330ffb449d7 SHA1 364e43ea7e65fc21220a5e00764c87916b14c4de SHA256 a0389d71b39a8e1f98b7f9b8c2a34a9b7cc1ab242bf501054ee7d599ff0167d0
-MD5 8136caf18f203a26be18cf1b17a2ed09 emacs-cvs-22.0.90.ebuild 5383
-RMD160 a2489d2fe0cfe15d1926bd14952a7330ffb449d7 emacs-cvs-22.0.90.ebuild 5383
-SHA256 a0389d71b39a8e1f98b7f9b8c2a34a9b7cc1ab242bf501054ee7d599ff0167d0 emacs-cvs-22.0.90.ebuild 5383
 EBUILD emacs-cvs-22.0.91.ebuild 5663 RMD160 59cbdd417ffbcc50004fe4f32c6220b82bddb8e0 SHA1 510e8fbf11398a7c03d5ea6ff7abcae1748bdafb SHA256 5f9e41899fe67281c5b957a67b3640a6779630f48427675aaafed24213d692a7
 MD5 46d44d98ea8e8f2423a2cb2c2489efce emacs-cvs-22.0.91.ebuild 5663
 RMD160 59cbdd417ffbcc50004fe4f32c6220b82bddb8e0 emacs-cvs-22.0.91.ebuild 5663
@@ -69,43 +53,24 @@ EBUILD emacs-cvs-23.0.0-r1.ebuild 5984 RMD160 6b728c9a31cf0f56a75badddf5c941500b
 MD5 bab102caf80f3a93f0ed44583c04e29c emacs-cvs-23.0.0-r1.ebuild 5984
 RMD160 6b728c9a31cf0f56a75badddf5c941500ba8d8e8 emacs-cvs-23.0.0-r1.ebuild 5984
 SHA256 dda339425a96853fbd15f59f3546632822b3ef09f04505d29f08c46647addbce emacs-cvs-23.0.0-r1.ebuild 5984
-EBUILD emacs-cvs-23.0.0.ebuild 5238 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 SHA1 740ffd7e4416be19cb4a40db63d33d1066800cd9 SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2
-MD5 10d02dd5a3cbe31f162edaebf502797c emacs-cvs-23.0.0.ebuild 5238
-RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 emacs-cvs-23.0.0.ebuild 5238
-SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2 emacs-cvs-23.0.0.ebuild 5238
-MISC ChangeLog 10279 RMD160 e80741b24dc1d21eff1f4387ba67ee14475dd60c SHA1 a97676bb5ad331c7b78ffca55e9bcf14c8ddd51d SHA256 0b5a72c3a552a66993c6d25f1b3c28bf91f7a04a63f33a1960965434e5b98838
-MD5 145962d6b97acff3105b48902551eeac ChangeLog 10279
-RMD160 e80741b24dc1d21eff1f4387ba67ee14475dd60c ChangeLog 10279
-SHA256 0b5a72c3a552a66993c6d25f1b3c28bf91f7a04a63f33a1960965434e5b98838 ChangeLog 10279
+MISC ChangeLog 10500 RMD160 c65d1f0313a33080d531a48ff8eb4a0115d78450 SHA1 4a610586ccb48358f4f61886fce2da0ece841660 SHA256 ff72bafc479551bd5a0159e548095e483fe0a0151cf7bbea486349e23be73b68
+MD5 3aaf17aa0793e613395dd717ebede220 ChangeLog 10500
+RMD160 c65d1f0313a33080d531a48ff8eb4a0115d78450 ChangeLog 10500
+SHA256 ff72bafc479551bd5a0159e548095e483fe0a0151cf7bbea486349e23be73b68 ChangeLog 10500
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r2 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r2 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.90 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.90 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.90 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.91 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.91 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.91 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0 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
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.91 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.91 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.91 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0-r1 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0-r1 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0-r1 1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFmsbAAiZjviIA2XgRAhWuAJ9+5bXpj3USshuK8eY33j/M3TFe2wCcD1KL
-wFY0ddDFmelhdWiYXblXuaY=
-=v/b0
+iD8DBQFFnldXNQqtfCuFneMRApy6AJ0ZQUdkM99vIFCbFtY69l6FdOagsACfSrXd
+KGsYtBpaPxp3H4jJDFAGRjM=
+=bWOV
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
deleted file mode 100644
index 0416ff8a9f56..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2006 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.50-r1.ebuild,v 1.2 2006/02/26 21:48:47 mkennedy Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff"
-# IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff xft source"
-
-S=${WORKDIR}/emacs
-
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-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-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	sys-libs/zlib
-	>=sys-apps/portage-2.0.51_rc1"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.50"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
-
-DFILE=emacs-${SLOT}.desktop
-
-# pkg_setup() {
-#	if use xft; then
-#		while read line; do ewarn "${line}"; done <<EOF
-
-# You have chosen to build Emacs using the XFT_JHD_BRANCH.	The
-# XFT_JHD_BRANCH is very early work towards supporting XFT in Emacs.
-# Emerging app-editors/emacs-cvs was risky enough, trying out the
-# XFT_JHD_BRANCH branch for XFT support even more so!
-
-# EOF
-#		ebeep
-#	fi
-# }
-
-src_unpack() {
-#	if use xft; then
-#		ECVS_BRANCH=XFT_JHD_BRANCH
-#	else
-#		ECVS_BRANCH=HEAD
-#	fi
-	cvs_src_unpack
-	cd ${S};
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
-#	if use xft; then
-#		epatch ${FILESDIR}/xft-invertcursor.patch
-#		epatch ${FILESDIR}/xft-bgalpha.patch
-#		epatch ${FILESDIR}/xft-xfaces-fixcrash.patch
-#	fi
-}
-
-src_compile() {
-	# no flag is allowed
-	ALLOWED_FLAGS=" "
-	strip-flags
-	unset LDFLAGS
-
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} --with-xpm --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 support"
-			myconf="${myconf} --with-x-toolkit=athena"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		fi
-#		if use xft; then
-#			# this is only relevant when the source is patched for XFT
-#			# support, so it must remain within this if/then block
-#			myconf="${myconf} $(use_with xft)"
-#		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	if use aqua ; then
-		einfo "Configuring to build with Carbon Emacs"
-		econf --enable-debug \
-			--enable-carbon-app=/Applications/Gentoo \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			 || die "econf carbon emacs failed"
-		make bootstrap || die "make carbon emacs bootstrap failed"
-	fi
-
-	econf --enable-debug \
-		--program-suffix=.emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	make bootstrap || die "make emacs bootstrap failed"
-}
-
-src_install () {
-	# make DESTDIR=${D} install doesn't work
-	einstall || die "einstall 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
-			gzip -9 ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-	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
-
-#	if use source; then
-#		insinto /usr/share/emacs/${SLOT}/src
-#		# This is not mean to install all the source -- just the
-#		# source you might find via find-function
-#		doins src/*.[ch]
-# #		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
-# # (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src")
-# # EOF
-# #		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el || die # need to move outside of NNfoo-gentoo.el for different versions (site-lisp is shared)
-#	fi
-
-	dodoc BUGS ChangeLog README
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${DFILE}
-}
-
-update-alternatives() {
-	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
-}
-
-pkg_postinst() {
-	use ppc-macos || update-alternatives
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild
deleted file mode 100644
index fc51cf38b307..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2006 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.50-r2.ebuild,v 1.4 2006/06/26 22:21:03 flameeyes Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff"
-# IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff xft source"
-
-S=${WORKDIR}/emacs
-
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-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-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	sys-libs/zlib
-	>=sys-apps/portage-2.0.51_rc1"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.50"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
-
-DFILE=emacs-${SLOT}.desktop
-
-# pkg_setup() {
-#	if use xft; then
-#		while read line; do ewarn "${line}"; done <<EOF
-
-# You have chosen to build Emacs using the XFT_JHD_BRANCH.	The
-# XFT_JHD_BRANCH is very early work towards supporting XFT in Emacs.
-# Emerging app-editors/emacs-cvs was risky enough, trying out the
-# XFT_JHD_BRANCH branch for XFT support even more so!
-
-# EOF
-#		ebeep
-#	fi
-# }
-
-src_unpack() {
-#	if use xft; then
-#		ECVS_BRANCH=XFT_JHD_BRANCH
-#	else
-#		ECVS_BRANCH=HEAD
-#	fi
-	cvs_src_unpack
-	cd ${S};
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
-#	if use xft; then
-#		epatch ${FILESDIR}/xft-invertcursor.patch
-#		epatch ${FILESDIR}/xft-bgalpha.patch
-#		epatch ${FILESDIR}/xft-xfaces-fixcrash.patch
-#	fi
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-
-	# no flag is allowed
-	ALLOWED_FLAGS=" "
-	strip-flags
-	unset LDFLAGS
-
-	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 --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"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		fi
-#		if use xft; then
-#			# this is only relevant when the source is patched for XFT
-#			# support, so it must remain within this if/then block
-#			myconf="${myconf} $(use_with xft)"
-#		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"
-		make bootstrap || die "make carbon emacs bootstrap failed"
-	fi
-
-	econf \
-		--program-suffix=.emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	make bootstrap || die "make emacs bootstrap failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	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
-			gzip -9 ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-	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
-
-#	if use source; then
-#		insinto /usr/share/emacs/${SLOT}/src
-#		# This is not mean to install all the source -- just the
-#		# source you might find via find-function
-#		doins src/*.[ch]
-# #		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
-# # (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src")
-# # EOF
-# #		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el || die # need to move outside of NNfoo-gentoo.el for different versions (site-lisp is shared)
-#	fi
-
-	dodoc BUGS ChangeLog README
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${DFILE}
-}
-
-update-alternatives() {
-	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
-}
-
-pkg_postinst() {
-	use ppc-macos || update-alternatives
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild
deleted file mode 100644
index 1af9929ee892..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2006 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.50-r3.ebuild,v 1.4 2006/08/23 03:59:11 mkennedy Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source gzip-el toolkit-scroll-bars"
-
-S=${WORKDIR}/emacs
-
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-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-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	sys-libs/zlib
-	>=sys-apps/portage-2.0.51_rc1"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.50"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-	cvs_src_unpack
-	cd ${S};
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
-}
-
-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"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		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"
-		make bootstrap || die "make carbon emacs bootstrap failed"
-	fi
-	econf \
-		--program-suffix=.emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-	make bootstrap || die "make emacs bootstrap failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	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
-			gzip -9 ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-	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
-
-	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
-
-	if ! use gzip-el; then
-		find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
-	fi
-	dodoc BUGS ChangeLog README
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${DFILE}
-}
-
-update-alternatives() {
-	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
-}
-
-pkg_postinst() {
-	use ppc-macos || update-alternatives
-	elisp-site-regen
-	if use X; then
-		while read line; do einfo "${line}"; done<<'EOF'
-
-You need to install some fonts for Emacs.  Under monolithic
-XFree86/Xorg you typically had such fonts installed by default.	 With
-modular Xorg, you will have to perform this step yourself.
-
-Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
-Emacs requirements under X11.
-
-EOF
-	fi
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.90.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.90.ebuild
deleted file mode 100644
index 4391ca491b0c..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.90.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2006 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.90.ebuild,v 1.2 2006/10/30 00:10:19 mkennedy Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source gzip-el toolkit-scroll-bars"
-
-S=${WORKDIR}/emacs
-
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-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-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	sys-libs/zlib
-	>=sys-apps/portage-2.0.51_rc1"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.90"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-	cvs_src_unpack
-	cd ${S};
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
-}
-
-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"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		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"
-		make bootstrap || die "make carbon emacs bootstrap failed"
-	else
-		econf \
-			--program-suffix=.emacs-${SLOT} \
-			--without-carbon \
-			${myconf} || die "econf emacs failed"
-		make bootstrap || die "make emacs bootstrap failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	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
-			gzip -9 ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-	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
-
-	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
-
-	if ! use gzip-el; then
-		find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
-	fi
-	dodoc BUGS ChangeLog README
-	insinto /usr/share/applications
-	cp ${FILESDIR}/emacs.desktop.in ${DFILE}
-	sed -i -e "s,@PV@,${SLOT},g" ${DFILE}
-	doins ${DFILE}
-}
-
-update-alternatives() {
-	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
-}
-
-pkg_postinst() {
-	use ppc-macos || update-alternatives
-	elisp-site-regen
-	if use X; then
-		while read line; do einfo "${line}"; done<<'EOF'
-
-You need to install some fonts for Emacs.  Under monolithic
-XFree86/Xorg you typically had such fonts installed by default.	 With
-modular Xorg, you will have to perform this step yourself.
-
-Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
-Emacs requirements under X11.
-
-EOF
-	fi
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
deleted file mode 100644
index 849bb8496133..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.10 2006/08/23 03:59:11 mkennedy Exp $
-
-ECVS_AUTH="pserver"
-export CVS_RSH="ssh"
-ECVS_SERVER="cvs.savannah.gnu.org:/cvsroot/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="emacs-unicode-2"
-ECVS_USER="anonymous"
-#ECVS_PASS=""
-ECVS_CVS_OPTIONS="-dP"
-ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0="
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua gif gnome gtk jpeg nls png spell tiff xft toolkit-scroll-bars"
-
-S=${WORKDIR}/${ECVS_MODULE}
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-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-5.3
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
-		jpeg? ( >=media-libs/jpeg-6b )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		png? ( >=media-libs/libpng-1.2.5 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		gnome? ( gnome-base/gnome-desktop )
-		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) )
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	>=sys-apps/portage-2.0.51_rc1"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="23.0.0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_compile() {
-
-	# no flag is allowed
-	ALLOWED_FLAGS=" "
-	strip-flags
-	unset LDFLAGS
-
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
-
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} --with-xpm $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_enable xft font-backend)"
-		myconf="${myconf} $(use_with xft freetype)"
-		myconf="${myconf} $(use_with xft)"
-		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 support"
-			myconf="${myconf} --with-x-toolkit=athena"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		fi
-	fi
-
-	if use aqua ; then
-		einfo "Configuring to build with Carbon Emacs"
-		econf --enable-debug \
-			--enable-carbon-app=/Applications/Gentoo \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			$(use_enable xft font-backend) \
-			 || die "econf carbon emacs failed"
-		make bootstrap || die "make carbon emacs bootstrap failed"
-	fi
-
-	econf --enable-debug \
-		--program-suffix=.emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	make bootstrap || die "make emacs bootstrap failed"
-}
-
-src_install () {
-	# make DESTDIR=${D} install doesn't work
-	einstall || die "einstall 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
-			gzip -9 ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT} || die
-
-	einfo "Fixing manpages..."
-	for m in  ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
-	done
-
-	dodoc BUGS ChangeLog ChangeLog.unicode README README.unicode
-
-	if use gnome; then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/${DFILE} || die "install desktop file failed"
-	fi
-}
-
-update-alternatives() {
-	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
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use ppc-macos || update-alternatives
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use ppc-macos || update-alternatives
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
deleted file mode 100644
index e69de29bb2d1..000000000000