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).

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

7 files changed, 50 insertions, 19 deletions

diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
index 66b9e4888262..54a1a7d8068e 100644
--- a/media-sound/nted/Manifest
+++ b/media-sound/nted/Manifest
@@ -4,8 +4,10 @@ AUX nted.desktop.patch 2509 RMD160 3298c930be44e9935e6046b308febba42d255392 SHA1
 DIST nted-1.6.0.tar.gz 3202514 RMD160 ba8068c23397fd088e724ae33754dd47863631b5 SHA1 9aef12049789b7786c30e171a55d32274bb859c2 SHA256 cca33b7411cd558fc15d9c2a283eefa2e7fffc6704564e70c53d43a7660dec33
 DIST nted-1.6.1.tar.gz 3202547 RMD160 95ab28d2a93388d1bd2e4d13c1b6b95c71fa1bbd SHA1 abe2c9ab8153f08e4e1b6ad2846757ceab6be7bf SHA256 36553bb13e96a8be98d6033208d719478bdbe0c5e43961349a79f97e5bcd15d6
 DIST nted-1.6.4.tar.gz 3288937 RMD160 eea34dab4e35de27907b304bf18b6b4a45383f2b SHA1 ff699ca6d01e7db32452d49960403bd7bace076d SHA256 164d84d6eb235976da4439b6f09991ea54f50ad387b960c2761c84a1e6abd987
+DIST nted-1.8.6.tar.gz 3508228 RMD160 8bd29bfafb18df73b14f0cca6859b768cd9e137a SHA1 82c8df59b1ec8ecc8362dabbff997727c4c77bb4 SHA256 0e2a92f041b5e2f181f68d6bb9bac54d1b55e1d53d578cdc0ea473215cab75c4
 EBUILD nted-1.6.0-r3.ebuild 1141 RMD160 880fb5e21d5c12f0b636c5ba6eb78927a6002db5 SHA1 5835bd1d53cef2753aa18dc1bb7cfe51966bcee3 SHA256 455a9c160d0755704e2e7fea9be007d78a10eaccc6c17ac784150cbaf72a6d02
 EBUILD nted-1.6.1.ebuild 1090 RMD160 735cc89c8718701c389b312a40aa6f8bc9e958d4 SHA1 66db4e2baf20eeb74203fedfea914b30e35da6b0 SHA256 10bef288f36b696b2dec9f01c596c2a00e31faae7f6a28ca0d5fe673e3a070e0
 EBUILD nted-1.6.4.ebuild 1019 RMD160 dd26b08afcc8c8b0b32dcc0cec98fd7d63d3be1a SHA1 5c662a046201f6b9d22a533d48beb7982ee04a54 SHA256 0003960964ce2c0f89d4d189c88c22ff8ca2bf79d1f883c9946db1f26378c441
-MISC ChangeLog 1588 RMD160 39cf82aeaee0c0c20d17c39a8685545d4411833a SHA1 166517becc27cc25a6add6fbe17f52589db85324 SHA256 b6586ec5fe25610e9dae821f5ff42deba8042cf08a6043b827f681b911b6b3af
+EBUILD nted-1.8.6.ebuild 958 RMD160 b66348954f7543c9ef5baa29e74b949165532bae SHA1 fbc1e169aa569d0c73919e2b88b76d1abf52508e SHA256 0704e90bd5e144a647ba44adddade90fbc340178beb39374209a60e26c38eb93
+MISC ChangeLog 1725 RMD160 8455a2d19aa8407f975cd45135a70eff8bc873c5 SHA1 400856a8312c793cac002ee38c1497f0953b189f SHA256 22be01d7d3cd35f1445ea72a42adbbec9a18295c0f5a170713e608f74886680e
 MISC metadata.xml 431 RMD160 795624e2d8daf85ab72f82cc5f0287145fdec223 SHA1 b5de7042160aec1fcb7568eb4e5e3a066b3e88ac SHA256 5430fc8c8b968f90971bf0834205ae70b5e0255b747183d7ee88d38631c3e251
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/Manifest b/media-sound/pulseaudio/Manifest
index e1ffab740665..9f2ba9332c97 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pulseaudio-0.9.15-CVE-2009-1894.patch 1969 RMD160 69a11b7f132d24e7f99fec180ffed3caf806de77 SHA1 1b9106e52c063e83b8577434360edaf3be81351d SHA256 a14e01e386f60c083dda6049e951bcf17af693ac475afd1f455d71f400f2e526
 AUX pulseaudio-0.9.15-bsd.patch 549 RMD160 d44e309557353c115281e860bfa643b197d04921 SHA1 0cd07acc70c0e53984e7a639d9668b4817cb804c SHA256 d044e27ad71424b601f0de37e29321226579146203c6c557434d11e298798787
 AUX pulseaudio-0.9.8-bt-nohal.patch 1153 RMD160 5ad7a7173795c022fca73ccf694207e18d6925a7 SHA1 9f50549357b5fa498e0b7f67258de431e90f89e2 SHA256 1bdc458d55529777a3a760205a09d0381433402a3002518ba5a700b3518c727d
@@ -14,10 +17,17 @@ DIST pulseaudio-0.9.18.tar.gz 2007214 RMD160 83d63e7476c2abad3da6bd26d2c97c2909b
 DIST pulseaudio-0.9.19.tar.gz 2029090 RMD160 2de3f4b9ec587c3df3b7a9d11a6d1b9d5f9c8690 SHA1 176d54b09051c560427ed251c838197ba2414bb0 SHA256 e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
 DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
 EBUILD pulseaudio-0.9.15-r2.ebuild 4758 RMD160 df52be0452fe373793b9741e06e38ddaf6b77c65 SHA1 c8b77b5936895533adb8a3a127dc7d1d1588ac4c SHA256 4973f88a60a53270f4976b44f6005ef6b8f25a8c4542b39eaa10b6d1f537c63c
-EBUILD pulseaudio-0.9.18-r50.ebuild 6724 RMD160 8cea29e0b8d08f87da4ea91c0d8b14142c3d64af SHA1 b231a435428134c5d65b771ee3ce6563afd468c8 SHA256 d0d5c9fb2b56072f710b98614279acebb56296bdc2b3cf02cd4f7dd35782c0ed
-EBUILD pulseaudio-0.9.18.ebuild 5332 RMD160 5651e8743b8955a7880bb0df1a223241bad8a040 SHA1 6085313efd1b40473828bfa9addbd0318ab0c2de SHA256 b19e4b4399d0bf64ccb0045ba09392c7a6aa57d73f53b124e5bd3a9b7e80da24
-EBUILD pulseaudio-0.9.19-r50.ebuild 6724 RMD160 ccbe8f194ec6203b6c0e8a7731d438b2716c82a6 SHA1 307e47b55ebc361b7333e69535f8f5d2b5e4a51c SHA256 628e7c589689996b184ef45b7cf75f937e94b94652251e1f3208dfb363817977
-EBUILD pulseaudio-0.9.19.ebuild 5332 RMD160 cda653178061b6720780c3012ae32e5d956269ae SHA1 6eeddf27c381deca3a2f33a037c65f08681f2a62 SHA256 077e77cdc414df258a67a44eb9136dc493678b8f10a01b88cc7dfe2f68a52605
+EBUILD pulseaudio-0.9.18-r50.ebuild 6793 RMD160 849f87acaec5b8c12b62f51f9451457d432b76ad SHA1 a42cc00e58a522740f8bf35947cafa68df0fcd22 SHA256 484c292ee30ac7017306a54cc6ba08f515532a5d34c1dae5eaa6aca91d0b43dc
+EBUILD pulseaudio-0.9.18.ebuild 5401 RMD160 95910d2ed74f0d273424704559f99baa701e4bd2 SHA1 6abfc3e421e9bf44330b5f421bd406f1aa23004f SHA256 60b5491ba6d508883132fdfc4020efa3603f172695dbf894db99541d482609b6
+EBUILD pulseaudio-0.9.19-r50.ebuild 6793 RMD160 8a24d81fdc9b7344c8450a1b10d60571ae687783 SHA1 34844a619820a3eab64c4799847ab7197c9c483c SHA256 3254927ce89ae667bc067babefb25c3023d82e4ff02455b5e4652d02d32c9032
+EBUILD pulseaudio-0.9.19.ebuild 5401 RMD160 4ef7ec7fa2cbbf8552e343c2f398a3c2131f77ce SHA1 be2991c0cdec195e1b18faa145c0f03c31ebc190 SHA256 4d2b0bc21fef50784aa6cfd833d0bfb06dfe2ca84319f3df9f761a60bf30d002
 EBUILD pulseaudio-0.9.9-r54.ebuild 5890 RMD160 05857cd7bdcf277b9d9bd5439f158e05087e0865 SHA1 3a7d401e5f8a8894b66fb1e63532c91ade0fa945 SHA256 09d81b78fe4089446be4dce8c438e8e99f762b140f1a74dbef08dfa084e5c34e
-MISC ChangeLog 34088 RMD160 1d2efb3efbfeac5a39f4547dc4849f268e4b66c1 SHA1 c643257603dd751509e0fe9eba807395f6d51ed5 SHA256 b5c36474dcba53971ba89568952cb0f6f806f53baafea2bab0693ff0fcb41640
+MISC ChangeLog 34429 RMD160 ea748733f38e2b56bef0c17a5256668fccbd6621 SHA1 95e76d2090195cb52e63c7645ce206ca23864028 SHA256 dce31ea06b97551b32a916789daf0a24c7a922cd45f1a6b44c19ead3c854d86c
 MISC metadata.xml 1774 RMD160 422f7fcca52193e22c6a257eea28af8ff84247c3 SHA1 5994d8a5212a87a6ef8e6537f9cd2ef22542c8c4 SHA256 94facd3169c4b679f77ff21e329d73a073c55ff93e0d40edfd31e56419947582
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrJyw0ACgkQAiZjviIA2Xg5qQCgjAlJQsOncHfyZEQm21O0zhNy
+Nl8An0dM1ITIWvTKoHr+x3mgKMRkNMGc
+=EEbX
+-----END PGP SIGNATURE-----
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