| 1 |
commit: 5c027e8ff4cfb6872fda369ee0fe6dce256e096d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 2 00:13:43 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 2 00:37:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c027e8f |
| 7 |
|
| 8 |
media-libs/phonon-vlc: DEPEND on >=Qt-4.8.7, warn on <GCC-5 |
| 9 |
|
| 10 |
Sort DEPENDs, switch Qt default |
| 11 |
|
| 12 |
Gentoo-bug: 595618 |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 15 |
|
| 16 |
.../{phonon-vlc-9999.ebuild => phonon-vlc-0.9.1-r1.ebuild} | 10 +++++++--- |
| 17 |
media-libs/phonon-vlc/phonon-vlc-9999.ebuild | 10 +++++++--- |
| 18 |
2 files changed, 14 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild |
| 21 |
similarity index 85% |
| 22 |
copy from media-libs/phonon-vlc/phonon-vlc-9999.ebuild |
| 23 |
copy to media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild |
| 24 |
index 541f5da3c0d..ab97311d5b3 100644 |
| 25 |
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild |
| 26 |
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild |
| 27 |
@@ -22,7 +22,7 @@ HOMEPAGE="https://phonon.kde.org/" |
| 28 |
|
| 29 |
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" |
| 30 |
SLOT="0" |
| 31 |
-IUSE="debug +qt4 qt5" |
| 32 |
+IUSE="debug qt4 +qt5" |
| 33 |
|
| 34 |
REQUIRED_USE="|| ( qt4 qt5 )" |
| 35 |
|
| 36 |
@@ -30,8 +30,8 @@ RDEPEND=" |
| 37 |
>=media-libs/phonon-4.9.0[qt4=,qt5=] |
| 38 |
>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis] |
| 39 |
qt4? ( |
| 40 |
- dev-qt/qtcore:4 |
| 41 |
- dev-qt/qtgui:4 |
| 42 |
+ >=dev-qt/qtcore-4.8.7-r2:4 |
| 43 |
+ >=dev-qt/qtgui-4.8.7:4 |
| 44 |
) |
| 45 |
qt5? ( |
| 46 |
dev-qt/qtcore:5 |
| 47 |
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND} |
| 48 |
DOCS=( AUTHORS ) |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then |
| 52 |
+ ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" |
| 53 |
+ fi |
| 54 |
+ |
| 55 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 56 |
} |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild |
| 60 |
index 541f5da3c0d..ab97311d5b3 100644 |
| 61 |
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild |
| 62 |
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild |
| 63 |
@@ -22,7 +22,7 @@ HOMEPAGE="https://phonon.kde.org/" |
| 64 |
|
| 65 |
LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" |
| 66 |
SLOT="0" |
| 67 |
-IUSE="debug +qt4 qt5" |
| 68 |
+IUSE="debug qt4 +qt5" |
| 69 |
|
| 70 |
REQUIRED_USE="|| ( qt4 qt5 )" |
| 71 |
|
| 72 |
@@ -30,8 +30,8 @@ RDEPEND=" |
| 73 |
>=media-libs/phonon-4.9.0[qt4=,qt5=] |
| 74 |
>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis] |
| 75 |
qt4? ( |
| 76 |
- dev-qt/qtcore:4 |
| 77 |
- dev-qt/qtgui:4 |
| 78 |
+ >=dev-qt/qtcore-4.8.7-r2:4 |
| 79 |
+ >=dev-qt/qtgui-4.8.7:4 |
| 80 |
) |
| 81 |
qt5? ( |
| 82 |
dev-qt/qtcore:5 |
| 83 |
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND} |
| 84 |
DOCS=( AUTHORS ) |
| 85 |
|
| 86 |
pkg_setup() { |
| 87 |
+ if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then |
| 88 |
+ ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" |
| 89 |
+ fi |
| 90 |
+ |
| 91 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 92 |
} |
Archives