From: Andreas Hüttel Date: Fri, 2 Dec 2011 19:22:19 +0000 (+0000) Subject: Make the qt-phonon blocker a hard one... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2aff8c787368185d0f0f976a2d2f13821eb7e8dc;p=gentoo.git Make the qt-phonon blocker a hard one... Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog index 5b2c15d6344e..91954b350abf 100644 --- 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.25 2011/11/30 23:02:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.26 2011/12/02 19:22:19 dilfridge Exp $ + + 02 Dec 2011; Andreas K. Huettel phonon-4.4.2.ebuild, + phonon-4.4.3.ebuild, phonon-4.5.0.ebuild, phonon-4.5.1-r1.ebuild: + Make the qt-phonon blocker a hard one... 30 Nov 2011; Andreas K. Huettel phonon-4.4.2.ebuild, phonon-4.4.3.ebuild: diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index 382efb8927a3..12824d175ca7 100644 --- 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 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-4.4.2.ebuild 3228 RMD160 dac66a33e36e719763669547fe2790fa79f3e576 SHA1 72e049dc607772ccd7b40179deaa48eba89523da SHA256 510867bcbd72b2aae0f0e56fcffcdb4645177d176b76f07240888f9bc5067a83 +EBUILD phonon-4.4.3.ebuild 3124 RMD160 f5a71fbc0386abf97cc917111d3da899a77fc63b SHA1 a3b115bd8d6672d977f1845a43ec5cf0e82c2e86 SHA256 66e231fdf800bcad1864b8eae2871eb0e914c709cd9bcb19d9384ebf2e1cd6a7 +EBUILD phonon-4.5.0.ebuild 1457 RMD160 50a6ddfe15812f2cc726c6e6259c60fa93ab2fff SHA1 bcf01312865677dbcba75558478645f2ffb5f35c SHA256 fe1c6aa1d54ae5fdc35d0626215ec5964615fd4971bdb7b9faf2e25bb012cd4b +EBUILD phonon-4.5.1-r1.ebuild 1648 RMD160 474cc1b149b2c60ba71e3780ee184fd7f547b2a6 SHA1 5053b2cd6c3de94ed9bba625689f0f901f3aaa84 SHA256 b4a7b9014acd6f432c19052dd7f1f13199dc88bece8a16b8406d7941a4b0f990 EBUILD phonon-9999.ebuild 1590 RMD160 b03dd21328185554fc8eada732cec67b8a2a9aca SHA1 1daa1e0ad9395089221b17465949b04312e68154 SHA256 1a201bdb5554bb4b4929af7033a24a681d42923b6e2879188a169a44de8f0ccd -MISC ChangeLog 13426 RMD160 980ad822fd03d8786d20be0a0a82863bd60da636 SHA1 8cfb869a14d6d23609c3d66fd19252d9ef2dbb22 SHA256 2dfce3dcfacc1551e4ee7d2a26ae9c2c378c9037cd86577bf5e615db944db6c9 +MISC ChangeLog 13616 RMD160 c22963d1538eb0a369aee39efb79981815509399 SHA1 dbc02bbd19e7cc049be6148229b59082df8f9f00 SHA256 b9483ce30336d581997b77ae9cc96ffc35bc46c5f029642db0f600837959fce5 MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -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 +iQIcBAEBCgAGBQJO2SV4AAoJENwGBM22xffeB4YP/ipThx4/m/5CX/Eqzww6RA2Z +KQkkPjwBrNlcORYsStZwOE7SGEKoyEZAMiHv/JVmFfYEHP989IXYoyneNdYk1pf4 +kO1pisKEB3Z9F4r0PQKpkHewDHwYV4t3gRlXSR47CY841WtSxa/sSVlxwDv7d4gg +dq+CzXpjryA0CpsxNuyp0ma5XS+cGNX5KvnD2WQqRALQfqIdoeh+QkkdJYaRuCGA +7KW6ATfWTMxi+IkH+cFnThKkuIDVb63qcYHkWU3hk1GDLLbBFGBhtMzsJtFK8DyB +caiCOwDijM/QYStnD83szDUd6VwurX93Sdfb9OjEJWYTQt8oWT+oxgv5cYs+rWnX +okYDv1T2Mmq7MUT1waBe35dg1nqCxMP6HX6WJREM2YH6VZl55mLMrx8IGVTkcnQs +KHlOhXTv2kJ2NYWxXrPplsd/t6wTKPPcOSt9YTiuj7SFfyVNv+Aml4n2rYvc2JVS +TPgd/DHkTXdHrGd+ywZSeQD9YzZhg39QNzXWUf2Rk5Wj7SdGX15drJ6eQb9sTujb +Mi8E/JiRFRbgwKVrFAHLbMpMjVNRp5XFD8c/eHw1pJVLQzx1vql7O9KoLmHYhy/X +cK/Wn0LxIygrzzU317vjtYTHE8zRyxmcpfeXgWYNVwoQ6ht+CR6o+OeoWDm+QaHG +EN5ZBoD0rZAr7bIZbnDK +=wPP0 -----END PGP SIGNATURE----- diff --git a/media-libs/phonon/phonon-4.4.2.ebuild b/media-libs/phonon/phonon-4.4.2.ebuild index 172c59e4bacc..aa9cd31899be 100644 --- 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.2 2011/11/30 23:02:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.2.ebuild,v 1.3 2011/12/02 19:22:19 dilfridge Exp $ EAPI="2" @@ -17,7 +17,7 @@ IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine" RDEPEND=" !kde-base/phonon-xine - !x11-libs/qt-phonon:4 + !!x11-libs/qt-phonon:4 >=x11-libs/qt-test-4.6.0:4[aqua=] >=x11-libs/qt-dbus-4.6.0:4[aqua=] >=x11-libs/qt-gui-4.6.0:4[aqua=] @@ -36,7 +36,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - !x11-libs/qt-phonon:4 + !!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 89f5ee917d20..17afbd62f6bb 100644 --- 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.3 2011/11/30 23:02:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.3.ebuild,v 1.4 2011/12/02 19:22:19 dilfridge Exp $ EAPI="2" @@ -17,7 +17,7 @@ IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine" RDEPEND=" !kde-base/phonon-xine - !x11-libs/qt-phonon:4 + !!x11-libs/qt-phonon:4 >=x11-libs/qt-test-4.6.0:4[aqua=] >=x11-libs/qt-dbus-4.6.0:4[aqua=] >=x11-libs/qt-gui-4.6.0:4[aqua=] @@ -36,7 +36,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - !x11-libs/qt-phonon:4 + !!x11-libs/qt-phonon:4 >=dev-util/automoc-0.9.87 " diff --git a/media-libs/phonon/phonon-4.5.0.ebuild b/media-libs/phonon/phonon-4.5.0.ebuild index e38d838ceb63..a39a36e2f813 100644 --- a/media-libs/phonon/phonon-4.5.0.ebuild +++ b/media-libs/phonon/phonon-4.5.0.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.5.0.ebuild,v 1.9 2011/10/20 20:22:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild,v 1.10 2011/12/02 19:22:19 dilfridge Exp $ EAPI=4 @@ -24,7 +24,7 @@ COMMON_DEPEND=" dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) - !x11-libs/qt-phonon:4 + !!x11-libs/qt-phonon:4 " # directshow? ( media-sound/phonon-directshow ) # mmf? ( media-sound/phonon-mmf ) diff --git a/media-libs/phonon/phonon-4.5.1-r1.ebuild b/media-libs/phonon/phonon-4.5.1-r1.ebuild index ec02b5cbdccc..4359ed59cb32 100644 --- a/media-libs/phonon/phonon-4.5.1-r1.ebuild +++ b/media-libs/phonon/phonon-4.5.1-r1.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.5.1-r1.ebuild,v 1.1 2011/10/30 23:22:41 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.1-r1.ebuild,v 1.2 2011/12/02 19:22:19 dilfridge Exp $ EAPI=4 @@ -23,7 +23,7 @@ SLOT="0" IUSE="aqua debug +gstreamer pulseaudio vlc xine" COMMON_DEPEND=" - !x11-libs/qt-phonon:4 + !!x11-libs/qt-phonon:4 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4