add a check for uncompressed man pages and clean up

Package-Manager: portage-2.1.1-r2

8 files changed, 26 insertions, 656 deletions

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 94a3c4d6ba41..272de60932ee 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -34,43 +34,29 @@ 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.93.tar.gz 37118034 RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 SHA1 1c226f1c03e33fef66b759e6afd6eb580adc948b SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
-EBUILD emacs-cvs-22.0.93-r1.ebuild 6264 RMD160 d633cd26aeca7969398afd0dd375d63cfe8f832c SHA1 3659df3eb0bdd995e66f800d49ee76cb4597538a SHA256 c95efc6ed9616a60d9646b1fe5e01829361ace3ee97214f97f5c9dce44fc8a8a
-MD5 26396a88a288a60876fc61d051f2a56b emacs-cvs-22.0.93-r1.ebuild 6264
-RMD160 d633cd26aeca7969398afd0dd375d63cfe8f832c emacs-cvs-22.0.93-r1.ebuild 6264
-SHA256 c95efc6ed9616a60d9646b1fe5e01829361ace3ee97214f97f5c9dce44fc8a8a emacs-cvs-22.0.93-r1.ebuild 6264
-EBUILD emacs-cvs-22.0.93-r2.ebuild 6682 RMD160 65e645eeed2ce6751a0ec90ca5ad398a6eed653b SHA1 2039cc4b6602c38062719a6eb3cd10f82ab8b4fd SHA256 6272b62261eba38913ad25bc645ce5ce51119f354a24657402b9cd4ce4b4fb8c
-MD5 38a8097db31f840f4195f079ffd90587 emacs-cvs-22.0.93-r2.ebuild 6682
-RMD160 65e645eeed2ce6751a0ec90ca5ad398a6eed653b emacs-cvs-22.0.93-r2.ebuild 6682
-SHA256 6272b62261eba38913ad25bc645ce5ce51119f354a24657402b9cd4ce4b4fb8c emacs-cvs-22.0.93-r2.ebuild 6682
-EBUILD emacs-cvs-22.0.9999-r1.ebuild 6320 RMD160 8c9a94f0374d60318e4f2e5f6d5dcb38b0e52df0 SHA1 9759c6aac3e10b2483ac1bd73c368956a8c0672f SHA256 ffc23d2bed42b79dbf62d95acaf186beec6640f024c1b55f3e1a5c9a212d367a
-MD5 d043eede4230334f40ce61e989f9eb4a emacs-cvs-22.0.9999-r1.ebuild 6320
-RMD160 8c9a94f0374d60318e4f2e5f6d5dcb38b0e52df0 emacs-cvs-22.0.9999-r1.ebuild 6320
-SHA256 ffc23d2bed42b79dbf62d95acaf186beec6640f024c1b55f3e1a5c9a212d367a emacs-cvs-22.0.9999-r1.ebuild 6320
-EBUILD emacs-cvs-22.0.9999-r2.ebuild 6739 RMD160 42396ccd49fccbbb2053e552505f18955709d22d SHA1 7ff9a453dad8945fb5df03890864f8ada24b4122 SHA256 9e63d1e320264e79cb9ff16755f52a80c71d626a77e8ded6fbc9ce9cd1d5af88
-MD5 0b35ba72a09eaf6243a4290974779d32 emacs-cvs-22.0.9999-r2.ebuild 6739
-RMD160 42396ccd49fccbbb2053e552505f18955709d22d emacs-cvs-22.0.9999-r2.ebuild 6739
-SHA256 9e63d1e320264e79cb9ff16755f52a80c71d626a77e8ded6fbc9ce9cd1d5af88 emacs-cvs-22.0.9999-r2.ebuild 6739
+EBUILD emacs-cvs-22.0.93-r2.ebuild 6723 RMD160 4e1a53af1bed8ca52462470fa12ff8caf77c8df8 SHA1 cec0bb3f1f7729477d4dc9bb2b970149afd39c3c SHA256 52a5a9867f24a8c8fcd2134245b42025555fcae0a643c297ecf674c02e3f17c1
+MD5 2ceb639f3d5e04268ae56ba13cd6a0db emacs-cvs-22.0.93-r2.ebuild 6723
+RMD160 4e1a53af1bed8ca52462470fa12ff8caf77c8df8 emacs-cvs-22.0.93-r2.ebuild 6723
+SHA256 52a5a9867f24a8c8fcd2134245b42025555fcae0a643c297ecf674c02e3f17c1 emacs-cvs-22.0.93-r2.ebuild 6723
+EBUILD emacs-cvs-22.0.9999-r2.ebuild 6780 RMD160 b8136e4ef9f26856824a9e02805005793a7b83fd SHA1 0b83092fcde1e5def0577a81df02a1a45fdfcc5d SHA256 68900827faa9b4e59fbbd52f4061baec582aa69bfe0fb44f74fe5ca0aa68913f
+MD5 dc19fee635a6539a61039da3bd149643 emacs-cvs-22.0.9999-r2.ebuild 6780
+RMD160 b8136e4ef9f26856824a9e02805005793a7b83fd emacs-cvs-22.0.9999-r2.ebuild 6780
+SHA256 68900827faa9b4e59fbbd52f4061baec582aa69bfe0fb44f74fe5ca0aa68913f emacs-cvs-22.0.9999-r2.ebuild 6780
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 SHA1 b816af746a3646a3ff5767db41f85cfc4a4b0117 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b
 MD5 61bac54173aa6dc34e29d7f75935ff36 emacs-cvs-23.0.0-r1.ebuild 5904
 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 emacs-cvs-23.0.0-r1.ebuild 5904
 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b emacs-cvs-23.0.0-r1.ebuild 5904
-MISC ChangeLog 14545 RMD160 a49f90e73e685bc845de9f2595f397619ecc0875 SHA1 6542351168e3e0628f4df40da81752d60d0711e1 SHA256 b06f516901f0d4dfba13e26f4f49bcd9820ee8a8011314b291e8283d3ec8299d
-MD5 07ed0283c9ff75ff0d5399f5f2591131 ChangeLog 14545
-RMD160 a49f90e73e685bc845de9f2595f397619ecc0875 ChangeLog 14545
-SHA256 b06f516901f0d4dfba13e26f4f49bcd9820ee8a8011314b291e8283d3ec8299d ChangeLog 14545
+MISC ChangeLog 14781 RMD160 89e06c8ea5ac46188b441bb6de7ff4e6ada5c9dc SHA1 1b4590a0fc71a5751ddcb68ef911601de26f2e3c SHA256 193f2c92f9a029eb32bf883cafa57d8a104f055f70becdfeb31e03b5c5fc9c30
+MD5 02c4aa8083f3b7faee395c1315132806 ChangeLog 14781
+RMD160 89e06c8ea5ac46188b441bb6de7ff4e6ada5c9dc ChangeLog 14781
+SHA256 193f2c92f9a029eb32bf883cafa57d8a104f055f70becdfeb31e03b5c5fc9c30 ChangeLog 14781
 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 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r1 247
-RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r1 247
-SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r1 247
 MD5 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r2 247
 RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r2 247
 SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r2 247
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999-r1 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999-r2 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999-r2 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999-r2 1
@@ -80,7 +66,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFxHAFNQqtfCuFneMRAju8AJ9HnJuk59/JWjfXSi0DDfnB584SqwCglEes
-Py5Na1pTPWrR108MRhNcaxo=
-=IJ4V
+iD8DBQFFxfRQNQqtfCuFneMRAuflAJ0XeKJI7DYCWVygZvB+ylxTuAfMzQCghlar
+pgt9NowOs5lDiyraVaHwUBc=
+=mwBJ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
deleted file mode 100644
index 6434a1756ee6..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r1.ebuild
+++ /dev/null
@@ -1,199 +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.93-r1.ebuild,v 1.5 2007/02/02 07:59:43 opfer Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit alternatives 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 aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell	source tiff	 toolkit-scroll-bars X Xaw3d "
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
-
-DEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	alsa? ( media-sound/alsa-headers )
-	gzip-el? ( app-arch/gzip  )
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.93"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-S="${WORKDIR}/emacs-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
-	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
-	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 "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} --with-xpm"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else use lesstif;
-			einfo "Configuring to build with lesstif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	if use aqua; then
-		einfo "Configuring to build with Carbon Emacs"
-		econf \
-			--enable-carbon-app=/Applications/Gentoo \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			 || die "econf carbon emacs failed"
-	else
-		econf \
-			--program-suffix=.emacs-${SLOT} \
-			--without-carbon \
-			${myconf} || die "econf emacs failed"
-	fi
-
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
-
-	if use aqua ; then
-		einfo "Installing Carbon Emacs..."
-		dodir /Applications/Gentoo/Emacs.app
-		pushd mac/Emacs.app
-		tar -chf - . | ( cd "${D}/Applications/Gentoo/Emacs.app"; tar -xf -)
-		popd
-	fi
-
-	# fix info documentation
-	einfo "Fixing info documentation..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	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
-
-	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png	editors
-}
-
-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
-
-	# ecompress from Portage 2.2.* does auto-compression
-	# which is not desired for the dir file, so remove it to
-	# let it be recreated
-	rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /dev/null
-
-
-	if use X; then
-		elog "You need to install some fonts for Emacs.	 Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
-		elog "Emacs requirements under X11."
-	fi
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild
deleted file mode 100644
index a8e994b1cc56..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r1.ebuild
+++ /dev/null
@@ -1,203 +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-r1.ebuild,v 1.7 2007/02/02 07:59:43 opfer Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit alternatives autotools cvs elisp-common	 eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gnome gtk gzip-el jpeg lesstif motif nls png spell	source tiff	 toolkit-scroll-bars X Xaw3d "
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
-
-DEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
-	X? ( gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	alsa? ( media-sound/alsa-headers )
-	gzip-el? ( app-arch/gzip  )
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.93"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-S="${WORKDIR}/emacs"
-
-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"
-	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 "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} --with-xpm"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else use lesstif;
-			einfo "Configuring to build with lesstif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	if use aqua; then
-		einfo "Configuring to build with Carbon Emacs"
-		econf \
-			--enable-carbon-app=/Applications/Gentoo \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			 || die "econf carbon emacs failed"
-	else
-		econf \
-			--program-suffix=.emacs-${SLOT} \
-			--without-carbon \
-			${myconf} || die "econf emacs failed"
-	fi
-
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
-
-	if use aqua ; then
-		einfo "Installing Carbon Emacs..."
-		dodir /Applications/Gentoo/Emacs.app
-		pushd mac/Emacs.app
-		tar -chf - . | ( cd "${D}/Applications/Gentoo/Emacs.app"; tar -xf -)
-		popd
-	fi
-
-	# fix info documentation
-	einfo "Fixing info documentation..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-		fi
-	done
-
-	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
-
-	make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png	editors
-}
-
-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
-
-	# ecompress from Portage 2.2.* does auto-compression
-	# which is not desired for the dir file, so remove it to
-	# let it be recreated
-	rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /dev/null
-
-	if use X; then
-		elog "You need to install some fonts for Emacs.	 Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic"
-		elog "Emacs requirements under X11."
-	fi
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r1
deleted file mode 100644
index f366c32d3a9d..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e768a1489e514fbb78d1a5f9c512846 emacs-22.0.93.tar.gz 37118034
-RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 emacs-22.0.93.tar.gz 37118034
-SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e emacs-22.0.93.tar.gz 37118034
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d1ce4c267c85..8fd52551ce16 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -62,22 +62,18 @@ EBUILD emacs-21.4-r4.ebuild 4492 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443
 MD5 317bcb60bc1061bf3794a1a993730405 emacs-21.4-r4.ebuild 4492
 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 emacs-21.4-r4.ebuild 4492
 SHA256 3914a526e5560e54fd0d670f190b4032f701aa46200570279f100a38841fcb4e emacs-21.4-r4.ebuild 4492
-EBUILD emacs-21.4-r5.ebuild 5065 RMD160 b3147487d3e9535af22b010933b85cc0389335b0 SHA1 26ffa6197cd8e9189fb10ee787ced23d62af15ea SHA256 9fa1e747a2087bf97f27211a3ec1c5fd67f8ee078cc06f85046fdf24f5a9be61
-MD5 a56fe02c52fa8ea3884fd82326720a49 emacs-21.4-r5.ebuild 5065
-RMD160 b3147487d3e9535af22b010933b85cc0389335b0 emacs-21.4-r5.ebuild 5065
-SHA256 9fa1e747a2087bf97f27211a3ec1c5fd67f8ee078cc06f85046fdf24f5a9be61 emacs-21.4-r5.ebuild 5065
-EBUILD emacs-21.4-r6.ebuild 5452 RMD160 d13637838204e40838966e501a60aa0b83fb6bea SHA1 32b08d0577902949c1d15e1fab415779836003f7 SHA256 439add09c2be98a64628ba156ffe4193cd45168a397a95a96b286d245bee42cb
-MD5 7f3a0a6da2c7655d3a77b977f98f72d8 emacs-21.4-r6.ebuild 5452
-RMD160 d13637838204e40838966e501a60aa0b83fb6bea emacs-21.4-r6.ebuild 5452
-SHA256 439add09c2be98a64628ba156ffe4193cd45168a397a95a96b286d245bee42cb emacs-21.4-r6.ebuild 5452
+EBUILD emacs-21.4-r6.ebuild 5495 RMD160 57dc85f2770d8037871bec3e489f5ef72bdf0486 SHA1 fc8aa565c835d176f38ccb1c969ef5cbe8ede4db SHA256 4fb00acca0160bf3d32021614d6b0627a5a8130f41e84da40dbea838fcb6fe8e
+MD5 b04d43927c490b1be05fec0508f1650a emacs-21.4-r6.ebuild 5495
+RMD160 57dc85f2770d8037871bec3e489f5ef72bdf0486 emacs-21.4-r6.ebuild 5495
+SHA256 4fb00acca0160bf3d32021614d6b0627a5a8130f41e84da40dbea838fcb6fe8e emacs-21.4-r6.ebuild 5495
 EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed SHA1 296bba1410b3575fd1ccf54bbcef7756adc5038a SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39
 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 16796 RMD160 38d6d852f5cc24d000596cddbb45c6ef3e8ab5cc SHA1 2598da689d76440897bec07b1f49ca08b24f1bf9 SHA256 1dd1d3564f203daa3cc53a417006a4bb31d03d45a2c8be202dad89d10de9113c
-MD5 07ca162453fbd4d4c3ba8d245dac6f92 ChangeLog 16796
-RMD160 38d6d852f5cc24d000596cddbb45c6ef3e8ab5cc ChangeLog 16796
-SHA256 1dd1d3564f203daa3cc53a417006a4bb31d03d45a2c8be202dad89d10de9113c ChangeLog 16796
+MISC ChangeLog 16953 RMD160 a6402fb6788c28942087e23d638289dd2b375c75 SHA1 35289dcfd35c21b2fe738a0e5a0cb94c82db2e42 SHA256 318bfcc0cbe85a43b0e5ff61439df3b6e0e5e261aa3cf92fdfb1fa8fbc92e1f8
+MD5 7378751d1c787c4f15ecec2adee9d1b8 ChangeLog 16953
+RMD160 a6402fb6788c28942087e23d638289dd2b375c75 ChangeLog 16953
+SHA256 318bfcc0cbe85a43b0e5ff61439df3b6e0e5e261aa3cf92fdfb1fa8fbc92e1f8 ChangeLog 16953
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -85,9 +81,6 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 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
-MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r5 473
-RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r5 473
-SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r5 473
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r6 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r6 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r6 473
@@ -97,7 +90,7 @@ SHA256 263c0f93c22b5467286e5ff0054a83697b60e25ea6e3c44f38ce61fa181d97b6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFxHD/NQqtfCuFneMRAkTGAKCKGj1slXEgJJ1EevXD6pjMCr+2xwCgl6Jg
-KuW5PbMLfovXhdEctxzh0Tk=
-=vp5k
+iD8DBQFFxfN9NQqtfCuFneMRAtfPAJ0RxtLwfjQMoB2PXNwW6EuCtE+SbQCfeYHH
+nTznDrvRh50nsYnuZzo+aWs=
+=grDt
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r5.ebuild b/app-editors/emacs/emacs-21.4-r5.ebuild
deleted file mode 100644
index 2048ea3e0caf..000000000000
--- a/app-editors/emacs/emacs-21.4-r5.ebuild
+++ /dev/null
@@ -1,197 +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-r5.ebuild,v 1.6 2007/01/05 14:22:36 opfer 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
-	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"
-	epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.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
-}
-
-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=*"
-
-	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}
-
-	if has_version 'app-text/aspell' ; then
-		# defaults to aspell if installed
-		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
-	fi
-
-	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 -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
-
-	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
-		while read line; do einfo "${line}"; done<<'EOF'
-
-You disabled sendmail support for Emacs.  If you later install a MTA
-then you will need to recompile Emacs.	See Bug #11104.
-
-EOF
-	fi
-	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() {
-	update-alternatives
-}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r5 b/app-editors/emacs/files/digest-emacs-21.4-r5
deleted file mode 100644
index 6898ecff2a12..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4-r5
+++ /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