Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: webkit-gtk-1.8.3-r200.ebuild ChangeLog webkit-gtk-1.8.3-r300.ebuild
Date: Tue, 01 Jan 2013 19:26:11
Message-Id: 20130101192556.D3FFE2171D@flycatcher.gentoo.org
1 tetromino 13/01/01 19:25:56
2
3 Modified: webkit-gtk-1.8.3-r200.ebuild ChangeLog
4 webkit-gtk-1.8.3-r300.ebuild
5 Log:
6 Add webkit-gtk-1.10's build space check to 1.8.3.
7
8 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
9
10 Revision Changes Path
11 1.10 net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild?rev=1.10&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild?rev=1.10&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild?r1=1.9&r2=1.10
16
17 Index: webkit-gtk-1.8.3-r200.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v
20 retrieving revision 1.9
21 retrieving revision 1.10
22 diff -u -r1.9 -r1.10
23 --- webkit-gtk-1.8.3-r200.ebuild 8 Dec 2012 21:35:36 -0000 1.9
24 +++ webkit-gtk-1.8.3-r200.ebuild 1 Jan 2013 19:25:56 -0000 1.10
25 @@ -1,11 +1,11 @@
26 -# Copyright 1999-2012 Gentoo Foundation
27 +# Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.9 2012/12/08 21:35:36 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.10 2013/01/01 19:25:56 tetromino Exp $
31
32 EAPI="4"
33
34 # Don't define PYTHON_DEPEND: python only needed at build time
35 -inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
36 +inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx
37
38 MY_P="webkit-${PV}"
39 DESCRIPTION="Open source web browser engine"
40 @@ -65,7 +65,34 @@
41
42 S="${WORKDIR}/${MY_P}"
43
44 +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
45 +
46 +pkg_pretend() {
47 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
48 + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
49 + check-reqs_pkg_pretend
50 + fi
51 +}
52 +
53 pkg_setup() {
54 + # Check whether any of the debugging flags is enabled
55 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
56 + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
57 + replace-flags -ggdb -g
58 + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
59 + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
60 + ewarn "large for current binutils releases (bug #432784) and has very"
61 + ewarn "high temporary build space and memory requirements."
62 + ewarn "If you really want to build ${PN} with \"-ggdb\", add"
63 + ewarn "WEBKIT_GTK_GGDB=yes"
64 + ewarn "to your make.conf file."
65 + fi
66 + einfo "You need to have at least 18GB of temporary build space available"
67 + einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
68 + einfo "not be enough, as the total space requirements depend on the flags"
69 + einfo "(-ggdb vs -g1) and enabled features."
70 + check-reqs_pkg_setup
71 + fi
72 # Needed for CodeGeneratorInspector.py
73 python_set_active_version 2
74 python_pkg_setup
75
76
77
78 1.190 net-libs/webkit-gtk/ChangeLog
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.190&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.190&content-type=text/plain
82 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.189&r2=1.190
83
84 Index: ChangeLog
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
87 retrieving revision 1.189
88 retrieving revision 1.190
89 diff -u -r1.189 -r1.190
90 --- ChangeLog 1 Jan 2013 19:15:10 -0000 1.189
91 +++ ChangeLog 1 Jan 2013 19:25:56 -0000 1.190
92 @@ -1,6 +1,10 @@
93 # ChangeLog for net-libs/webkit-gtk
94 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
95 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.189 2013/01/01 19:15:10 tetromino Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.190 2013/01/01 19:25:56 tetromino Exp $
97 +
98 + 01 Jan 2013; Alexandre Rostovtsev <tetromino@g.o>
99 + webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r300.ebuild:
100 + Add webkit-gtk-1.10's build space check to 1.8.3.
101
102 01 Jan 2013; Alexandre Rostovtsev <tetromino@g.o>
103 webkit-gtk-1.10.2-r300.ebuild:
104
105
106
107 1.10 net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild?rev=1.10&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild?rev=1.10&content-type=text/plain
111 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild?r1=1.9&r2=1.10
112
113 Index: webkit-gtk-1.8.3-r300.ebuild
114 ===================================================================
115 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v
116 retrieving revision 1.9
117 retrieving revision 1.10
118 diff -u -r1.9 -r1.10
119 --- webkit-gtk-1.8.3-r300.ebuild 8 Dec 2012 21:40:08 -0000 1.9
120 +++ webkit-gtk-1.8.3-r300.ebuild 1 Jan 2013 19:25:56 -0000 1.10
121 @@ -1,11 +1,11 @@
122 -# Copyright 1999-2012 Gentoo Foundation
123 +# Copyright 1999-2013 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.9 2012/12/08 21:40:08 ago Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.10 2013/01/01 19:25:56 tetromino Exp $
127
128 EAPI="4"
129
130 # Don't define PYTHON_DEPEND: python only needed at build time
131 -inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
132 +inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx
133
134 MY_P="webkit-${PV}"
135 DESCRIPTION="Open source web browser engine"
136 @@ -72,7 +72,34 @@
137
138 S="${WORKDIR}/${MY_P}"
139
140 +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
141 +
142 +pkg_pretend() {
143 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
144 + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
145 + check-reqs_pkg_pretend
146 + fi
147 +}
148 +
149 pkg_setup() {
150 + # Check whether any of the debugging flags is enabled
151 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then
152 + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
153 + replace-flags -ggdb -g
154 + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
155 + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
156 + ewarn "large for current binutils releases (bug #432784) and has very"
157 + ewarn "high temporary build space and memory requirements."
158 + ewarn "If you really want to build ${PN} with \"-ggdb\", add"
159 + ewarn "WEBKIT_GTK_GGDB=yes"
160 + ewarn "to your make.conf file."
161 + fi
162 + einfo "You need to have at least 18GB of temporary build space available"
163 + einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
164 + einfo "not be enough, as the total space requirements depend on the flags"
165 + einfo "(-ggdb vs -g1) and enabled features."
166 + check-reqs_pkg_setup
167 + fi
168 # Needed for CodeGeneratorInspector.py
169 python_set_active_version 2
170 python_pkg_setup