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 875601396D0 for ; Thu, 31 Aug 2017 20:54:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D87351FC05E; Thu, 31 Aug 2017 20:54:54 +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 B43D41FC05E for ; Thu, 31 Aug 2017 20:54:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6CEBA341656 for ; Thu, 31 Aug 2017 20:54:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FB258974 for ; Thu, 31 Aug 2017 20:54:52 +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: <1504212829.29982ceb8b403528df0ecdfadf5cecbfb28b7dfa.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/ X-VCS-Repository: repo/gentoo X-VCS-Files: 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: 29982ceb8b403528df0ecdfadf5cecbfb28b7dfa X-VCS-Branch: master Date: Thu, 31 Aug 2017 20:54:52 +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: 6a26b6c8-1b2a-41fd-8afd-7d5e816e42af X-Archives-Hash: 84b88ceb52a30a4f88c876a6fd4b4315 commit: 29982ceb8b403528df0ecdfadf5cecbfb28b7dfa Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 30 17:26:31 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 31 20:53:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29982ceb media-libs/phonon: Drop USE=qt5 Package-Manager: Portage-2.3.6, Repoman-2.3.1 media-libs/phonon/phonon-9999.ebuild | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index 99ae1101bb2..33202cf975a 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -18,38 +18,34 @@ HOMEPAGE="https://phonon.kde.org/" LICENSE="|| ( LGPL-2.1 LGPL-3 )" SLOT="0" -IUSE="aqua debug designer gstreamer pulseaudio qt4 +qt5 +vlc" - -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="aqua debug designer gstreamer pulseaudio qt4 +vlc" RDEPEND=" !!dev-qt/qtphonon:4 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + pulseaudio? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}] + ) qt4? ( >=dev-qt/qtcore-4.8.7-r2:4[${MULTILIB_USEDEP}] >=dev-qt/qtdbus-4.8.7:4[${MULTILIB_USEDEP}] >=dev-qt/qtgui-4.8.7:4[${MULTILIB_USEDEP}] designer? ( >=dev-qt/designer-4.8.7:4[${MULTILIB_USEDEP}] ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) - ) - pulseaudio? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}] - ) " DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}] - qt5? ( kde-frameworks/extra-cmake-modules:5 ) + kde-frameworks/extra-cmake-modules:5 " PDEPEND=" aqua? ( media-libs/phonon-qt7 ) - 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" ) @@ -59,7 +55,7 @@ pkg_setup() { ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" fi - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) + MULTIBUILD_VARIANTS=( $(usev qt4) qt5 ) } multilib_src_configure() {