From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 569E71396D1 for ; Sat, 26 Aug 2017 19:19:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAF29E0C7C; Sat, 26 Aug 2017 19:19:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79933E0C64 for ; Sat, 26 Aug 2017 19:19:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DD073417F3 for ; Sat, 26 Aug 2017 19:19:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2A6B8394 for ; Sat, 26 Aug 2017 19:19:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1503775007.921dbba28e20a5e4fbdb89817df6368e2a585bdd.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon/metadata.xml media-libs/phonon/phonon-4.9.1-r1.ebuild media-libs/phonon/phonon-9999.ebuild X-VCS-Directories: media-libs/phonon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 921dbba28e20a5e4fbdb89817df6368e2a585bdd X-VCS-Branch: master Date: Sat, 26 Aug 2017 19:19:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 82adca5d-caf5-4026-9605-3c1f6e251775 X-Archives-Hash: f7cba08c7a59dd64a77cb052062de8f8 commit: 921dbba28e20a5e4fbdb89817df6368e2a585bdd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 26 16:22:20 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 26 19:16:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921dbba2 media-libs/phonon: Drop USE=zeitgeist Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-libs/phonon/metadata.xml | 1 - media-libs/phonon/phonon-4.9.1-r1.ebuild | 10 +++------- 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 77e6a3e1428..c965ebc5d23 100644 --- a/media-libs/phonon/metadata.xml +++ b/media-libs/phonon/metadata.xml @@ -8,6 +8,5 @@ Install plugin for dev-qt/designer Install VLC Phonon backend - Add support for Zeitgeist event tracking system diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild index 4e09c9e960b..38d15b51591 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 771827319c8..99ae1101bb2 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 )