Enforce USE dependency for media-libs/phonon.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 23 insertions, 21 deletions

diff --git a/dev-qt/qt-meta/ChangeLog b/dev-qt/qt-meta/ChangeLog
index 1655f1e2eb3c..88ab02142c79 100644
--- a/dev-qt/qt-meta/ChangeLog
+++ b/dev-qt/qt-meta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qt-meta
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/ChangeLog,v 1.8 2014/09/28 22:54:38 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/ChangeLog,v 1.9 2014/12/31 13:12:26 kensington Exp $
+
+  31 Dec 2014; Michael Palimaka <kensington@gentoo.org> qt-meta-4.8.5.ebuild:
+  Enforce USE dependency for media-libs/phonon.
 
   28 Sep 2014; Davide Pesavento <pesa@gentoo.org> qt-meta-4.8.5.ebuild:
   Update HOMEPAGE.
diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest
index 8dc2104bd73a..8ca198558fa7 100644
--- a/dev-qt/qt-meta/Manifest
+++ b/dev-qt/qt-meta/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD qt-meta-4.8.5.ebuild 1307 SHA256 8f3d9c26328e50be2b523853f100d42af7334109fd7186a731a309fea9afc6d9 SHA512 3be07a9f6d1a592ee4a60750c9364dfa081c643d8219865ed9ab98ea5aa19a7dc8b5c9d8bcf3cfb25549f7ed120679647970ec45027aa192d2a112ccdaa30bae WHIRLPOOL 8da94190c6b827dcf381a7b140232d30631cbbe68ae25ba373b2713218c9a7e57fe3748a116f6877f395e69f647050d140564c38dc4f09bf6af41627c45c6997
-MISC ChangeLog 2410 SHA256 a4287a56a4d1bc8622ea8ffbddf762d7786882833c652300255b815205e94242 SHA512 da29c93c8616791c740d92d62f951016c4fc21335f070257a7b0eb17e9539f7c51e9b21aabfce43f8ab7f11dc10b559cb2822e2109d91cc036618673221454ab WHIRLPOOL 7222190c8acca88623de895814df6f334ce245231de514e94505fd2f6c08ea2f993b1bb48d55414b2a449b7d6cfc35c462374c394235b3e3e7a5fb23bf402011
+EBUILD qt-meta-4.8.5.ebuild 1323 SHA256 8fd6dfb32c74f515a06ff3ef2de835cffbf354aae7dd5ef888f3ee52faf0eb61 SHA512 8af9436f382a06583568e599f78b910345454fca866e5a5ac45e78e1f396ecc357b2d57a6503cb75ecc63953152334891d099b87a223dbc6a32b9659d28d93f0 WHIRLPOOL e5ff30cd5b5ad01ab644dd00757866beac4cb9dcac1dc2dae1dfe3621445c3322c7c2b00233f3e7a039545554aab6c2b81b60254161edc2868f78f981f444095
+MISC ChangeLog 2543 SHA256 720b9d6429fd1a869e3892b36ce832230d162de2d296b445340ea636137ffaa7 SHA512 19a92d52f0de043fff7d0524cf84951382c8cc24bb1f75901933ecc1c93cf13a6c947d926de967671b123f0c6848129e6aedadcf231b01e669471f063cdf1bf3 WHIRLPOOL 28ab9ba053b8ec4bfa7cc8df523be3f6003367f94f3fd97a58447bb1180cc07711d7db43775f214213f578174c2fc0dedd9ac6b34a267863a97d4ec8c51c31da
 MISC metadata.xml 395 SHA256 69c3bf90d4ba70fa911ef0fe49ab5cd9a84c982c2e91808536cc3333d6865221 SHA512 a490490bb3c964a59a13569b26d5f66569597a77f9e2539fa927eead3b76edd96c3baef62d3cebf06b9c1fe6607bdd42d3bd8cbb59af89e70888aa31116a2a6b WHIRLPOOL 77cdc493d24a61c158e593faaa5ca0e63a1c8aee5402eb9b9110df67d54b8f07071f9753707bbe22d44880f9fc0e3e0fb4d671ac690234d4c844dfcae24740a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUKJGvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9iGgP/RP4lhawLjNamwmrQdV5RqXa
-SP4+pVUsqMpR5jl2z2mB+x+GqiXlG6J/VeZ2QeBTsBH4WMQ11WDHqEzHfnzRDuwQ
-c8CLmazxE70nxV56+FUhcBhD4VpHfn4imVQfgiNfY+DX+QoI12qe6nTf4F3UaXA4
-+VNOvZ3P/UqdMCF2G4v5FZnh/0dONTif8ftqdkjlv+nVByosfpanlGOLCQ+sQlkC
-TYgeu4t6QOlvBHIT/Ubu7mlZBLtlRA7edPScXV1rT3NlDh3Jf5LlNkOpUVXZRdM8
-eqzDlUfgjwI/Y/UxEqU+EgGZjefP1AjW4wRsYKLQqYZG2allhkj2KbBMAURZEX6X
-6spe2CQ71lxcFzdJfz8w1TalnXwcWR2Tp9o2vFX5Iwko3/2vTnVYg4G5cmpMNbrJ
-WSKvfn2pQSl6q9CWGqBk68PXSbx9EJis6eMENBwf84SANkr5QXqInmOl9Mm7GiOY
-vaM3hzXsia6wB1/yBkmVqu74LduLgJi2LcyqmzR+G4sdvFPxTzrNzIn3p8R/WzHF
-jdilK6wlPIzEef8xTvdyYHmtxuG6QA9Yz1MQhA8eNuODyjyluVK9KElMmxMSukjD
-SRlN1uqOUb2c6ERJ6onyNVzm1dMz4Xs/B9JArdP0n9ykbByLNYQTeNLdKI+L8NVE
-q1vjWsBJFU/A5MAtZb/M
-=nUtL
+iQJiBAEBCABMBQJUo/ZMRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7GxrD/9P1Dga8+Mx/Ku/Elh0lDmwfN1EJl5ZSYOPDmfejG8QLOTiCYrZUL4Tmjkm
+uvR9buQG00Yetj4mxc17MumbRQ9YKMzokqIIANW1+YxiBT+xJnm437RIQi4WnME8
+qQQ3mTZn2jlQecPlur+JytmXj5bzeCujspAztlgZ3pRRgIVthtQyQ0E9soRpSRDL
+lSpC9TeBQzTcW18IH9wcUQjfWLD/QsPeKOkCfNGZZ1mlYT8zm9RetcWnkfEGNDWi
+TGjgTCWx13e8bkS8XFDN2gcR9z7YY9Z7e7LqU5aJj0gRkQMJAt1r3rr5hxuMYcCX
+AZGEN9bTQMIbIFM+ryXf7Xb2Jgx4adD1H4Oo6Z5tYQBhq8sxhnm3J1oODWpI/y3k
+Lf5ybdHlbRc6lE4Dp4fEVnlQxu757U7qX0mUGDSIPg8jeNXkjwMbZKawLFD8NGgI
+6yQkiib35DvFO7w2Y9xVIJuYiEK9n3XG+6cvrowzwH81d/sL8oa9x6TRilqQx6rb
+j60goGSC9B/8kIecSqTy79Y9Xs/Eib5LpxdHPgdVl9uhjatzvwe5e07pFKhrONoB
+Q8HWO+ZhAs3k04AEOBFRakRfIIXqZKdZckDTPqWybFHP0jL6wYxcl79xv2cIrVMF
+Up4aTedq5xvfVAczGjtelVWpakOXGA5PXI4MhtmMWVFqofg40Q==
+=SsXw
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild b/dev-qt/qt-meta/qt-meta-4.8.5.ebuild
index 7361b939f698..b0ccd796f7a1 100644
--- a/dev-qt/qt-meta/qt-meta-4.8.5.ebuild
+++ b/dev-qt/qt-meta/qt-meta-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/qt-meta-4.8.5.ebuild,v 1.4 2014/09/28 22:54:38 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-meta/qt-meta-4.8.5.ebuild,v 1.5 2014/12/31 13:12:26 kensington Exp $
 
 EAPI=5
 
@@ -30,8 +30,8 @@ RDEPEND="
 	>=dev-qt/qtmultimedia-${PV}:4
 	>=dev-qt/qtopengl-${PV}:4
 	openvg? ( >=dev-qt/qtopenvg-${PV}:4 )
-	kde? ( media-libs/phonon )
-	!kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon ) )
+	kde? ( media-libs/phonon[qt4] )
+	!kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) )
 	>=dev-qt/qtscript-${PV}:4
 	>=dev-qt/qtsql-${PV}:4
 	>=dev-qt/qtsvg-${PV}:4