Add USE=qt to pull in qt deps for equalizer

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x560FDD64

5 files changed, 53 insertions, 24 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index b197b7d580f0..66c0f07213ce 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.296 2013/01/01 18:46:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.297 2013/02/15 08:51:56 nirbheek Exp $
+
+  15 Feb 2013; Nirbheek Chauhan <nirbheek@gentoo.org> metadata.xml,
+  pulseaudio-3.0.ebuild, pulseaudio-9999.ebuild:
+  Add USE=qt to pull in qt deps for equalizer
 
   01 Jan 2013; Raúl Porcel <armin76@gentoo.org> pulseaudio-2.1-r1.ebuild:
   sh stable wrt #435074
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 87a73a43bb8d..30bcdbf28044 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -14,14 +14,24 @@ 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 6588 SHA256 eac4a93fb0ef1f3f2eaaac5903424475fcf910d3acc95c0d289285169e3cb1d5 SHA512 991e0cf65d953e3a4c3b3474558f6889175406936d44f6cf83aca4bc4b1b2597bf57b34e49cca5fff9859b081fef468ffbf48bcddbe43bcafc5a90263db5f8f7 WHIRLPOOL 93083b2d123dbcd157dd44181ad6e4a00b3c8b52d4e067ead9889766e25f5ec4aacbe969345c0877156c1dbf0a37f2a660570c1d1e31bad4d026953d7929b455
-EBUILD pulseaudio-9999.ebuild 6540 SHA256 aa48a3532bfd96379ed026ed38c1d3a8b013c17f6bf2e93cae97f2f2637f5d82 SHA512 f574074b6df1f98de3967cce6738b963d94887fb8fba160f6e2d5b0e0b632cb73366f520f38196bb86c9ccade341d1833cd418284321576d678453847da58705 WHIRLPOOL 72d2f3de98acea65e1e72473c903ec93a5dc1b13f80239066b6624b7f0d2bdc6f5da779afdd9859e2fa319c685aceb6ebdfea33cbf5882be1b5e876216a3a711
-MISC ChangeLog 57307 SHA256 8212860a30c886684218e9af475de688dc21cdcd2dfedb00095d0ac5d9119855 SHA512 671a7202c644e7c050ed15b8190673e279e04ebadc7cdc01cb8eb6fb5963cc42974e041b8e9e9af3749b469f9cda111ed9db93c18d2401325ea9e629c44442f6 WHIRLPOOL 56bcde17efd9769df26862607923fd58af063bb6e0e8933c6e1c65511846a8e8c0c31139a63c7680936d5f7bce777d0aceb8b27959384c803bc2b02f98afb2ca
-MISC metadata.xml 2915 SHA256 833bf5b1874232dc37f100f32ad32a4b757d02d96cda0b49596196f4d715ea61 SHA512 52660b534e64ce727c1eea8060cbf66a2a5776d3149e551aa00800c65c80dfbed5828c974ba82dcd6e56e849612645dd1f7d2cf1aed250a2631b53bb10cccb3c WHIRLPOOL 51605e887017e571800d79394d0515740888c337228dcb89f70389734044553b95043edd7e362b70cd9b1eff0be34a22f37d6a3bc45d41fa102264963e7b00a8
+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)
 
-iEYEAREIAAYFAlDjLxIACgkQuQc30/atMkDgKwCdEMl4vdPc+7e+N2oEUmnzbfBQ
-rkgAn3DIx/c4+KGq7h/+aykmiQrpJ2QQ
-=Z+1u
+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-----
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index af8e8805f59e..748e8cf3e94d 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -41,6 +41,9 @@
       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 5259c6d06da5..9df96e955049 100644
--- a/media-sound/pulseaudio/pulseaudio-3.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2 2012/12/21 16:55:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.3 2013/02/15 08:51:56 nirbheek Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit eutils flag-o-matic user versionator toolchain-funcs udev
 
@@ -18,7 +18,9 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 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 avahi +caps equalizer jack lirc neon oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd"
+IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
+gtk ipv6 jack libsamplerate lirc neon +orc oss qt realtime ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X xen"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
@@ -48,10 +50,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	asyncns? ( net-libs/libasyncns )
 	udev? ( >=virtual/udev-143[hwdb] )
 	realtime? ( sys-auth/rtkit )
-	equalizer? (
-		sci-libs/fftw:3.0
-		dev-python/PyQt4[dbus]
-	)
+	equalizer? ( sci-libs/fftw:3.0 )
 	orc? ( >=dev-lang/orc-0.4.9 )
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
@@ -79,7 +78,9 @@ PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
 # bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
 RDEPEND="${RDEPEND}
+	equalizer? ( qt? ( dev-python/PyQt4[dbus] ) )
 	X? ( gnome-extra/gnome-audio )
 	system-wide? (
 		sys-apps/openrc
@@ -222,4 +223,9 @@ 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."
+		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 2c3e18097b23..8db05fffb67a 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.32 2012/12/26 02:44:01 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.33 2013/02/15 08:51:56 nirbheek Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit autotools eutils flag-o-matic user versionator git-2 udev
 
@@ -18,7 +18,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/pulseaudio/pulseaudio.git"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd"
+IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
+gtk ipv6 jack libsamplerate lirc neon +orc oss qt realtime ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X xen"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
@@ -48,10 +50,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	asyncns? ( net-libs/libasyncns )
 	udev? ( >=virtual/udev-143[hwdb] )
 	realtime? ( sys-auth/rtkit )
-	equalizer? (
-		sci-libs/fftw:3.0
-		dev-python/PyQt4[dbus]
-	)
+	equalizer? ( sci-libs/fftw:3.0 )
 	orc? ( >=dev-lang/orc-0.4.9 )
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
@@ -79,7 +78,9 @@ PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
 # bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
 RDEPEND="${RDEPEND}
+	equalizer? ( qt? ( dev-python/PyQt4[dbus] ) )
 	X? ( gnome-extra/gnome-audio )
 	system-wide? (
 		sys-apps/openrc
@@ -224,4 +225,9 @@ 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."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
 }