[gentoo-commits] proj/kde-sunset:master commit in: dev-qt/designer/, dev-python/PyQt4/, x11-libs/qtscriptgenerator/, ...

[Andreas Sturmlechner]

commit:     3ebb8675f0739f7bdfec894f443aaaaf3a30cff4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 17:33:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 14:45:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=3ebb8675

*/*: Fix MissingUseDepDefault for media-libs/phonon*[qt4]

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/PyQt4/PyQt4-4.12.1.ebuild                         | 2 +-
 dev-qt/designer/designer-4.8.7.ebuild                        | 2 +-
 dev-qt/qt-meta/qt-meta-4.8.6.ebuild                          | 2 +-
 dev-qt/qtdemo/qtdemo-4.8.7.ebuild                            | 2 +-
 kde-apps/dolphin/dolphin-4.14.3-r1.ebuild                    | 2 +-
 kde-apps/dragon/dragon-4.14.3.ebuild                         | 2 +-
 kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild            | 2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild      | 2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild    | 2 +-
 kde-apps/kopete/kopete-4.14.3-r1.ebuild                      | 2 +-
 kde-apps/marble/marble-4.14.3.ebuild                         | 4 ++--
 kde-apps/okular/okular-16.08.3.ebuild                        | 2 +-
 kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild                | 2 +-
 kde-apps/phonon-kde/phonon-kde-4.14.3.ebuild                 | 2 +-
 kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild                    | 2 +-
 kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild                | 2 +-
 kde-misc/eyesaver/eyesaver-0.4.ebuild                        | 2 +-
 kde-misc/miniplayer/miniplayer-2.5-r1.ebuild                 | 2 +-
 media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild | 2 +-
 media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild             | 2 +-
 media-libs/phonon/phonon-4.9.1-r1.ebuild                     | 4 ++--
 media-video/kmplayer/kmplayer-0.11.5.ebuild                  | 2 +-
 media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild   | 2 +-
 net-irc/konversation/konversation-1.5.1.ebuild               | 2 +-
 x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild | 2 +-
 25 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index f8701dc5..889a7585 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( >=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-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
index 9d766529..533f0388 100644
--- a/dev-qt/designer/designer-4.8.7.ebuild
+++ b/dev-qt/designer/designer-4.8.7.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	webkit? ( >=dev-qt/qtwebkit-${PV}:4[debug=,${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )"
+PDEPEND="phonon? ( media-libs/phonon[designer,qt4(-)] )"
 
 QT4_TARGET_DIRECTORIES="tools/designer"
 

diff --git a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
index 1092d373..d2b16339 100644
--- a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
+++ b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
@@ -34,5 +34,5 @@ RDEPEND="
 	>=dev-qt/qttest-${PV}:4
 	webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
 	>=dev-qt/qtxmlpatterns-${PV}:4
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 "

diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
index 21ed0b6b..85ce6e4b 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	declarative? ( ~dev-qt/qtdeclarative-${PV}[debug=,webkit?,${MULTILIB_USEDEP}] )
 	multimedia? ( ~dev-qt/qtmultimedia-${PV}[debug=,${MULTILIB_USEDEP}] )
 	opengl? ( ~dev-qt/qtopengl-${PV}[debug=,${MULTILIB_USEDEP}] )
-	phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] )
+	phonon? ( >=media-libs/phonon-4.8.3-r1[qt4(-),${MULTILIB_USEDEP}] )
 	webkit? ( >=dev-qt/qtwebkit-${PV}:4[debug=,${MULTILIB_USEDEP}] )
 	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[debug=,${MULTILIB_USEDEP}] )
 "

diff --git a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
index d1749781..c8581580 100644
--- a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="debug semantic-desktop thumbnail"
 DEPEND="
 	$(add_kdeframeworks_dep kactivities '' 4.13)
 	$(add_kdeapps_dep libkonq)
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	x11-libs/libXrender
 	semantic-desktop? (
 		$(add_kdeframeworks_dep baloo)

diff --git a/kde-apps/dragon/dragon-4.14.3.ebuild b/kde-apps/dragon/dragon-4.14.3.ebuild
index 5a03b237..ea27ade9 100644
--- a/kde-apps/dragon/dragon-4.14.3.ebuild
+++ b/kde-apps/dragon/dragon-4.14.3.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug xine"
 
 RDEPEND="
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

diff --git a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
index 9c660264..1611d290 100644
--- a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	$(add_kdeapps_dep kdepim-common-libs)
 	$(add_kdeapps_dep kdepimlibs)
 	$(add_kdeapps_dep ktimezoned)
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
index b30d8ec4..8b2e8ab1 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-libs/libical:=
 	dev-libs/qjson
 	kde-apps/akonadi:4
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	x11-misc/shared-mime-info
 	ldap? ( net-nds/openldap )
 	prison? ( kde-frameworks/prison:4 )

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
index 828d6218..540ebc26 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	dev-libs/libical:=
 	dev-libs/qjson
 	kde-apps/akonadi:4
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	x11-misc/shared-mime-info
 	ldap? ( net-nds/openldap )
 	prison? ( kde-frameworks/prison:4 )

diff --git a/kde-apps/kopete/kopete-4.14.3-r1.ebuild b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
index 488020a9..3dcd28e1 100644
--- a/kde-apps/kopete/kopete-4.14.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
@@ -65,7 +65,7 @@ COMMONDEPEND="
 	$(add_kdeapps_dep kdepimlibs)
 	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	media-libs/qimageblitz[-qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver

diff --git a/kde-apps/marble/marble-4.14.3.ebuild b/kde-apps/marble/marble-4.14.3.ebuild
index 78c86a33..288d3ae9 100644
--- a/kde-apps/marble/marble-4.14.3.ebuild
+++ b/kde-apps/marble/marble-4.14.3.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
 	designer-plugin? ( dev-qt/designer:4 )
-	kde? ( media-libs/phonon[qt4] )
-	phonon? ( media-libs/phonon[qt4] )
+	kde? ( media-libs/phonon[qt4(-)] )
+	phonon? ( media-libs/phonon[qt4(-)] )
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )
 "

diff --git a/kde-apps/okular/okular-16.08.3.ebuild b/kde-apps/okular/okular-16.08.3.ebuild
index 62e2ab38..5eda762a 100644
--- a/kde-apps/okular/okular-16.08.3.ebuild
+++ b/kde-apps/okular/okular-16.08.3.ebuild
@@ -17,7 +17,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	media-libs/qimageblitz[-qt5(+)]
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )

diff --git a/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild b/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild
index a3a2d30b..33f5e323 100644
--- a/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild
+++ b/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? (
 		dev-libs/glib:2

diff --git a/kde-apps/phonon-kde/phonon-kde-4.14.3.ebuild b/kde-apps/phonon-kde/phonon-kde-4.14.3.ebuild
index bb141918..9136b8f5 100644
--- a/kde-apps/phonon-kde/phonon-kde-4.14.3.ebuild
+++ b/kde-apps/phonon-kde/phonon-kde-4.14.3.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? (
 		dev-libs/glib:2

diff --git a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
index 7c73ff3e..8b1a2ac4 100644
--- a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	dev-qt/qtsql:4
 	dev-qt/qtsvg:4
 	dev-qt/qttest:4
-	phonon? ( media-libs/phonon[qt4] )
+	phonon? ( media-libs/phonon[qt4(-)] )
 	qimageblitz? ( >=media-libs/qimageblitz-0.0.4[-qt5(+)] )
 	qscintilla? ( x11-libs/qscintilla:= )
 	qwt? ( x11-libs/qwt:5[svg] )

diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index f70b182d..56538df9 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -46,7 +46,7 @@ COMMONDEPEND="
 	media-libs/freetype:2
 	media-libs/giflib:=
 	media-libs/libpng:0=
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	sys-libs/libutempter
 	sys-libs/zlib
 	virtual/jpeg:0

diff --git a/kde-misc/eyesaver/eyesaver-0.4.ebuild b/kde-misc/eyesaver/eyesaver-0.4.ebuild
index ff784625..07534351 100644
--- a/kde-misc/eyesaver/eyesaver-0.4.ebuild
+++ b/kde-misc/eyesaver/eyesaver-0.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="debug"
 
-DEPEND="media-libs/phonon[qt4]"
+DEPEND="media-libs/phonon[qt4(-)]"
 RDEPEND="
 	${DEPEND}
 	kde-plasma/plasma-workspace:4

diff --git a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
index 303ec28c..6ce76b4c 100644
--- a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
+++ b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 "
 RDEPEND="
 	${DEPEND}

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
index 184d1b21..30082d75 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/phonon-4.9.0[qt4?,qt5?]
+	>=media-libs/phonon-4.9.0[qt4(-)?,qt5?]
 	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:1.0 )

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
index 2a16bbfc..afbee410 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
@@ -27,7 +27,7 @@ IUSE="debug qt4 +qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
-	>=media-libs/phonon-4.9.0[qt4=,qt5=]
+	>=media-libs/phonon-4.9.0[qt4(-)=,qt5=]
 	>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
 	qt4? (
 		>=dev-qt/qtcore-4.8.7-r2:4

diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index a7eb294f..1f0a5ccf 100644
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -47,8 +47,8 @@ DEPEND="${RDEPEND}
 	qt5? ( kde-frameworks/extra-cmake-modules:5 )
 "
 PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4(-)?,qt5?] )
+	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4(-)?,qt5?] )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )

diff --git a/media-video/kmplayer/kmplayer-0.11.5.ebuild b/media-video/kmplayer/kmplayer-0.11.5.ebuild
index 2ac24863..6028edec 100644
--- a/media-video/kmplayer/kmplayer-0.11.5.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.5.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cairo debug expat npp"
 
 DEPEND="
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	x11-libs/libX11
 	cairo? (
 		x11-libs/cairo

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
index 695b005a..6c19defe 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
@@ -17,7 +17,7 @@ SLOT="4"
 IUSE="debug unicode xine"
 
 RDEPEND="
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	unicode? ( dev-libs/icu:= )
 	xine? ( media-libs/xine-lib )
 "

diff --git a/net-irc/konversation/konversation-1.5.1.ebuild b/net-irc/konversation/konversation-1.5.1.ebuild
index ecee3699..9fb6bcd3 100644
--- a/net-irc/konversation/konversation-1.5.1.ebuild
+++ b/net-irc/konversation/konversation-1.5.1.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt debug"
 
 DEPEND="
 	$(add_kdeapps_dep kdepimlibs)
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 	crypt? ( app-crypt/qca:2-qt4 )
 "
 RDEPEND="${DEPEND}

diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild
index 4f7ffede..714470ab 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-qt/qtsql:4
 	dev-qt/qtsvg:4[accessibility]
 	dev-qt/qtxmlpatterns:4
-	media-libs/phonon[qt4]
+	media-libs/phonon[qt4(-)]
 "
 RDEPEND="${DEPEND}"