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 85F1B139694 for ; Fri, 2 Jun 2017 00:38:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8A1EE0BF4; Fri, 2 Jun 2017 00:38:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6CF1E0BF4 for ; Fri, 2 Jun 2017 00:38:38 +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 8809134178B for ; Fri, 2 Jun 2017 00:38:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 193437474 for ; Fri, 2 Jun 2017 00:38:34 +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: <1496363868.506c68fb14f5e544ca1de6fdba52142e206a3eef.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-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: 506c68fb14f5e544ca1de6fdba52142e206a3eef X-VCS-Branch: master Date: Fri, 2 Jun 2017 00:38:34 +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: 20f750f6-4240-41ff-acc8-cfeaeab803c2 X-Archives-Hash: 895a85f667bece92eba89fbd95705817 commit: 506c68fb14f5e544ca1de6fdba52142e206a3eef Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 1 22:54:43 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jun 2 00:37:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506c68fb media-libs/phonon: DEPEND on >=Qt-4.8.7, warn on phonon-4.9.1-r1.ebuild} | 22 +++++++++++++--------- media-libs/phonon/phonon-9999.ebuild | 12 ++++++++---- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild similarity index 87% copy from media-libs/phonon/phonon-9999.ebuild copy to media-libs/phonon/phonon-4.9.1-r1.ebuild index eb135e7f669..cd5697cdb95 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild @@ -18,7 +18,7 @@ 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 zeitgeist" REQUIRED_USE=" || ( qt4 qt5 ) @@ -27,11 +27,15 @@ REQUIRED_USE=" RDEPEND=" !!dev-qt/qtphonon:4 + pulseaudio? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}] + ) qt4? ( - dev-qt/qtcore:4[${MULTILIB_USEDEP}] - dev-qt/qtdbus:4[${MULTILIB_USEDEP}] - dev-qt/qtgui:4[${MULTILIB_USEDEP}] - designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] ) + >=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 @@ -40,10 +44,6 @@ RDEPEND=" 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}] - ) zeitgeist? ( dev-libs/libqzeitgeist ) " DEPEND="${RDEPEND} @@ -59,6 +59,10 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) pkg_setup() { + if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then + 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) ) } diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index eb135e7f669..e905c36b507 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -28,10 +28,10 @@ REQUIRED_USE=" RDEPEND=" !!dev-qt/qtphonon:4 qt4? ( - dev-qt/qtcore:4[${MULTILIB_USEDEP}] - dev-qt/qtdbus:4[${MULTILIB_USEDEP}] - dev-qt/qtgui:4[${MULTILIB_USEDEP}] - designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] ) + >=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 @@ -59,6 +59,10 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) pkg_setup() { + if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then + 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) ) }