Fix typo that made the ebuild pull in udev[hwdb] and udev[extras] (bug #370335)

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

5 files changed, 21 insertions, 15 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index d64abc599cf6..907b664bbf90 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.229 2011/06/08 22:04:40 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.230 2011/06/09 08:16:50 angelos Exp $
+
+  09 Jun 2011; Christoph Mende <angelos@gentoo.org> pulseaudio-0.9.22.ebuild,
+  pulseaudio-0.9.22-r2.ebuild, pulseaudio-9999.ebuild:
+  Fix typo that made the ebuild pull in udev[hwdb] and udev[extras] (bug
+  #370335)
 
   08 Jun 2011; William Hubbs <williamh@gentoo.org> pulseaudio-0.9.22.ebuild:
   Per ford_prefect, apply the last commit to the stable ebuild.
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 4887739314e1..c93a794c4702 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9aa6054d7c09271ec4 SHA1 1a3747c5e24c2cc26e43348a12627725b5d6242f SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000
 AUX pulseaudio-0.9.22-xcb-atom-2.patch 4381 RMD160 9f46c2d75c7c89f23919ef890829af4533166304 SHA1 c427582c9724b034c0e72f76685e32e44f281868 SHA256 7c256858654529302ec242dadf2a6123da7077154fe31adc26ca96f8824becd4
@@ -8,15 +8,16 @@ AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 2
 AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363
 AUX pulseaudio.init.d-5 2352 RMD160 36a3732386617f5436a60d0d9248a69da9804c5d SHA1 4b2fa2f0437b78b0a7fd5a54e8a83b02c99af579 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59
 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
-EBUILD pulseaudio-0.9.22-r2.ebuild 6804 RMD160 c9d29c255909c7e1503702af6275e1242c1de2dc SHA1 e21fe3265413de58f46c737d3823f6d1ffdd0436 SHA256 f4e7a0fd3dc035c601ada439b89e198bbb756f5d7222a2683bf3b8f7011591ba
-EBUILD pulseaudio-0.9.22.ebuild 6667 RMD160 174ca1c400660a2b04c1c3e1d60038fee52cc520 SHA1 f42162a4a18b08add32d19eb34030d32f602314f SHA256 eaf82eee9b6dbdb1ee87da700536914a4d64f20bb8589b158f08497800f7dc72
-EBUILD pulseaudio-9999.ebuild 6436 RMD160 bd54105eec620a59b9af9a8e4314683acb5a55ee SHA1 c75a71867a40e29ddcd1afc3bc079030328a3197 SHA256 ffe8c2936e86b24662a318e87ba30bfdf1319b2b293362231ebdfe0d93840dfe
-MISC ChangeLog 44264 RMD160 b951ea2ecb1f82c73a014382efe662170abc79cc SHA1 05347216012ca12854d2611ad55055289b4a6511 SHA256 04842f58470aa7086f476109d3168b7b4308949a0ea7c128d3fc6988a08ff208
+EBUILD pulseaudio-0.9.22-r2.ebuild 6810 RMD160 32897d4ee7faab004c63184da5056d0997274de9 SHA1 dbd281d0bb1a125adbf39471d25bbcaad2ed807e SHA256 7b9123eb33a341de5f236befd77a8ac182a11d349c471b0a727c4bda07e2af24
+EBUILD pulseaudio-0.9.22.ebuild 6673 RMD160 7fedd677e1965979a1b3ae723bc631f0ac9b9502 SHA1 8c20123736b20c264b255a579da3f848184f6104 SHA256 c20632a24bd755409e6e4fc6185174bd903f8c890b02d4b605dc7d9d427dbea8
+EBUILD pulseaudio-9999.ebuild 6442 RMD160 ecee606ba2a2c2425e6dafddd81efac723640aac SHA1 ec958ed05562f7b23a8d7bcfc40adbc022aead87 SHA256 72e694f0971e56623e1c329092e77954abbf7260f0fa5fb1b754c54b58c40402
+MISC ChangeLog 44481 RMD160 064807c3a16628e7576997c7a23762cc038165be SHA1 eb3a8496343bb91a320666aaf58922505f042a61 SHA256 8f7f01423a354563992702c860aa5727dd4b5a67fbb178221d063434ef99db03
+MISC ChangeLog.orig 553 RMD160 43e528d0d69831c4f3816e1d24dc1ca19bb2eba7 SHA1 385e6240b3a400aa3902339334fb00d660fa9b92 SHA256 c70f69330aaf37cab38c333dc71600af9329434f62651cffec9e1ba7f37db673
 MISC metadata.xml 2225 RMD160 270fc66edbe5134853cc06c1feaca8d94a8c50fd SHA1 1c8edb3e83bb3791d860e3b007e7dab37bdf3459 SHA256 57429e87e6e2902c0a81aa480f603ffa894234434c03da1ffef89d52493d848b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3v8gcACgkQblQW9DDEZTh8WgCfZktuarEJwBFvQibeOtexrYYK
-l0gAn2bq8jCjUMhQnEQQ9ftXfCbdPFLH
-=l0sh
+iF4EAREIAAYFAk3wgXgACgkQmWq1bYTyC0MShQEAofQEt2e8qvNsuHL97VdbuoUO
+x1wMJDx8LTyzXEzaMi4A/0GM0hbnBxfb3A8yh//uGkPsou35vDQcHZYghLePOrjv
+=EnKU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
index 9b204dc0fa5c..ef4bb56443d7 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r2.ebuild,v 1.2 2011/06/08 21:43:57 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild,v 1.3 2011/06/09 08:16:50 angelos Exp $
 
 EAPI=3
 
@@ -40,7 +40,7 @@ RDEPEND="app-admin/eselect-esd
 		>=sys-apps/dbus-1.0.0
 	)
 	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] )
+	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
 	realtime? ( sys-auth/rtkit )
 	>=media-libs/audiofile-0.2.6-r1
 	>=media-libs/speex-1.2_beta
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index 8f8e174d8299..bc2045366c69 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-2011 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.19 2011/06/08 22:04:40 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.20 2011/06/09 08:16:50 angelos Exp $
 
 EAPI=3
 
@@ -39,7 +39,7 @@ RDEPEND="app-admin/eselect-esd
 		>=sys-apps/dbus-1.0.0
 	)
 	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] )
+	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
 	realtime? ( sys-auth/rtkit )
 	>=media-libs/audiofile-0.2.6-r1
 	>=media-libs/speex-1.2_beta
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index 2df8faf4644d..288a0c4e83bd 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7 2011/06/08 21:43:57 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.8 2011/06/09 08:16:50 angelos Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ RDEPEND="app-admin/eselect-esd
 		>=sys-apps/dbus-1.0.0
 	)
 	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] )
+	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
 	realtime? ( sys-auth/rtkit )
 	equalizer? ( sci-libs/fftw:3.0 )
 	orc? ( >=dev-lang/orc-0.4.9 )