8 files changed, 12 insertions, 724 deletions
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index bdbb5d4f8591..9d50a75b3e3f 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.99 2007/10/10 07:27:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.100 2007/10/21 10:04:10 graaff Exp $
+
+  21 Oct 2007; Hans de Graaff <graaff@gentoo.org> -xemacs-21.4.20-r1.ebuild,
+  -xemacs-21.4.20-r2.ebuild, -xemacs-21.4.20-r3.ebuild:
+  Remove old versions
 
   10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> xemacs-21.4.20-r1.ebuild,
   xemacs-21.4.20-r2.ebuild, xemacs-21.4.20-r3.ebuild,
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 10122a12abcc..401dca88cfe4 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -31,18 +31,6 @@ RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 files/xemacs.desktop 1080
 SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060 files/xemacs.desktop 1080
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST xemacs-21.4.20.tar.gz 8408589 RMD160 95eb4d5fd9dfcc6575e805434daaf41701c8b5f0 SHA1 651e8c2fcf680c577375a6d623bb9228a56f3a0d SHA256 1062a9bfc719054e6873f9280d6ecc51fbed75a104e0582d378b7ee7bcac64f0
-EBUILD xemacs-21.4.20-r1.ebuild 5951 RMD160 f3c0f5846cf70b5cb89ea8874aee48e47ca3959d SHA1 6d6b1f50c835a1aabdc0c13721c0a3e01e05384b SHA256 5ba0caea08bc2deea7619f155b0834572bfa58beae7352ff382c117231bd4c0b
-MD5 d3718e1aa7afa854df72336287dc4b2f xemacs-21.4.20-r1.ebuild 5951
-RMD160 f3c0f5846cf70b5cb89ea8874aee48e47ca3959d xemacs-21.4.20-r1.ebuild 5951
-SHA256 5ba0caea08bc2deea7619f155b0834572bfa58beae7352ff382c117231bd4c0b xemacs-21.4.20-r1.ebuild 5951
-EBUILD xemacs-21.4.20-r2.ebuild 6365 RMD160 4d4fb1fabd8bbca4f059826f908cff6088cc4d94 SHA1 79355d316bca9c0221a0a1e1e8005c11d3ac3140 SHA256 d0e448f798058f4e7bb47ca674d3d5237f27f00288d5a7c11da040e53bd13bb3
-MD5 800a50bd79e21f400b903220eadfc373 xemacs-21.4.20-r2.ebuild 6365
-RMD160 4d4fb1fabd8bbca4f059826f908cff6088cc4d94 xemacs-21.4.20-r2.ebuild 6365
-SHA256 d0e448f798058f4e7bb47ca674d3d5237f27f00288d5a7c11da040e53bd13bb3 xemacs-21.4.20-r2.ebuild 6365
-EBUILD xemacs-21.4.20-r3.ebuild 6587 RMD160 40eb2569aad5cbf8248320fcfe3bbfb0fe34cd53 SHA1 892f53eefa5910c169d64e7602aff7f0cbbdb8d8 SHA256 956f02a538176664ef5d2658fb288c7949c667f264fada1c2c8f5076e5acf0a4
-MD5 b867daa912bcc7404c82d7ff6af2f7a7 xemacs-21.4.20-r3.ebuild 6587
-RMD160 40eb2569aad5cbf8248320fcfe3bbfb0fe34cd53 xemacs-21.4.20-r3.ebuild 6587
-SHA256 956f02a538176664ef5d2658fb288c7949c667f264fada1c2c8f5076e5acf0a4 xemacs-21.4.20-r3.ebuild 6587
 EBUILD xemacs-21.4.20-r4.ebuild 6710 RMD160 71e389dfd1d12dd8ffd0058caa505fe1cb501833 SHA1 7675d8040f52b049db4d33641f1eefb61207b75b SHA256 2b2a50eb033492882d3e9950f1f965574b923bc5173af5cd3af852709ee73b51
 MD5 c147b39cfdde0aba60e4ae7843279a67 xemacs-21.4.20-r4.ebuild 6710
 RMD160 71e389dfd1d12dd8ffd0058caa505fe1cb501833 xemacs-21.4.20-r4.ebuild 6710
@@ -51,23 +39,14 @@ EBUILD xemacs-21.4.20-r5.ebuild 6918 RMD160 8380067e48559740571bd7662c28e3099085
 MD5 e8def69bdb994c25f816099cc87a7faf xemacs-21.4.20-r5.ebuild 6918
 RMD160 8380067e48559740571bd7662c28e30990857b19 xemacs-21.4.20-r5.ebuild 6918
 SHA256 8ca1e8664bc43510dd25f6976abea330964ef9294ba7102f9999ccd31c757bdd xemacs-21.4.20-r5.ebuild 6918
-MISC ChangeLog 17774 RMD160 a361d8476b83ecdd203436a3a1ded1cac0032928 SHA1 6e05de11788fd0db590604e7ad69fc1268dc712e SHA256 9a1750a03c4ea820594950627fdb71646a65fcc445a2ce26c67b797ac4598c97
-MD5 b5ffec1f3c78d9ffa46954d0b5130993 ChangeLog 17774
-RMD160 a361d8476b83ecdd203436a3a1ded1cac0032928 ChangeLog 17774
-SHA256 9a1750a03c4ea820594950627fdb71646a65fcc445a2ce26c67b797ac4598c97 ChangeLog 17774
+MISC ChangeLog 17934 RMD160 59ed1121189273d6b98c5ea246a5c9f99ebfb9ff SHA1 d5a1fff02cb2e96c04f209605ba1262f3724b541 SHA256 e3588560912d091cf01003e87676162f733ec00d05e10b485a9d77ecb1dcf465
+MD5 f206293dc75ea528f5e4b8b3d566b961 ChangeLog 17934
+RMD160 59ed1121189273d6b98c5ea246a5c9f99ebfb9ff ChangeLog 17934
+SHA256 e3588560912d091cf01003e87676162f733ec00d05e10b485a9d77ecb1dcf465 ChangeLog 17934
 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea
 MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365
 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea metadata.xml 365
-MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r1 479
-RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r1 479
-SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r1 479
-MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r2 479
-RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r2 479
-SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r2 479
-MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r3 479
-RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r3 479
-SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r3 479
 MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r4 479
 RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r4 479
 SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r4 479
@@ -77,7 +56,7 @@ SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHDH7xOeoy/oIi7uwRAnsCAJ0cEKo5GF/sGTm1ZiCEPCYY/n85WQCdG1bY
-Mg189fxyg1qr1ZCQxjZe9Uc=
-=VqKS
+iD8DBQFHGyQg0BM77Tkv120RArJOAJ9l0CZvwHcg2QiMw7jYAA2YZ6x8KgCg8b7V
+F8DxgKfZoipFxRVM7Cys8ZA=
+=ghLy
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.20-r1 b/app-editors/xemacs/files/digest-xemacs-21.4.20-r1
deleted file mode 100644
index 716056cfd79c..000000000000
--- a/app-editors/xemacs/files/digest-xemacs-21.4.20-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
-RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571
-SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571
-MD5 faeb21de9da15cc2abd6c3fcdc1b6142 xemacs-21.4.20.tar.gz 8408589
-RMD160 95eb4d5fd9dfcc6575e805434daaf41701c8b5f0 xemacs-21.4.20.tar.gz 8408589
-SHA256 1062a9bfc719054e6873f9280d6ecc51fbed75a104e0582d378b7ee7bcac64f0 xemacs-21.4.20.tar.gz 8408589
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.20-r2 b/app-editors/xemacs/files/digest-xemacs-21.4.20-r2
deleted file mode 100644
index 716056cfd79c..000000000000
--- a/app-editors/xemacs/files/digest-xemacs-21.4.20-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
-RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571
-SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571
-MD5 faeb21de9da15cc2abd6c3fcdc1b6142 xemacs-21.4.20.tar.gz 8408589
-RMD160 95eb4d5fd9dfcc6575e805434daaf41701c8b5f0 xemacs-21.4.20.tar.gz 8408589
-SHA256 1062a9bfc719054e6873f9280d6ecc51fbed75a104e0582d378b7ee7bcac64f0 xemacs-21.4.20.tar.gz 8408589
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.20-r3 b/app-editors/xemacs/files/digest-xemacs-21.4.20-r3
deleted file mode 100644
index 716056cfd79c..000000000000
--- a/app-editors/xemacs/files/digest-xemacs-21.4.20-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
-RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571
-SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571
-MD5 faeb21de9da15cc2abd6c3fcdc1b6142 xemacs-21.4.20.tar.gz 8408589
-RMD160 95eb4d5fd9dfcc6575e805434daaf41701c8b5f0 xemacs-21.4.20.tar.gz 8408589
-SHA256 1062a9bfc719054e6873f9280d6ecc51fbed75a104e0582d378b7ee7bcac64f0 xemacs-21.4.20.tar.gz 8408589
diff --git a/app-editors/xemacs/xemacs-21.4.20-r1.ebuild b/app-editors/xemacs/xemacs-21.4.20-r1.ebuild
deleted file mode 100644
index b84ab9914b05..000000000000
--- a/app-editors/xemacs/xemacs-21.4.20-r1.ebuild
+++ /dev/null
@@ -1,212 +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/xemacs/xemacs-21.4.20-r1.ebuild,v 1.10 2007/10/10 07:27:26 ulm Exp $
-
-export WANT_AUTOCONF="2.1"
-inherit autotools eutils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-DEPEND="virtual/libc
-	!virtual/xemacs
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ldap? ( net-nds/openldap )
-	esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/Xaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff )
-	png? ( =media-libs/libpng-1.2* )
-	jpeg? ( media-libs/jpeg )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-
-	cd "${S}"
-	epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch
-
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-
-	# Fix constent crashes with the combination native sound,linux,wav
-	epatch "${FILESDIR}"/xemacs-21.4.20-linuxplay.patch
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		use tiff && myconf="${myconf} --with-tiff" ||
-			myconf="${myconf} --without-tiff"
-		use png && myconf="${myconf} --with-png" ||
-			myconf="${myconf} --without-png"
-		use jpeg && myconf="${myconf} --with-jpeg" ||
-			myconf="${myconf} --without-jpeg"
-		use xface && myconf="${myconf} --with-xface" ||
-			myconf="${myconf} --without-xface"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-		use motif && myconf="${myconf} --with-xim=motif" ||
-			myconf="${myconf} --with-xim=xlib"
-			use canna && myconf="${myconf} --with-canna" ||
-					myconf="${myconf} --without-canna"
-		use freewnn && myconf="${myconf} --with-wnn" ||
-					myconf="${myconf} --without-wnn"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use esd && soundconf="${soundcond},esd"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# fixes #21264
-	use alpha && myconf="${myconf} --with-system-malloc"
-
-	use ppc64 && myconf="${myconf} --with-system-malloc"
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin ; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-		dosym /usr/bin/${i}-xemacs /usr/bin/${i}
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-}
diff --git a/app-editors/xemacs/xemacs-21.4.20-r2.ebuild b/app-editors/xemacs/xemacs-21.4.20-r2.ebuild
deleted file mode 100644
index 93b0943b382b..000000000000
--- a/app-editors/xemacs/xemacs-21.4.20-r2.ebuild
+++ /dev/null
@@ -1,226 +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/xemacs/xemacs-21.4.20-r2.ebuild,v 1.3 2007/10/10 07:27:26 ulm Exp $
-
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
-
-export WANT_AUTOCONF="2.1"
-inherit autotools eutils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-DEPEND="virtual/libc
-	!virtual/xemacs
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ldap? ( net-nds/openldap )
-	esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/Xaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff )
-	png? ( =media-libs/libpng-1.2* )
-	jpeg? ( media-libs/jpeg )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-
-	cd "${S}"
-	epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch
-
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-
-	# Fix constent crashes with the combination native sound,linux,wav
-	epatch "${FILESDIR}"/xemacs-21.4.20-linuxplay.patch
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		use tiff && myconf="${myconf} --with-tiff" ||
-			myconf="${myconf} --without-tiff"
-		use png && myconf="${myconf} --with-png" ||
-			myconf="${myconf} --without-png"
-		use jpeg && myconf="${myconf} --with-jpeg" ||
-			myconf="${myconf} --without-jpeg"
-		use xface && myconf="${myconf} --with-xface" ||
-			myconf="${myconf} --without-xface"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		use canna && myconf="${myconf} --with-canna" ||
-					myconf="${myconf} --without-canna"
-		use freewnn && myconf="${myconf} --with-wnn" ||
-					myconf="${myconf} --without-wnn"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use esd && soundconf="${soundcond},esd"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# fixes #21264, this should be fixed in 21.4.21 and has been fixed
-	# in 21.5 for sure.
-	use alpha && myconf="${myconf} --with-system-malloc"
-	use ppc64 && myconf="${myconf} --with-system-malloc"
-	use ia64  && myconf="${myconf} --with-system-malloc"
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin ; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-		dosym /usr/bin/${i}-xemacs /usr/bin/${i}
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-}
diff --git a/app-editors/xemacs/xemacs-21.4.20-r3.ebuild b/app-editors/xemacs/xemacs-21.4.20-r3.ebuild
deleted file mode 100644
index cd91c35f57f5..000000000000
--- a/app-editors/xemacs/xemacs-21.4.20-r3.ebuild
+++ /dev/null
@@ -1,239 +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/xemacs/xemacs-21.4.20-r3.ebuild,v 1.6 2007/10/10 07:27:26 ulm Exp $
-
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
-
-export WANT_AUTOCONF="2.1"
-inherit autotools eutils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-DEPEND="virtual/libc
-	!virtual/xemacs
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ldap? ( net-nds/openldap )
-	esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/Xaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff )
-	png? ( =media-libs/libpng-1.2* )
-	jpeg? ( media-libs/jpeg )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2
-	>=app-admin/eselect-emacs-0.7-r1"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-
-	cd "${S}"
-	epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch
-
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-
-	# Fix constent crashes with the combination native sound,linux,wav
-	epatch "${FILESDIR}"/xemacs-21.4.20-linuxplay.patch
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		use tiff && myconf="${myconf} --with-tiff" ||
-			myconf="${myconf} --without-tiff"
-		use png && myconf="${myconf} --with-png" ||
-			myconf="${myconf} --without-png"
-		use jpeg && myconf="${myconf} --with-jpeg" ||
-			myconf="${myconf} --without-jpeg"
-		use xface && myconf="${myconf} --with-xface" ||
-			myconf="${myconf} --without-xface"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		use canna && myconf="${myconf} --with-canna" ||
-					myconf="${myconf} --without-canna"
-		use freewnn && myconf="${myconf} --with-wnn" ||
-					myconf="${myconf} --without-wnn"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use esd && soundconf="${soundconf},esd"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# fixes #21264, this should be fixed in 21.4.21 and has been fixed
-	# in 21.5 for sure.
-	use alpha && myconf="${myconf} --with-system-malloc"
-	use ppc64 && myconf="${myconf} --with-system-malloc"
-	use ia64  && myconf="${myconf} --with-system-malloc"
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	make prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin ; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update --if-unset
-}
-
-pkg_postrm() {
-	eselect emacs update --if-unset
-}