Fix dependencies with X USE flag enabled and xorg-server-1.7 dependencies (thanks to Olivier Hubert in bug #285251); fix typo (thanks to Yuan Ye in bug #285146).

(Portage version: 2.2_rc43/cvs/Linux x86_64)

5 files changed, 32 insertions, 13 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 443de4d72e61..b50f15ba92dd 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.169 2009/10/04 14:58:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.170 2009/10/05 10:31:45 flameeyes Exp $
+
+  05 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  pulseaudio-0.9.18.ebuild, pulseaudio-0.9.18-r50.ebuild,
+  pulseaudio-0.9.19.ebuild, pulseaudio-0.9.19-r50.ebuild:
+  Fix dependencies with X USE flag enabled and xorg-server-1.7 dependencies
+  (thanks to Olivier Hubert in bug #285251); fix typo (thanks to Yuan Ye in
+  bug #285146).
 
   04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   pulseaudio-0.9.15-r2.ebuild, pulseaudio-0.9.18.ebuild,
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild
index b8d2b9cf9137..2489251af655 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild,v 1.3 2009/10/04 14:58:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild,v 1.4 2009/10/05 10:31:45 flameeyes Exp $
 
 EAPI=2
 
@@ -54,7 +54,10 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	X? ( x11-proto/xproto )
+	X? (
+		x11-proto/xproto
+		|| ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
+	)
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
 	|| ( dev-util/unifdef sys-freebsd/freebsd-ubin )
@@ -78,7 +81,7 @@ pkg_setup() {
 
 	if use udev && use hal; then
 		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be ued automatically."
+		elog "discover modules, but only udev will be used automatically."
 		elog "If you wish to use hal you have to enable it explicitly"
 		elog "or you might just disable the hal USE flag entirely."
 	fi
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild
index 2323e15b64cf..cd6adc0a5285 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild,v 1.3 2009/10/04 14:58:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild,v 1.4 2009/10/05 10:31:45 flameeyes Exp $
 
 EAPI=2
 
@@ -54,7 +54,10 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	X? ( x11-proto/xproto )
+	X? (
+		x11-proto/xproto
+		|| ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
+	)
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
 	dev-util/intltool"
@@ -71,7 +74,7 @@ pkg_setup() {
 
 	if use udev && use hal; then
 		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be ued automatically."
+		elog "discover modules, but only udev will be used automatically."
 		elog "If you wish to use hal you have to enable it explicitly"
 		elog "or you might just disable the hal USE flag entirely."
 	fi
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild
index 8cfc6a00c298..ac572a5e5957 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild,v 1.2 2009/10/04 14:58:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild,v 1.3 2009/10/05 10:31:45 flameeyes Exp $
 
 EAPI=2
 
@@ -54,7 +54,10 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	X? ( x11-proto/xproto )
+	X? (
+		x11-proto/xproto
+		|| ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
+	)
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
 	|| ( dev-util/unifdef sys-freebsd/freebsd-ubin )
@@ -78,7 +81,7 @@ pkg_setup() {
 
 	if use udev && use hal; then
 		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be ued automatically."
+		elog "discover modules, but only udev will be used automatically."
 		elog "If you wish to use hal you have to enable it explicitly"
 		elog "or you might just disable the hal USE flag entirely."
 	fi
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
index 424edd42c222..c9be0484b29f 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild,v 1.2 2009/10/04 14:58:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild,v 1.3 2009/10/05 10:31:45 flameeyes Exp $
 
 EAPI=2
 
@@ -54,7 +54,10 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	X? ( x11-proto/xproto )
+	X? (
+		x11-proto/xproto
+		|| ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
+	)
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
 	dev-util/intltool"
@@ -71,7 +74,7 @@ pkg_setup() {
 
 	if use udev && use hal; then
 		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be ued automatically."
+		elog "discover modules, but only udev will be used automatically."
 		elog "If you wish to use hal you have to enable it explicitly"
 		elog "or you might just disable the hal USE flag entirely."
 	fi