Replace ALSA patch by sed magic.

(Portage version: 2.1.4)

7 files changed, 68 insertions, 83 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/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
-