| 1 |
ulm 13/08/31 22:13:48 |
| 2 |
|
| 3 |
Modified: emacs-vcs-24.3.9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Account for new --with-sound configure option argument, upstream bug #15067. |
| 6 |
|
| 7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.20 app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?rev=1.20&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?rev=1.20&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?r1=1.19&r2=1.20 |
| 15 |
|
| 16 |
Index: emacs-vcs-24.3.9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v |
| 19 |
retrieving revision 1.19 |
| 20 |
retrieving revision 1.20 |
| 21 |
diff -u -r1.19 -r1.20 |
| 22 |
--- emacs-vcs-24.3.9999.ebuild 14 Aug 2013 06:26:39 -0000 1.19 |
| 23 |
+++ emacs-vcs-24.3.9999.ebuild 31 Aug 2013 22:13:48 -0000 1.20 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -117,12 +117,6 @@ |
| 33 |
|
| 34 |
epatch_user |
| 35 |
|
| 36 |
- if ! use alsa; then |
| 37 |
- # ALSA is detected even if not requested by its USE flag. |
| 38 |
- # Suppress it by supplying pkg-config with a wrong library name. |
| 39 |
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.ac \ |
| 40 |
- || die "unable to sed configure.ac" |
| 41 |
- fi |
| 42 |
if ! use gzip-el; then |
| 43 |
# Emacs' build system automatically detects the gzip binary and |
| 44 |
# compresses el files. We don't want that so confuse it with a |
| 45 |
@@ -147,12 +141,12 @@ |
| 46 |
|
| 47 |
local myconf |
| 48 |
|
| 49 |
- if use alsa && ! use sound; then |
| 50 |
- einfo "Although sound USE flag is disabled you chose to have alsa," |
| 51 |
- einfo "so sound is switched on anyway." |
| 52 |
- myconf+=" --with-sound" |
| 53 |
+ if use alsa; then |
| 54 |
+ use sound || ewarn \ |
| 55 |
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." |
| 56 |
+ myconf+=" --with-sound=alsa" |
| 57 |
else |
| 58 |
- myconf+=" $(use_with sound)" |
| 59 |
+ myconf+=" --with-sound=$(usex sound oss)" |
| 60 |
fi |
| 61 |
|
| 62 |
if use X; then |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.141 app-editors/emacs-vcs/ChangeLog |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.141&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.141&content-type=text/plain |
| 70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.140&r2=1.141 |
| 71 |
|
| 72 |
Index: ChangeLog |
| 73 |
=================================================================== |
| 74 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v |
| 75 |
retrieving revision 1.140 |
| 76 |
retrieving revision 1.141 |
| 77 |
diff -u -r1.140 -r1.141 |
| 78 |
--- ChangeLog 14 Aug 2013 06:26:39 -0000 1.140 |
| 79 |
+++ ChangeLog 31 Aug 2013 22:13:48 -0000 1.141 |
| 80 |
@@ -1,6 +1,9 @@ |
| 81 |
# ChangeLog for app-editors/emacs-vcs |
| 82 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 83 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.140 2013/08/14 06:26:39 ulm Exp $ |
| 84 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.141 2013/08/31 22:13:48 ulm Exp $ |
| 85 |
+ |
| 86 |
+ 31 Aug 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild: |
| 87 |
+ Account for new --with-sound configure option argument, upstream bug #15067. |
| 88 |
|
| 89 |
14 Aug 2013; Ulrich Müller <ulm@g.o> emacs-vcs-24.3.9999.ebuild: |
| 90 |
Don't call configure with --program-transform-name, upstream bug #15091. |
Archives