diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-04-23 21:09:16 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-04-23 21:09:16 +0000 |
| commit | 20ffe291e5ef2b736e7fd0de0ebb47cdf2dad2fe (patch) | |
| tree | dc65c22edd65cc1e6e1d24269e0c4302bd520f61 /media-sound | |
| parent | Revison bump to fix undefined variable in esync (diff) | |
| download | gentoo-2-20ffe291e5ef2b736e7fd0de0ebb47cdf2dad2fe.tar.gz gentoo-2-20ffe291e5ef2b736e7fd0de0ebb47cdf2dad2fe.tar.bz2 gentoo-2-20ffe291e5ef2b736e7fd0de0ebb47cdf2dad2fe.zip | |
bring back the alsa useflag guard for the alsa-plugins dep which was dropped in http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild?r1=1.18&r2=1.19
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/pulseaudio/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-1.99.2.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/pulseaudio/pulseaudio-9999.ebuild | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index f151d1ded012..771dc7d9010c 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.267 2012/03/29 03:17:38 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.268 2012/04/23 21:09:16 aballier Exp $ + + 23 Apr 2012; Alexis Ballier <aballier@gentoo.org> pulseaudio-1.99.2.ebuild, + pulseaudio-9999.ebuild: + bring back the alsa useflag guard for the alsa-plugins dep which was dropped + in + http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/pulseaudi + o/pulseaudio-9999.ebuild?r1=1.18&r2=1.19 29 Mar 2012; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-1.99.2.ebuild, pulseaudio-9999.ebuild: diff --git a/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild b/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild index 9dd2cd052d33..69e537b178b6 100644 --- a/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild +++ b/media-sound/pulseaudio/pulseaudio-1.99.2.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/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild,v 1.2 2012/03/29 03:17:38 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild,v 1.3 2012/04/23 21:09:16 aballier Exp $ EAPI=4 @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool" # This is a PDEPEND to avoid a circular dep -PDEPEND="media-plugins/alsa-plugins[pulseaudio]" +PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )" # alsa-utils dep is for the alsasound init.d script (see bug #155707) # bluez dep is for the bluetooth init.d script diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild index 66fbec01bbf8..ca51071d6a03 100644 --- a/media-sound/pulseaudio/pulseaudio-9999.ebuild +++ b/media-sound/pulseaudio/pulseaudio-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/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.22 2012/03/29 03:17:38 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.23 2012/04/23 21:09:16 aballier Exp $ EAPI=4 @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool" # This is a PDEPEND to avoid a circular dep -PDEPEND="media-plugins/alsa-plugins[pulseaudio]" +PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )" # alsa-utils dep is for the alsasound init.d script (see bug #155707) # bluez dep is for the bluetooth init.d script |