Remove old.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 16 insertions, 759 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 32edce5532b8..98ab90858604 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.392 2010/11/05 17:59:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.393 2010/11/05 21:50:36 ulm Exp $
+
+  05 Nov 2010; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r19.ebuild,
+  -emacs-22.3-r3.ebuild, -emacs-23.1-r2.ebuild:
+  Remove old.
 
   05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> emacs-21.4-r22.ebuild,
   emacs-22.3-r6.ebuild, emacs-23.2-r2.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7ee0b9f757d8..6420451f11de 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,28 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-11.tar.bz2 13005 RMD160 2a55e7e102659d978e9069f56d188c91a721f468 SHA1 f1068df11532aadc38c0ebb618f9d420add3f2bb SHA256 10f76aa765ae9de34b3a36fbfa8391cb1be1dd97e0f78700623b3d9a3c68902c
-DIST emacs-21.4-patches-9.tar.bz2 12452 RMD160 6060f5a2a342e1187c32a5a591b1523b02592d55 SHA1 221b6725b729f1c31816489a95ae94c9819f62df SHA256 b2acb9576b043e555714230f8e609b03c70b0a6e3a585db9b39dbf499e71d355
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
-DIST emacs-22.3-patches-3.tar.bz2 4257 RMD160 54be56231a1089de414419adbb25fec570b30bc8 SHA1 5d1b725d20b4cd6af51dc5475d5b254c771006bd SHA256 a437aab14692384f9d4cddf434971051ade4f87047dcfa56ec2563127d946ba9
 DIST emacs-22.3-patches-5.tar.bz2 5018 RMD160 180d9a320354553ea45b6b1c50c7c7dd72e1077c SHA1 6c80dcebf08953244ab0e0900a1c40d016b291d9 SHA256 0717296c2b8a3622fc557d90350f64048c5930d04688cd07121a501441b3bfed
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-DIST emacs-23.1-patches-5.tar.bz2 3414 RMD160 2ec70b92fcb77d357edcd9e2da54fa33cfb527ac SHA1 a1d851fcd490118f6e2f16a67b94dd89de5cc2f1 SHA256 f81df36a8e69010bd81ddfda36393d9ca0da205a9717ffd8721dff47320b14b1
 DIST emacs-23.1-patches-7.tar.bz2 4271 RMD160 a4582c6e25b4c32f043cec503bb841c2c1c6ca16 SHA1 3fc42fcdd1034941f1a0f83ea7ddd3d86f77a157 SHA256 005cc13e4441a06a189b719ecc527e99b17518110a52b41bf20a2d6dacf13d11
 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
 DIST emacs-23.2-patches-1.tar.bz2 2061 RMD160 ca10e6a59a8858082bea8ff71d43a2fafc1f5a73 SHA1 51434ca75e234751a32aba2027981f05da97a3ee SHA256 ac9b98dd9883d9749c5644c859019065923f4520c4fbd623dabacb1c050150f8
 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
-EBUILD emacs-21.4-r19.ebuild 5257 RMD160 7f3d833b103af119824c5c766d494480d13c7f78 SHA1 16bb5b6f97edf95c414182acce28129986fae3e0 SHA256 4a7e942978c8ee63ee5b6e0a62fee7f6780f3245352037cba0e12df941c39656
 EBUILD emacs-21.4-r20.ebuild 5259 RMD160 201202e85ef127240638cd7226110b41d39d53a6 SHA1 1ebc627f50775c04ed11416ca8ffc0702ea44bff SHA256 0313bc2d9f5691c28aa75967fd9ba378b5dabfa1996032cecae3c68937a63d33
 EBUILD emacs-21.4-r22.ebuild 5200 RMD160 2ba4fd8f253a1dcd9db1c5d344231a0258209312 SHA1 effd843ed36144ca5758762f587f138098f3ccc0 SHA256 6127e293bdd13f7a1e8119237a9a33cf66a7270761a2c9dd904075613af33aa5
-EBUILD emacs-22.3-r3.ebuild 7837 RMD160 e96a7240558efe30d51cf5cd6bbb8dc765b6cfb2 SHA1 978c5808deb11713bc24cf7feddea9dd80c18540 SHA256 9c68f7d93e2e59f97c47bf9318b8da763d68381220944861caf79c6513847eda
 EBUILD emacs-22.3-r4.ebuild 7881 RMD160 6ab0399fd2c20b0906aca000e60427f90b9e54e9 SHA1 e73f8069cc4f843586616623b4efe48868c23f00 SHA256 27eca79c4a5adcb30aeb539b38f5cbc0e22e177150b80e70795e55b7d04f41fd
 EBUILD emacs-22.3-r6.ebuild 8010 RMD160 7fcee9fb03d6c3dda0cc55faac6744e9afdd6d37 SHA1 0a2ca8807fc7b8f0aab06fe133c06ca0a7483473 SHA256 02b14d17f729741a6de7dae55d767534c1b39045d6aa03b111ec4c5d3af9792a
-EBUILD emacs-23.1-r2.ebuild 9720 RMD160 0f650171079388c073a0f0db389eefcc1d4367ec SHA1 dbce6823a6a5663048bbbd88a36846f532e9dd6c SHA256 39072e210c840af6339313bdcc97f354777cdbec5ed267074782097c0d8194e8
 EBUILD emacs-23.1-r3.ebuild 9793 RMD160 c215eec76ea59514a83bc62058a9cd93a055e327 SHA1 c79c66489d225ddf73e7f83c21cadf91018ae36c SHA256 af9a49ce2c96ed67601bd03554ef3faa357f9acd2fa946592bd8fed96fd5b0b9
 EBUILD emacs-23.2-r2.ebuild 9966 RMD160 0df2ac9bac236de605b783ede7220d10aaa3894e SHA1 8a96a0b88247d2ab26cb06a760d1d91eac25e5f5 SHA256 735077b0ae90221fc72ab4b37b8aef0e151d28860740ac4c59ef5c6604278c22
 EBUILD emacs-23.2.ebuild 9905 RMD160 39521fa7f22d3daea1e66a6faad85ad082b1daa6 SHA1 8b73357172b5b3337557655e1670d432b15ccca5 SHA256 3cfde8e37f0b1c1f78bbfeb29b4da6a3b775ea526b2c9a57c5a3d52a0e18a11e
-MISC ChangeLog 56124 RMD160 9f051c3ccd4c6d0aab2e8a663e991e2962ca9fb5 SHA1 4500b7103381411ecc47c6837cfd0be2d4e03d31 SHA256 406f0a92d1eaec2f5c260f4889ceb379ca99c0536fc10dfc8a67961c865b5ba9
+MISC ChangeLog 56252 RMD160 5f2b8e329a03e332b45de157c774e118ca971257 SHA1 5f925e63f7f0f51b3d40e5eaa1b0a99985b9a626 SHA256 e84abb53ee0c552c08282d5cc714de7c878a059569ebebff26bfd06139f85332
 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzUfNkACgkQOeoy/oIi7uxVmwCbBck54NIUKF7YeoQ/GXyxAt4A
+ZZgAoMhUfo15aSo9uwRdmDIauQUjCJr1
+=7dAw
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r19.ebuild b/app-editors/emacs/emacs-21.4-r19.ebuild
deleted file mode 100644
index 780b9d1d5788..000000000000
--- a/app-editors/emacs/emacs-21.4-r19.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.16 2010/10/10 17:13:21 ulm Exp $
-
-EAPI=2
-
-inherit flag-o-matic eutils toolchain-funcs autotools
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-9.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim motif sendmail"
-
-DEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-misc/xbitmaps
-		>=media-libs/giflib-4.1.0.1b
-		>=media-libs/jpeg-6b-r2:0
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-	)"
-
-RDEPEND="${DEPEND}
-	>=app-emacs/emacs-common-gentoo-1[X?]
-	sendmail? ( virtual/mta )"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-
-	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"
-
-	# 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
-
-	# custom aclocal.m4 was only needed for autoconf 2.13 and earlier
-	rm aclocal.m4
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# -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=*"
-
-	local myconf
-	if use X ; then
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-
-		if use Xaw3d ; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			use motif \
-				&& ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")"
-		elif use motif ; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-	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() {
-	local i m
-
-	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}
-
-	# move info documentation to the correct place
-	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}"
-
-	# move man pages to the correct place
-	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
-
-	# fix 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
-
-	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
-	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
-	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
-}
-
-pkg_postinst() {
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-
-	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
-		echo
-		elog "You need to install some fonts for Emacs."
-		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 ifunset
-}
diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild
deleted file mode 100644
index aff9ea3523b3..000000000000
--- a/app-editors/emacs/emacs-22.3-r3.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.17 2010/10/10 17:13:21 ulm Exp $
-
-EAPI=2
-
-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
-	mirror://gentoo/${P}-patches-3.tar.bz2"
-
-LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
-SLOT="22"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg:0 )
-		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-2.3:0 ) )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( dev-util/pkgconfig )
-	X? ( gtk? ( dev-util/pkgconfig ) )
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-22.1
-	>=app-emacs/emacs-common-gentoo-1[X?]"
-
-# 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}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-
-	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 alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	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
-
-	eautoreconf
-}
-
-src_configure() {
-	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
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			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
-
-		local f tk=
-		for f in gtk Xaw3d motif; do
-			use ${f} || continue
-			[ "${tk}" ] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--infodir=/usr/share/info/emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	local i m
-
-	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
-	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
-	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
-
-	local c=";;"
-	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]
-		c=""
-	fi
-
-	sed 's/^X//' >"${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "/usr/share/info/emacs-${SLOT}")
-	X	(re "\\\\\`/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${SITEFILE}" || die
-
-	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
-	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
-	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
-}
-
-pkg_postinst() {
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[ -e "${f}" ] || touch "${f}"
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-
-	if use X; then
-		echo
-		elog "You need to install some fonts for Emacs."
-		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 ifunset
-}
diff --git a/app-editors/emacs/emacs-23.1-r2.ebuild b/app-editors/emacs/emacs-23.1-r2.ebuild
deleted file mode 100644
index 488a80924805..000000000000
--- a/app-editors/emacs/emacs-23.1-r2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.19 2010/10/10 17:13:21 ulm Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic
-
-if [ "${PV##*.}" = "9999" ]; then
-	ECVS_AUTH="pserver"
-	ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-	ECVS_MODULE="emacs"
-	ECVS_BRANCH="HEAD"
-	ECVS_LOCALNAME="emacs"
-	inherit cvs
-	SRC_URI=""
-	S="${WORKDIR}/${ECVS_LOCALNAME}"
-else
-	SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-		mirror://gentoo/${P}-patches-5.tar.bz2"
-	# 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%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
-SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-RESTRICT="strip"
-
-RDEPEND="!=app-editors/emacs-vcs-23.0*
-	!=app-editors/emacs-vcs-23.1.9999
-	sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg:0 )
-		png? ( media-libs/libpng )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	>=app-emacs/emacs-common-gentoo-1[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [ "${PV##*.}" = "9999" ]; then
-		FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-			| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-		[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-		echo
-		einfo "Emacs CVS branch: ${ECVS_BRANCH}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-		echo
-	else
-		EPATCH_SUFFIX=patch epatch
-	fi
-
-	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 alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	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
-
-	eautoreconf
-}
-
-src_configure() {
-	ALLOWED_FLAGS=""
-	strip-flags
-	#unset LDFLAGS
-	if use sh; then
-		replace-flags -O[1-9] -O0		#262359
-	else
-		replace-flags -O[3-9] -O2
-	fi
-
-	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 gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
-		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-		myconf="${myconf} $(use_with xft)"
-
-		if use xft; then
-			myconf="${myconf} $(use_with m17n-lib libotf)"
-			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-		else
-			myconf="${myconf} --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect because xft is not set."
-		fi
-
-		# 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
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-
-		local f tk=
-		for f in gtk Xaw3d motif; do
-			use ${f} || continue
-			[ "${tk}" ] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	if [ "${PV##*.}" = "9999" ]; then
-		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-		# cleanup, otherwise emacs will be dumped again in src_install
-		(cd src; emake versionclean)
-	fi
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	local i m
-
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv "${i}" "${i}.info" || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.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 -rf "${D}"/usr/share/{applications,icons}
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs
-
-	local c=";;"
-	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]
-		c=""
-	fi
-
-	sed 's/^X//' >"${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${SITEFILE}" || die
-
-	dodoc README BUGS || 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_SUFFIX} f
-	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
-	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
-}
-
-pkg_postinst() {
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[ -e "${f}" ] || touch "${f}"
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-
-	if use X; then
-		echo
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-	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."
-	echo
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}