Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
Date: Tue, 29 May 2018 20:31:59
Message-Id: 1527625910.fa1379fce82d1232d4975b1fa7035914a29e1829.floppym@gentoo
1 commit: fa1379fce82d1232d4975b1fa7035914a29e1829
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 20:31:08 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 20:31:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1379fc
7
8 www-client/chromium: use bundled python libs
9
10 These are only used at build time, so using the system packages has no
11 benefit.
12
13 Package-Manager: Portage-2.3.40_p8, Repoman-2.3.9_p240
14
15 www-client/chromium/chromium-68.0.3438.3.ebuild | 18 ++++--------------
16 1 file changed, 4 insertions(+), 14 deletions(-)
17
18 diff --git a/www-client/chromium/chromium-68.0.3438.3.ebuild b/www-client/chromium/chromium-68.0.3438.3.ebuild
19 index 2022782559c..eb64c40b42e 100644
20 --- a/www-client/chromium/chromium-68.0.3438.3.ebuild
21 +++ b/www-client/chromium/chromium-68.0.3438.3.ebuild
22 @@ -104,22 +104,8 @@ DEPEND="${COMMON_DEPEND}
23 >=sys-devel/clang-5
24 virtual/pkgconfig
25 dev-vcs/git
26 - $(python_gen_any_dep '
27 - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
28 - >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
29 - dev-python/html5lib[${PYTHON_USEDEP}]
30 - dev-python/simplejson[${PYTHON_USEDEP}]
31 - ')
32 "
33
34 -# Keep this in sync with the python_gen_any_dep call.
35 -python_check_deps() {
36 - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
37 - has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
38 - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
39 - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
40 -}
41 -
42 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
43 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
44 fi
45 @@ -243,7 +229,10 @@ src_prepare() {
46 third_party/catapult
47 third_party/catapult/common/py_vulcanize/third_party/rcssmin
48 third_party/catapult/common/py_vulcanize/third_party/rjsmin
49 + third_party/catapult/third_party/beautifulsoup4
50 + third_party/catapult/third_party/html5lib-python
51 third_party/catapult/third_party/polymer
52 + third_party/catapult/third_party/six
53 third_party/catapult/tracing/third_party/d3
54 third_party/catapult/tracing/third_party/gl-matrix
55 third_party/catapult/tracing/third_party/jszip
56 @@ -318,6 +307,7 @@ src_prepare() {
57 third_party/rnnoise
58 third_party/s2cellid
59 third_party/sfntly
60 + third_party/simplejson
61 third_party/skia
62 third_party/skia/third_party/gif
63 third_party/skia/third_party/skcms