diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-26 18:22:20 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-26 21:16:47 +0200 |
| commit | 921dbba28e20a5e4fbdb89817df6368e2a585bdd (patch) | |
| tree | 52e305787402b1e11cb037adaeaf138b654b1b7c /media-libs/phonon | |
| parent | profiles/package.mask: fix a typo (diff) | |
| download | gentoo-921dbba28e20a5e4fbdb89817df6368e2a585bdd.tar.gz gentoo-921dbba28e20a5e4fbdb89817df6368e2a585bdd.tar.bz2 gentoo-921dbba28e20a5e4fbdb89817df6368e2a585bdd.zip | |
media-libs/phonon: Drop USE=zeitgeist
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'media-libs/phonon')
| -rw-r--r-- | media-libs/phonon/metadata.xml | 1 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-4.9.1-r1.ebuild | 10 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 10 |
3 files changed, 6 insertions, 15 deletions
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml index 77e6a3e14285..c965ebc5d239 100644 --- 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 4e09c9e960b9..38d15b515910 100644 --- 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 771827319c83..99ae1101bb25 100644 --- 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 ) |