From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-953192-garchives=archives.gentoo.org@lists.gentoo.org>
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 0FD3A139694
for <garchives@archives.gentoo.org>; Fri, 2 Jun 2017 00:38:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 658FD21C012;
Fri, 2 Jun 2017 00:38:49 +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 3846F21C012
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2017 00:38:43 +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 56C98341791
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2017 00:38:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 556397477
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2017 00:38:34 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1496363870.5c027e8ff4cfb6872fda369ee0fe6dce256e096d.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild media-libs/phonon-vlc/phonon-vlc-9999.ebuild
X-VCS-Directories: media-libs/phonon-vlc/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 5c027e8ff4cfb6872fda369ee0fe6dce256e096d
X-VCS-Branch: master
Date: Fri, 2 Jun 2017 00:38:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 63315e6a-adaf-4629-af38-4c165e600aec
X-Archives-Hash: 37a37516d1376bfbc1c84edcf025bcf8
commit: 5c027e8ff4cfb6872fda369ee0fe6dce256e096d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 00:13:43 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 00:37:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c027e8f
media-libs/phonon-vlc: DEPEND on >=Qt-4.8.7, warn on <GCC-5
Sort DEPENDs, switch Qt default
Gentoo-bug: 595618
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../{phonon-vlc-9999.ebuild => phonon-vlc-0.9.1-r1.ebuild} | 10 +++++++---
media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
similarity index 85%
copy from media-libs/phonon-vlc/phonon-vlc-9999.ebuild
copy to media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
index 541f5da3c0d..ab97311d5b3 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://phonon.kde.org/"
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="debug +qt4 qt5"
+IUSE="debug qt4 +qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -30,8 +30,8 @@ RDEPEND="
>=media-libs/phonon-4.9.0[qt4=,qt5=]
>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ >=dev-qt/qtcore-4.8.7-r2:4
+ >=dev-qt/qtgui-4.8.7:4
)
qt5? (
dev-qt/qtcore:5
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS )
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-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 541f5da3c0d..ab97311d5b3 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://phonon.kde.org/"
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="debug +qt4 qt5"
+IUSE="debug qt4 +qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -30,8 +30,8 @@ RDEPEND="
>=media-libs/phonon-4.9.0[qt4=,qt5=]
>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ >=dev-qt/qtcore-4.8.7-r2:4
+ >=dev-qt/qtgui-4.8.7:4
)
qt5? (
dev-qt/qtcore:5
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS )
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) )
}