[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

[Ulrich Mueller]

commit:     4cae174a7859b066cab44412fe3b05d4120a5e5f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 22:15:50 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 22:30:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4cae174a

Merge changes from Portage tree.

Package-Manager: portage-2.2.1

---
 app-editors/emacs-vcs/ChangeLog                  |  3 +++
 app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 12 +++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index a3bdbf5..63ad864 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Aug 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild:
+  Merge changes from Portage tree.
+
   14 Aug 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild:
   Merge changes from Portage tree.
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 91a3102..c3cdcc0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.18 2013/08/12 05:54:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.20 2013/08/31 22:13:48 ulm Exp $
 
 EAPI=5
 
@@ -117,12 +117,6 @@ src_prepare() {
 
 	epatch_user
 
-	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.ac \
-			|| die "unable to sed configure.ac"
-	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
@@ -148,11 +142,11 @@ src_configure() {
 	local myconf
 
 	if use alsa; then
-		use sound || einfo \
+		use sound || ewarn \
 			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
 		myconf+=" --with-sound=alsa"
 	else
-		myconf+=" $(use_with sound)"
+		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
 	if use X; then