Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: media-video/qemplayer/
Date: Sun, 01 Jul 2012 15:39:56
Message-Id: 1341155959.1dc1f99e4c3939d9b9a6ab83a5cce66b0134b7f7.pesa@gentoo
1 commit: 1dc1f99e4c3939d9b9a6ab83a5cce66b0134b7f7
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Sun Jul 1 15:19:19 2012 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 1 15:19:19 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1dc1f99e
7
8 [media-video/qemplayer] Check gcc version only for non-binary MERGE_TYPEs.
9
10 (Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 media-video/qemplayer/qemplayer-12.4.ebuild | 10 ++++++----
14 1 files changed, 6 insertions(+), 4 deletions(-)
15
16 diff --git a/media-video/qemplayer/qemplayer-12.4.ebuild b/media-video/qemplayer/qemplayer-12.4.ebuild
17 index 49cb7f3..101c7c6 100644
18 --- a/media-video/qemplayer/qemplayer-12.4.ebuild
19 +++ b/media-video/qemplayer/qemplayer-12.4.ebuild
20 @@ -30,10 +30,12 @@ DEPEND="${RDEPEND}
21 "
22
23 pkg_setup() {
24 - local major=$(gcc-major-version)
25 - local minor=$(gcc-minor-version)
26 - if (( major < 4 || ( major == 4 && minor < 4 ) )); then
27 - die "gcc 4.4.7 or newer is required"
28 + if [[ ${MERGE_TYPE} != "binary" ]]; then
29 + local major=$(gcc-major-version)
30 + local minor=$(gcc-minor-version)
31 + if (( major < 4 || ( major == 4 && minor < 4 ) )); then
32 + die "gcc 4.4.7 or newer is required"
33 + fi
34 fi
35 }