Remove old.

Package-Manager: portage-2.1.4_rc4

6 files changed, 19 insertions, 471 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 36c241235662..d87c56e3e189 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.217 2007/11/28 19:38:23 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.218 2007/11/28 21:49:35 ulm Exp $
+
+  28 Nov 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r13.ebuild,
+  -emacs-22.1-r2.ebuild:
+  Remove old.
 
   28 Nov 2007; <welp@gentoo.org> emacs-21.4-r14.ebuild,
   emacs-22.1-r3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ec21a2b2a2cc..7af87263817d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
 MD5 8a440640bcaf8056c90863ec16dd1c93 files/emacs-22.1-Xaw3d-headers.patch 4736
 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 files/emacs-22.1-Xaw3d-headers.patch 4736
@@ -32,7 +35,6 @@ DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc
 DIST emacs-21-files.tar.bz2 900 RMD160 71b4a7b6d6b2f47a087fdb54381513b82fb97411 SHA1 04d909e88eb56378d09e6c10ed21e22c01525609 SHA256 3d7c5b2ca8b11d3cd2dd9ea22b90867471de34552e4d1bae11206d18031f6ab2
 DIST emacs-21-patches.tar.bz2 8891 RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f SHA1 592c47434288a5c3672110acf4f36ab2072c19ae SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914
 DIST emacs-21.4-patches-1.tar.bz2 9598 RMD160 a838e9d49fbc23e2c7f000a96fca06f0e347ab47 SHA1 ef15a55f94fc01e99cc386273bebdfe363efe15c SHA256 75c8a3d9f420e9ab3f426b39b0f73299a22d399415cbd4190dfda63b6e65f3a1
-DIST emacs-21.4-patches.tar.bz2 9434 RMD160 fe05c6a0fd8b7c8d610d8992e8125446926f750e SHA1 81fe49207325c867a7184b23ad6976e6720e1bb4 SHA256 238986441bec629ffd810a74700b2c8276e4b1e42a71fa614a9f2eab839d6ca3
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
@@ -44,10 +46,6 @@ EBUILD emacs-21.4-r12.ebuild 6197 RMD160 14e47c68a83aea84a78facf0f9470e060813880
 MD5 948b86edf3b321171e2af56aa0f75b0f emacs-21.4-r12.ebuild 6197
 RMD160 14e47c68a83aea84a78facf0f9470e0608138809 emacs-21.4-r12.ebuild 6197
 SHA256 263dbcd2ecc9d4557dc214418df3aee459013724854ff7301f8fb2e692a71501 emacs-21.4-r12.ebuild 6197
-EBUILD emacs-21.4-r13.ebuild 5558 RMD160 ec9ede8479a4f6f72cecbe27215b6b04e707bcbd SHA1 84aa321d5225b95e606e9178573b52d3d3661925 SHA256 cc71a272dc0c7ca22ae9d26cc1b993fbdfeba60ce8f27978829a8d041b65c3eb
-MD5 e53689f8ee6aa1725ee32feca5bb9eac emacs-21.4-r13.ebuild 5558
-RMD160 ec9ede8479a4f6f72cecbe27215b6b04e707bcbd emacs-21.4-r13.ebuild 5558
-SHA256 cc71a272dc0c7ca22ae9d26cc1b993fbdfeba60ce8f27978829a8d041b65c3eb emacs-21.4-r13.ebuild 5558
 EBUILD emacs-21.4-r14.ebuild 5561 RMD160 952167dfe5e13168de061b13628dd0dda730b963 SHA1 ff73812f1be9f6d39d7113d7d6306c75433b0b3d SHA256 4dfe806389f333e551dfcd837f685b95be0daba4a8b4acac8368fe55b2d8d88f
 MD5 0d4caf92d6b1930956d8d334bf7e5929 emacs-21.4-r14.ebuild 5561
 RMD160 952167dfe5e13168de061b13628dd0dda730b963 emacs-21.4-r14.ebuild 5561
@@ -60,18 +58,14 @@ EBUILD emacs-21.4-r8.ebuild 5760 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e
 MD5 3a3e7463c54cf97632b5cd1ae7c93d02 emacs-21.4-r8.ebuild 5760
 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e emacs-21.4-r8.ebuild 5760
 SHA256 3effad0fa79294bf0d597159991c3bd1112689674e06f0c27e6b96f112a655c5 emacs-21.4-r8.ebuild 5760
-EBUILD emacs-22.1-r2.ebuild 7674 RMD160 60d836351fcd110e7654d59713179f8ebcfcdd5d SHA1 2c22cb0f15ad73cb8ee2b9324235511216552ebe SHA256 3735f7e0b8bb2540c7c20e9106ab61b5e6daabc47f8319064a7196935e11b706
-MD5 68f598626b6b7e839d959fff2ffc01e6 emacs-22.1-r2.ebuild 7674
-RMD160 60d836351fcd110e7654d59713179f8ebcfcdd5d emacs-22.1-r2.ebuild 7674
-SHA256 3735f7e0b8bb2540c7c20e9106ab61b5e6daabc47f8319064a7196935e11b706 emacs-22.1-r2.ebuild 7674
 EBUILD emacs-22.1-r3.ebuild 7789 RMD160 bab0323e3c0c85b259432163dca19946dde38f06 SHA1 09033873206a118e2026693056fb1217fa6a1555 SHA256 0dcec94b3159aeaa2dd756fcf480602d53f8fc36f8fd71a1e2584d1b436b6ca5
 MD5 7f471544c67cb9afe72826111790d074 emacs-22.1-r3.ebuild 7789
 RMD160 bab0323e3c0c85b259432163dca19946dde38f06 emacs-22.1-r3.ebuild 7789
 SHA256 0dcec94b3159aeaa2dd756fcf480602d53f8fc36f8fd71a1e2584d1b436b6ca5 emacs-22.1-r3.ebuild 7789
-MISC ChangeLog 32079 RMD160 9346ba8477e8d5d01242c48e3da228a118ec1f66 SHA1 14f0637f24dbff3c080e6112b04db56ecea0b078 SHA256 ab62b9064e61ecc30cfba89fba3aa740df2c6dc0d41be966271a931cda3f842a
-MD5 6cb70a57bedef40e8b4b96059d7b48a5 ChangeLog 32079
-RMD160 9346ba8477e8d5d01242c48e3da228a118ec1f66 ChangeLog 32079
-SHA256 ab62b9064e61ecc30cfba89fba3aa740df2c6dc0d41be966271a931cda3f842a ChangeLog 32079
+MISC ChangeLog 32189 RMD160 28986c36c1de8d0301d61a1449fe75485b9f98e6 SHA1 dfcc35e69f8d902fa9258a9436dc630e0cc5403b SHA256 1d576e45c8e4555351114360abf4a7719d43b13fafc4bc34dd417ba57276a2de
+MD5 59b0f534f1d8a4592677523fddaa0b11 ChangeLog 32189
+RMD160 28986c36c1de8d0301d61a1449fe75485b9f98e6 ChangeLog 32189
+SHA256 1d576e45c8e4555351114360abf4a7719d43b13fafc4bc34dd417ba57276a2de ChangeLog 32189
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -82,9 +76,6 @@ SHA256 f7d4b9ed47bcd2d99200e2174e011edfd6b8b0bf30965823409bceede6353da1 files/di
 MD5 468a3477927c6638fd0c62ac262de2ec files/digest-emacs-21.4-r12 720
 RMD160 b0ca2d4dd576d4e81ebffdba3f7abe36980d9707 files/digest-emacs-21.4-r12 720
 SHA256 92435bb0f281ed6635d5c18928331c73fcfac2ab62762eb8aa88275a0a7fe4db files/digest-emacs-21.4-r12 720
-MD5 e0499fcca7b5a9c46b70ebc1b81a2b6c files/digest-emacs-21.4-r13 726
-RMD160 acf9851c610825aaa83316151398c141266073b3 files/digest-emacs-21.4-r13 726
-SHA256 a8da1c47d6b3fe196f74db410b6bbfbd96ddb1eb2c2c360fc04bd4eff457ec71 files/digest-emacs-21.4-r13 726
 MD5 50e6f1905f9ccf5d52888c5e338f200a files/digest-emacs-21.4-r14 732
 RMD160 f76a8752d2842c86f4f25ddb3229ba9abb61bebb files/digest-emacs-21.4-r14 732
 SHA256 4c8798c4118a57e1895e18f6fd9ac27fdad6ff1e93aa75147d954b8c8793dd61 files/digest-emacs-21.4-r14 732
@@ -94,9 +85,13 @@ SHA256 f982f9350410ec80f097275982dc87df4f0d4bec244378e9fd9be5c5c69bf5bc files/di
 MD5 83632aac65f7a273244d059fe1078245 files/digest-emacs-21.4-r8 958
 RMD160 5978e60fdbe353bdc3e07f3568fcb0c281b4a46b files/digest-emacs-21.4-r8 958
 SHA256 f982f9350410ec80f097275982dc87df4f0d4bec244378e9fd9be5c5c69bf5bc files/digest-emacs-21.4-r8 958
-MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1-r2 238
-RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1-r2 238
-SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1-r2 238
 MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1-r3 238
 RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1-r3 238
 SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1-r3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHTeKMOeoy/oIi7uwRAjciAKCC70eFhIAULxf4ycy67AEYacy+/wCgx1as
+jBst876stluPQXKYlZ+cmN4=
+=Vxvt
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r13.ebuild b/app-editors/emacs/emacs-21.4-r13.ebuild
deleted file mode 100644
index a7df8a2ca756..000000000000
--- a/app-editors/emacs/emacs-21.4-r13.ebuild
+++ /dev/null
@@ -1,194 +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/emacs-21.4-r13.ebuild,v 1.9 2007/11/17 23:15:40 ulm Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic eutils toolchain-funcs autotools
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 FDL-1.1 BSD"
-SLOT="21"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim lesstif motif nls sendmail"
-
-RDEPEND="sys-libs/ncurses
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-misc/emacs-desktop
-		>=media-libs/giflib-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		Xaw3d? ( x11-libs/Xaw3d )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 )
-		)
-	)
-	sendmail? ( virtual/mta )
-	>=app-admin/eselect-emacs-0.7-r1"
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/xbitmaps )"
-
-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"
-
-	EPATCH_SUFFIX=patch epatch
-
-	# install emacsclient.1 man page (#165466)
-	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
-
-	# This will need to be updated for X-Compilation
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		"${S}/src/s/gnu-linux.h" || die
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
-	unset LDFLAGS
-
-	# ever since GCC 3.2
-	replace-flags -O[3-9] -O2
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	eautoconf
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		if use motif && use lesstif; then
-			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			append-cppflags -I/usr/X11R6/include/lesstif
-		fi
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-		if use Xaw3d ; then
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die "econf failed"
-	emake CC="$(tc-getCC)" || die "emake failed"
-
-	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die "emake recompile failed"
-	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)" || die "die emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	for i in "${D}"/usr/bin/* ; do
-		mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
-	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
-
-	einfo "Fixing info documentation..."
-	mkdir "${T}/emacs-${SLOT}"
-	mv "${D}/usr/share/info/dir" "${T}"
-	for i in "${D}"/usr/share/info/*
-	do
-		mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info
-	done
-	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
-	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
-
-	einfo "Fixing manpages..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv ${m} failed"
-	done
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	einfo "Fixing permissions..."
-	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
-	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-}
-
-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{/${PV},}/site-lisp/subdirs.el
-
-	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 sendmail && ! has_version "virtual/mta"; then
-		elog "You disabled sendmail support for Emacs. If you later install"
-		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
-	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
-}
-
-pkg_postrm() {
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs/emacs-22.1-r2.ebuild b/app-editors/emacs/emacs-22.1-r2.ebuild
deleted file mode 100644
index 6de51dd25d76..000000000000
--- a/app-editors/emacs/emacs-22.1-r2.ebuild
+++ /dev/null
@@ -1,245 +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/emacs-22.1-r2.ebuild,v 1.7 2007/11/22 21:57:27 ulm Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="latest"
-
-inherit autotools 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="mirror://gnu/emacs/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2 BSD"
-SLOT="22"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg 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="!<app-editors/emacs-cvs-22.1
-	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-libs/alsa-lib )
-	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? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-# 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}"
-
-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}/${P}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
-	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
-	epatch "${FILESDIR}/${P}-backup-buffer.patch"
-	epatch "${FILESDIR}/${P}-hack-local-variables.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${P}-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
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		myconf="${myconf} $(use_with xpm)"
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		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
-
-	myconf="${myconf} $(use_with hesiod)"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--infodir=/usr/share/info/emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" || die "emake failed"
-
-	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die "emake recompile failed"
-	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)" || die "emake 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
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(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
-
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e ${f} || touch ${f}
-	done
-
-	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, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r13 b/app-editors/emacs/files/digest-emacs-21.4-r13
deleted file mode 100644
index 7d6b52b2661a..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4-r13
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 60faa533ebb78effdc963820ce4ed331 emacs-21.4-patches.tar.bz2 9434
-RMD160 fe05c6a0fd8b7c8d610d8992e8125446926f750e emacs-21.4-patches.tar.bz2 9434
-SHA256 238986441bec629ffd810a74700b2c8276e4b1e42a71fa614a9f2eab839d6ca3 emacs-21.4-patches.tar.bz2 9434
-MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
-RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
-SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
-MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
-RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
-SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433
diff --git a/app-editors/emacs/files/digest-emacs-22.1-r2 b/app-editors/emacs/files/digest-emacs-22.1-r2
deleted file mode 100644
index 44943fdbcd94..000000000000
--- a/app-editors/emacs/files/digest-emacs-22.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6949df37caec2d7a2e0eee3f1b422726 emacs-22.1.tar.gz 38172226
-RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 emacs-22.1.tar.gz 38172226
-SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 emacs-22.1.tar.gz 38172226