clean up

svn path=/emacs-overlay/; revision=123

8 files changed, 9 insertions, 675 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 8b63f51..06288d7 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.0.95-r2.ebuild, -emacs-cvs-22.0.9999-r6.ebuild,
+  -emacs-cvs-23.0.0-r2.ebuild:
+  clean up
+
   19 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-cvs-22.0.95-r3.ebuild, emacs-cvs-22.0.9999-r7.ebuild,
   emacs-cvs-23.0.0-r3.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 0f38d52..e978cb0 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -11,53 +11,32 @@ MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475
 DIST emacs-22.0.95.tar.gz 37754533 RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 SHA1 90cd5a6078d26b3bd0eb4f2da0561df759bc880f SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d
-EBUILD emacs-cvs-22.0.95-r2.ebuild 6513 RMD160 216ce5248a0d4ae20f24c49f8bf19ebd521be698 SHA1 633412c25f5833b0da222d824bc85bbec51a123a SHA256 d175024a482c8d62d8f6322f3c68fff8bf5f9418d319a138bb0c8dbc0fab119e
-MD5 b0373d2c10d31d606ecb80eb4f24150d emacs-cvs-22.0.95-r2.ebuild 6513
-RMD160 216ce5248a0d4ae20f24c49f8bf19ebd521be698 emacs-cvs-22.0.95-r2.ebuild 6513
-SHA256 d175024a482c8d62d8f6322f3c68fff8bf5f9418d319a138bb0c8dbc0fab119e emacs-cvs-22.0.95-r2.ebuild 6513
 EBUILD emacs-cvs-22.0.95-r3.ebuild 6605 RMD160 309fdf7aae95829cfde36986a540e0ae9b2f97dc SHA1 931982f83673ddde74689648e589df911509945d SHA256 bfdc5c5907402a33be1c9f3bed4390f6697df314312574e946a5e31c14cd6a50
 MD5 521b468c7ac6d2709a8b6d4a58d21844 emacs-cvs-22.0.95-r3.ebuild 6605
 RMD160 309fdf7aae95829cfde36986a540e0ae9b2f97dc emacs-cvs-22.0.95-r3.ebuild 6605
 SHA256 bfdc5c5907402a33be1c9f3bed4390f6697df314312574e946a5e31c14cd6a50 emacs-cvs-22.0.95-r3.ebuild 6605
-EBUILD emacs-cvs-22.0.9999-r6.ebuild 6578 RMD160 c0e078a1713b439d5bde6b6dae12c04731d0a0c7 SHA1 0f82bdc9b1e19116c0775675eb5e003abc51dc19 SHA256 ed88165ecc941525c5396af519eb2a5c298f59bf0dfa9d7891b1a71dec5603ae
-MD5 f136ca8aa40b5b3b69709566abd66f32 emacs-cvs-22.0.9999-r6.ebuild 6578
-RMD160 c0e078a1713b439d5bde6b6dae12c04731d0a0c7 emacs-cvs-22.0.9999-r6.ebuild 6578
-SHA256 ed88165ecc941525c5396af519eb2a5c298f59bf0dfa9d7891b1a71dec5603ae emacs-cvs-22.0.9999-r6.ebuild 6578
 EBUILD emacs-cvs-22.0.9999-r7.ebuild 6670 RMD160 e843977065abd6b3603f3c9a746ac45b8f6b00e9 SHA1 4885e79514fec166341abac320b571fa30057d9b SHA256 b893bddb387bac5f93f1e7869a5cd25ceefe4a48e93df45aad07ac3ad1688ec3
 MD5 eae681a69040f7823d8288d63783777c emacs-cvs-22.0.9999-r7.ebuild 6670
 RMD160 e843977065abd6b3603f3c9a746ac45b8f6b00e9 emacs-cvs-22.0.9999-r7.ebuild 6670
 SHA256 b893bddb387bac5f93f1e7869a5cd25ceefe4a48e93df45aad07ac3ad1688ec3 emacs-cvs-22.0.9999-r7.ebuild 6670
-EBUILD emacs-cvs-23.0.0-r2.ebuild 6835 RMD160 4420d82848adbbc1ddc7f434325eab6023e32342 SHA1 4fc9ddb6c0f3ec873e5bbf48fc10bd56f3e0df4c SHA256 c091857c05f45494aad5281412c92bd88cee36c5f76773cdbce84a82d6afb9e4
-MD5 95cfb5d8c6e877f6d2b2305e67e6691c emacs-cvs-23.0.0-r2.ebuild 6835
-RMD160 4420d82848adbbc1ddc7f434325eab6023e32342 emacs-cvs-23.0.0-r2.ebuild 6835
-SHA256 c091857c05f45494aad5281412c92bd88cee36c5f76773cdbce84a82d6afb9e4 emacs-cvs-23.0.0-r2.ebuild 6835
 EBUILD emacs-cvs-23.0.0-r3.ebuild 6927 RMD160 39d611a99a184cc3ce0a0e9c88567ba207a3b282 SHA1 2ea5c161c24680fd88f58bf85897122a9bdb40e3 SHA256 f158337dedd3410e9b2dc37b35db5656c153fd587a5ab6758889ebe9ddc8c50c
 MD5 3da6e9699bbade5decf3b71a4427a2e8 emacs-cvs-23.0.0-r3.ebuild 6927
 RMD160 39d611a99a184cc3ce0a0e9c88567ba207a3b282 emacs-cvs-23.0.0-r3.ebuild 6927
 SHA256 f158337dedd3410e9b2dc37b35db5656c153fd587a5ab6758889ebe9ddc8c50c emacs-cvs-23.0.0-r3.ebuild 6927
-MISC ChangeLog 5061 RMD160 f0812d0440892744bc652085e6aadd5c5b649f83 SHA1 e91f8722d52e73af3ef9b364ea768f16d23d2094 SHA256 9c8992b85a26a0f4d8b5d9d74e9a778173083ee6c782bbe9a99d7e8c39917d92
-MD5 c6e4d8625f6e93e8c3b6706271a19b22 ChangeLog 5061
-RMD160 f0812d0440892744bc652085e6aadd5c5b649f83 ChangeLog 5061
-SHA256 9c8992b85a26a0f4d8b5d9d74e9a778173083ee6c782bbe9a99d7e8c39917d92 ChangeLog 5061
+MISC ChangeLog 5223 RMD160 3b4bb155fe3de33d702bb75e9bdaf0acc85ae41b SHA1 cd07f40ad4addf6712e3552fa6cd04ee475510f7 SHA256 1228e88e531a8d24a653fb9dace6d3c68d7a8cb2888a491a2ec8f6edbefa7cde
+MD5 4620b67fc0caaa57209cbba8362ad254 ChangeLog 5223
+RMD160 3b4bb155fe3de33d702bb75e9bdaf0acc85ae41b ChangeLog 5223
+SHA256 1228e88e531a8d24a653fb9dace6d3c68d7a8cb2888a491a2ec8f6edbefa7cde ChangeLog 5223
 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 d6f599895923b8ba7322cd3778f8cbd6 files/digest-emacs-cvs-22.0.95-r2 247
-RMD160 d862c5cc0a3c1e37d1d191a39b8b27fee97feb83 files/digest-emacs-cvs-22.0.95-r2 247
-SHA256 a2976d3a758f1cd9304edc61dcbec515ccc29f2daafd8918926b2af9ba407ed1 files/digest-emacs-cvs-22.0.95-r2 247
 MD5 d6f599895923b8ba7322cd3778f8cbd6 files/digest-emacs-cvs-22.0.95-r3 247
 RMD160 d862c5cc0a3c1e37d1d191a39b8b27fee97feb83 files/digest-emacs-cvs-22.0.95-r3 247
 SHA256 a2976d3a758f1cd9304edc61dcbec515ccc29f2daafd8918926b2af9ba407ed1 files/digest-emacs-cvs-22.0.95-r3 247
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r6 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r6 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r6 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r7 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r7 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r7 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r2 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r2 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r3 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r3 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r3 0
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r2.ebuild
deleted file mode 100644
index 4766872..0000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	app-admin/eselect-emacs
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND )
-	X? ( gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.95"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-S="${WORKDIR}/emacs-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
-	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
-
-	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
-		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with xpm)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			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"
-		elif use lesstif; then
-			einfo "Configuring to build with lesstif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	use hesiod && myconf="${myconf} --with-hesiod"
-
-	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) $(use_with sound) \
-			 || 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
-
-	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
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	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
-
-	dodoc BUGS ChangeLog README
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
-
-	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
-	# A forthcoming Portage version will handle that itself
-	rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
-
-	eselect emacs update --if-unset
-
-	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 the Emacs eselect module"
-	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
-	elog "stable release"
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild
deleted file mode 100644
index 0206ed6..0000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r6.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-ECVS_LOCALNAME="emacs-22"
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-
-RESTRICT="${RESTRICT} nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	app-admin/eselect-emacs
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND )
-	X? ( gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="22.0.95"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
-	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
-
-	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
-		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with xpm)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			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"
-		elif use lesstif; then
-			einfo "Configuring to build with lesstif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	use hesiod && myconf="${myconf} --with-hesiod"
-
-	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) $(use_with sound) \
-			 || 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
-
-	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
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	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
-
-	dodoc BUGS ChangeLog README
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
-
-	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
-	# A forthcoming Portage version will handle that itself
-	rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
-
-	eselect emacs update --if-unset
-
-	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 the Emacs eselect module"
-	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
-	elog "stable release"
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r2.ebuild
deleted file mode 100644
index 062bb34..0000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_LOCALNAME="emacs-unicode"
-ECVS_BRANCH="emacs-unicode-2"
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa aqua gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
-
-RESTRICT="$RESTRICT nostrip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	app-admin/eselect-emacs
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND )
-	X? ( gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="23.0.0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
-	use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff"
-
-	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
-		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with xpm)"
-		myconf="${myconf} $(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(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"
-		elif use lesstif; then
-			einfo "Configuring to build with lesstif toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=motif"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	use hesiod && myconf="${myconf} --with-hesiod"
-
-	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_enable xft font-backend) \
-			$(use_with gif) $(use_with png) $(use_with sound) \
-			 || 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
-
-	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
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	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
-
-	dodoc BUGS ChangeLog README
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
-
-	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
-	# A forthcoming Portage version will handle that itself
-	rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
-
-	eselect emacs update --if-unset
-
-	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 the Emacs eselect module"
-	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
-	elog "stable release"
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95-r2
deleted file mode 100644
index 9f2aeea..0000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 07ae2a749fec6decbdf65ae3673d5546 emacs-22.0.95.tar.gz 37754533
-RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 emacs-22.0.95.tar.gz 37754533
-SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d emacs-22.0.95.tar.gz 37754533
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r6 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r6
deleted file mode 100644
index e69de29..0000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r6
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r2
deleted file mode 100644
index e69de29..0000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r2
+++ /dev/null