synced x11-libs/qt-qt3support with main tree

11 files changed, 19 insertions, 258 deletions

diff --git a/metadata/cache/x11-libs/qt-qt3support-4.4.2 b/metadata/cache/x11-libs/qt-qt3support-4.4.2
index 8302f694c..8c51befe0 100644
--- a/metadata/cache/x11-libs/qt-qt3support-4.4.2
+++ b/metadata/cache/x11-libs/qt-qt3support-4.4.2
@@ -12,9 +12,9 @@ base eutils flag-o-matic multilib multilib-native portability qt4-build toolchai
 
 
 
-1
+2
 
-compile install postinst postrm preinst setup unpack
+compile configure install postinst postrm preinst prepare setup unpack
 
 
 
diff --git a/metadata/cache/x11-libs/qt-qt3support-4.5.0 b/metadata/cache/x11-libs/qt-qt3support-4.5.0
deleted file mode 100644
index 52732bb7d..000000000
--- a/metadata/cache/x11-libs/qt-qt3support-4.5.0
+++ /dev/null
@@ -1,22 +0,0 @@
-~x11-libs/qt-core-4.5.0[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.0[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.0[debug=,qt3support,lib32?]
-~x11-libs/qt-core-4.5.0[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.0[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.0[debug=,qt3support,lib32?]
-4
-http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.0.tar.bz2
-
-http://www.qtsoftware.com/
-|| ( LGPL-2.1 GPL-3 )
-The Qt3 support module for the Qt toolkit
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
-+accessibility phonon custom-cxxflags debug pch lib32
-
-phonon? ( || ( ~x11-libs/qt-phonon-4.5.0[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) )
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/qt-qt3support-4.5.0_rc1 b/metadata/cache/x11-libs/qt-qt3support-4.5.0_rc1
deleted file mode 100644
index 158a517e5..000000000
--- a/metadata/cache/x11-libs/qt-qt3support-4.5.0_rc1
+++ /dev/null
@@ -1,22 +0,0 @@
-~x11-libs/qt-core-4.5.0_rc1[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.0_rc1[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.0_rc1[debug=,qt3support,lib32?]
-~x11-libs/qt-core-4.5.0_rc1[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.0_rc1[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.0_rc1[debug=,qt3support,lib32?]
-4
-http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.0-rc1.tar.bz2
-
-http://www.qtsoftware.com/
-|| ( GPL-3 GPL-2 )
-The Qt3 support module for the Qt toolkit
-~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
-+accessibility phonon custom-cxxflags debug pch lib32
-
-phonon? ( || ( ~x11-libs/qt-phonon-4.5.0_rc1[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) )
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/qt-qt3support-4.5.1 b/metadata/cache/x11-libs/qt-qt3support-4.5.1
index 310201407..885135839 100644
--- a/metadata/cache/x11-libs/qt-qt3support-4.5.1
+++ b/metadata/cache/x11-libs/qt-qt3support-4.5.1
@@ -1,16 +1,16 @@
-~x11-libs/qt-core-4.5.1[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.1[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.1[debug=,qt3support,lib32?]
-~x11-libs/qt-core-4.5.1[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.1[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.1[debug=,qt3support,lib32?]
+~x11-libs/qt-core-4.5.1[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.1[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.1[debug=,qt3support,lib32?] phonon? ( || ( ~x11-libs/qt-phonon-4.5.1[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) kde? ( media-sound/phonon[lib32?] ) )
+~x11-libs/qt-core-4.5.1[debug=,qt3support,lib32?] ~x11-libs/qt-gui-4.5.1[accessibility=,debug=,qt3support,lib32?] ~x11-libs/qt-sql-4.5.1[debug=,qt3support,lib32?] phonon? ( || ( ~x11-libs/qt-phonon-4.5.1[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) kde? ( media-sound/phonon[lib32?] ) )
 4
 http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2
 
 http://www.qtsoftware.com/
 || ( LGPL-2.1 GPL-3 )
 The Qt3 support module for the Qt toolkit
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
-+accessibility phonon custom-cxxflags debug pch lib32
++accessibility kde phonon custom-cxxflags debug pch lib32
+
 
-phonon? ( || ( ~x11-libs/qt-phonon-4.5.1[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) )
 
 2
 
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
deleted file mode 100644
index 837d1ab3d..000000000
--- a/x11-libs/qt-qt3support/ChangeLog
+++ /dev/null
@@ -1,105 +0,0 @@
-# ChangeLog for x11-libs/qt-qt3support
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.24 2009/03/04 21:10:38 yngwin Exp $
-
-*qt-qt3support-4.5.0 (04 Mar 2009)
-
-  04 Mar 2009; Ben de Groot <yngwin@gentoo.org> +qt-qt3support-4.5.0.ebuild:
-  Version bump
-
-  18 Feb 2009; Jeroen Roovers <jer@gentoo.org> qt-qt3support-4.4.2.ebuild:
-  Stable for HPPA (bug #248083).
-
-*qt-qt3support-4.5.0_rc1 (11 Feb 2009)
-
-  11 Feb 2009; Ben de Groot <yngwin@gentoo.org>
-  +qt-qt3support-4.5.0_rc1.ebuild:
-  Version bump
-
-  06 Feb 2009; Raúl Porcel <armin76@gentoo.org> qt-qt3support-4.4.2.ebuild:
-  ia64/sparc stable wrt #248038
-
-  04 Feb 2009; Brent Baude <ranger@gentoo.org> qt-qt3support-4.4.2.ebuild:
-  Marking qt-qt3support-4.4.2 ppc64 stable for bug 248038
-
-  04 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org>
-  qt-qt3support-4.4.2.ebuild:
-  Add ~mips keywords to qt-4.4.2
-
-  31 Jan 2009; Tobias Klausmann <klausman@gentoo.org>
-  qt-qt3support-4.4.2.ebuild:
-  Stable on alpha, bug #248038
-
-  29 Jan 2009; Alexis Ballier <aballier@gentoo.org>
-  qt-qt3support-4.4.2.ebuild:
-  keyword ~x86-fbsd
-
-  18 Jan 2009; Markus Meier <maekke@gentoo.org> qt-qt3support-4.4.2.ebuild:
-  amd64/x86 stable, bug #248038
-
-  17 Jan 2009; nixnut <nixnut@gentoo.org> qt-qt3support-4.4.2.ebuild:
-  ppc stable #248038
-
-  06 Jan 2009; Ben de Groot <yngwin@gentoo.org> -qt-qt3support-4.4.0.ebuild,
-  -qt-qt3support-4.4.1.ebuild:
-  Clean out old ebuilds
-
-*qt-qt3support-4.4.2 (19 Sep 2008)
-
-  19 Sep 2008; Ben de Groot <yngwin@gentoo.org> +qt-qt3support-4.4.2.ebuild:
-  Version bump
-
-  16 Aug 2008; Ben de Groot <yngwin@gentoo.org> qt-qt3support-4.4.1.ebuild:
-  Add explicit dep on qt-core
-
-*qt-qt3support-4.4.1 (11 Aug 2008)
-
-  11 Aug 2008; Ben de Groot <yngwin@gentoo.org> +qt-qt3support-4.4.1.ebuild:
-  Version bump
-
-  13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-  qt-qt3support-4.4.0.ebuild:
-  Make all split Qt4 ebuilds block the old monolithic ebuild.
-
-  30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-qt3support-4.4.0.ebuild:
-  Marked ~hppa (bug #223557).
-
-  27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-qt3support-4.4.0.ebuild:
-  Add ~alpha/~ia64/~sparc wrt #223557
-
-  25 May 2008; Markus Rothe <corsair@gentoo.org> qt-qt3support-4.4.0.ebuild:
-  Added ~ppc/~ppc64
-
-  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-  -qt-qt3support-4.4.0_rc1.ebuild:
-  Old.
-
-*qt-qt3support-4.4.0 (15 May 2008)
-
-  15 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-  +qt-qt3support-4.4.0.ebuild:
-  Version bump to Qt-4.4.0.
-
-  10 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-  -qt-qt3support-4.4.0_beta1.ebuild, +qt-qt3support-4.4.0_rc1.ebuild:
-  Version bump qt-qt3support to 4.4.0_rc1. Thanks to Bo Andresen and Bernd
-  Steinhauser.
-
-  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-  -qt-qt3support-4.4.0_rc1.ebuild:
-  Old.
-
-*qt-qt3support-4.4.0_beta1 (05 Mar 2008)
-
-  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-  +qt-qt3support-4.4.0_beta1.ebuild:
-  Added Qt-4.4.0_beta, note that the RC1 is an accidentally mislabelled
-  `technical preview`, so this will appear as a downgrade if you installed
-  that version.
-
-*qt-qt3support-4.4.0_rc1 (20 Dec 2007)
-
-  20 Dec 2007; Caleb Tennis <caleb@gentoo.org> +metadata.xml,
-  +qt-qt3support-4.4.0_rc1.ebuild:
-  Initial import
-
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
index 55e4318ab..518635272 100644
--- a/x11-libs/qt-qt3support/Manifest
+++ b/x11-libs/qt-qt3support/Manifest
@@ -1,11 +1,5 @@
 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.0-rc1.tar.bz2 110889586 RMD160 60b410f1776d5f55863543fcd4dd3a8105864ec1 SHA1 1dffebc52543ee8dd486ec69fc51d02e216323bd SHA256 94aa6268662a24cec1a20e2fb88fcac418101719c0e1ab2729289fd8b7d475d7
-DIST qt-x11-opensource-src-4.5.0.tar.bz2 113335010 RMD160 5714f2772ce358e6528ec13121aebc8e63e848cf SHA1 db136bbed1715c155ceb610309d33f943c1df8fd SHA256 e1b356a54e65781ed94f19d785356a88daa8d38b9dbbca35439b80ca8c4a5be9
 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75
-EBUILD qt-qt3support-4.4.2.ebuild 1333 RMD160 4ab2684c30f20278b2876caa42fd0c9e74e31e05 SHA1 ac303aa355ce17266d00354d8b7443cdbb799e88 SHA256 7594e81794614dc70667019315770de473956662dcd91a53561ff064b9b5c067
-EBUILD qt-qt3support-4.5.0.ebuild 1127 RMD160 ecebc9c614a9e38b7bf8cfa6f070c9e8f031cd06 SHA1 cfbddcabdd0756ad13a739b89c5be9529ffec88b SHA256 58091e736feb2ca5425d7576cfcd2b309306da3ed7c4ba5cbe79c844dd9db3b8
-EBUILD qt-qt3support-4.5.0_rc1.ebuild 1154 RMD160 8398052ad8cea88a4f3f84ae1f278a57af4566c5 SHA1 966a4e66537eb5d46f3217cb50c6926d019be9b4 SHA256 f5c8ea570e6230e9c52e60e3f3e148f1f8ba967d9930a59f6f0ebc0d41cb39da
-EBUILD qt-qt3support-4.5.1.ebuild 1127 RMD160 ecebc9c614a9e38b7bf8cfa6f070c9e8f031cd06 SHA1 cfbddcabdd0756ad13a739b89c5be9529ffec88b SHA256 58091e736feb2ca5425d7576cfcd2b309306da3ed7c4ba5cbe79c844dd9db3b8
-MISC ChangeLog 3338 RMD160 222e0531129792533334ea323523d1e89cf89ed4 SHA1 f54528b704c33c84938067300e7d42d59d1d2f78 SHA256 a894820f08671cd19ca186c7684478a711e5a4dd9d039058ba9a9f44f44a91d9
-MISC metadata.xml 264 RMD160 16ea1c84ae075d7f5c45aec4a2932d5e20e59a57 SHA1 da7cd2663e77bcb4ef83745051440b2f3f0c8293 SHA256 8f54bd4ae6e2bd476a6cd11b0afbf43740db12b05379879ac7dcddbe2723c649
+EBUILD qt-qt3support-4.4.2.ebuild 1337 RMD160 38f25d5aa3862b5b8d42bd22fec7ea5d60da507c SHA1 48b826269351f664ac0a2f33da17f370e11cebce SHA256 2905b822dccacdf771f1acd79b58da8c93a2028ae40699ac1c016ec40a8ea23d
+EBUILD qt-qt3support-4.5.1.ebuild 1157 RMD160 374f738862fb865373188fe53de2aa33ef2bf579 SHA1 136668a107d3b9f792d6f707513ed7d188aa45f8 SHA256 0528dc5dd5620dcb59e2c600b57a9144a99d43d35879f42454583b772dc6f941
diff --git a/x11-libs/qt-qt3support/metadata.xml b/x11-libs/qt-qt3support/metadata.xml
deleted file mode 100644
index c072d29cb..000000000
--- a/x11-libs/qt-qt3support/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>qt</herd>
-  <use>
-    <flag name='phonon'>
-      Enable phonon configuration dialog in qtconfig
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.4.2.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.4.2.ebuild
index 145116c78..f9c164a8d 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.4.2.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.2.ebuild,v 1.9 2009/02/18 19:53:30 jer Exp $
 
-EAPI="1"
+EAPI="2"
 inherit qt4-build multilib-native
 
 DESCRIPTION="The Qt3 support module for the Qt toolkit."
@@ -40,10 +40,10 @@ pkg_setup() {
 	qt4-build_pkg_setup
 }
 
-multilib-native_src_compile_internal() {
+multilib-native_src_configure_internal() {
 	local myconf
 	myconf="${myconf} -qt3support -no-gstreamer -no-phonon
 		$(qt_use accessibility)"
 
-	qt4-build_src_compile
+	qt4-build_src_configure
 }
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild
deleted file mode 100644
index bfe1a67c4..000000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild,v 1.2 2009/03/17 17:57:50 armin76 Exp $
-
-EAPI="2"
-inherit qt4-build multilib-native
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+accessibility phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support,lib32?]
-	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support,lib32?]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support,lib32?]"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? (
-	|| ( ~x11-libs/qt-phonon-${PV}[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) )"
-
-QT4_TARGET_DIRECTORIES="
-src/qt3support
-src/tools/uic3
-tools/designer/src/plugins/widgets
-tools/qtconfig
-tools/porting"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-src/
-include/
-tools/"
-
-multilib-native_src_configure_internal() {
-	myconf="${myconf} -qt3support
-		$(qt_use phonon gstreamer)
-		$(qt_use phonon)
-		$(qt_use accessibility)"
-	qt4-build_src_configure
-}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.0_rc1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.0_rc1.ebuild
deleted file mode 100644
index e3bb8c955..000000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.5.0_rc1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.0_rc1.ebuild,v 1.1 2009/02/11 23:18:29 yngwin Exp $
-
-EAPI="2"
-inherit qt4-build multilib-native
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+accessibility phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support,lib32?]
-	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support,lib32?]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support,lib32?]"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? (
-	|| ( ~x11-libs/qt-phonon-${PV}[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) )"
-
-QT4_TARGET_DIRECTORIES="
-src/qt3support
-src/tools/uic3
-tools/designer/src/plugins/widgets
-tools/qtconfig
-tools/porting"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-src/
-include/
-tools/"
-
-multilib-native_src_configure_internal() {
-	myconf="${myconf} -qt3support
-		$(qt_use phonon gstreamer)
-		$(qt_use phonon)
-		$(qt_use accessibility)"
-	qt4-build_src_configure
-}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
index bfe1a67c4..f082134b2 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild,v 1.2 2009/03/17 17:57:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild,v 1.6 2009/05/29 23:10:54 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build multilib-native
 
 DESCRIPTION="The Qt3 support module for the Qt toolkit"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+accessibility phonon"
+KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+accessibility kde phonon"
 
 DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support,lib32?]
 	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support,lib32?]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support,lib32?]"
+	~x11-libs/qt-sql-${PV}[debug=,qt3support,lib32?]
+	phonon? ( || ( ~x11-libs/qt-phonon-${PV}[debug=,lib32?]
+		media-sound/phonon[gstreamer,lib32?] )
+		kde? ( media-sound/phonon[lib32?] ) )"
 RDEPEND="${DEPEND}"
-PDEPEND="phonon? (
-	|| ( ~x11-libs/qt-phonon-${PV}[debug=,lib32?] media-sound/phonon[gstreamer,lib32?] ) )"
 
 QT4_TARGET_DIRECTORIES="
 src/qt3support