Restore kde useflag

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

4 files changed, 14 insertions, 8 deletions

diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index c129de07a690..6633dcb8dfb2 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.40 2010/01/20 15:33:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.41 2010/01/22 19:49:45 yngwin Exp $
+
+  22 Jan 2010; Ben de Groot <yngwin@gentoo.org> qt-demo-4.6.0.ebuild,
+  qt-demo-4.6.1.ebuild:
+  Restore kde useflag
 
   20 Jan 2010; Ben de Groot <yngwin@gentoo.org> qt-demo-4.6.0.ebuild,
   qt-demo-4.6.1.ebuild:
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest
index 99258dda1e92..9af5d73373e9 100644
--- a/x11-libs/qt-demo/Manifest
+++ b/x11-libs/qt-demo/Manifest
@@ -4,7 +4,7 @@ DIST qt-everywhere-opensource-src-4.6.0.tar.gz 155679111 RMD160 7842b9f4a5364016
 DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-demo-4.5.3.ebuild 1272 RMD160 168e9d8582c92dec3f98d8caab4b60b240eb66d0 SHA1 c7946621ac78e89455f8971e5a4e23d53d22fba8 SHA256 972f3f857e794cc2ad62d84ee5c2d4e1203befbc2da07293a6ca961a480867e1
-EBUILD qt-demo-4.6.0.ebuild 1332 RMD160 d77cec8f6fad37663251623ca6325952b6f41528 SHA1 1d817c6dbda3eab7fd79e1c0c9a100e080b85850 SHA256 1e2112ab2fa95a62382deda2cd59a5aeadd436b32cbc93cc97ac08395335452a
-EBUILD qt-demo-4.6.1.ebuild 1332 RMD160 7c457bf52b568b3e81df530bb474796c39ebd70c SHA1 5bbbf4e0afe47895cdac3d5c3d501a181cfaf360 SHA256 5fc5cd810a7127191d7e12c81ca6c0fd78a105379dd0ae976c006a2f730055b2
-MISC ChangeLog 5167 RMD160 8984a3f107ff0cceddc0d8f00dbe1cf8b6d18d89 SHA1 f1a500b7d8318b0fc59cf720e368a42b561d87e4 SHA256 da016316ef5b084c8089c7ca8890dff65df870ae4db756d418c6136fa50dde78
+EBUILD qt-demo-4.6.0.ebuild 1371 RMD160 b9c9f371482c7920271baf2630a2d3702a34b2a5 SHA1 5673e7e5b8a65a940f0760edad569ec5629d4ce4 SHA256 ab47f2cf20e7d9eb552ffc0ce52071e4bd35340e427f85fbd42f454b898e3092
+EBUILD qt-demo-4.6.1.ebuild 1371 RMD160 d9f11aad361f13dc118ba1617ed2c18f6854a52a SHA1 cfb79e0bcf67f609af201db8ccc789ec87588dea SHA256 b69c6049b0b1a5a7b28c4c8a306f68079fdd8d0385f60b8a0b366f95fb384556
+MISC ChangeLog 5284 RMD160 919af55c0c83ab068e1aafa80f5027ece52a5b4f SHA1 d1ab971c5262c347163064675ad22fae2ad8d375 SHA256 9fdc719b37c48a9e465b666d5bb0ea565a9e4ac093b3fff62cd0559d35f43716
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
diff --git a/x11-libs/qt-demo/qt-demo-4.6.0.ebuild b/x11-libs/qt-demo/qt-demo-4.6.0.ebuild
index 598801f82e1e..eb870e54ac54 100644
--- a/x11-libs/qt-demo/qt-demo-4.6.0.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.6.0.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-demo/qt-demo-4.6.0.ebuild,v 1.3 2010/01/20 15:33:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.0.ebuild,v 1.4 2010/01/22 19:49:45 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -8,7 +8,7 @@ inherit qt4-build
 DESCRIPTION="Demonstration module of the Qt toolkit"
 SLOT="4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+IUSE="kde"
 
 DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-core-${PV}:${SLOT}[aqua=]
@@ -17,6 +17,7 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=]
 	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] media-sound/phonon[aqua=] )
+	kde? ( media-sound/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
diff --git a/x11-libs/qt-demo/qt-demo-4.6.1.ebuild b/x11-libs/qt-demo/qt-demo-4.6.1.ebuild
index 6e30193bb175..8de18a77c232 100644
--- a/x11-libs/qt-demo/qt-demo-4.6.1.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.6.1.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-demo/qt-demo-4.6.1.ebuild,v 1.2 2010/01/20 15:33:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.1.ebuild,v 1.3 2010/01/22 19:49:45 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -8,7 +8,7 @@ inherit qt4-build
 DESCRIPTION="Demonstration module of the Qt toolkit"
 SLOT="4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+IUSE="kde"
 
 DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-core-${PV}:${SLOT}[aqua=]
@@ -17,6 +17,7 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=]
 	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] media-sound/phonon[aqua=] )
+	kde? ( media-sound/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]