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-9999.ebuild ChangeLog kmod-7.ebuild
Date: Fri, 06 Apr 2012 21:04:13
Message-Id: 20120406210402.1B5EB2004B@flycatcher.gentoo.org
1 ssuominen 12/04/06 21:04:02
2
3 Modified: kmod-9999.ebuild ChangeLog kmod-7.ebuild
4 Log:
5 Use zlib_CFLAGS and zlib_LIBS because zlib.pc pkg-config file is present only in sys-libs/zlib >= 1.2.6 wrt #410865
6
7 (Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.23 sys-apps/kmod/kmod-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.23&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.23&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.22&r2=1.23
15
16 Index: kmod-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
19 retrieving revision 1.22
20 retrieving revision 1.23
21 diff -u -r1.22 -r1.23
22 --- kmod-9999.ebuild 2 Apr 2012 12:40:54 -0000 1.22
23 +++ kmod-9999.ebuild 6 Apr 2012 21:04:02 -0000 1.23
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.22 2012/04/02 12:40:54 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.23 2012/04/06 21:04:02 ssuominen Exp $
29
30 EAPI=4
31
32 @@ -53,6 +53,12 @@
33
34 src_configure()
35 {
36 + # http://bugs.gentoo.org/410865
37 + if has_version '<sys-libs/zlib-1.2.6'; then
38 + export zlib_CFLAGS="-I/usr/include"
39 + export zlib_LIBS="-lz"
40 + fi
41 +
42 local myconf
43 [[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"
44
45
46
47
48 1.34 sys-apps/kmod/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.34&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.34&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.33&r2=1.34
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
57 retrieving revision 1.33
58 retrieving revision 1.34
59 diff -u -r1.33 -r1.34
60 --- ChangeLog 2 Apr 2012 12:40:54 -0000 1.33
61 +++ ChangeLog 6 Apr 2012 21:04:02 -0000 1.34
62 @@ -1,6 +1,11 @@
63 # ChangeLog for sys-apps/kmod
64 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.33 2012/04/02 12:40:54 ssuominen Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.34 2012/04/06 21:04:02 ssuominen Exp $
67 +
68 + 06 Apr 2012; Samuli Suominen <ssuominen@g.o> kmod-7.ebuild,
69 + kmod-9999.ebuild:
70 + Use zlib_CFLAGS and zlib_LIBS because zlib.pc pkg-config file is present only
71 + in sys-libs/zlib >= 1.2.6 wrt #410865
72
73 02 Apr 2012; Samuli Suominen <ssuominen@g.o> kmod-7.ebuild,
74 kmod-9999.ebuild:
75
76
77
78 1.9 sys-apps/kmod/kmod-7.ebuild
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.9&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.9&content-type=text/plain
82 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?r1=1.8&r2=1.9
83
84 Index: kmod-7.ebuild
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v
87 retrieving revision 1.8
88 retrieving revision 1.9
89 diff -u -r1.8 -r1.9
90 --- kmod-7.ebuild 2 Apr 2012 12:40:54 -0000 1.8
91 +++ kmod-7.ebuild 6 Apr 2012 21:04:02 -0000 1.9
92 @@ -1,6 +1,6 @@
93 # Copyright 1999-2012 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.8 2012/04/02 12:40:54 ssuominen Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.9 2012/04/06 21:04:02 ssuominen Exp $
97
98 EAPI=4
99
100 @@ -53,6 +53,12 @@
101
102 src_configure()
103 {
104 + # http://bugs.gentoo.org/410865
105 + if has_version '<sys-libs/zlib-1.2.6'; then
106 + export zlib_CFLAGS="-I/usr/include"
107 + export zlib_LIBS="-lz"
108 + fi
109 +
110 local myconf
111 [[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"