Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-32.0.1700.19.ebuild ChangeLog chromium-33.0.1711.3.ebuild
Date: Sat, 23 Nov 2013 18:51:14
Message-Id: 20131123185109.B5FCE2004B@flycatcher.gentoo.org
1 phajdan.jr 13/11/23 18:51:09
2
3 Modified: chromium-32.0.1700.19.ebuild ChangeLog
4 chromium-33.0.1711.3.ebuild
5 Log:
6 Prepare for unmasking tcmalloc USE flag, add blocker on old nvidia-drivers. Thanks to Julien Sanchez and Pavel Volkov for testing (bug #413637).
7
8 (Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 30427902)
9
10 Revision Changes Path
11 1.3 www-client/chromium/chromium-32.0.1700.19.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild?r1=1.2&r2=1.3
16
17 Index: chromium-32.0.1700.19.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- chromium-32.0.1700.19.ebuild 22 Nov 2013 01:07:42 -0000 1.2
24 +++ chromium-32.0.1700.19.ebuild 23 Nov 2013 18:51:09 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.2 2013/11/22 01:07:42 floppym Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.3 2013/11/23 18:51:09 phajdan.jr Exp $
30
31 EAPI="5"
32 PYTHON_COMPAT=( python{2_6,2_7} )
33 @@ -20,7 +20,7 @@
34 LICENSE="BSD"
35 SLOT="0"
36 KEYWORDS="~amd64 ~arm ~x86"
37 -IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite tcmalloc"
38 +IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite +tcmalloc"
39
40 # Native Client binaries are compiled with different set of flags, bug #452066.
41 QA_FLAGS_IGNORED=".*\.nexe"
42 @@ -90,10 +90,12 @@
43 dev-libs/openssl:0
44 dev-python/pyftpdlib
45 )"
46 +# For nvidia-drivers blocker, see bug #413637 .
47 RDEPEND+="
48 !=www-client/chromium-9999
49 x11-misc/xdg-utils
50 - virtual/ttf-fonts"
51 + virtual/ttf-fonts
52 + tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
53
54 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
55 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
56 @@ -228,10 +230,6 @@
57 # additions, bug #336871.
58 myconf+=" -Ddisable_sse2=1"
59
60 - # Optional tcmalloc. Note it causes problems with e.g. NVIDIA
61 - # drivers, bug #413637.
62 - myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
63 -
64 # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
65 myconf+=" -Ddisable_nacl=1"
66
67 @@ -293,7 +291,8 @@
68 $(gyp_use gnome-keyring use_gnome_keyring)
69 $(gyp_use gnome-keyring linux_link_gnome_keyring)
70 $(gyp_use kerberos)
71 - $(gyp_use pulseaudio)"
72 + $(gyp_use pulseaudio)
73 + $(gyp_use tcmalloc linux_use_tcmalloc)"
74
75 if use system-sqlite; then
76 elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
77
78
79
80 1.992 www-client/chromium/ChangeLog
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.992&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.992&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.991&r2=1.992
85
86 Index: ChangeLog
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
89 retrieving revision 1.991
90 retrieving revision 1.992
91 diff -u -r1.991 -r1.992
92 --- ChangeLog 22 Nov 2013 01:07:42 -0000 1.991
93 +++ ChangeLog 23 Nov 2013 18:51:09 -0000 1.992
94 @@ -1,6 +1,11 @@
95 # ChangeLog for www-client/chromium
96 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
97 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.991 2013/11/22 01:07:42 floppym Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.992 2013/11/23 18:51:09 phajdan.jr Exp $
99 +
100 + 23 Nov 2013; Pawel Hajdan jr <phajdan.jr@g.o>
101 + chromium-32.0.1700.19.ebuild, chromium-33.0.1711.3.ebuild:
102 + Prepare for unmasking tcmalloc USE flag, add blocker on old nvidia-drivers.
103 + Thanks to Julien Sanchez and Pavel Volkov for testing (bug #413637).
104
105 22 Nov 2013; Mike Gilbert <floppym@g.o> chromium-32.0.1700.19.ebuild,
106 chromium-33.0.1711.3.ebuild, files/chromium-build_ffmpeg-r0.patch:
107
108
109
110 1.3 www-client/chromium/chromium-33.0.1711.3.ebuild
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild?rev=1.3&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild?rev=1.3&content-type=text/plain
114 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild?r1=1.2&r2=1.3
115
116 Index: chromium-33.0.1711.3.ebuild
117 ===================================================================
118 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v
119 retrieving revision 1.2
120 retrieving revision 1.3
121 diff -u -r1.2 -r1.3
122 --- chromium-33.0.1711.3.ebuild 22 Nov 2013 01:07:41 -0000 1.2
123 +++ chromium-33.0.1711.3.ebuild 23 Nov 2013 18:51:09 -0000 1.3
124 @@ -1,6 +1,6 @@
125 # Copyright 1999-2013 Gentoo Foundation
126 # Distributed under the terms of the GNU General Public License v2
127 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v 1.2 2013/11/22 01:07:41 floppym Exp $
128 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v 1.3 2013/11/23 18:51:09 phajdan.jr Exp $
129
130 EAPI="5"
131 PYTHON_COMPAT=( python{2_6,2_7} )
132 @@ -20,7 +20,7 @@
133 LICENSE="BSD"
134 SLOT="0"
135 KEYWORDS="~amd64 ~arm ~x86"
136 -IUSE="aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite tcmalloc"
137 +IUSE="aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite +tcmalloc"
138
139 # Native Client binaries are compiled with different set of flags, bug #452066.
140 QA_FLAGS_IGNORED=".*\.nexe"
141 @@ -90,10 +90,12 @@
142 dev-libs/openssl:0
143 dev-python/pyftpdlib
144 )"
145 +# For nvidia-drivers blocker, see bug #413637 .
146 RDEPEND+="
147 !=www-client/chromium-9999
148 x11-misc/xdg-utils
149 - virtual/ttf-fonts"
150 + virtual/ttf-fonts
151 + tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
152
153 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
154 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
155 @@ -229,10 +231,6 @@
156 # additions, bug #336871.
157 myconf+=" -Ddisable_sse2=1"
158
159 - # Optional tcmalloc. Note it causes problems with e.g. NVIDIA
160 - # drivers, bug #413637.
161 - myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
162 -
163 # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
164 myconf+=" -Ddisable_nacl=1"
165
166 @@ -295,7 +293,8 @@
167 $(gyp_use gnome-keyring use_gnome_keyring)
168 $(gyp_use gnome-keyring linux_link_gnome_keyring)
169 $(gyp_use kerberos)
170 - $(gyp_use pulseaudio)"
171 + $(gyp_use pulseaudio)
172 + $(gyp_use tcmalloc linux_use_tcmalloc)"
173
174 if use system-sqlite; then
175 elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
Report Message
Find on MARC Find on Google Groups