commit: e250332ae287a8b438d028ba2dcfcf4471186dc0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 00:12:29 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=e250332a
media-libs/phonon-gstreamer: 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
...999.ebuild => phonon-gstreamer-4.9.0-r1.ebuild} | 22 +++++++++++++---------
.../phonon-gstreamer/phonon-gstreamer-9999.ebuild | 20 ++++++++++++--------
2 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
similarity index 79%
copy from media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
copy to media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
index 2bcb89acddb..3caf47c96cd 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
if [[ ${PV} != *9999* ]]; then
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
~x64-macos"
+ KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
~x64-macos"
else
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
inherit git-r3
@@ -21,7 +21,7 @@ HOMEPAGE="https://phonon.kde.org/";
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="alsa debug +network +qt4 qt5"
+IUSE="alsa debug +network qt4 +qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -30,12 +30,14 @@ RDEPEND="
dev-libs/libxml2:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
>=media-libs/phonon-4.9.0[qt4?,qt5?]
+ media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+ virtual/opengl
+ network? ( media-plugins/gst-plugins-soup:1.0 )
qt4? (
- dev-qt/qtcore:4[glib]
- dev-qt/qtgui:4[glib]
- dev-qt/qtopengl:4
+ >=dev-qt/qtcore-4.8.7-r2:4[glib]
+ >=dev-qt/qtgui-4.8.7:4[glib]
+ >=dev-qt/qtopengl-4.8.7:4
!<dev-qt/qtwebkit-4.10.4:4[gstreamer]
)
qt5? (
@@ -45,14 +47,16 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
)
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup:1.0 )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
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-gstreamer/phonon-gstreamer-9999.ebuild
b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 2bcb89acddb..8a7cb1f9533 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,7 +21,7 @@ HOMEPAGE="https://phonon.kde.org/";
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="alsa debug +network +qt4 qt5"
+IUSE="alsa debug +network qt4 +qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -30,12 +30,14 @@ RDEPEND="
dev-libs/libxml2:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
>=media-libs/phonon-4.9.0[qt4?,qt5?]
+ media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+ virtual/opengl
+ network? ( media-plugins/gst-plugins-soup:1.0 )
qt4? (
- dev-qt/qtcore:4[glib]
- dev-qt/qtgui:4[glib]
- dev-qt/qtopengl:4
+ >=dev-qt/qtcore-4.8.7-r2:4[glib]
+ >=dev-qt/qtgui-4.8.7:4[glib]
+ >=dev-qt/qtopengl-4.8.7:4
!<dev-qt/qtwebkit-4.10.4:4[gstreamer]
)
qt5? (
@@ -45,14 +47,16 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
)
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup:1.0 )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
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) )
}
