Remove old version.

Package-Manager: portage-2.1.3_rc5

6 files changed, 13 insertions, 383 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index a6658b359773..da580ff57bc4 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.141 2007/06/19 08:05:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.142 2007/06/24 15:39:37 ulm Exp $
+
+  24 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-Xaw3d-headers.patch,
+  -files/emacs-cvs-disable_alsa_detection.patch, -emacs-cvs-22.0.990.ebuild:
+  Remove old version.
 
   19 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild,
   emacs-cvs-23.0.0-r6.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index fa23cd38d3fe..24beaee47798 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,27 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
-MD5 2f28d7e33295c25205c50466d3deac65 files/emacs-cvs-Xaw3d-headers.patch 2045
-RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 files/emacs-cvs-Xaw3d-headers.patch 2045
-SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c files/emacs-cvs-Xaw3d-headers.patch 2045
 AUX emacs-cvs-disable_alsa_detection-r1.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
 MD5 4d8a875faa61af1fa4d5fd31d85ad5d5 files/emacs-cvs-disable_alsa_detection-r1.patch 1573
 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b files/emacs-cvs-disable_alsa_detection-r1.patch 1573
 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc files/emacs-cvs-disable_alsa_detection-r1.patch 1573
-AUX emacs-cvs-disable_alsa_detection.patch 1606 RMD160 9efec483c24d7a5e9e9514e4eb3df3ee1d0742e1 SHA1 420a2bf2414fb19e0ca98982f2be0aaf511350af SHA256 72192c7d87fa312c676baf99f9564b60c3961fd08b4124ae342a5616d4c52a4a
-MD5 c74e12e93c45c2276b6cf685f49f66aa files/emacs-cvs-disable_alsa_detection.patch 1606
-RMD160 9efec483c24d7a5e9e9514e4eb3df3ee1d0742e1 files/emacs-cvs-disable_alsa_detection.patch 1606
-SHA256 72192c7d87fa312c676baf99f9564b60c3961fd08b4124ae342a5616d4c52a4a files/emacs-cvs-disable_alsa_detection.patch 1606
 AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 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.990.tar.gz 38184881 RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 SHA1 d6ccf5ae41e3d3382fd43c0524ea660a497f9053 SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c
-EBUILD emacs-cvs-22.0.990.ebuild 7426 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 SHA1 da90a70b6efed5d35b8ed09e46b4d611bb0b55d4 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e
-MD5 923a512c786c0f667600a277ddf7070e emacs-cvs-22.0.990.ebuild 7426
-RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 emacs-cvs-22.0.990.ebuild 7426
-SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e emacs-cvs-22.0.990.ebuild 7426
 EBUILD emacs-cvs-22.1.50.ebuild 7516 RMD160 cd329ccdfd75c5b4a3895f30c8ad1ebf05df8d00 SHA1 46f5ea28652e5cbbd3a78db9c75cb16dc05ad0f7 SHA256 e3707c8c165926c4e2d5baa76f33cbabe3a824df88d46e3ac99972b4fde5f0f9
 MD5 7af8f7d4a31fa0c05e390c87deffb276 emacs-cvs-22.1.50.ebuild 7516
 RMD160 cd329ccdfd75c5b4a3895f30c8ad1ebf05df8d00 emacs-cvs-22.1.50.ebuild 7516
@@ -30,28 +17,24 @@ EBUILD emacs-cvs-23.0.0-r6.ebuild 7683 RMD160 b512e3922917890fa98f891878994ad002
 MD5 8eec92e7945474fc86fcb63686e07650 emacs-cvs-23.0.0-r6.ebuild 7683
 RMD160 b512e3922917890fa98f891878994ad002d5a214 emacs-cvs-23.0.0-r6.ebuild 7683
 SHA256 cecc45706813941b46646f528493110249c57a97b7033b276ef5dda029d17d10 emacs-cvs-23.0.0-r6.ebuild 7683
-MISC ChangeLog 26936 RMD160 fb2a6cc32587efef885869abab503e424d03e4a8 SHA1 06c3a054956b6c938809f7f15d2616c38e8e9aa2 SHA256 81291bee8721a13a7a8e756465523ec41af1fc880c66f0f0e9eca4eaffe2b045
-MD5 55b09180ead8ea561048c80fea57305c ChangeLog 26936
-RMD160 fb2a6cc32587efef885869abab503e424d03e4a8 ChangeLog 26936
-SHA256 81291bee8721a13a7a8e756465523ec41af1fc880c66f0f0e9eca4eaffe2b045 ChangeLog 26936
+MISC ChangeLog 27123 RMD160 6f847f8d6447c7423523166142b145df1b9f8ba3 SHA1 2aa9a27343ce3b2652c2160464cecc9eeab9c28c SHA256 850e8ed01d58893726e15d7c22de07bf1020ebc2ad3ea091abc3c9f2e6c62ae0
+MD5 aaaeb996210852723efa3c179e45e288 ChangeLog 27123
+RMD160 6f847f8d6447c7423523166142b145df1b9f8ba3 ChangeLog 27123
+SHA256 850e8ed01d58893726e15d7c22de07bf1020ebc2ad3ea091abc3c9f2e6c62ae0 ChangeLog 27123
 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 07fa6d117472cfb4f75c1d00ec300709 files/digest-emacs-cvs-22.0.990 250
-RMD160 46f7fa259ce23c2a8ee97d9cc5e88b8f93d29b60 files/digest-emacs-cvs-22.0.990 250
-SHA256 00f87abb7a35a8ee4f7f6624fb1ac8e567fe7977dcd7405d603e754122ddb5c4 files/digest-emacs-cvs-22.0.990 250
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.1.50 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.1.50 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.1.50 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r6 0
-
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGd47MOeoy/oIi7uwRAqv3AKCwPdtVTfpAH8eqWIcz9pLCqhHlJgCdEcvg
-Yw50DhewOvPuRH9oO4auRhc=
-=vyPO
+iD8DBQFGfpA8Oeoy/oIi7uwRAqcaAJwPVgx4Sz4Fhw1jI2fTd4xvSnq0SgCdFED7
+v9HMWUKd1xoY6w0i7qr85OU=
+=iBvk
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
deleted file mode 100644
index dae9cc936eb5..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.8 2007/06/01 18:42:08 ulm Exp $
-
-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"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="22"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? (
-		$X_DEPEND
-		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? (
-					lesstif? ( x11-libs/lesstif )
-					!lesstif? ( x11-libs/openmotif )
-				)
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/editor"
-
-S="${WORKDIR}/emacs-${PV}"
-
-# 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}"
-
-	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}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	if use 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
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		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
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			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"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			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
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
-	# the build system (has been reported upstream)
-	use hesiod && myconf="${myconf} --with-hesiod"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--infodir=/usr/share/info/emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-}
-
-src_install () {
-	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 /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//' >00${PN}-${SLOT}-gentoo.el <<EOF
-(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 00${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
-	echo
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	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 --if-unset
-	fi
-
-	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"
-	elog "the Emacs eselect module. Man and info pages are automatically"
-	elog "redirected, so you are to test emacs-cvs along with the stable"
-	elog "release. \"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.990 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.990
deleted file mode 100644
index d397f8b92767..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.990
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 809ab62a9b9c36a9d685021a907f6022 emacs-22.0.990.tar.gz 38184881
-RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 emacs-22.0.990.tar.gz 38184881
-SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c emacs-22.0.990.tar.gz 38184881
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch b/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch
deleted file mode 100644
index 0e6be8910334..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-*** emacs/src/xfns.c.~1.681.~	2007-03-24 11:49:48.000000000 -0400
---- emacs/src/xfns.c	2007-04-18 01:18:52.000000000 -0400
-***************
-*** 72,79 ****
---- 72,84 ----
-  #include <X11/Shell.h>
-  
-  #ifndef USE_MOTIF
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Paned.h>
-+ #include <X11/Xaw3d/Label.h>
-+ #else  /* !HAVE_XAW3D */
-  #include <X11/Xaw/Paned.h>
-  #include <X11/Xaw/Label.h>
-+ #endif /* HAVE_XAW3D */
-  #endif /* USE_MOTIF */
-  
-  #ifdef USG
-*** emacs/src/xmenu.c.~1.317.~	2007-01-20 23:18:14.000000000 -0500
---- emacs/src/xmenu.c	2007-04-18 01:15:43.000000000 -0400
-***************
-*** 82,88 ****
---- 82,92 ----
-  #include <X11/StringDefs.h>
-  #include <X11/Shell.h>
-  #ifdef USE_LUCID
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Paned.h>
-+ #else  /* !HAVE_XAW3D */
-  #include <X11/Xaw/Paned.h>
-+ #endif /* HAVE_XAW3D */
-  #endif /* USE_LUCID */
-  #include "../lwlib/lwlib.h"
-  #else /* not USE_X_TOOLKIT */
-*** emacs/lwlib/lwlib.c.~1.55.~	2007-02-27 23:25:05.000000000 -0500
---- emacs/lwlib/lwlib.c	2007-04-18 01:21:44.000000000 -0400
-***************
-*** 48,54 ****
---- 48,58 ----
-  #endif /* not USE_MOTIF && USE_LUCID */
-  #endif
-  #if defined (USE_XAW)
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Paned.h>
-+ #else  /* !HAVE_XAW3D */
-  #include <X11/Xaw/Paned.h>
-+ #endif /* HAVE_XAW3D */
-  #include "lwlib-Xaw.h"
-  #endif
-  
-*** emacs/lwlib/lwlib-Xaw.c.~1.25.~	2007-02-26 22:07:08.000000000 -0500
---- emacs/lwlib/lwlib-Xaw.c	2007-04-18 01:22:33.000000000 -0400
-***************
-*** 35,46 ****
---- 35,55 ----
-  #include <X11/CoreP.h>
-  #include <X11/Shell.h>
-  
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Scrollbar.h>
-+ #include <X11/Xaw3d/Paned.h>
-+ #include <X11/Xaw3d/Dialog.h>
-+ #include <X11/Xaw3d/Form.h>
-+ #include <X11/Xaw3d/Command.h>
-+ #include <X11/Xaw3d/Label.h>
-+ #else /* !HAVE_XAW3D */
-  #include <X11/Xaw/Scrollbar.h>
-  #include <X11/Xaw/Paned.h>
-  #include <X11/Xaw/Dialog.h>
-  #include <X11/Xaw/Form.h>
-  #include <X11/Xaw/Command.h>
-  #include <X11/Xaw/Label.h>
-+ #endif /* HAVE_XAW3D */
-  
-  #include <X11/Xatom.h>
-  
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection.patch b/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection.patch
deleted file mode 100644
index 3ae58f95363d..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- /tmp/configure.in	2007-03-13 11:09:44.000000000 +0100
-+++ configure.in	2007-03-13 11:11:48.000000000 +0100
-@@ -1527,40 +1527,6 @@
-   # Emulation library used on NetBSD.
-   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
-   AC_SUBST(LIBSOUND)
--
--  ALSA_REQUIRED=1.0.0
--  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
--  dnl Check if --with-pkg-config-prog has been given.
--  if test "X${with_pkg_config_prog}" != X; then
--    PKG_CONFIG="${with_pkg_config_prog}"
--  fi
--  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
--  if test $HAVE_ALSA = yes; then
--    SAVE_CFLAGS="$CFLAGS"
--    SAVE_LDFLAGS="$LDFLAGS"
--    CFLAGS="$ALSA_CFLAGS $CFLAGS"
--    LDFLAGS="$ALSA_LIBS $LDFLAGS"
--    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
--                    emacs_alsa_normal=yes,
--	            emacs_alsa_normal=no)
--    if test "$emacs_alsa_normal" != yes; then
--      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
--                     [snd_lib_error_set_handler (0);],
--                     emacs_alsa_subdir=yes,
--	             emacs_alsa_subdir=no)
--      if test "$emacs_alsa_subdir" != yes; then
--        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
--      fi
--      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
--    fi
--
--    CFLAGS="$SAVE_CFLAGS"
--    LDFLAGS="$SAVE_LDFLAGS"
--    LIBSOUND="$LIBSOUND $ALSA_LIBS"
--    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
--    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
--    AC_SUBST()
--  fi
-   AC_SUBST(CFLAGS_SOUND)
- fi
-