Add qt-phonon blocker also in DEPEND

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 1595a29a4fe781752d8fd12ddaf051639c99a694..5b2c15d6344e2f0af96c41539e8d3e845599f16a 100644 (file)
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.24 2011/11/30 23:00:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.25 2011/11/30 23:02:23 dilfridge Exp $
+
+  30 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-4.4.2.ebuild,
+  phonon-4.4.3.ebuild:
+  Add qt-phonon blocker also in DEPEND
 
   30 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -phonon-4.5.0-r1.ebuild, -phonon-4.5.0-r2.ebuild, -phonon-4.5.1.ebuild:

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 6ed1c751c4b42a80f4692df9a0769b66c5c6cceb..382efb8927a330bfa0a1bdb98e12b379ce57ea74 100644 (file)
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -8,27 +8,27 @@ DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606
 DIST phonon-4.4.3.tar.bz2 648733 RMD160 d7f36bf490acc595dabfd1f7fb1f4433cf77ccf8 SHA1 50262d590beb648be9dcad6b913b920db19a84f8 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
 DIST phonon-4.5.0.tar.bz2 322043 RMD160 80098d330ce4167eed5b6b6004871614178b37ef SHA1 122f7c53939a2c40c3312c2f5e59f25ca2c9ee53 SHA256 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc
 DIST phonon-4.5.1.tar.xz 291088 RMD160 b5aa9313b62bac7d5233716db52c9275168ee191 SHA1 710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8 SHA256 0180f01cb6cae907285adf76e4aece9be33af6a352dc057709e40b7838e2f4c8
-EBUILD phonon-4.4.2.ebuild 3203 RMD160 a0f49130f52e10cec11e1cceec4c65401cce4e7d SHA1 87543b810822b8fa7559245fc39656da33da1fdc SHA256 fb3e0e1061632acc710b8ff60829efaf24e4f3d86db32c739042f80fc1aadfd0
-EBUILD phonon-4.4.3.ebuild 3096 RMD160 c204f5d0e23ebf2c8308a5805effb756ac6d46fc SHA1 688a6d8714dfaeff908b67f1081d83cb4cf898d5 SHA256 21bc50fb7d05894498b57d7c338e19ec3dc7fb9a5cb5412c6a4e83067a8282a4
+EBUILD phonon-4.4.2.ebuild 3226 RMD160 503230c28221e39656136dcc688535baf82c2a62 SHA1 3b92490d31eed9d0e5108da48f30fad21a7792c0 SHA256 b2c6c6741cd754799b02754444df0e7b4af2dd3acfb0b8e4d9735ba171a8433b
+EBUILD phonon-4.4.3.ebuild 3122 RMD160 4d5fbfc8e73d57885715c2551ce860745bace7f7 SHA1 69221ee2f9b4575633c130126f5875daad658d7f SHA256 8dc8cc488f4c4d04b87e5d6fc7aeeff6ae6897d488ae3f290050e193010d0c1d
 EBUILD phonon-4.5.0.ebuild 1455 RMD160 8922026063da6d1af4507a6a25c2bb77d9b7532f SHA1 746916879212a687f7a832dd7bb305d78fa3cbfc SHA256 a7482183176afa8d39daca3a435e641d73a6207d4b9bbe87906d3f735d6b0f3b
 EBUILD phonon-4.5.1-r1.ebuild 1647 RMD160 3e6859622f88565a357b79df948ab0519cf3dd76 SHA1 a5ed049f4be0bf05832a018938a765ba1a63bfc9 SHA256 243f53cb4646c1151328472efe90d66445a1c13ea0a3bdc5eed2b0b8740f651f
 EBUILD phonon-9999.ebuild 1590 RMD160 b03dd21328185554fc8eada732cec67b8a2a9aca SHA1 1daa1e0ad9395089221b17465949b04312e68154 SHA256 1a201bdb5554bb4b4929af7033a24a681d42923b6e2879188a169a44de8f0ccd
-MISC ChangeLog 13285 RMD160 ddc87f7b77b76cc399bed4308aa7fa2bd573356f SHA1 841e60ce8d7a84606feb78b39cb34865c27739db SHA256 8c7a49575a57b5add118265973c867f62de47ceb5980d8f845be495edc404d18
+MISC ChangeLog 13426 RMD160 980ad822fd03d8786d20be0a0a82863bd60da636 SHA1 8cfb869a14d6d23609c3d66fd19252d9ef2dbb22 SHA256 2dfce3dcfacc1551e4ee7d2a26ae9c2c378c9037cd86577bf5e615db944db6c9
 MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO1rWcAAoJENwGBM22xffe26IQAIrOcae2UwAH5Hykbolr7Pd0
-nzdYcqrkXia59HE9U5/55FaDcbyC8oU65kevi+nJiTuuhrByhfIB2m49gaKrY5tS
-PvnYuonkN7f9vbdO0xqrbEOFHyR45xIUURcBBZWm6zsdzi592C2M5kHIObuU+i2A
-ZTzIetW9ziI6XLhB+QUQvxTbVcblhwYXzAVM+EI48Bdh5pZk35DuC6UPtkisMPDX
-qWNE2IMYLA2oVIFXgLFMhWA2az6CYpMFGbSbIZJ9806NnLo2awKpAV3+PDIgShV4
-e6liqUb5vKuxyy2dU9K11VWa7xWKfa75FQpEJ5xk/XWcV1gWrZpSlYrGWqEqCNgI
-YwLb77R2hzTdFNawgXZz40KNlWwrDCsg8h3yD7FrB6vRC6wdkqqUetX5vXzRmUqm
-/mVILIPQXSm7x5jeNyr16fWh0XVAng2ITUyr3AN3LdoawBTTNFjtLMfcOeegKxcV
-2ez1G5MPYt1BK8YIYbZhRpQI/jRCEK/K8o4W2SKYT+XNfnguHWG7H99lVCY8tZru
-+FIBMztKjXFpAW+aCG90OJ+RiiKeGMqU/LAQNocrOD9sMw/+yVX1GoH1CnNpLL1e
-VN9lshktB24hzy8n3oE8q+/HrT84X1rWNQVw+SgBW1i/ctUyMSo2PSMV0VKPt0Le
-t8T3NBDXUJ/Fj9aS9ICD
-=To3w
+iQIcBAEBCgAGBQJO1rYGAAoJENwGBM22xffegagP/i9VpWYdtaW2zZ8OZ/wvdxHd
+TGv+fXHQWEyqcaX+vs6cEbT9YJwx10+lThY2UXLYOYIyhWZoJPEuvNyyaSKVBR4Y
+nmZbF9nYokpS8/3EO+ju/Ot3o+AFojkQMrskpJtQBUp00axSAIfy2Af97QjIJzEv
+RnoM3LFnDwwMRudhKxn7GfQirwGlU3IPnA47N9loWrapXt6bc5ULPQ54zBH1nB2/
+pVLDGKuxripdngt2WQcwbHqSgsXVUAsoiMHdKWjTJgFW8BAXpjsEnwPPVUCc4cqc
+WHYZfZ2ss69TihjnIVvvGKuv5Y51glLusD/zLzp6Pm8EsOMY99C+QrJX3oWf/2w5
+p8WWtfUurFDzoXyHSLXnzCPCuS23eHIFu0mS4br0uHV/9KHnV/sCQatOiMB0kx8M
+tS890t1CN/m3ItI+97QB1rECqS0lRzPbz7GTSXQOb/r5WAVWlXGLhC3zgYroURvk
+ewm03j2x7d1GDTBmEvNmdaMsDLFhSrZdMYU0CYYRpqoSbWqRhFfKw+KPzdCiqS+Q
+k1zkQMFfoTflmDpfPA2v/kPKodA/urEvjQQ29exkpU4KTp4kaNVylxHC3IcaOJGp
+OS8+Kbb70cKPi0L6DUJohrWW2hC3AD1UAoknAG/KkkvfhwWN+3wtq8eMp5LhoY9k
+/YoknpDz0pIabvpsdsQd
+=Flwp
 -----END PGP SIGNATURE-----

diff --git a/media-libs/phonon/phonon-4.4.2.ebuild b/media-libs/phonon/phonon-4.4.2.ebuild
index fb3647cd0364b2e1b7e9ec82a2b99cc79ff31db6..172c59e4bacc51da2ccae8a9d47e0daa213ebeda 100644 (file)
--- a/media-libs/phonon/phonon-4.4.2.ebuild
+++ b/media-libs/phonon/phonon-4.4.2.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-libs/phonon/phonon-4.4.2.ebuild,v 1.1 2011/03/26 16:07:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild,v 1.2 2011/11/30 23:02:23 dilfridge Exp $
 
 EAPI="2"
 
@@ -36,6 +36,7 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
+       !x11-libs/qt-phonon:4
        >=dev-util/automoc-0.9.87
 "
 

diff --git a/media-libs/phonon/phonon-4.4.3.ebuild b/media-libs/phonon/phonon-4.4.3.ebuild
index 8ebbb9935020ba87abfa6eb645bafc64588e9d12..89f5ee917d20ffa733433e18cc1efc94d73db079 100644 (file)
--- a/media-libs/phonon/phonon-4.4.3.ebuild
+++ b/media-libs/phonon/phonon-4.4.3.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-libs/phonon/phonon-4.4.3.ebuild,v 1.2 2011/06/01 16:04:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild,v 1.3 2011/11/30 23:02:23 dilfridge Exp $
 
 EAPI="2"
 
@@ -36,6 +36,7 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
+       !x11-libs/qt-phonon:4
        >=dev-util/automoc-0.9.87
 "