dev-qt/qtdemo: remove kde USE flag

Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
index 6c215b9a265b06f4a95767b0cd657cc554552b77..d37a099bf4a6c410b7b4042d1d8063046154f190 100644 (file)
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
@@ -13,7 +13,7 @@ else
        KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
-IUSE="dbus declarative kde multimedia opengl phonon webkit xmlpatterns"
+IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
 
 DEPEND="
        ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
@@ -28,10 +28,7 @@ DEPEND="
        declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-       phonon? (
-               kde? ( media-libs/phonon[aqua=,qt4] )
-               !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) )
-       )
+       phonon? ( media-libs/phonon[aqua=,qt4] )
        webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
 "

diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
index cfcb9167b11cdea719b0183641a4c020e9d28723..58b778819e4ce86dc48d215f5343eceb9aac7a4d 100644 (file)
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then
        KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
-IUSE="dbus declarative kde multimedia opengl phonon webkit xmlpatterns"
+IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
 
 DEPEND="
        ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
@@ -25,13 +25,7 @@ DEPEND="
        declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
        multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-       phonon? (
-               kde? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] )
-               !kde? ( || (
-                       ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-                       >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}]
-               ) )
-       )
+       phonon? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] )
        webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
        xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
 "