Remove old.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.27-gentoo-r4 i686

9 files changed, 20 insertions, 593 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index d4fcb3e66199..69adc3c61272 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.290 2008/12/24 10:45:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.291 2008/12/24 11:18:38 ulm Exp $
+
+  24 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-22.1-freebsd-sparc.patch,
+  -files/emacs-22.1-vcdiff-tmp-race.patch,
+  -files/emacs-22.2-fast-lock.patch, -files/emacs-22.2-heimdal-gentoo.patch,
+  -files/emacs-22.2-python-nopwd.patch, -emacs-21.4-r15.ebuild,
+  -emacs-22.2-r3.ebuild:
+  Remove old.
 
   24 Dec 2008; Raúl Porcel <armin76@gentoo.org> emacs-21.4-r17.ebuild,
   emacs-22.3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d9e44325c269..ac8adfeb9343 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,26 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
-AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
-AUX emacs-22.1-vcdiff-tmp-race.patch 831 RMD160 0ffb7c22f28982a0f199a177a5e21a6a62b5ef46 SHA1 9200da3d3825747ded3cba4c9e1c0a514131e9ae SHA256 a220e676cde0e84fb136328915a747cce1b0807c21373cfda7c93063997d616d
-AUX emacs-22.2-fast-lock.patch 1474 RMD160 a85b27612673d3cdea50d35a25fd8f1172425cb2 SHA1 468d15d844cacaf905f5aca9c5ea63f0017a0162 SHA256 72419329a28850e5e92e517a7634a38a106afbb743c21167411bbb755c82f4c2
-AUX emacs-22.2-heimdal-gentoo.patch 1906 RMD160 004cd91c637df470e5960854b943d2cce5b628af SHA1 6460fca37eed80fd0b7539ec0982dcd180fe2281 SHA256 7cd1a4358a26aa832461e5a16b6d8a1ea95b58dd19578ee2361f91afc4e3bc7f
-AUX emacs-22.2-python-nopwd.patch 660 RMD160 c5967762416b3816aaa5fe714d0014223ce4196c SHA1 27d7d7d0aea3ea92e0d4b86cca1f45123ecb6965 SHA256 64607f50aefaba2ffc75fe151f5272306daef3ff34f5ef9070717babe2c47715
 AUX emacs-22.2-sh.patch 761 RMD160 4a65a87cfd31d0714e9f99de91dee1c292ba5159 SHA1 1cf46bd5f2bff3e4cff2d6fb43a05dabca81c276 SHA256 743f9e3fcf0059ff68a5ba704311d8aa1ae09600eb3692de51e0b7105ea1f9b4
 AUX emacs-22.3-freebsd-sparc.patch 488 RMD160 37a5499a515a45e19858b6aaa1217ec116811d2d SHA1 47d2880c01857515d38adc9a56485e9bd695cac6 SHA256 963ea3506cbcf4797ec974e2802a11c6e9c09cddf1360dbbe6a452a2cef6efbf
 AUX emacs-22.3-linux-random-heap.patch 566 RMD160 6d0df837e04ba6cd712939092626cc067248cae5 SHA1 0313a5b34bb5b868596408af9b71b18c28b227c4 SHA256 76d049df10d1a4789a45297d8a14b2e7b41e700aefd0aec66ab47fbdfe0c0fbd
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-3.tar.bz2 17323 RMD160 c0a205792f80c34b599c82fe5cf957f10f80956a SHA1 d452c45756e69edf71a46518cfde809eb65955f9 SHA256 679fe1c0e4fbc2ccf44e6c7097aa093c4e575fde15b5416d944916893bd543ff
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
-DIST emacs-21.4-patches-2.tar.bz2 9984 RMD160 fd1a5e24740a9ce230b0898864abea2ef4451db2 SHA1 4042d587210dba95514c18054de4a98ce8d4c231 SHA256 2980bf428e97e34def633ce4c6bf383dbaf09aeb57eea318398144a067c7fa34
 DIST emacs-21.4-patches-6.tar.bz2 11785 RMD160 01edee136f6cd88611fa632227f685c1b93ed7a9 SHA1 042fddfc02dbd958219382fd42de0f6e20cff6c3 SHA256 495dbcb7bfb4a0dbff57e3d5873adb9eb9a4219dec3136df864ce38a6dc21937
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
-DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r5.ebuild 2629 RMD160 03464aef9aba114c10a960141791db06863b3d31 SHA1 88cfdacff5d07aba75b31942ba2f66ae2a17e788 SHA256 9ea826f0882053d9e56f73f259f88d77ccdcc117ff8793898f24b8647bb68b9d
-EBUILD emacs-21.4-r15.ebuild 5251 RMD160 6cb3de4ad357b8982fbc64dd2cad6bc1ee3bcbe4 SHA1 76a2ba348fd5ac93dd326a9fedf77550dbb51464 SHA256 00a75f9804a8df387aafa4380dd5855ba6991b69e1a68a5965fd69614b677d73
 EBUILD emacs-21.4-r17.ebuild 5434 RMD160 cde44890dd918f4e72fc2dac635cf43507ca7103 SHA1 f9e58f0367f04ea0b512105ac86dee5b8f4623ed SHA256 eb31b78ea205a19daa9e742025d277b228a36ebb297e50f662fa1622541d1a2f
-EBUILD emacs-22.2-r3.ebuild 8196 RMD160 ecf047909794fd1ed3f26912de31febe6e5f600d SHA1 99a3dc7eae2347db5afe59159f427997509e15a5 SHA256 24ef32b3fd737117e814d46811796756d3cdfcc7ab7c075555b8c3796494e47f
 EBUILD emacs-22.3-r1.ebuild 8041 RMD160 2e3b9ec92e99749fc77fa03e0f6349d30f9e95aa SHA1 8ef0f6dba6e220ffbc261e12ec175c33dd779b64 SHA256 a1724ffbfa17887cea8b9b608553d0cc27bef293751b342c1a000038804ecd22
 EBUILD emacs-22.3.ebuild 7744 RMD160 58a606af901b41673591cffe8d17d65f1b9bf59f SHA1 3dcdff928569f0a62c273b36b4ad4ad1163e06ce SHA256 a73b5f647b51a7147a33623d5cf6a8ae995cb30ce11c0d9906ea03b26da46f44
-MISC ChangeLog 41978 RMD160 ce63322af14d9c00d359974e86c4faf4b485fe11 SHA1 6e7656806069fd312e4082a4093e81573ce6f6c6 SHA256 1a2bdd59e283784759d50485550931f7686edbff65bdc0bfc26515139aff4678
+MISC ChangeLog 42286 RMD160 fa22bf83a14f6dfc62fe4b4e2057b1666f789a46 SHA1 4482426b715560c6319bcd605c537765ea8d0dc6 SHA256 6c10f076662f8bcf54ec7d12dcefd660d6839e859429c1ccb0e2808401038b7c
 MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAklSGr0ACgkQOeoy/oIi7uyrZQCg1aFYcHNVbnUc0ZIdHJJEXwk7
+jYUAoNjsCn2F70CoT+9yMer6P7kKQE/R
+=Q1HQ
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r15.ebuild b/app-editors/emacs/emacs-21.4-r15.ebuild
deleted file mode 100644
index a5709626868a..000000000000
--- a/app-editors/emacs/emacs-21.4-r15.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r15.ebuild,v 1.6 2008/11/07 08:43:11 ulm Exp $
-
-WANT_AUTOCONF="2.1"
-
-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-2.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 FDL-1.1 BSD as-is X11"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim motif nls sendmail"
-
-RDEPEND="sys-libs/ncurses
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-misc/emacs-desktop
-		>=media-libs/giflib-4.1.0.1b
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.2.1
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-	)
-	sendmail? ( virtual/mta )
-	>=app-admin/eselect-emacs-1.2"
-
-DEPEND="${RDEPEND}
-	X? ( x11-misc/xbitmaps )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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"
-
-	# install emacsclient.1 man page (#165466)
-	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
-
-	# This will need to be updated for X-Compilation
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		"${S}/src/s/gnu-linux.h" || die
-
-	eautoconf
-}
-
-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=*"
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	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) 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
-			# 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"
-	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}
-
-	einfo "Fixing info documentation..."
-	mkdir "${T}/emacs-${SLOT}"
-	mv "${D}/usr/share/info/dir" "${T}"
-	for i in "${D}"/usr/share/info/*
-	do
-		mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
-	done
-	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
-	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
-
-	einfo "Fixing manpages..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
-	done
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	einfo "Fixing permissions..."
-	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
-	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/emacs-${SLOT} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
-	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
-	echo
-}
-
-pkg_postinst() {
-	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
-		cp "${ROOT}"/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
-
-	emacs-infodir-rebuild
-
-	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
-		# transition from pre-eselect revision
-		eselect emacs set emacs-${SLOT}
-	else
-		eselect emacs update ifunset
-	fi
-
-	if ! use sendmail && ! has_version "virtual/mta"; then
-		elog "You disabled sendmail support for Emacs. If you later install"
-		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
-	fi
-}
-
-pkg_postrm() {
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-22.2-r3.ebuild b/app-editors/emacs/emacs-22.2-r3.ebuild
deleted file mode 100644
index 05379b9ab371..000000000000
--- a/app-editors/emacs/emacs-22.2-r3.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2-r3.ebuild,v 1.11 2008/11/07 08:43:11 ulm Exp $
-
-inherit autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
-SLOT="22"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-RDEPEND="!<app-editors/emacs-cvs-22.1
-	sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( dev-util/pkgconfig )
-	X? ( gtk? ( dev-util/pkgconfig ) )
-	gzip-el? ( app-arch/gzip )"
-
-# FULL_VERSION keeps the full version number, which is needed in order to
-# determine some path information correctly for copy/move operations later on
-FULL_VERSION="${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/emacs-22.1-freebsd-sparc.patch"
-	# fix vcdiff insecure temporary file creation (bug 216880)
-	epatch "${FILESDIR}/emacs-22.1-vcdiff-tmp-race.patch"
-	# support compilation with Heimdal (bug 215558)
-	epatch "${FILESDIR}/${P}-heimdal-gentoo.patch"
-	# fix fast-lock cache security problem (bug 221197)
-	epatch "${FILESDIR}/${P}-fast-lock.patch"
-	# fix search path for interactive python (bug 236498)
-	epatch "${FILESDIR}/${P}-python-nopwd.patch"
-	# SuperH support (bug 238210)
-	epatch "${FILESDIR}/${P}-sh.patch"
-
-	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_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	#unset LDFLAGS
-	if use hppa; then # bug #193703
-		replace-flags -O[2-9] -O
-	else
-		replace-flags -O[3-9] -O2
-	fi
-	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) 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"
-
-	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
-
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
-		mv "${i}" "${i}.info" || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	einfo "Fixing manpages ..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv man failed"
-	done
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /usr/share/emacs/site-lisp
-	keepdir /var/lib/games/emacs
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 10${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/emacs-${SLOT} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
-	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
-	echo
-}
-
-pkg_postinst() {
-	[ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \
-		|| cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[ -e "${f}" ] || touch "${f}"
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-
-	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
-		# transition from pre-eselect revision
-		eselect emacs set emacs-${SLOT}
-	else
-		eselect emacs update ifunset
-	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/files/emacs-22.1-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
deleted file mode 100644
index d5e0793aa3de..000000000000
--- a/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: emacs/src/alloc.c
-===================================================================
---- emacs.orig/src/alloc.c
-+++ emacs/src/alloc.c
-@@ -4522,7 +4522,7 @@ mark_stack ()
-   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
--#ifdef sparc
-+#if defined(sparc) && !defined(__FreeBSD__)
-   asm ("ta 3");
- #endif
- 
diff --git a/app-editors/emacs/files/emacs-22.1-vcdiff-tmp-race.patch b/app-editors/emacs/files/emacs-22.1-vcdiff-tmp-race.patch
deleted file mode 100644
index 7f59d6afeeac..000000000000
--- a/app-editors/emacs/files/emacs-22.1-vcdiff-tmp-race.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Steve Grubb of Red Hat discovered that vcdiff script as shipped with Emacs
-(confirmed in versions 20.7 to 22.1.50) uses temporary files insecurely,
-which makes it possible for local attacker to conduct a symlink attack and
-make the victim overwrite arbitrary file.
-
-diff -ur emacs-21.4.orig/lib-src/vcdiff emacs-21.4/lib-src/vcdiff
---- emacs-21.4.orig/lib-src/vcdiff	2006-09-28 12:07:51.000000000 -0400
-+++ emacs-21.4/lib-src/vcdiff	2006-09-28 15:58:53.000000000 -0400
-@@ -86,14 +86,14 @@
- 	case $f in
- 	s.* | */s.*)
- 		if
--			rev1=/tmp/geta$$
-+			rev1=`mktemp /tmp/geta.XXXXXXXX`
- 			get -s -p -k $sid1 "$f" > $rev1 &&
- 			case $sid2 in
- 			'')
- 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
- 				;;
- 			*)
--				rev2=/tmp/getb$$
-+				rev2=`mktemp /tmp/getb.XXXXXXXX`
- 				get -s -p -k $sid2 "$f" > $rev2
- 				workfile=$rev2
- 			esac
diff --git a/app-editors/emacs/files/emacs-22.2-fast-lock.patch b/app-editors/emacs/files/emacs-22.2-fast-lock.patch
deleted file mode 100644
index e1c00a5cb305..000000000000
--- a/app-editors/emacs/files/emacs-22.2-fast-lock.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- emacs-22.2-orig/lisp/obsolete/fast-lock.el	2008-01-10 13:15:40.000000000 +0100
-+++ emacs-22.2/lisp/obsolete/fast-lock.el	2008-05-12 21:25:57.000000000 +0200
-@@ -286,7 +286,7 @@
- 				      (integer :tag "size")))))
-   :group 'fast-lock)
- 
--(defcustom fast-lock-cache-directories '("." "~/.emacs-flc")
-+(defcustom fast-lock-cache-directories '("~/.emacs-flc")
- ; - `internal', keep each file's Font Lock cache file in the same file.
- ; - `external', keep each file's Font Lock cache file in the same directory.
-   "*Directories in which Font Lock cache files are saved and read.
-@@ -304,13 +304,18 @@
-  ((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\")
- 
- would cause a file's current directory to be used if the file is under your
--home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
-+home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'.
-+For security reasons, it is not advisable to use the file's current directory
-+to avoid the possibility of using the cache of another user."
-   :type '(repeat (radio (directory :tag "directory")
- 			(cons :tag "Matching"
- 			      (regexp :tag "regexp")
- 			      (directory :tag "directory"))))
-   :group 'fast-lock)
- 
-+;;;###autoload
-+(put 'fast-lock-cache-directories 'risky-local-variable t)
-+
- (defcustom fast-lock-save-events '(kill-buffer kill-emacs)
-   "*Events under which caches will be saved.
- Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.
diff --git a/app-editors/emacs/files/emacs-22.2-heimdal-gentoo.patch b/app-editors/emacs/files/emacs-22.2-heimdal-gentoo.patch
deleted file mode 100644
index 349a9e2a60b9..000000000000
--- a/app-editors/emacs/files/emacs-22.2-heimdal-gentoo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- emacs-22.2-orig/configure.in	2008-04-02 18:28:37.000000000 +0200
-+++ emacs-22.2/configure.in	2008-04-02 22:18:38.000000000 +0200
-@@ -2700,7 +2700,9 @@
-   fi
- 
-   if test "${with_kerberos5+set}" = set; then
--    AC_CHECK_HEADERS(krb5.h)
-+    AC_CHECK_HEADERS(krb5.h,
-+      AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
-+		       [#include <krb5.h>]))
-   else
-     AC_CHECK_HEADERS(des.h,,
- 		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
---- emacs-22.2-orig/lib-src/pop.c	2008-02-23 14:49:00.000000000 +0100
-+++ emacs-22.2/lib-src/pop.c	2008-04-02 22:35:55.000000000 +0200
-@@ -1200,11 +1200,12 @@
-       krb5_free_principal (kcontext, server);
-       if (rem)
- 	{
-+	  strcpy (pop_error, KRB_ERROR);
-+	  strncat (pop_error, error_message (rem),
-+		   ERROR_MAX - sizeof (KRB_ERROR));
-+#if defined HAVE_KRB5_ERROR_TEXT
- 	  if (err_ret && err_ret->text.length)
- 	    {
--	      strcpy (pop_error, KRB_ERROR);
--	      strncat (pop_error, error_message (rem),
--		       ERROR_MAX - sizeof (KRB_ERROR));
- 	      strncat (pop_error, " [server says '",
- 		       ERROR_MAX - strlen (pop_error) - 1);
- 	      strncat (pop_error, err_ret->text.data,
-@@ -1213,12 +1214,17 @@
- 	      strncat (pop_error, "']",
- 		       ERROR_MAX - strlen (pop_error) - 1);
- 	    }
--	  else
-+#elif defined HAVE_KRB5_ERROR_E_TEXT
-+	  if (err_ret && err_ret->e_text && strlen(*err_ret->e_text))
- 	    {
--	      strcpy (pop_error, KRB_ERROR);
--	      strncat (pop_error, error_message (rem),
--		       ERROR_MAX - sizeof (KRB_ERROR));
-+	      strncat (pop_error, " [server says '",
-+		       ERROR_MAX - strlen (pop_error) - 1);
-+	      strncat (pop_error, *err_ret->e_text,
-+		       ERROR_MAX - strlen (pop_error) - 1);
-+	      strncat (pop_error, "']",
-+		       ERROR_MAX - strlen (pop_error) - 1);
- 	    }
-+#endif
- 	  if (err_ret)
- 	    krb5_free_error (kcontext, err_ret);
- 	  krb5_auth_con_free (kcontext, auth_context);
diff --git a/app-editors/emacs/files/emacs-22.2-python-nopwd.patch b/app-editors/emacs/files/emacs-22.2-python-nopwd.patch
deleted file mode 100644
index cecd73d47028..000000000000
--- a/app-editors/emacs/files/emacs-22.2-python-nopwd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- emacs-22.2-orig/lisp/progmodes/python.el	2008-01-21 01:25:09.000000000 +0100
-+++ emacs-22.2/lisp/progmodes/python.el	2008-09-02 22:58:11.000000000 +0200
-@@ -1355,7 +1355,9 @@
-   ;; invoked.  Would support multiple processes better.
-   (when (or new (not (comint-check-proc python-buffer)))
-     (with-current-buffer
--        (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
-+	(let* ((cmdlist
-+		(append (python-args-to-list cmd)
-+			'("-i" "-c" "import sys; sys.path.remove('')")))
-                (path (getenv "PYTHONPATH"))
-                (process-environment	; to import emacs.py
-                 (cons (concat "PYTHONPATH=" data-directory