diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-22 06:22:23 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-22 06:22:23 +0000 |
| commit | 5bde97a5c2b42cd72d8ae865b123771b3df2ebca (patch) | |
| tree | ef2902d3835e566d9bc936722867ea84aa5956f0 /app-emulation | |
| parent | Revision bump. Fix runtime issue with httplib2-0.7.7 (patch by Arfrever). (diff) | |
| download | gentoo-2-5bde97a5c2b42cd72d8ae865b123771b3df2ebca.tar.gz gentoo-2-5bde97a5c2b42cd72d8ae865b123771b3df2ebca.tar.bz2 gentoo-2-5bde97a5c2b42cd72d8ae865b123771b3df2ebca.zip | |
Don't pass --without-pulse to configure if pulseaudio patches are not applied.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.5.20.ebuild | 4 | ||||
| -rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 5fdce228c5c3..e5241b3cae13 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.441 2012/12/22 04:40:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.442 2012/12/22 06:22:23 tetromino Exp $ + + 22 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.20.ebuild, + wine-9999.ebuild: + Don't pass --without-pulse to configure if pulseaudio patches are not + applied. *wine-1.5.20 (22 Dec 2012) diff --git a/app-emulation/wine/wine-1.5.20.ebuild b/app-emulation/wine/wine-1.5.20.ebuild index b80fd8d01bce..17d65233a887 100644 --- a/app-emulation/wine/wine-1.5.20.ebuild +++ b/app-emulation/wine/wine-1.5.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.1 2012/12/22 04:40:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.2 2012/12/22 06:22:23 tetromino Exp $ EAPI="5" @@ -191,7 +191,7 @@ do_configure() { $(use_with oss) \ $(use_with png) \ $(use_with threads pthread) \ - $(use_with pulseaudio pulse) \ + $(usex vanilla "" $(use_with pulseaudio pulse)) \ $(use_with scanner sane) \ $(use_enable test tests) \ $(use_with truetype freetype) \ diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 16f6401a29fc..5c95516a8431 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.124 2012/12/22 04:40:21 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.125 2012/12/22 06:22:23 tetromino Exp $ EAPI="5" @@ -191,7 +191,7 @@ do_configure() { $(use_with oss) \ $(use_with png) \ $(use_with threads pthread) \ - $(use_with pulseaudio pulse) \ + $(usex vanilla "" $(use_with pulseaudio pulse)) \ $(use_with scanner sane) \ $(use_enable test tests) \ $(use_with truetype freetype) \ |