Adjust phonon dependencies

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 8348938d23f429edd5b9d830823746d9c4b6eb7c..b07c80ab22af5076404a8baf9bbee301387c740e 100644 (file)
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.83 2010/03/03 11:58:05 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.84 2010/04/02 10:01:25 hwoarang Exp $
+
+  02 Apr 2010; Markos Chandras <hwoarang@gentoo.org> qt-webkit-4.6.2.ebuild:
+  Adjust phonon dependencies
 
   03 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   qt-webkit-4.6.2.ebuild:

diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index ae3e334016c321856713e690da459ee09292b40c..a7b9545d6fea1a1925ae4e45613e68cedf990d46 100644 (file)
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 30_webkit_unaligned_access.diff 4390 RMD160 2fbf2c94d140c180b33a8cf938a1add5d922e63f SHA1 4cb4fcb90d929a2e4a7484bc50a6bc7b3852a812 SHA256 2661c5c5b1811d085c5da39a6b8b107e6d0d053f24869bf8c2431b5a7fe9e0e6
 AUX qt-webkit-4.5.3-no-javascript-crash.patch 845 RMD160 2026a6990409b331d6ab495c7d9bacde26f40c8d SHA1 bd5776b379d0abc486efef1e23cbd5dbfb841f03 SHA256 b48fb83915a3f75ad9cedacc06accb6e0832d21cb0762bbd3494a21be85f581b
 AUX qt-webkit-4.6.0-solaris-strnstr.patch 820 RMD160 7303234fc296e5af2aa3a5e10b501776de3383b8 SHA1 e43d209055e7de4fc295a0334ac51054cd19983f SHA256 7ecb2f6317c0da2b0e986678f76f0908b0001e9fab694d5e16df922af75ec82c
@@ -11,13 +8,6 @@ EBUILD qt-webkit-4.5.3-r1.ebuild 1198 RMD160 d813f3dfcca35aa1a1d631b59d8c3917fb2
 EBUILD qt-webkit-4.5.3-r2.ebuild 1262 RMD160 6db2a597f89a4ac9fe3a7cd6ba562babd3c3ad2d SHA1 764dd726c46c670e5610f98c8889823df885daf3 SHA256 1dda47b7789640ff2a160ca327875b6dd6531d013e64d666ce09c1ff30778ff7
 EBUILD qt-webkit-4.5.3.ebuild 1119 RMD160 9336c62e21710ef858974b33625358ec0ae367fe SHA1 1700657ca5e4e1a53d0fd0c36abb2708a433d6a5 SHA256 138038e54bdf1ca0c75a3573f5a132088ae2739402e8a06f8bca07127d338fe4
 EBUILD qt-webkit-4.6.1.ebuild 1255 RMD160 298c759a15a13a9ebffe03278d5ed684bd2e7699 SHA1 561b8cfcd31ac5cf433dcfbb8fb659d1841ab641 SHA256 3159b0b4a7c3f8e7b184e8ea22ee9cb1e9f3512f09d78c19f248058bdabc73dd
-EBUILD qt-webkit-4.6.2.ebuild 1253 RMD160 b818bbcccac14c9f63b9b6b635264775c2d42e16 SHA1 3928a495dd1fd0be13b0b6900cb79831529639f3 SHA256 d076dcb1d2143138f9eb81f23b0798ea35252d521c6621cacc17e35ee3698315
-MISC ChangeLog 11527 RMD160 797951c230bbe0a77ff422a0f86753400b8ca9e2 SHA1 e81c50fb307095f5579fa1b54b8bc72d548362b5 SHA256 0e6ee2df169bfbffde2f3e82332902c625904ccc4a5eb78a745b86e67641cdb0
+EBUILD qt-webkit-4.6.2.ebuild 1316 RMD160 152bfdf60637e904d4f1f232cc27997188b88497 SHA1 205370628a1a32554da44367681da923f9c291a3 SHA256 e455f2f3d34a5d24ca37e928e31d86113865bdfe52ea172856f3e2f8d3172f7f
+MISC ChangeLog 11637 RMD160 e9f381e64c814c6399aa5d8620a90042c67e6dcf SHA1 629f02d9e7161644eaec08f43d3c4a55af056a21 SHA256 67fa3642415033bf28753d743b7a8192b9bbd4a40e4a74426030ececc614485d
 MISC metadata.xml 403 RMD160 2afea624f8c9b3dba9cd2aa884ce53cbe0df67de SHA1 e34dce4d6fae80aa1e5fecdcd5e039efa36992fb SHA256 e514fc0725be75bedd69c2115c22d6562a1a889594d736c0f708103e80d6ff57
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuOTtMACgkQNQqtfCuFneOu/ACeLxO0WYr5VyePUh4MUDCf2fo9
-2DMAoJvb1MhSVcqiorGlIpu1RUTJ7oZW
-=Fs4x
------END PGP SIGNATURE-----

diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
index 2006c1136570e35522b890d6eecadb3b54e73262..064f44ae16e591f80d5255be025e31f64cf5c2d1 100644 (file)
--- a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v 1.3 2010/03/03 11:58:05 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v 1.4 2010/04/02 10:01:25 hwoarang Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -16,7 +16,7 @@ DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
        ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
        !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=]
                media-sound/phonon[aqua=] ) )
-       kde? ( media-sound/phonon[aqua=] )"
+       kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"