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: ChangeLog chromium-32.0.1700.68.ebuild chromium-33.0.1750.3.ebuild
Date: Fri, 03 Jan 2014 07:32:50
Message-Id: 20140103073247.4E67D2004C@flycatcher.gentoo.org
1 phajdan.jr 14/01/03 07:32:47
2
3 Modified: ChangeLog chromium-32.0.1700.68.ebuild
4 chromium-33.0.1750.3.ebuild
5 Log:
6 Correctly handle python dependencies, bug #496326 by nzqr.
7
8 (Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key 30427902)
9
10 Revision Changes Path
11 1.1006 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.1006&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.1006&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.1005&r2=1.1006
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.1005
21 retrieving revision 1.1006
22 diff -u -r1.1005 -r1.1006
23 --- ChangeLog 20 Dec 2013 01:51:27 -0000 1.1005
24 +++ ChangeLog 3 Jan 2014 07:32:47 -0000 1.1006
25 @@ -1,6 +1,10 @@
26 # ChangeLog for www-client/chromium
27 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1005 2013/12/20 01:51:27 floppym Exp $
29 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1006 2014/01/03 07:32:47 phajdan.jr Exp $
31 +
32 + 02 Jan 2014; Pawel Hajdan jr <phajdan.jr@g.o>
33 + chromium-32.0.1700.68.ebuild, chromium-33.0.1750.3.ebuild:
34 + Correctly handle python dependencies, bug #496326 by nzqr.
35
36 *chromium-32.0.1700.68 (20 Dec 2013)
37
38
39
40
41 1.2 www-client/chromium/chromium-32.0.1700.68.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild?rev=1.2&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild?rev=1.2&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild?r1=1.1&r2=1.2
46
47 Index: chromium-32.0.1700.68.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild,v
50 retrieving revision 1.1
51 retrieving revision 1.2
52 diff -u -r1.1 -r1.2
53 --- chromium-32.0.1700.68.ebuild 20 Dec 2013 01:51:27 -0000 1.1
54 +++ chromium-32.0.1700.68.ebuild 3 Jan 2014 07:32:47 -0000 1.2
55 @@ -1,6 +1,6 @@
56 -# Copyright 1999-2013 Gentoo Foundation
57 +# Copyright 1999-2014 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild,v 1.1 2013/12/20 01:51:27 floppym Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild,v 1.2 2014/01/03 07:32:47 phajdan.jr Exp $
61
62 EAPI="5"
63 PYTHON_COMPAT=( python{2_6,2_7} )
64 @@ -71,15 +71,11 @@
65 kerberos? ( virtual/krb5 )
66 selinux? ( sec-policy/selinux-chromium )"
67 DEPEND="${RDEPEND}
68 - ${PYTHON_DEPS}
69 !arm? (
70 dev-lang/yasm
71 )
72 dev-lang/perl
73 dev-perl/JSON
74 - >=dev-python/jinja-2.7
75 - dev-python/ply
76 - dev-python/simplejson
77 >=dev-util/gperf-3.0.3
78 dev-util/ninja
79 sys-apps/hwids
80 @@ -88,7 +84,6 @@
81 virtual/pkgconfig
82 test? (
83 dev-libs/openssl:0
84 - dev-python/pyftpdlib
85 )"
86 # For nvidia-drivers blocker, see bug #413637 .
87 RDEPEND+="
88 @@ -97,6 +92,21 @@
89 virtual/ttf-fonts
90 tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
91
92 +# Python dependencies. The DEPEND part needs to be kept in sync
93 +# with python_check_deps.
94 +DEPEND+=" $(python_gen_any_dep '
95 + >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
96 + dev-python/ply[${PYTHON_USEDEP}]
97 + dev-python/simplejson[${PYTHON_USEDEP}]
98 + test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
99 +')"
100 +python_check_deps() {
101 + has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
102 + has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
103 + has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
104 + { ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
105 +}
106 +
107 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
108 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
109 fi
110
111
112
113 1.2 www-client/chromium/chromium-33.0.1750.3.ebuild
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild?rev=1.2&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild?rev=1.2&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild?r1=1.1&r2=1.2
118
119 Index: chromium-33.0.1750.3.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild,v
122 retrieving revision 1.1
123 retrieving revision 1.2
124 diff -u -r1.1 -r1.2
125 --- chromium-33.0.1750.3.ebuild 18 Dec 2013 12:24:37 -0000 1.1
126 +++ chromium-33.0.1750.3.ebuild 3 Jan 2014 07:32:47 -0000 1.2
127 @@ -1,6 +1,6 @@
128 -# Copyright 1999-2013 Gentoo Foundation
129 +# Copyright 1999-2014 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild,v 1.1 2013/12/18 12:24:37 phajdan.jr Exp $
132 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild,v 1.2 2014/01/03 07:32:47 phajdan.jr Exp $
133
134 EAPI="5"
135 PYTHON_COMPAT=( python{2_6,2_7} )
136 @@ -71,15 +71,11 @@
137 kerberos? ( virtual/krb5 )
138 selinux? ( sec-policy/selinux-chromium )"
139 DEPEND="${RDEPEND}
140 - ${PYTHON_DEPS}
141 !arm? (
142 dev-lang/yasm
143 )
144 dev-lang/perl
145 dev-perl/JSON
146 - >=dev-python/jinja-2.7
147 - dev-python/ply
148 - dev-python/simplejson
149 >=dev-util/gperf-3.0.3
150 dev-util/ninja
151 sys-apps/hwids
152 @@ -88,7 +84,6 @@
153 virtual/pkgconfig
154 test? (
155 dev-libs/openssl:0
156 - dev-python/pyftpdlib
157 )"
158 # For nvidia-drivers blocker, see bug #413637 .
159 RDEPEND+="
160 @@ -97,6 +92,21 @@
161 virtual/ttf-fonts
162 tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
163
164 +# Python dependencies. The DEPEND part needs to be kept in sync
165 +# with python_check_deps.
166 +DEPEND+=" $(python_gen_any_dep '
167 + >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
168 + dev-python/ply[${PYTHON_USEDEP}]
169 + dev-python/simplejson[${PYTHON_USEDEP}]
170 + test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
171 +')"
172 +python_check_deps() {
173 + has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
174 + has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
175 + has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
176 + { ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
177 +}
178 +
179 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
180 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
181 fi
Report Message
Find on MARC Find on Google Groups