summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-demo/ChangeLog6
-rw-r--r--x11-libs/qt-demo/qt-demo-4.6.0.ebuild5
-rw-r--r--x11-libs/qt-demo/qt-demo-4.6.1.ebuild5
3 files changed, 11 insertions, 5 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/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=]