[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdemo/

[Michael Palimaka]

commit:     a7c921af482fb5550156331c6a54c319f5aeb42f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 13:56:39 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 14:05:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c921af

dev-qt/qtdemo: remove kde USE flag

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

 dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild |  7 ++-----
 dev-qt/qtdemo/qtdemo-4.8.7.ebuild    | 10 ++--------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild 
b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
index 6c215b9a265..d37a099bf4a 100644
--- 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 cfcb9167b11..58b778819e4 100644
--- 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}] )
 "