Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-15.ebuild ChangeLog
Date: Fri, 27 Dec 2013 21:40:09
Message-Id: 20131227214006.3C6DA2004C@flycatcher.gentoo.org
1 ssuominen 13/12/27 21:40:06
2
3 Modified: kmod-15.ebuild ChangeLog
4 Log:
5 Use MERGE_TYPE to avoid the pkg_setup() based compiler version check wrt #495228
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.8 sys-apps/kmod/kmod-15.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-15.ebuild?rev=1.8&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-15.ebuild?rev=1.8&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-15.ebuild?r1=1.7&r2=1.8
15
16 Index: kmod-15.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v
19 retrieving revision 1.7
20 retrieving revision 1.8
21 diff -u -r1.7 -r1.8
22 --- kmod-15.ebuild 8 Dec 2013 18:22:35 -0000 1.7
23 +++ kmod-15.ebuild 27 Dec 2013 21:40:06 -0000 1.8
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.7 2013/12/08 18:22:35 maekke Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.8 2013/12/27 21:40:06 ssuominen Exp $
29
30 EAPI=5
31 inherit autotools eutils libtool multilib toolchain-funcs versionator
32 @@ -38,8 +38,10 @@
33 zlib? ( virtual/pkgconfig )"
34
35 pkg_setup() {
36 - [[ $(tc-getCPP) == *cpp ]] && ! version_is_at_least 4.6 $(gcc-version) && \
37 - die "You need at least GNU GCC 4.6.x to build this package." #481020
38 + if [[ ${MERGE_TYPE} != binary ]]; then
39 + [[ $(tc-getCPP) == *cpp ]] && ! version_is_at_least 4.6 $(gcc-version) && \
40 + die "You need at least GNU GCC 4.6.x to build this package." #481020
41 + fi
42 }
43
44 src_prepare() {
45
46
47
48 1.121 sys-apps/kmod/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.121&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.121&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.120&r2=1.121
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
57 retrieving revision 1.120
58 retrieving revision 1.121
59 diff -u -r1.120 -r1.121
60 --- ChangeLog 27 Dec 2013 21:34:25 -0000 1.120
61 +++ ChangeLog 27 Dec 2013 21:40:06 -0000 1.121
62 @@ -1,6 +1,10 @@
63 # ChangeLog for sys-apps/kmod
64 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL
65 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.120 2013/12/27 21:34:25 ssuominen Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.121 2013/12/27 21:40:06 ssuominen Exp $
67 +
68 + 27 Dec 2013; Samuli Suominen <ssuominen@g.o> kmod-15.ebuild:
69 + Use MERGE_TYPE to avoid the pkg_setup() based compiler version check wrt
70 + #495228
71
72 *kmod-16 (27 Dec 2013)