4 files changed, 27 insertions, 58 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 766bbbe854a9..a91e34fb0ea8 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.230 2008/01/22 10:06:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.231 2008/01/30 20:36:59 ulm Exp $
+
+  30 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-22.1-disable_alsa_detection.patch, emacs-21.4-r14.ebuild,
+  emacs-22.1-r3.ebuild:
+  Replace ALSA disable patch by sed magic. Add missing dependency on pkgconfig.
 
   22 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r4.ebuild:
   Remove old.
diff --git a/app-editors/emacs/emacs-21.4-r14.ebuild b/app-editors/emacs/emacs-21.4-r14.ebuild
index fdcc3914f1fb..0619baa200cc 100644
--- a/app-editors/emacs/emacs-21.4-r14.ebuild
+++ b/app-editors/emacs/emacs-21.4-r14.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/emacs-21.4-r14.ebuild,v 1.12 2008/01/22 07:56:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.13 2008/01/30 20:36:59 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -42,13 +42,13 @@ 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"
 
-	EPATCH_SUFFIX=patch epatch
-
 	# install emacsclient.1 man page (#165466)
 	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
 
diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild
index 4484f2718b2f..8a820ce35cbe 100644
--- a/app-editors/emacs/emacs-22.1-r3.ebuild
+++ b/app-editors/emacs/emacs-22.1-r3.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/emacs-22.1-r3.ebuild,v 1.16 2008/01/22 07:56:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.17 2008/01/30 20:36:59 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -44,6 +44,8 @@ RDEPEND="!<app-editors/emacs-cvs-22.1
 	)"
 
 DEPEND="${RDEPEND}
+	alsa? ( dev-util/pkgconfig )
+	gtk? ( dev-util/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
 
 # FULL_VERSION keeps the full version number, which is needed in order to
@@ -54,9 +56,24 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
+	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
+	epatch "${FILESDIR}/${P}-backup-buffer.patch"
+	epatch "${FILESDIR}/${P}-hack-local-variables.patch"
+	epatch "${FILESDIR}/${P}-format-int.patch"
+	epatch "${FILESDIR}/${P}-s390x-non-multilib.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
@@ -65,17 +82,6 @@ src_unpack() {
 			|| die "unable to sed configure.in"
 	fi
 
-	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
-	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
-	epatch "${FILESDIR}/${P}-backup-buffer.patch"
-	epatch "${FILESDIR}/${P}-hack-local-variables.patch"
-	epatch "${FILESDIR}/${P}-format-int.patch"
-	epatch "${FILESDIR}/${P}-s390x-non-multilib.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
-
 	eautoreconf
 }
 
diff --git a/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch b/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
deleted file mode 100644
index d4b630f362a8..000000000000
--- a/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.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
-