summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2010-12-16 19:59:17 +0000
committerTim Harder <radhermit@gentoo.org>2010-12-16 19:59:17 +0000
commit1054f67db53df7689962157cc97780729ed0d675 (patch)
tree55afadb811dffea26d68f1e2dba6d49d39ef666f /media-sound
parentRevision bump to revert upstream commit that was causing gnome-session to be ... (diff)
downloadgentoo-2-1054f67db53df7689962157cc97780729ed0d675.tar.gz
gentoo-2-1054f67db53df7689962157cc97780729ed0d675.tar.bz2
gentoo-2-1054f67db53df7689962157cc97780729ed0d675.zip
Fix libX11 dependency order (bug #348806 by Rodolphe Rocca).
(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/pulseaudio/ChangeLog5
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.22.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 8dc724229ece..73ed42972074 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/pulseaudio
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.201 2010/12/01 07:44:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.202 2010/12/16 19:59:17 radhermit Exp $
+
+ 16 Dec 2010; Tim Harder <radhermit@gentoo.org> pulseaudio-0.9.22.ebuild:
+ Fix libX11 dependency order (bug #348806 by Rodolphe Rocca).
01 Dec 2010; Markus Meier <maekke@gentoo.org> pulseaudio-0.9.21.1.ebuild:
arm stable, bug #299913
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index 885924c67eac..835261149972 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.4 2010/11/30 22:01:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.5 2010/12/16 19:59:17 radhermit Exp $
EAPI=3
@@ -18,7 +18,7 @@ IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluet
RDEPEND="app-admin/eselect-esd
X? (
- || ( <x11-libs/libX11-1.4.0[xcb] >=x11-libs/libX11-1.4.0 )
+ || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] )
x11-libs/xcb-util
x11-libs/libSM
x11-libs/libICE