Switch USE=qt -> USE=qt4 to be able to reuse the global USE flag.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x29C3E2EC

5 files changed, 19 insertions, 38 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 66c0f07213ce..fe778efee199 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.297 2013/02/15 08:51:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.298 2013/02/20 11:12:06 ford_prefect Exp $
+
+  20 Feb 2013; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-3.0.ebuild,
+  pulseaudio-9999.ebuild, metadata.xml:
+  Switch USE=qt -> USE=qt4 to be able to reuse the global USE flag.
 
   15 Feb 2013; Nirbheek Chauhan <nirbheek@gentoo.org> metadata.xml,
   pulseaudio-3.0.ebuild, pulseaudio-9999.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 30bcdbf28044..a7070e27ae98 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000 SHA512 38f9c39f13b50a45213b255952a359b19181ef39ff18121b23b8390da840b41f4aabfd96cfb9950716f0f75a19793f5a0b9edb7cb31fb6ccdbb5050b3689e69c WHIRLPOOL 970b915fb3abb83a95e3a6801bd34ae548c490a86bb9abf299a9301f77c0ee0537668cd3202124f9d1952d8720caac7cc16f9a5108c3e60ffd20ed0b12fa6cef
 AUX pulseaudio-0.9.22-xcb-atom-2.patch 4381 SHA256 7c256858654529302ec242dadf2a6123da7077154fe31adc26ca96f8824becd4 SHA512 bcf1845c5c74987217c94fab080a7b20b2c7fc06b2a839b8c95fa92d639ac72589eb53fda8325965fdd708c5f728aec5538c0901daaf8303d83fc768d646bb1b WHIRLPOOL 37ed10c8265e2520ccf5b60507ee37aca830b2e2c5c2d48a82f5baeed77d76e0ad2a4ff1b7752f26cba1691f126bad8f4e1f78a9788f867d38e03cb2365bf2a8
 AUX pulseaudio-0.9.22-xcb-atom.patch 3026 SHA256 b7c528c3f20743d4337878138b0d0f12073a50b4d435c72812d06c472ebb1104 SHA512 ad0e8f9fca6109930cdfc67aa4205c483901cf4ffa31338f7b8fce6533c3de20d6b0baa6583249e5408b22ecb8af51f28e7039e998d387576c9720d8726095ee WHIRLPOOL fb4e449ed62dc7616ae841d061dfcefce537826f3c9e1dd93ff7e45d861b8fe4e2a07a4ba2283c0e12463796c1b54e5b4b4b6ba54947eac04ae4a8f5b65a2f6c
@@ -14,24 +11,7 @@ DIST pulseaudio-2.1.tar.xz 1355004 SHA256 ef6b347bf47abfb98080795f1583018ac959b4
 DIST pulseaudio-3.0.tar.xz 1367468 SHA256 c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d SHA512 965d6f2472f1b15b600b4578cfbfcb6bbe6be2e7661c0672216141118e34caba3046a026aed69d4fc6ae82b7190bc64e00cf03fb638a872b5d0d25c7c3e10514 WHIRLPOOL 79813545993c7a6291550a471d5e32826438c72060ca07051a455a23c8695de5e1d30d104bec01ec29552e5e8d72448f393536d5b81c50d6371e29567ba937bc
 EBUILD pulseaudio-1.1-r1.ebuild 6730 SHA256 1f43b6879c137447521bdada6dda8f438fa26530cf59d73a8ed4dfc1e3f928de SHA512 48861b93d999661a68f2d56d1c29f498d1a1afcb72619f754ee84a875f56e5f164c6f4d885445e4e20e6ddbd75bb9300fcbc5fc0a462f437d236939764ebc158 WHIRLPOOL 1fd994e50ebd5440221624ac882c34aeaf6dbfafcdb6a2a791c48850efadb8288f53fd2f9564b39cd4cfcd171a2e6fec7f872ba94bff9aaee22bbc43213cdbf5
 EBUILD pulseaudio-2.1-r1.ebuild 6716 SHA256 888b5b1ec537d7e2751cd95b8fd6239755ce8be31e2c4ca3692e57719bee5533 SHA512 71adb83543a200909f4dd07f70a9d58641d4e8c7655a45ad36163e1eadf20fc0501400b8dad8d81de98e9b7cb8f8cbedf1d2144353d4109c16773682177ebc8b WHIRLPOOL 378e3f30e5a339363f7a175f19ee873647cbef55e56acc526dfdf529bedd10ed69afaab30a0b315df522cbe9df48f57f8b8bca51de4c8d398692c208f9d80327
-EBUILD pulseaudio-3.0.ebuild 6900 SHA256 300aec4de575ce06db6bfad8395067ca5959d33490d6b5c42afd8dc92dec8353 SHA512 4d7e16851d421b89bb87f9a15c3168c12b36732ad8cb213efcd3d254e2967c38a97a88d3166a3faffea4c2ccf5312214b33b372245a42a267510bdc9dcb232b8 WHIRLPOOL fee00a6f1464f9b08f3b6be54e26f24707df0bdabaa7b9f0ea771027fc45c4b64528821fa5daa111597b81d70521fde64d4e254006f44f9cb8cc5551dc32cb8a
-EBUILD pulseaudio-9999.ebuild 6851 SHA256 9c07322c252654eb77f04a0786b8d7ed7335986053cac2f8bd5e82062a47f25a SHA512 cfc838fea2578919bdc6bbf6c215033e9f4c42c1468f79331a3f28e92bfc9f7a61000aca229721624cf693390933ccc7f8574945ae8c8925b52beadb7f1d68db WHIRLPOOL 6a64eac4e7138a8d16d8a6d1c0fc260fc8a35e07e3c1cbbe7470f15a236b25bccfc2e31e770b55a171ef2f1773b4e3697b6784952c0be9b6cfae1ca81d176dff
-MISC ChangeLog 57472 SHA256 75cb6ebc42003ef22d29c1ef850805f498088f8e3d3837c7cd89bc348639ea0c SHA512 52f33c5d2e70c871f2684fa2b7c3fcc0fc781a23a8271dc54e81a936ad4b36cc579869d8024f70724eb1b351c633ec38238369bcbcfea1317f7dbae188f32e05 WHIRLPOOL 25ed0cfbf047986e22ff2a2a69d1be0de296412b018cb64e33475fb9f232670e95398369b6e03c9c76073ac8db8f99763e584cad220e952762e95a938ba51824
-MISC metadata.xml 3032 SHA256 0cae20f4d05526641df8458cb72c5d67fc4112d1d55579e6d2eb08a307453965 SHA512 312a5749f0a6915931d4a69de8851d8c80872fd964237ad7bee378ee2c3cce355858a08696902f3ca89d345b6e5eed3902e9d43c743c8db353b412ae17c236b1 WHIRLPOOL 80a27eebf49845fd98344df4e0cfbf8196928dcad86a6328a6eb43ed290989e373725289665ece0a19caba85553790fa07b465144690a18a410c58ee00eaef10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRHfdAAAoJEO/kOhxWD91ktLAP/3nb6iFAhB/qxf/iFrwIjkcT
-F0eKZ4wOStGHR8N7a8exrfK3f1KAnz8htOQutlvKurVBAgb/6fdEd9AGuGDHv1mJ
-MjsIRgCl9giv7T7idFA0138hHSnVTDCDawPHF516+wGqB/c4ZBg0z04KgvYZk/9E
-P/3QvpVqnYs7cbClsyLavjO6BjYNRIWgcqOqlfu5vQKrsAHxqeHQRFQZ3vYV19bj
-Z9lGBW0b1MFw4NVZ92ao7pm2P98kiwQTcGiClOvAoC1wkiEZbN3sHCvoK36p+tEc
-1RR87xZF6eE0N8ufb0/BsMU3vrWceegilpXYV9tbCqX0i5eZb4ehOwS8bq+A0jaX
-//gcW1SYWEaq8AupEQ+XCpXY7sSR2S3737Di2ObRAmNgSjwazHaH3kGLp7iJedDY
-nK7N5U6wMuYIgVpeMU6PdCwuybbISHlQ8W4sLLsD02NZSn/hwUngseN36Lbp1c1P
-jSYNt/sj3cRcfxSE22k0GaOImh6puXNd1GJghbsjr3Q6AP3A5rFGDDNeC5qiM5Hn
-WdM8vD5WNq/AYIEW6BiZi+iFZVkbmg48N1EruK0CaIaRqgj8R+wa79U507ayeJdA
-hlK8yVS/pOMWUFJOLzgAk5RnPJYzew1BPRUAWCHhTncqf5u3s3WTaCmeEoM+9irQ
-tGXGjhTmG0kOtJzu8isF
-=MXs7
------END PGP SIGNATURE-----
+EBUILD pulseaudio-3.0.ebuild 6908 SHA256 ca91dd1981980e164d784794035772ca17a5d8a4b0f9fcaf3763eba0750c740e SHA512 56bfab296ec251b85a36c6ff54729c9bf0c678224d0fbceb33677d3a404d1877de7c5f85b86b087ac6c595f027fcbf1760a1b84ccdb4f62554e4d2f3c512f06b WHIRLPOOL 87c54be6ae5257d384ed05f2b927f663340e6d079fe45a543a52c2530efff9f8a542c14df4f92ecb1c5a9c43b85d82175c5c57a9c6bf91fe11c68fa259066679
+EBUILD pulseaudio-9999.ebuild 6859 SHA256 b07012ed8a5576ffb994eb8f7157f059d285b48b9903218f61e969eeb7dc8113 SHA512 0620df63cf9b4af70e153e7f7d5a9ea3d873845632fd9264623ae079fb6ba9accbb84dd1871c11f93b4c264c538b9f7852eb5adfa5cc95a30cd6593dad2fe0ab WHIRLPOOL 580a7c075d9502ca788271cd51c9307ccf90afca51444eb8dd2f8564ef76aa2e4ee560916a3d8356d2c73aa78420b8a06df773871f5a674f4cfb71175b498fe6
+MISC ChangeLog 57663 SHA256 aecb40092fcc68fc264deafee7d6c15058286ee44ca8043d04f34fd583076b12 SHA512 d870dacf76fe4164e98534ee7f3dd1afa56f33cbb2d5e9ff152b9cc834e751a3c010f20a29a34c9ac13741474d3b48501f5113d4366abf1dd2e0b8cd64c54b13 WHIRLPOOL 91e4a2fdf621777ea1cb8971ad7724295bd81321294806d69fdb73b1db124b48164c818b572fcb074fe9e02f10f3f48e24c246075f8b5e1eba3dcf01d0685912
+MISC metadata.xml 2915 SHA256 833bf5b1874232dc37f100f32ad32a4b757d02d96cda0b49596196f4d715ea61 SHA512 52660b534e64ce727c1eea8060cbf66a2a5776d3149e551aa00800c65c80dfbed5828c974ba82dcd6e56e849612645dd1f7d2cf1aed250a2631b53bb10cccb3c WHIRLPOOL 51605e887017e571800d79394d0515740888c337228dcb89f70389734044553b95043edd7e362b70cd9b1eff0be34a22f37d6a3bc45d41fa102264963e7b00a8
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 748e8cf3e94d..af8e8805f59e 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -41,9 +41,6 @@
       Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
       real-time priority while running.
     </flag>
-    <flag name="qt">
-	  Pull in deps for the equalizer GUI qpaeq (requires <pkg>dev-python/PyQt4</pkg>).
-    </flag>
     <flag name="equalizer">
       Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
     </flag>
diff --git a/media-sound/pulseaudio/pulseaudio-3.0.ebuild b/media-sound/pulseaudio/pulseaudio-3.0.ebuild
index 9df96e955049..1e45713d1548 100644
--- a/media-sound/pulseaudio/pulseaudio-3.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.3 2013/02/15 08:51:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.4 2013/02/20 11:12:06 ford_prefect Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
-gtk ipv6 jack libsamplerate lirc neon +orc oss qt realtime ssl systemd
+gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
 system-wide tcpd test +udev +webrtc-aec +X xen"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
@@ -80,7 +80,7 @@ PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
 # bluez dep is for the bluetooth init.d script
 # PyQt4 dep is for the qpaeq script
 RDEPEND="${RDEPEND}
-	equalizer? ( qt? ( dev-python/PyQt4[dbus] ) )
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
 	X? ( gnome-extra/gnome-audio )
 	system-wide? (
 		sys-apps/openrc
@@ -223,8 +223,8 @@ pkg_postinst() {
 		elog "your Bluetooth controller enabled and inserted at bootup or"
 		elog "PulseAudio will refuse to start."
 	fi
-	if use equalizer && ! use qt; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt' USE-flag."
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
 		elog "This will build the equalizer module, but the 'qpaeq' tool"
 		elog "which is required to set equalizer levels will not work."
 	fi
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index 8db05fffb67a..e965c22194d3 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.33 2013/02/15 08:51:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.34 2013/02/20 11:12:06 ford_prefect Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS=""
 IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
-gtk ipv6 jack libsamplerate lirc neon +orc oss qt realtime ssl systemd
+gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
 system-wide tcpd test +udev +webrtc-aec +X xen"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
@@ -80,7 +80,7 @@ PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
 # bluez dep is for the bluetooth init.d script
 # PyQt4 dep is for the qpaeq script
 RDEPEND="${RDEPEND}
-	equalizer? ( qt? ( dev-python/PyQt4[dbus] ) )
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
 	X? ( gnome-extra/gnome-audio )
 	system-wide? (
 		sys-apps/openrc
@@ -225,8 +225,8 @@ pkg_postinst() {
 		elog "your Bluetooth controller enabled and inserted at bootup or"
 		elog "PulseAudio will refuse to start."
 	fi
-	if use equalizer && ! use qt; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt' USE-flag."
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
 		elog "This will build the equalizer module, but the 'qpaeq' tool"
 		elog "which is required to set equalizer levels will not work."
 	fi