Add kde useflag again, for selecting media-sound/phonon, now that that package is stable on the needed arches. Fixes bug 270188.

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

4 files changed, 19 insertions, 19 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 1023d89ee433..99bc7998a543 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.40 2009/06/02 18:05:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.41 2009/06/03 22:02:57 yngwin Exp $
+
+  03 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.5.1.ebuild,
+  metadata.xml:
+  Add kde useflag again, for selecting media-sound/phonon, now that that
+  package is stable on the needed arches
 
   02 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
   qt-webkit-4.5.1.ebuild:
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 048b8313114d..5a69aa4f6ff6 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0249-webkit-stale-frame-pointer.diff 4812 RMD160 aea505ff0783ba34a68dff4e9968fe8c0944a3be SHA1 910a7260f703e62d14eb521c6243e0f4b8bfaa76 SHA256 002f3900fbb9b17927260117db93b14297bdda4369e13f1593a949ebac0bd60d
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75
 EBUILD qt-webkit-4.4.2-r1.ebuild 1204 RMD160 7c273ab0808d0f57c8876a631f8f8fe1d13fd86a SHA1 57aaebe1f2f4444873b5f60107b68add1e164fe1 SHA256 746670af79dcfae1cc62d43f052769a42ffa9fc109b97e28c72c24246f9fbda9
 EBUILD qt-webkit-4.4.2.ebuild 1102 RMD160 fc6bcf5f550172032a8eb07034bae9b39ac057b7 SHA1 c1d03d1d04c3e51931453859cb56ba3414f97647 SHA256 85c5b7368065868d1261483a0005b4257b44bdef02fb7c369cea85ac194c038e
-EBUILD qt-webkit-4.5.1.ebuild 1068 RMD160 f4455960d7eea9d8dade713c7be5373ba5a11631 SHA1 1d422b037f79cb0b5089e8f0bc2da6e595e440cf SHA256 4234758e65415524dc754fb679343eed534f02166ce2840ed15794b886d46202
-MISC ChangeLog 5321 RMD160 c84ab160bcb54eee18740fcefad2212b4d476672 SHA1 5b76fdc4bff2c7ec44b4f53cee8a701ce0fba887 SHA256 123ac45a9314f6be4154d0f9d634e64ca4c4cc199ec13edf45e74566f17b9baa
-MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkolae4ACgkQNQqtfCuFnePjZgCffwIGOblGJdih6CWfP/s8W9+b
-CUYAnRufuqz/zpJq4/MaMSYI/XSQwpQB
-=8Bod
------END PGP SIGNATURE-----
+EBUILD qt-webkit-4.5.1.ebuild 1070 RMD160 4d77a2761f972c57dc8598a393a8c1d4ff4caca9 SHA1 c7def7140b5d0884687de5129887e1933790c8f2 SHA256 ae6698fddedbfb2a12738504f89a8e0dd6d7963cd713390a779c896e0abfa43c
+MISC ChangeLog 5525 RMD160 5f868a3edf4a9f96d3bbe1b166567dd413f27a3b SHA1 ff6aa4c0fa1294b28ce56a91583ed5b380fbd2b2 SHA256 b41c007ffd32adada7729309b833d1e32686f678424832ff9a97a5cc958fda69
+MISC metadata.xml 284 RMD160 b9074d3491bcd710578c8eea5d49322e37cbeee9 SHA1 43a9766ca508301d94a0a11151d1e7114d5f2e9a SHA256 d93c9eadc729c0d1cee418ee259ed1fac10fc8d908a3508d67a73bd9f1de900a
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 01a5c2875e0d..048f15543632 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd> 
+  <herd>qt</herd>
+  <use>
+    <flag name='kde'>
+      Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild
index 2e64aa712489..32311402d574 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.5.1.ebuild,v 1.8 2009/06/02 18:05:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild,v 1.9 2009/06/03 22:02:57 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build flag-o-matic
@@ -8,12 +8,12 @@ inherit qt4-build flag-o-matic
 DESCRIPTION="The Webkit module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 -sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="kde"
 
 DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
 	~x11-libs/qt-gui-${PV}[debug=]
-	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon )"
-#	kde? ( media-sound/phonon )"
+	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon )
+	kde? ( media-sound/phonon )"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"