Replace ALSA disable patch by sed magic. Add missing dependency on pkgconfig.

Package-Manager: portage-2.1.4

5 files changed, 42 insertions, 77 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/Manifest b/app-editors/emacs/Manifest
index cf0eb636d300..1fb33651b3b4 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,10 +9,6 @@ AUX emacs-22.1-backup-buffer.patch 481 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5
 MD5 7d91e22e2876c9841b5c43611283ea24 files/emacs-22.1-backup-buffer.patch 481
 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5873982 files/emacs-22.1-backup-buffer.patch 481
 SHA256 84b740a49cf201cd4e5f7384adeb3eff6b1a2c8af6b6b6d1fe849e32d50e0e8b files/emacs-22.1-backup-buffer.patch 481
-AUX emacs-22.1-disable_alsa_detection.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
-MD5 4d8a875faa61af1fa4d5fd31d85ad5d5 files/emacs-22.1-disable_alsa_detection.patch 1573
-RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b files/emacs-22.1-disable_alsa_detection.patch 1573
-SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc files/emacs-22.1-disable_alsa_detection.patch 1573
 AUX emacs-22.1-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd
 MD5 c90238868fbd7ef8eeaf5993c8b2a9c5 files/emacs-22.1-format-int.patch 3078
 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 files/emacs-22.1-format-int.patch 3078
@@ -44,18 +40,18 @@ EBUILD emacs-18.59-r4.ebuild 2515 RMD160 8fcdd2f89402ef9ec002611fb46a06a0d16b73d
 MD5 aed258dc1bf484c15e8f4fcfdace621b emacs-18.59-r4.ebuild 2515
 RMD160 8fcdd2f89402ef9ec002611fb46a06a0d16b73dd emacs-18.59-r4.ebuild 2515
 SHA256 395d8d5096c857f80cb4ff9b3528c7409789d68f2dd633cd2320b626a68518a4 emacs-18.59-r4.ebuild 2515
-EBUILD emacs-21.4-r14.ebuild 5568 RMD160 1762ecb17c2f676d752e2f733711cbb41170b36b SHA1 dc29576070087127b6e0e9b5a17ae29fa7be4781 SHA256 1d17f5509e7faabde449a2460b2b9ac3cf272f05d1195ec60804cd7bf489d5b4
-MD5 c4e6c254fb98d392f26dbb7ffe98b80b emacs-21.4-r14.ebuild 5568
-RMD160 1762ecb17c2f676d752e2f733711cbb41170b36b emacs-21.4-r14.ebuild 5568
-SHA256 1d17f5509e7faabde449a2460b2b9ac3cf272f05d1195ec60804cd7bf489d5b4 emacs-21.4-r14.ebuild 5568
-EBUILD emacs-22.1-r3.ebuild 7872 RMD160 d5b45a730cad6273be30ff6d9efccfd5a366d9c1 SHA1 aa1d27278f8e01b689bdd1c4df425fd24760c863 SHA256 5bc851145c45c43be1970f542aa125942d6059308c7903042c7634e36351898f
-MD5 7850bf60654f43096e6c78c2ec889a40 emacs-22.1-r3.ebuild 7872
-RMD160 d5b45a730cad6273be30ff6d9efccfd5a366d9c1 emacs-22.1-r3.ebuild 7872
-SHA256 5bc851145c45c43be1970f542aa125942d6059308c7903042c7634e36351898f emacs-22.1-r3.ebuild 7872
-MISC ChangeLog 33690 RMD160 b33ee1b99c723c55e859ef627083630906ceac95 SHA1 450da3567a4534171e1a7172b39a95f5576d850c SHA256 24ce504e79c600e162c6923c95075e053397ec4b46027f5894a5af39822a97ba
-MD5 e14f29eb5be3529511772bb7e26c9a7f ChangeLog 33690
-RMD160 b33ee1b99c723c55e859ef627083630906ceac95 ChangeLog 33690
-SHA256 24ce504e79c600e162c6923c95075e053397ec4b46027f5894a5af39822a97ba ChangeLog 33690
+EBUILD emacs-21.4-r14.ebuild 5565 RMD160 766477d22af79ca3fa75ea4c97c44b0272144545 SHA1 1a130300925d78e7b957635fbff57d13aa256da2 SHA256 8f3a4e78a6fb28d4a090a0e21ab769fc11fe4537927d2a6c5334badd85aa9c3c
+MD5 8c600e0cb04389c4d4813a4263bf8769 emacs-21.4-r14.ebuild 5565
+RMD160 766477d22af79ca3fa75ea4c97c44b0272144545 emacs-21.4-r14.ebuild 5565
+SHA256 8f3a4e78a6fb28d4a090a0e21ab769fc11fe4537927d2a6c5334badd85aa9c3c emacs-21.4-r14.ebuild 5565
+EBUILD emacs-22.1-r3.ebuild 8010 RMD160 484973a84881d7d3df3a55954a247ca91401a3a9 SHA1 b42f1f96dd9f13086e0a486780cac5176a50dd65 SHA256 5de2c5d331069fcfc420fdf6562ec36fa2ae4feea1821dda6462a5d1cef90485
+MD5 56def197b5ae9c0a87a677b134d4b7b8 emacs-22.1-r3.ebuild 8010
+RMD160 484973a84881d7d3df3a55954a247ca91401a3a9 emacs-22.1-r3.ebuild 8010
+SHA256 5de2c5d331069fcfc420fdf6562ec36fa2ae4feea1821dda6462a5d1cef90485 emacs-22.1-r3.ebuild 8010
+MISC ChangeLog 33915 RMD160 1e49403efc2c213c78a29516ef31132800d3b72a SHA1 d0716b924a64f57ee9b6c2c1f420fd8aad8421ac SHA256 cfa5e24647b1a51787a6236f2e9afe62b459b314145ec409bf87bb4527f6b2b8
+MD5 01158b161ac9def9ee3359171c1ac47d ChangeLog 33915
+RMD160 1e49403efc2c213c78a29516ef31132800d3b72a ChangeLog 33915
+SHA256 cfa5e24647b1a51787a6236f2e9afe62b459b314145ec409bf87bb4527f6b2b8 ChangeLog 33915
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -72,7 +68,7 @@ SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAkeVwGEACgkQOeoy/oIi7uxI/QCeKS2HuCLG0QukEA5fQfZZAr5K
-0awAoLbaqZMwwycSDTso7Y0gubYPDxpm
-=VfKS
+iEYEARECAAYFAkeg4AEACgkQOeoy/oIi7uwXlwCgpF6YBovPmAoRwSpra9ZL9jlx
+UtgAnAzPBuHw8hL9oHFzHwpLohYatH8d
+=Dct1
 -----END PGP SIGNATURE-----
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
-