Replace ALSA patch by sed magic.

Package-Manager: portage-2.1.4

8 files changed, 95 insertions, 114 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index ea786e257151..3ce72fe26a09 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.182 2008/01/10 17:26:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.183 2008/01/26 18:52:34 ulm Exp $
+
+  26 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-disable_alsa_detection-r1.patch,
+  emacs-cvs-22.1.50-r2.ebuild, emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  emacs-cvs-23.0.0_p20070920-r1.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  The ALSA disable patch failed (again) on the trunk. Replace it by sed magic.
 
   10 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.50-r1.ebuild,
   emacs-cvs-23.0.60-r1.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 34b09880900e..a476d8203015 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -5,10 +5,6 @@ AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb
 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-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd
 MD5 c90238868fbd7ef8eeaf5993c8b2a9c5 files/emacs-cvs-format-int.patch 3078
 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 files/emacs-cvs-format-int.patch 3078
@@ -35,30 +31,30 @@ RMD160 6c698c2ce80c496079810da7290315ff579c9194 files/emacs-cvs-no-x-compile.pat
 SHA256 cf6b5d8a48796618a98f3a66f85f0010290b277be1d605304e7d83f36cc69349 files/emacs-cvs-no-x-compile.patch 452
 DIST emacs-cvs-22.1.50_p20070829.tar.bz2 20915594 RMD160 47f3c1c543de65c49deadbcdf4e83236aaa68f1b SHA1 6223e5b4cde078814648306b095f6081f56eea77 SHA256 c27196e9359d5ad4f30e3552c7897c995798324a323a4b47060b98426a71891f
 DIST emacs-cvs-23.0.0_p20070920.tar.bz2 21944733 RMD160 4ca3f66530c44a82e1badba4dfc934b2e5e5b8d7 SHA1 7e8b99d695adaec619837a6eec22c04ac69cb7aa SHA256 c38d4be31e047f5a470b1664a2721b3dcb83b3876cb3490a86e05804aebf4f2a
-EBUILD emacs-cvs-22.1.50-r2.ebuild 7887 RMD160 2dd54f7a6aea91af68b53079372c725461c624cf SHA1 7eb6a7bf1b148d213d4811c981e3d6657fcb9ecb SHA256 8a22474304a23900a58b5ed061f1aaebc9b946cc25bbc180d89d1193aac45187
-MD5 39101eacb1fedd97003ebffab6d8398a emacs-cvs-22.1.50-r2.ebuild 7887
-RMD160 2dd54f7a6aea91af68b53079372c725461c624cf emacs-cvs-22.1.50-r2.ebuild 7887
-SHA256 8a22474304a23900a58b5ed061f1aaebc9b946cc25bbc180d89d1193aac45187 emacs-cvs-22.1.50-r2.ebuild 7887
-EBUILD emacs-cvs-22.1.50_p20070829-r2.ebuild 7578 RMD160 8b213e42587476210e5c180d4dedd394ccac0d95 SHA1 6cf0064bee30291f4a9252d9426b0cf8ed0d5574 SHA256 341d374ec674fc544370e12cde2829d665a21eb025984689efc5c454b3789a39
-MD5 12b7034e44ac54cefb040a7bd703c2be emacs-cvs-22.1.50_p20070829-r2.ebuild 7578
-RMD160 8b213e42587476210e5c180d4dedd394ccac0d95 emacs-cvs-22.1.50_p20070829-r2.ebuild 7578
-SHA256 341d374ec674fc544370e12cde2829d665a21eb025984689efc5c454b3789a39 emacs-cvs-22.1.50_p20070829-r2.ebuild 7578
-EBUILD emacs-cvs-23.0.0_p20070920-r1.ebuild 7839 RMD160 a318d7068f464b74962edff66fec27c60d515a5a SHA1 8bec7c353444409e784870be4e117938769ef5f5 SHA256 7bb109ab3f6f38bea5126d0ea7320c6994e40f030f86ff4baa67759edcc68886
-MD5 a02536842141517885326d5189badd80 emacs-cvs-23.0.0_p20070920-r1.ebuild 7839
-RMD160 a318d7068f464b74962edff66fec27c60d515a5a emacs-cvs-23.0.0_p20070920-r1.ebuild 7839
-SHA256 7bb109ab3f6f38bea5126d0ea7320c6994e40f030f86ff4baa67759edcc68886 emacs-cvs-23.0.0_p20070920-r1.ebuild 7839
-EBUILD emacs-cvs-23.0.50-r1.ebuild 7987 RMD160 aef8f0d7d892563bf6a0fa4ed4a8a677ea29d265 SHA1 6bc663a6b26223d24b75bc85f58bbfd41f1279b6 SHA256 25f04082e9205d8055917d6a5a7eb915946a5afd45285cae8ca67299661070e9
-MD5 ff4552b0994653e740c3e52b5f030f45 emacs-cvs-23.0.50-r1.ebuild 7987
-RMD160 aef8f0d7d892563bf6a0fa4ed4a8a677ea29d265 emacs-cvs-23.0.50-r1.ebuild 7987
-SHA256 25f04082e9205d8055917d6a5a7eb915946a5afd45285cae8ca67299661070e9 emacs-cvs-23.0.50-r1.ebuild 7987
-EBUILD emacs-cvs-23.0.60-r1.ebuild 8177 RMD160 25b2ccf91beefb78d88fb69796df5f1f9568a773 SHA1 970d31c19d530602ec992d5598c1c0554a829ca8 SHA256 d828ed2ea78dd3f3d7d524abcc4b69e73fdbf696ca5a291a0a482999df435168
-MD5 a6585f17ae5675f470a13b1a6ee108be emacs-cvs-23.0.60-r1.ebuild 8177
-RMD160 25b2ccf91beefb78d88fb69796df5f1f9568a773 emacs-cvs-23.0.60-r1.ebuild 8177
-SHA256 d828ed2ea78dd3f3d7d524abcc4b69e73fdbf696ca5a291a0a482999df435168 emacs-cvs-23.0.60-r1.ebuild 8177
-MISC ChangeLog 35393 RMD160 a1a769ae9d907e3ad44b75ef0ae3c4f779a7a4d8 SHA1 5e9eef4a0ccb0aab38445b3f1df4eb45cea8e5f7 SHA256 f535c4682e69566be50c86e4a908511187ad3bb7a5327c24aa5c6832ab5369ac
-MD5 13a9ca9d37e895cb12353a53d508cc29 ChangeLog 35393
-RMD160 a1a769ae9d907e3ad44b75ef0ae3c4f779a7a4d8 ChangeLog 35393
-SHA256 f535c4682e69566be50c86e4a908511187ad3bb7a5327c24aa5c6832ab5369ac ChangeLog 35393
+EBUILD emacs-cvs-22.1.50-r2.ebuild 7965 RMD160 3078c8353be016bed84424ed7b0e99c537c73080 SHA1 b6c05f1c13457e4ed3d0bc238eac198b382c5db7 SHA256 09b085aa8f246d119c3494fa335cf0045b2344809662ad154bf13ceda6197177
+MD5 3d7026fd85595a5c25d3190d515343a7 emacs-cvs-22.1.50-r2.ebuild 7965
+RMD160 3078c8353be016bed84424ed7b0e99c537c73080 emacs-cvs-22.1.50-r2.ebuild 7965
+SHA256 09b085aa8f246d119c3494fa335cf0045b2344809662ad154bf13ceda6197177 emacs-cvs-22.1.50-r2.ebuild 7965
+EBUILD emacs-cvs-22.1.50_p20070829-r2.ebuild 7656 RMD160 9a1a8772864d3a99d1ba05087d76d50f5edfe7ef SHA1 7bef3fbb040dd2db319aa3dd87edc9b8e11e878d SHA256 ef4b562cb69de508d7a65451442c525dc3c35290581aad3e9664c58c7766a4ef
+MD5 ba0bc0861186da44032aedaaaf108c05 emacs-cvs-22.1.50_p20070829-r2.ebuild 7656
+RMD160 9a1a8772864d3a99d1ba05087d76d50f5edfe7ef emacs-cvs-22.1.50_p20070829-r2.ebuild 7656
+SHA256 ef4b562cb69de508d7a65451442c525dc3c35290581aad3e9664c58c7766a4ef emacs-cvs-22.1.50_p20070829-r2.ebuild 7656
+EBUILD emacs-cvs-23.0.0_p20070920-r1.ebuild 7917 RMD160 d6c5a386ad56433e3181ef02b9ebc77ab9952a19 SHA1 ccff244d1d089463be0798c1f2a87166dad7ddef SHA256 1fc9decd1951029e24887eec26e67eed7ef5bcb2a875303efa817523f20a49ba
+MD5 04f5c2b535d7623b08f1567ff9494344 emacs-cvs-23.0.0_p20070920-r1.ebuild 7917
+RMD160 d6c5a386ad56433e3181ef02b9ebc77ab9952a19 emacs-cvs-23.0.0_p20070920-r1.ebuild 7917
+SHA256 1fc9decd1951029e24887eec26e67eed7ef5bcb2a875303efa817523f20a49ba emacs-cvs-23.0.0_p20070920-r1.ebuild 7917
+EBUILD emacs-cvs-23.0.50-r1.ebuild 8065 RMD160 9f8c4d11cf8f2fd8387185b1863ae28b4cc38091 SHA1 4f0288e1a07ddcdbaa4a6c24ebd088439e56695c SHA256 8284f4e6ee3b082aa34db3b0c51a631c5d7b4cee1545bb93c08fb30bad387384
+MD5 dcc328e5c268bab56eea5f6207c43f4f emacs-cvs-23.0.50-r1.ebuild 8065
+RMD160 9f8c4d11cf8f2fd8387185b1863ae28b4cc38091 emacs-cvs-23.0.50-r1.ebuild 8065
+SHA256 8284f4e6ee3b082aa34db3b0c51a631c5d7b4cee1545bb93c08fb30bad387384 emacs-cvs-23.0.50-r1.ebuild 8065
+EBUILD emacs-cvs-23.0.60-r1.ebuild 8255 RMD160 5d94d47530e79687d26313ea08f54a0ae44a5c7d SHA1 cedb9cad07c986c0eb1eaae7a3033788f9637575 SHA256 f3445f21294e8645c01b62e118f37b95ccd012d0ef186fd76ee44075f73c8187
+MD5 153fc4e08d4dd7d4e2f0c3f976760588 emacs-cvs-23.0.60-r1.ebuild 8255
+RMD160 5d94d47530e79687d26313ea08f54a0ae44a5c7d emacs-cvs-23.0.60-r1.ebuild 8255
+SHA256 f3445f21294e8645c01b62e118f37b95ccd012d0ef186fd76ee44075f73c8187 emacs-cvs-23.0.60-r1.ebuild 8255
+MISC ChangeLog 35742 RMD160 29f6eca67f529f2edd1a772858141afbb8d10ab0 SHA1 e36683e990e6cde7ecf5500a3d97658e25e16b85 SHA256 327761946960d321da13df87c34794571b428124afdc95090c20bac0f882edcd
+MD5 11ad4b280e7f71f2623b7d32c038d0cc ChangeLog 35742
+RMD160 29f6eca67f529f2edd1a772858141afbb8d10ab0 ChangeLog 35742
+SHA256 327761946960d321da13df87c34794571b428124afdc95090c20bac0f882edcd ChangeLog 35742
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -81,7 +77,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAkeGVV8ACgkQOeoy/oIi7uxN4gCg6XBAu5NbqhWtrNlMd/nV/JRF
-mPoAoJq6dwRA7LbHadygFTNEGTk0u6aY
-=Oxyc
+iEYEARECAAYFAkebgZUACgkQOeoy/oIi7uzczACg109fiuoxWNNGBeZN7r9yj6qR
+TXsAn1SqvGh1NQbBvrNbImix/y51T2Tb
+=Y1uo
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild
index f73be34197d7..9ffac2504bd9 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1.50-r2.ebuild,v 1.6 2008/01/10 14:47:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild,v 1.7 2008/01/26 18:52:34 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -73,9 +73,19 @@ src_unpack() {
 		|| die "Upstream version number changed to ${FULL_VERSION}"
 	echo
 
+	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.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
@@ -84,12 +94,6 @@ src_unpack() {
 			|| 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-r1.patch"
-
 	eautoreconf
 }
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild
index 5a5cb9a47ada..d907a6eedd98 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1.50_p20070829-r2.ebuild,v 1.6 2008/01/10 14:47:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild,v 1.7 2008/01/26 18:52:34 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -57,9 +57,22 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
+	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
+	epatch "${FILESDIR}/${PN}-hack-local-variables.patch"
+	epatch "${FILESDIR}/${PN}-format-int.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
@@ -68,15 +81,6 @@ src_unpack() {
 			|| die "unable to sed configure.in"
 	fi
 
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
-	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
-	epatch "${FILESDIR}/${PN}-hack-local-variables.patch"
-	epatch "${FILESDIR}/${PN}-format-int.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-r1.patch"
-
 	eautoreconf
 }
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild
index 73d1442bd6ab..2a48e281cab2 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild,v 1.6 2008/01/10 14:47:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild,v 1.7 2008/01/26 18:52:34 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -58,9 +58,23 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
+	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
+	epatch "${FILESDIR}/${PN}-no-x-compile.patch"
+	epatch "${FILESDIR}/${PN}-hack-local-variables.patch"
+	epatch "${FILESDIR}/${PN}-format-int.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
@@ -69,16 +83,6 @@ src_unpack() {
 			|| die "unable to sed configure.in"
 	fi
 
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
-	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
-	epatch "${FILESDIR}/${PN}-no-x-compile.patch"
-	epatch "${FILESDIR}/${PN}-hack-local-variables.patch"
-	epatch "${FILESDIR}/${PN}-format-int.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-r1.patch"
-
 	eautoreconf
 }
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild
index a34cb5769fc6..4f90eb80df94 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.8 2008/01/10 17:26:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.9 2008/01/26 18:52:34 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -77,9 +77,18 @@ src_unpack() {
 		|| die "Upstream version number changed to ${FULL_VERSION}"
 	echo
 
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.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
@@ -88,11 +97,6 @@ src_unpack() {
 			|| die "unable to sed configure.in"
 	fi
 
-	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-r1.patch"
-
 	eautoreconf
 }
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild
index 5f7ea6effe73..ba92427727a4 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.8 2008/01/10 17:26:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.9 2008/01/26 18:52:34 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -77,9 +77,18 @@ src_unpack() {
 		|| die "Upstream version number changed to ${FULL_VERSION}"
 	echo
 
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.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
@@ -88,11 +97,6 @@ src_unpack() {
 			|| die "unable to sed configure.in"
 	fi
 
-	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-r1.patch"
-
 	eautoreconf
 }
 
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection-r1.patch b/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection-r1.patch
deleted file mode 100644
index d4b630f362a8..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection-r1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in	22 May 2007 15:54:32 -0000	1.448
-+++ configure.in	30 May 2007 13:19:39 -0000
-@@ -1590,39 +1590,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.])
--  fi
-   AC_SUBST(CFLAGS_SOUND)
- fi
-