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

[Andreas Sturmlechner]

commit:     506c68fb14f5e544ca1de6fdba52142e206a3eef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  1 22:54:43 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <GCC-5

Sort DEPENDs, switch Qt default

Gentoo-bug: 595618

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../{phonon-9999.ebuild => 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) )
 }