dev-python/PyQt4: remove kde USE flag

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

diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index a88d0967b04ea965ea2b3705234ffff453d3f0a0..d632d951e8d7dff595d2f0efb424f35bbbae45ef 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="X compat dbus debug declarative designer doc examples help kde multimedia
+IUSE="X compat dbus debug declarative designer doc examples help multimedia
        opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
@@ -45,10 +45,7 @@ RDEPEND="
        help? ( >=dev-qt/qthelp-${QT_PV} )
        multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
        opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-       phonon? (
-               kde? ( >=media-libs/phonon-4.7[qt4] )
-               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) )
-       )
+       phonon? ( >=media-libs/phonon-4.7[qt4] )
        script? ( >=dev-qt/qtscript-${QT_PV} )
        scripttools? ( >=dev-qt/qtgui-${QT_PV} )
        sql? ( >=dev-qt/qtsql-${QT_PV} )

diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild
index 3f6ed72fa428c48d8515fbfe2340954b279f2a04..979f8323a03b583861e7930d97dae1489b950650 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.12.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
-IUSE="X compat dbus debug declarative designer doc examples help kde multimedia
+IUSE="X compat dbus debug declarative designer doc examples help multimedia
        opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
@@ -45,10 +45,7 @@ RDEPEND="
        help? ( >=dev-qt/qthelp-${QT_PV} )
        multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
        opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-       phonon? (
-               kde? ( >=media-libs/phonon-4.7[qt4] )
-               !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) )
-       )
+       phonon? ( >=media-libs/phonon-4.7[qt4] )
        script? ( >=dev-qt/qtscript-${QT_PV} )
        scripttools? ( >=dev-qt/qtgui-${QT_PV} )
        sql? ( >=dev-qt/qtsql-${QT_PV} )

diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 9fe84c585da5cffff5cb93277fd360044d36d8de..7cc6900ee958b2c5a6e2b7e1cf9deba652cdeb0e 100644 (file)
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -12,7 +12,6 @@
                <flag name="declarative">Build bindings for the QtDeclarative module</flag>
                <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
                <flag name="help">Build bindings for the QtHelp module</flag>
-               <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
                <flag name="multimedia">Build bindings for the QtMultimedia module</flag>
                <flag name="opengl">Build bindings for the QtOpenGL module</flag>
                <flag name="phonon">Build bindings for the phonon module</flag>