media-libs/phonon: Drop USE=zeitgeist

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 77e6a3e142855cd21dcd8c680b8b4cde74278046..c965ebc5d239049bf0c457da9d8e07082e6d3a48 100644 (file)
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -8,6 +8,5 @@
        <use>
                <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
                <flag name="vlc">Install VLC Phonon backend</flag>
-               <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
        </use>
 </pkgmetadata>

diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 4e09c9e960b9515da897117741e027a804449ae9..38d15b51591016759e4a73d69487afaa3b62a888 100644 (file)
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -18,12 +18,9 @@ HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio qt4 +qt5 +vlc zeitgeist"
+IUSE="aqua debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
 
-REQUIRED_USE="
-       || ( qt4 qt5 )
-       zeitgeist? ( qt4 )
-"
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
        !!dev-qt/qtphonon:4
@@ -44,7 +41,6 @@ RDEPEND="
                dev-qt/qtwidgets:5
                designer? ( dev-qt/designer:5 )
        )
-       zeitgeist? ( dev-libs/libqzeitgeist )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]
@@ -72,7 +68,7 @@ multilib_src_configure() {
                -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
                -DWITH_GLIB2=$(usex pulseaudio)
                -DWITH_PulseAudio=$(usex pulseaudio)
-               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
+               -DWITH_QZeitgeist=OFF
                -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
        )
 

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 771827319c8303068f5392e4a5776e1619247382..99ae1101bb2565a1b3e2e7afa2af6a03f9715c79 100644 (file)
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -18,12 +18,9 @@ HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
+IUSE="aqua debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
 
-REQUIRED_USE="
-       || ( qt4 qt5 )
-       zeitgeist? ( qt4 )
-"
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
        !!dev-qt/qtphonon:4
@@ -44,7 +41,6 @@ RDEPEND="
                dev-libs/glib:2[${MULTILIB_USEDEP}]
                >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
        )
-       zeitgeist? ( dev-libs/libqzeitgeist )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]
@@ -72,7 +68,7 @@ multilib_src_configure() {
                -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
                -DWITH_GLIB2=$(usex pulseaudio)
                -DWITH_PulseAudio=$(usex pulseaudio)
-               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
+               -DWITH_QZeitgeist=OFF
                -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
        )