clean up old versions

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

9 files changed, 4 insertions, 685 deletions

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a2c15fffcbc3..3ad6b945578c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
@@ -54,29 +51,10 @@ MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
 SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/emacs-subdirs-el-gentoo.diff 1369
 DIST emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653
-DIST emacs-18.59-gentoo.tar.gz 11526 RMD160 eae80651d4aae8c393e3fb08dadbcc01f5573cfb SHA256 41b181f7c5c7644258fd9a2c22d81ea9389728f7ac01fb944576b505124c25a3
-DIST emacs-18.59-linux22x-elf-glibc2.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
-DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.0.50-20050225.tar.gz 33383930 RMD160 cf882d823cc2ac75b3bcacd83f73654fc05ccb0b SHA1 d258a6d3849d5f0010ad476ae6400ce9e4c7ebaa SHA256 e132ac3975a04f42e810e762283953bfe48eeb7ecafcc56f78ad32b777dbee7f
 DIST inline_patch-20041229.tar.gz 7047
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59.ebuild 1952 RMD160 6416a30158a3eecc8d458d3e4858cea2354f3c45 SHA1 ca1fd0c092e7377cc19da3a28f358f918135fbc4 SHA256 9f833b5b6ecefd5b402b7002b699fef4f35f361610a7f67578c91771c7cfb06b
-MD5 e256337ccf7d47ff464ed060f29383b2 emacs-18.59.ebuild 1952
-RMD160 6416a30158a3eecc8d458d3e4858cea2354f3c45 emacs-18.59.ebuild 1952
-SHA256 9f833b5b6ecefd5b402b7002b699fef4f35f361610a7f67578c91771c7cfb06b emacs-18.59.ebuild 1952
-EBUILD emacs-21.4-r1.ebuild 4684 RMD160 bac6fef1d36f03e9941e1bde5660ece2afadb729 SHA1 97df96eea718a6df449e2e0ac73b73dcb07c2219 SHA256 3964d2511a262b9f908b0b4af7d5143e9ba3b627922d045be3ab89b975f9c4aa
-MD5 5c875ab13297dfc0030f9cf2b9cb714b emacs-21.4-r1.ebuild 4684
-RMD160 bac6fef1d36f03e9941e1bde5660ece2afadb729 emacs-21.4-r1.ebuild 4684
-SHA256 3964d2511a262b9f908b0b4af7d5143e9ba3b627922d045be3ab89b975f9c4aa emacs-21.4-r1.ebuild 4684
-EBUILD emacs-21.4-r2.ebuild 4684 RMD160 51c191441229cd0eec392290576bdcd4b0978217 SHA1 2cbacbbb9eee0d1f52c129174914c2421caac4dd SHA256 611f6ddb08720c94d8b095305a016f19dce92fcacd622a3e66f6ac9b6370bcf4
-MD5 9fb84012af2dd7ac7cae86c2619ed8d0 emacs-21.4-r2.ebuild 4684
-RMD160 51c191441229cd0eec392290576bdcd4b0978217 emacs-21.4-r2.ebuild 4684
-SHA256 611f6ddb08720c94d8b095305a016f19dce92fcacd622a3e66f6ac9b6370bcf4 emacs-21.4-r2.ebuild 4684
-EBUILD emacs-21.4-r3.ebuild 4620 RMD160 3498c949e653969c42fd806550d7ac7cb81fe24e SHA1 f1c5f89dcfa540fcba39cd6d9ac4e29d60dd409c SHA256 c7bc8770b5f0ef11f84d512b67664899661e120759d028981443909142e11fa5
-MD5 58e5c3fa6da72afdba82c5bf69c7d422 emacs-21.4-r3.ebuild 4620
-RMD160 3498c949e653969c42fd806550d7ac7cb81fe24e emacs-21.4-r3.ebuild 4620
-SHA256 c7bc8770b5f0ef11f84d512b67664899661e120759d028981443909142e11fa5 emacs-21.4-r3.ebuild 4620
 EBUILD emacs-21.4-r4.ebuild 4492 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 SHA1 fbcb530b08adec024137267b802ea9497e8f7204 SHA256 3914a526e5560e54fd0d670f190b4032f701aa46200570279f100a38841fcb4e
 MD5 317bcb60bc1061bf3794a1a993730405 emacs-21.4-r4.ebuild 4492
 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 emacs-21.4-r4.ebuild 4492
@@ -89,26 +67,14 @@ EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb49469
 MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557
 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557
 SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557
-MISC ChangeLog 15848 RMD160 be586d5b26d1b54b988bc18bc90358ce2c56527a SHA1 eceeaaac5d8b2a5cafaecdad1dbede04129cd416 SHA256 9b89bcf526def964c0b48038fea4485ecf375b4b97fa287a60cad694fe338fc6
-MD5 d7f9d659df256b659b766362943d9f7f ChangeLog 15848
-RMD160 be586d5b26d1b54b988bc18bc90358ce2c56527a ChangeLog 15848
-SHA256 9b89bcf526def964c0b48038fea4485ecf375b4b97fa287a60cad694fe338fc6 ChangeLog 15848
+MISC ChangeLog 16020 RMD160 4a9d2f84cdcf2767542e7a0a65c9ed266d44a1a5 SHA1 91da0f99540bed07c9849f2c07f94aee6c39e8b0 SHA256 ef4a2a6d1df4dfd30b3544c4607408b6650d10276e30d35d0195ca3f8b6d18ad
+MD5 9dcfc5fdffb71e0d78d03dbfbaa64787 ChangeLog 16020
+RMD160 4a9d2f84cdcf2767542e7a0a65c9ed266d44a1a5 ChangeLog 16020
+SHA256 ef4a2a6d1df4dfd30b3544c4607408b6650d10276e30d35d0195ca3f8b6d18ad ChangeLog 16020
 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 605806a42f0c5e7a8d89d8f493dcdf74 files/digest-emacs-18.59 786
-RMD160 eda5bd937705eb3474a2b57755cdfc03e78ceada files/digest-emacs-18.59 786
-SHA256 c215b055ee36fe3a75aefab41cec93eeeb6c75b1185bddbfa7f902d33f84d1c9 files/digest-emacs-18.59 786
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r1 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r1 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r1 473
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r2 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r2 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r2 473
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r3 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r3 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r3 473
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r4 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r4 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r4 473
@@ -118,10 +84,3 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 MD5 56b020a4e966468679ce67d99479c7f7 files/digest-emacs-22.0.50_pre20050225 440
 RMD160 bd1c85e484649b0f59d8e862c56464ca05d82540 files/digest-emacs-22.0.50_pre20050225 440
 SHA256 263c0f93c22b5467286e5ff0054a83697b60e25ea6e3c44f38ce61fa181d97b6 files/digest-emacs-22.0.50_pre20050225 440
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFaXoNNQqtfCuFneMRAvyUAJ94VYSXfHFO1UX8M9GvWIDlujsXBQCfVwfF
-FQrKkEGW8AUCRLP4T7/VpdI=
-=2nNo
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59.ebuild b/app-editors/emacs/emacs-18.59.ebuild
deleted file mode 100644
index 22d3e79bc7ed..000000000000
--- a/app-editors/emacs/emacs-18.59.ebuild
+++ /dev/null
@@ -1,71 +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/emacs-18.59.ebuild,v 1.7 2006/02/27 19:37:06 mkennedy Exp $
-
-inherit eutils
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/patches/${P}-linux22x-elf-glibc2.diff.gz
-	mirror://gentoo/${P}-gentoo.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses
-	X? ( || ( x11-libs/libX11 virtual/x11 ) )"
-PROVIDE="virtual/editor"
-
-MY_BASEDIR="/usr/share/emacs/${PV}"
-MY_LOCKDIR="/var/lib/emacs/lock"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${P}-linux22x-elf-glibc2.diff
-	epatch ${P}-unexelf.patch
-	epatch ${P}-gentoo.patch
-	epatch ${P}-gcc-gentoo.patch
-}
-
-src_compile() {
-	SANDBOX_ON=0
-
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		x86)   arch=intel386 ;;
-		*)	   die "Architecture ${ARCH} not supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "${MY_BASEDIR}/lisp"
-		#define PATH_EXEC "${MY_BASEDIR}/etc"
-		#define PATH_LOCK "${MY_LOCKDIR}/"
-		#define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!"
-	END
-
-	emake -j1 || die
-}
-
-src_install() {
-	dodir ${MY_BASEDIR}
-	dodir /usr/share/man/man1
-	make install LIBDIR=${D}${MY_BASEDIR} BINDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man/man1 || die
-	chmod -R go-w ${D}${MY_BASEDIR}
-	rmdir ${D}${MY_BASEDIR}/lock
-
-	dodir ${MY_LOCKDIR%/*}
-	diropts -m0777
-	dodir ${MY_LOCKDIR}
-	keepdir ${MY_LOCKDIR}
-
-	for file in ${D}/usr/bin/*; do mv ${file} ${file}-${PV}; done
-	mv ${D}/usr/share/man/man1/emacs.1 ${D}/usr/share/man/man1/emacs-${PV}.1
-}
diff --git a/app-editors/emacs/emacs-21.4-r1.ebuild b/app-editors/emacs/emacs-21.4-r1.ebuild
deleted file mode 100644
index 1f5a0e7c4f8b..000000000000
--- a/app-editors/emacs/emacs-21.4-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.17 2005/12/12 03:52:00 spyderous Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86"
-IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( || ( ( x11-libs/libXext
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXmu
-				x11-libs/libXpm
-				|| ( media-fonts/font-adobe-100dpi
-					media-fonts/font-adobe-75dpi )
-			)
-			virtual/x11
-		)
-		>=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
-		!arm? (
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-		gnome? ( gnome-base/gnome-desktop )
-		)
-	)
-	nls? ( sys-devel/gettext )
-	!nosendmail? ( virtual/mta )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
-
-PROVIDE="virtual/emacs virtual/editor"
-SANDBOX_DISABLED="1"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/emacs-21.3-xorg.patch
-	epatch ${FILESDIR}/emacs-21.3-amd64.patch
-	epatch ${FILESDIR}/emacs-21.3-hppa.patch
-	epatch ${FILESDIR}/emacs-21.2-sh.patch
-	use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch
-
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-
-	# 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
-
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die
-}
-
-src_compile() {
-
-	# -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
-
-	# gcc 3.4 with -O3 or stronger flag spoils emacs
-	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	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
-			export CPPFLAGS="${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
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	einstall || die
-	for i in ${D}/usr/bin/* ; do
-		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/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
-		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
-	done
-	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
-	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
-
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${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
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome ; then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/${DFILE}
-	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() {
-	update-alternatives
-	if use nosendmail ; then
-	ewarn
-	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
-	ewarn "you need to recompile Emacs after that. See bug #11104."
-	ewarn
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-}
diff --git a/app-editors/emacs/emacs-21.4-r2.ebuild b/app-editors/emacs/emacs-21.4-r2.ebuild
deleted file mode 100644
index bd5ecae540db..000000000000
--- a/app-editors/emacs/emacs-21.4-r2.ebuild
+++ /dev/null
@@ -1,182 +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/emacs-21.4-r2.ebuild,v 1.5 2006/03/05 22:11:02 josejx Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( || ( ( x11-libs/libXext
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXmu
-				x11-libs/libXpm
-				|| ( media-fonts/font-adobe-100dpi
-					media-fonts/font-adobe-75dpi )
-			)
-			virtual/x11
-		)
-		>=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
-		!arm? (
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-		gnome? ( gnome-base/gnome-desktop )
-		)
-	)
-	nls? ( sys-devel/gettext )
-	!nosendmail? ( virtual/mta )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/emacs-21.3-xorg.patch
-	epatch ${FILESDIR}/emacs-21.3-amd64.patch
-	epatch ${FILESDIR}/emacs-21.3-hppa.patch
-	epatch ${FILESDIR}/emacs-21.2-sh.patch
-	use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch
-
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-
-	# 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
-
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || 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
-
-	# gcc 3.4 with -O3 or stronger flag spoils emacs
-	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	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
-			export CPPFLAGS="${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
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	einstall || die
-	for i in ${D}/usr/bin/* ; do
-		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/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
-		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
-	done
-	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
-	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
-
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${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
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome ; then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/${DFILE}
-	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() {
-	update-alternatives
-	if use nosendmail ; then
-	ewarn
-	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
-	ewarn "you need to recompile Emacs after that. See bug #11104."
-	ewarn
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-}
diff --git a/app-editors/emacs/emacs-21.4-r3.ebuild b/app-editors/emacs/emacs-21.4-r3.ebuild
deleted file mode 100644
index 9ecb645e2210..000000000000
--- a/app-editors/emacs/emacs-21.4-r3.ebuild
+++ /dev/null
@@ -1,179 +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/emacs-21.4-r3.ebuild,v 1.11 2006/05/03 11:38:15 flameeyes Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim lesstif motif nls nosendmail"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/gdbm
-	X? ( || ( ( x11-libs/libXext
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXmu
-				x11-libs/libXpm
-				|| ( media-fonts/font-adobe-100dpi
-					media-fonts/font-adobe-75dpi )
-			)
-			virtual/x11
-		)
-		>=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
-		!arm? (
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
-		motif? (
-			lesstif? ( x11-libs/lesstif )
-			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-		)
-	)
-	nls? ( sys-devel/gettext )
-	!nosendmail? ( virtual/mta )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/emacs-21.3-xorg.patch
-	epatch ${FILESDIR}/emacs-21.3-amd64.patch
-	epatch ${FILESDIR}/emacs-21.3-hppa.patch
-	epatch ${FILESDIR}/emacs-21.2-sh.patch
-	use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch
-
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-
-	# 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
-
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || 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
-
-	# gcc 3.4 with -O3 or stronger flag spoils emacs
-	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	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
-			export CPPFLAGS="${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
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	einstall || die
-	for i in ${D}/usr/bin/* ; do
-		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/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
-		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
-	done
-	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
-	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
-
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${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
-
-	einfo "Fixing permissions..."
-	find ${D} -perm 664 |xargs chmod 644
-	find ${D} -type d |xargs chmod 755
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	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() {
-	update-alternatives
-	if use nosendmail ; then
-	ewarn
-	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
-	ewarn "you need to recompile Emacs after that. See bug #11104."
-	ewarn
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-}
diff --git a/app-editors/emacs/files/digest-emacs-18.59 b/app-editors/emacs/files/digest-emacs-18.59
deleted file mode 100644
index 653b007e2e20..000000000000
--- a/app-editors/emacs/files/digest-emacs-18.59
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 13cde90d997b3c4611c57f11e16961e9 emacs-18.59-gentoo.tar.gz 11526
-RMD160 eae80651d4aae8c393e3fb08dadbcc01f5573cfb emacs-18.59-gentoo.tar.gz 11526
-SHA256 41b181f7c5c7644258fd9a2c22d81ea9389728f7ac01fb944576b505124c25a3 emacs-18.59-gentoo.tar.gz 11526
-MD5 a7a4ed051dc232cdc9cf37208135302a emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
-RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
-SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd emacs-18.59-linux22x-elf-glibc2.diff.gz 15671
-MD5 ca57ae095ef098faca135bca736e1ca8 emacs-18.59.tar.gz 2962652
-RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc emacs-18.59.tar.gz 2962652
-SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e emacs-18.59.tar.gz 2962652
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r1 b/app-editors/emacs/files/digest-emacs-21.4-r1
deleted file mode 100644
index 6898ecff2a12..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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-21.4-r2 b/app-editors/emacs/files/digest-emacs-21.4-r2
deleted file mode 100644
index 6898ecff2a12..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-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-21.4-r3 b/app-editors/emacs/files/digest-emacs-21.4-r3
deleted file mode 100644
index 6898ecff2a12..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-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