Account for new --with-sound configure option argument, upstream bug #15067.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 23 insertions, 26 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 279d7f94c952..a0f163a20a0f 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.140 2013/08/14 06:26:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.141 2013/08/31 22:13:48 ulm Exp $
+
+  31 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+  Account for new --with-sound configure option argument, upstream bug #15067.
 
   14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
   Don't call configure with --program-transform-name, upstream bug #15091.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 5e728b2c3a10..bd23dacb0fac 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD emacs-vcs-24.3.9999.ebuild 11426 SHA256 60e89be4798a3b5fe87b053fa9d3de08c0101ae1600a905c06c89e3ea1f102c9 SHA512 1c4bcb0351328f6df6f07d9b650b3efcba1ece1ccad42a598093763d15a37415368adb930982af82cdafe74a05eb87a92492c4145a1270bcd05eabfe64fca81a WHIRLPOOL bbf20a5418334ff4a41b10371998ff56bbc4b06846ce71b3cc1c23c3538ef705a4e95aec3e03196eecf6d326eb37a56e4007bd684bbebe9ea7cabe3384f07946
-MISC ChangeLog 73662 SHA256 633fbdc5db7dce1de02d1bdb37f8ef81e4f591a33f94541de9afe8a0fc732b4a SHA512 06bbef3f73fdfc6faed296acc0613e72ff0bd4adbd00cecbcbd87922531e5f70ae7656bd6da0c25f66a7755b3d81810f039919744466b54c1fbbdc19be976b9d WHIRLPOOL 8331ff0a78425cc445b2aaf56e364a474563e93b774c8cfe684e3fdcaed43ffab777fdfb6e9c0ef8ac23b92680c3b02df774ec7310597367f15c9bfa4d4ae6a6
+EBUILD emacs-vcs-24.3.9999.ebuild 11154 SHA256 81ec9bdc1ef19e276b474a43ea78fe1fc7a61c6234ad3ac671ddbd911e865c1a SHA512 c2034b6106f5201635ecd8736e53e7bafc2225ffbe0b5881729f93aaf0ed7b35b2bc4bfaa6f3005abcc9002ef90f67ee48b5fb8d339853ed39408b9dbafb7516 WHIRLPOOL 3426b290a61474e486a2333b4db14f8df8e50d42de590623e6d48112441cfe6b99b151f5deb9e5045dc8efb31e423ecdf81cfd1b9aa69bcb3b7e84117791fa89
+MISC ChangeLog 73817 SHA256 657e8607942b0d62ed74f02b3d5a81e8bee585d7fdd6378036074b7cea51b114 SHA512 e0f49c32fc059e4491564d025b9e1d855601040c162cd95e2f05949122ae09e9b8b30667f8148cd57a26adccc8e4e181b37294732adc4c4ad2db42b4b6c2ade9 WHIRLPOOL 8d46c3cfd2431303a01f03833d3f09a77ae5d410580edc82681cc82452176a7166389b2e10e7da0f82e7834fcc08b50c7f79c13b8a8bb5637a447ed3add1a163
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSCyOWAAoJEJQzkH1pP7W4E9kL/2FQVdF/3ymE0ayBqBAlP8Kb
-7pRVfWTmNOzQF4IlkL1sZf7jEpHN5RNmo5q1UFp/o10932k42UCi9IvOlLmzQCVG
-CsgHOuSq/QYaGVrFxG3xt7ws0pt6IJF0MMNZajI8i4HelX+RAKIjO/DPKyLfRR+Z
-pyqr9ObDB9a+eEZvktUrZU6Pn3WZa7JqjQc8wVh4aa184ShWgocNGDcJpKLT6mwV
-T0irbL6BZSb7aqHThOq3wpzEd7wQVTCVDBGric/REoqjX8WknRvNRx8TtBVI1KFh
-B2Sj7XuyyRZOGBP494WepG0DifPSVLGguu435RE1cbLihxKDRc5SbsBqUKYrmaxb
-LpSw7NHPz5J5ouHotm8Ixg7y4tX/FNYoVHxnLZAVKvGjbSYnilCsZFcXS83zosmw
-PER44YMFl3rw7GVSMJJ1MBxmx2w5XloJ03TYFYiqEZtelyiBVyR6m8B05BehTdbv
-9YV+04VkIe/nVc9U2uyKemvOibmqcxk3mopTG0FEEA==
-=1chp
+iQGcBAEBCAAGBQJSImq5AAoJEJQzkH1pP7W4mMYL/RNIR08H1BZiPZCZIHmI7L80
+4FHKE2OF86uWlKyrXsXYbrt8NHh1TDHcV6uRl9mDnmIF9Sqr6iON/zxiB+HVKsbl
+KIGwsQFb6U6XYm289+DlPwRseW6kc8PWvnPHICAhlPiIWTCCQBG+olGBNlfUrFBE
+xWDWQTJ06kb9uFbC3AJ9W8H4m7/brjNYOU1SvuwF94FIoeZUZoCGLP3thJ+W40sW
+AgCNID7hK6VHcZnZazMNHzmljRf6mJW83E+YSTGowqhKwUOUKdz+Fk8aOJ5RoQcx
+MJt3lVY0ijSSHMosqjmO6qa1IHR10oIanLZMWem1otnTOHWsebcyQCAOBWRSetiM
+8zHz4sPPq5aCScB8yzdRM+z7BV2apFG9543mn3yQMQUT7fj2sRNPUVU/7Xeo90cB
+gSeU4XZwr539/tvQaWGvnzzPILA7QWzsBoYaejJX5qaNAactwTEBHyghVq6gQx12
+L8Y2xt4J6W0FgAA8js3vKS9+cR8UFkeFGQCqJyG0GQ==
+=3ME2
 -----END PGP SIGNATURE-----
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 8c8f6e7f5a10..c3cdcc0e9715 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.19 2013/08/14 06:26:39 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
@@ -147,12 +141,12 @@ src_configure() {
 
 	local myconf
 
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
+	if use alsa; then
+		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