[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/

[Andreas Sturmlechner]

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) )
 }