Enforce USE dependency for media-libs/phonon.

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

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 998e350be44c129e848330a0b1543f5766a51f10..326acec116151326ef6b9d602c600b62b50bdf99 100644 (file)
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.278 2014/12/10 15:11:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.279 2014/12/31 12:53:58 kensington Exp $
+
+  31 Dec 2014; Michael Palimaka <kensington@gentoo.org> PyQt4-4.10.3-r2.ebuild,
+  PyQt4-4.11.1.ebuild, PyQt4-4.11.2.ebuild:
+  Enforce USE dependency for media-libs/phonon.
 
   10 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> PyQt4-4.11.1.ebuild:
   amd64 stable wrt bug #517344

diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 4b4526de67ca0f5726246ba8b255a520e324a110..ed98dcb6b4ea2eb3a047e6785d4c437cd1829d3a 100644 (file)
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -7,18 +7,27 @@ DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b
 DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
 DIST PyQt-x11-gpl-4.11.2.tar.gz 11120742 SHA256 05dfc4060d25f81e5d45fb020ad59d21af7dc4c01ace4d2b37f3b49493d03f6e SHA512 c849a28070aed1ab55a407da7b3386d5c899e5ada3c8b21b50f8182193a9f6fb53c7ef9ad02b2b261fd3ce901fb2a0189fe4266dd20cf6036bc2c8047f47ba79 WHIRLPOOL 0106a5c4f1f91e79280da3ff834ef61285cf6b8a18cb3d48df7ab969c28b35f76fbdfa648401f8d1e128feee139fcd7eb74edc0fd9ee17ff7a04f28855563eaf
 DIST PyQt-x11-gpl-4.11.3.tar.gz 11120237 SHA256 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 SHA512 48264bed71a0c9662c2903a7cf1ed0263f18b3b69e5b9639b6a006f3cf72bc9766e786788c46046546d1676b221ed2ab29d2ec7fe57057ea9b84cede5ee7622c WHIRLPOOL 1c0f7ecd9f845ec1887ebd0c5b4473bc9be19c074aa8d0c3203c7ccdc0fbd16c4f247f80ba81ab491ef06cefaae704adb1da5da99d658826e941db398c920570
-EBUILD PyQt4-4.10.3-r2.ebuild 5661 SHA256 b71c877ca0b824dabb9ac99ab1c0e27b5b1686be20a642ef278e344c33413238 SHA512 67195e69490050607741915966ecd3cf4b4be2a7036feb731ce8535aa7fc82c9fc932d6a2e1eb1d301204971d53d6901bf01731bcdbdcaa500916e3cf91b24fe WHIRLPOOL 70db74ec457deae5ff938067882c2bf48973f15e625a2214450e04db8a6ef04219a64894e7993df71ad1fe78e521404bde003a6800fd9153007c18d347381a00
-EBUILD PyQt4-4.11.1.ebuild 5615 SHA256 d28c6df5e86489ac79d0105e10c225049911a1b49d0647c873dc9bbaa01898aa SHA512 afc3ba941ba4d12f42ca53ff6489af7116dfe53494e10f74480e3b842b30bd6b7fcb745046eefd1c441272fa7fdfd3157b1b54fdec6ae8661dd4d8794713538a WHIRLPOOL 1eb3fc406dd9eff29d7baa296a2668a23c4bef7357b08c999a6b825e62cc119ef016c7e43b1e00dc8f4957397b8dc0b3c4e5408b23e4932d2335a7739b27aeba
-EBUILD PyQt4-4.11.2.ebuild 5615 SHA256 6f3b0b50cde02e9fa9507c0d1bab42f8514c029d8e5c110382547b56ed8611f5 SHA512 e10ec78547a1fe49701d8ce73f3dbe4f4e3adec055f32209af55c8ec7da43b5f5bf7f4ce7bf14b42241878626f21b2803f5535cea90fde40f73211b6683ac2eb WHIRLPOOL 416cdce1aee0a233acbbeb1d8adc63344c69538c7c513154167cf23b4aea1efedf4166fb51385d7795939d02a0286bd2558f0cb591a20c70387521cbde6861f3
+EBUILD PyQt4-4.10.3-r2.ebuild 5677 SHA256 2990d2f9dddea6b931f1b09583537b88b44805792ddc39aef17a111481f30d80 SHA512 1afa45d0497fa14ac09542ea5dc68a03174b4092253955597a07086a7d0c8fa936645f9dbdba9c7c9419ac6d7ad9ed5712d67c7dcd39902a64ab8594631ea06a WHIRLPOOL c678ce009fdb7e46ee731cc5ef3d20a7306f34c6f31d24f479b312c57763664a68c3e515aca0bd0595fefe9e39f2c6cc5b842bc4c1bfa52a577eff73b06f4e59
+EBUILD PyQt4-4.11.1.ebuild 5629 SHA256 3de5cf93835f6cb2550c213392347d68b9c6a979aea881147252948e50179c45 SHA512 e98fcb8500453b0f96751ca62468df9ca0c30fcb45f55a5c19364ab98ce52ded940f2359ac58db3841a8bacf94ebc12a19a610c0b6c207c94b6297aaf548b348 WHIRLPOOL 6800484f3a73ccc35e1c8989edc037391da649de9802574b27cfe2e8c888756785525c64cad1b8abaf636337316818be01d9640f3dfb557e94e999ab0b6cac03
+EBUILD PyQt4-4.11.2.ebuild 5631 SHA256 efcdd7226308e88634f4ff122855c998fc7b15e9ddaff343dc1346f5d6a4516e SHA512 20663a574349b92b1cebd19e0d47f9b2021faaadca7f59dad07a7c284178eb080bc1ade75de858f66d92df1e4ed8ed97462b2e201224bb0e680f259eb4a249c8 WHIRLPOOL 1103603c5f5f17ab878154c8a18e280a04623daa98816998c970a8fd55ff6f8316f2902809635b3d939c906ebd4176f0cdb0b79dd986166ba995d6f8d1232763
 EBUILD PyQt4-4.11.3.ebuild 4297 SHA256 b0ea4b0e4949f33d51cb75840bcb2cfb36e31ff64149ced934167cacc8f1f1f5 SHA512 5a5e33e462ba22994804d8d9d04209abceb454c6ca8ec6011da750da0126cd6ec526a872091b75ef62dd550478db164a7f53b622a1945ec7fcda55598695008d WHIRLPOOL 98160328bc50d1a7e63cef4a6659273e828b9d2ac38fa2684a031a88089d108cd1002cee2efad21a2f44254aba400fdb4d1b1b4c5bfdb7ce6ea3237f0f69f7d1
-MISC ChangeLog 38332 SHA256 a0bd576456dc33aeecfb2265e9d0d4180ba1a40b82067cdabaac852637cf15de SHA512 00fbdd176286aeab50baf8cad4e177e2173aa1eb92b3abb59c69e21b596f9eb4d101326510fb293a5c8e826291fa50763954e589ad7b05574f0f2d1d674f326e WHIRLPOOL e80b09862b2ea7105ae7c7972cdf7a65f8e699bd04729259984976e397d5b4a068362ff54cbcd5e0c95c9209cc0de541ad610c1305281a53ef761bdd0291a510
+MISC ChangeLog 38508 SHA256 a543a86e332e53ea26e250d64c57f810e624e04c5d398afcf1f1c63e9916bde6 SHA512 78d712b3942b6ae47d6e178e8638e4d8ae3421ce44063f3cedf304a1b4eed81f9d013f3d325d961d730f3dda092008bb154aab6222278a1ddde53bc95caddc39 WHIRLPOOL 96e9df2a23ec537fc30cd909f631b53867d7614ed9e379eec184513a3a17af52c30f1a30e4b4e388ad7786fe4ccf55bc461d49722095269d5e384fc36ccf225a
 MISC metadata.xml 1577 SHA256 166e2a7e692d873540177609fc64de3b423048895c919b0e092d0e99e2b6476a SHA512 7ed844b5f4d2e9355aab4672448eab120f9914dc96ff29ca1197df5fa3ee657a00444f3c5ff11135eaced730664738b3f43205ab1d61a54a656166046beef203 WHIRLPOOL 108e531296bfa72819d5a1364b021c2587bf1c023b498ccb0a3fb75385b26f458c95eaec3d4392377e3bdae901aaa4b6a4486c9e30f61a0b8e2b264c13f1d76e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlSIYlsACgkQG9wOWsQutdZ+RAP+I/SB0pYpeFmrlGJ/BObxer8O
-sfcPPHeMCI7FFY9wEA0mU9V4vo1s1z4p9SKZ/y0VJ8J3c1avdI3zP2CW/eRhCbjg
-Y59yPI/FOSywSC+jOLW+0HkdZN6BX5NXycy8lNGcFVR9BehUIafhPEHukh6SAwPT
-y8m/QmVNxVJSRrakQnE=
-=XOPg
+iQJiBAEBCABMBQJUo/H4RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7F6OD/9XdeCrzUHQctnbfmVm83EtzDDDv2wQo958iBRHkjByufWIAAK0OpVtDSWf
+qSiW+hHwdVNwWGU1Sv+upIjqu7NFUtJoIMHOvUxzgQ5Sym7bazotwZLzo0PuL+pv
+WGtfmbUcouXrV6CJdsfee8nyYigGNVd9fRLbX0gX9nKkxpEYHsNyaRdIhCjcK2sm
+oOtyHJHrYbAGLO57A9GmxaB4Ki69ILdWY8ZN9nH0stjZRmpofr3zyAeYgseV9W4b
+9jhQkoX3XJZ5ecOPgRrKHuYh9FK5GJzreoQE8+MqlTVV3b29CFNt4HIF7H/ILnoM
++aPKlj0CYe0uPIByyS6cTpaW7i3/Uu/0OfBbSfslnWZfFKv5FRzlMDS1WWE8sCcp
+t3tXYpG7mARQS953nzgt2itM86bMe3Z9kejX5hjn8aHfkqgkJ5cZogQxCmdHXWqn
+3Hq+LMtgieEujmTAj1z1x5GMzs60xDVXKaMrwNTalfhmGnxintfqgGMHJiT8Sqpa
+mvVvEnFNusHjUy4/lg88UzHulXMzum52UKLhY2q/N6r1Jg+5sm/IO08+ZjY9AJiR
+/r1ACKIgHgPeKvNahd0kN/lPNhgOakRug1TQwdhEuQ+tVr0sed+Sv01dFG6JoOFX
+WpgeX375i/OJbjQOFA1J2eLoBQAlS+cp6iDJM0zqWG3OBhRkzw==
+=SXqe
 -----END PGP SIGNATURE-----

diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
index 665fd0f40245c51b315fdbc7f3e68ed49e62b3f9..96489f705805777d4d8eea398fb970cd749c755c 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r2.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-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.11 2014/05/30 20:55:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.12 2014/12/31 12:53:58 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -59,8 +59,8 @@ RDEPEND="
        multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
        opengl? ( >=dev-qt/qtopengl-${QT_PV} )
        phonon? (
-               kde? ( media-libs/phonon )
-               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
+               kde? ( media-libs/phonon[qt4] )
+               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
        )
        script? ( >=dev-qt/qtscript-${QT_PV} )
        sql? ( >=dev-qt/qtsql-${QT_PV} )

diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
index d16bc57e36011cd271c98595e6b0e67d2507ce37..4534dfb3429421db2aef5816dae6ae155ef1eb92 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.1.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-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.9 2014/12/10 15:11:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.10 2014/12/31 12:53:58 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -58,8 +58,8 @@ RDEPEND="
        multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
        opengl? ( >=dev-qt/qtopengl-${QT_PV} )
        phonon? (
-               kde? ( media-libs/phonon )
-               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
+               kde? ( media-libs/phonon[qt4] )
+               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
        )
        script? ( >=dev-qt/qtscript-${QT_PV} )
        sql? ( >=dev-qt/qtsql-${QT_PV} )

diff --git a/dev-python/PyQt4/PyQt4-4.11.2.ebuild b/dev-python/PyQt4/PyQt4-4.11.2.ebuild
index 0802fc2c4cafe5db2bfb7be1e08d3d3d7bf2a302..d662c2a5a2263f7f4bc5654902b9e8f40323bcd5 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.11.2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.2.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-python/PyQt4/PyQt4-4.11.2.ebuild,v 1.1 2014/09/20 20:05:06 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2.ebuild,v 1.2 2014/12/31 12:53:58 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -58,8 +58,8 @@ RDEPEND="
        multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
        opengl? ( >=dev-qt/qtopengl-${QT_PV} )
        phonon? (
-               kde? ( media-libs/phonon )
-               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
+               kde? ( media-libs/phonon[qt4] )
+               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
        )
        script? ( >=dev-qt/qtscript-${QT_PV} )
        sql? ( >=dev-qt/qtsql-${QT_PV} )