commit: 80b5b3be10775984d6456ad2dc7180515dabb39b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 03:15:11 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 03:15:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b5b3be
www-client/chromium: beta channel bump (56.0.2924.59)
Package-Manager: Portage-2.3.3_p25, Repoman-2.3.1_p18
www-client/chromium/Manifest | 2 +-
...2924.18.ebuild => chromium-56.0.2924.59.ebuild} | 35 ++++++++++++++--------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cccf996..1f010d2 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-55.0.2883.75.tar.xz 511256096 SHA256
5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55 SHA512
9830b02e05ebaf120b02b11114c67196ba5c7f2d5aa917b9e5f8516b1f0cce1abd8e752c379e8ac1f16c7b7e451341486d9356d47a1b77b72ab5117390ce16b9
WHIRLPOOL
ab752b9e9a6c7a536424ac1384d9f0ad0f23dd40bbf6784e4185554602628e8e1f45acbb264fff33f7f00c8ee14f293bfaf23259d2db4f785c9c9c49e72b28eb
-DIST chromium-56.0.2924.18.tar.xz 513374276 SHA256
c68089d563348f41f40a606f583489853994adcd6b3329f24a10bf7a3ff292bc SHA512
fac070b0874f334cd874cea4b631f6701766c1bc30b5455daee9284f233fde1ed4f17f0666dc30c7dd6b4116a740a4e146dfdb15708a335a7701dc453c1df392
WHIRLPOOL
a707a503daef0b43431ad11944597daabace44f3237ce22342b5f4b2d80c1a0724cbdf8e2fcbef3d7f2d111c4f4130189a423c2764071a7d4cba039225d8f712
DIST chromium-56.0.2924.21.tar.xz 513324284 SHA256
08330d147a9340c593ac0255adac30e189e1e9ed99c43d148891058365b4182a SHA512
acfc81177e5fdacc954cdc94b705079b8fdf19a7d90573b38b9a297eeb2d169325f460ce1ec14ea52cfa57782f818d733ece62c8ff313610730881efeba5afb7
WHIRLPOOL
cc2ed9362aa5f88d05e884e46897b919020044d7556c5c4217ddd527cf198d84c87d9d48281aa4d4dae94dc06490657fdcf2d9c5653f9eea3a33767e5383eac6
+DIST chromium-56.0.2924.59.tar.xz 513389580 SHA256
3b34c4cef3a5017556064d246b14b69a8bd2277d8908a6e8b63c014d501ebac2 SHA512
3ef43728e7ca9d5c1eb4b808bd8c0dbf37a3ee387c57d2826e39fed47ab6316e636b96fd2787c140601e87bd084df61093a85c5014e6151ca70c2e9619a1d52c
WHIRLPOOL
4d2f8ee6e7c5b1f3455ba9c25518178990e725dafcc75a3049a6fd5ddb17dfdf3b325c78478b7b3ca62fe7712e8e58e0f5f0f0944d32d99dc0819f99293268c0
DIST chromium-57.0.2950.4.tar.xz 521653320 SHA256
41a56ce7a89bfa0ee47039d18be1889781b78dfde88ad93ef19cabde20c5d8b6 SHA512
333848375a8fbeee0bb9249a1f978caea9800f40a84c149a20263a668a3921eb74ced2d2563bc67ba902838e8865a3b552f9c03e88ff2ce87e6d88807d3fcbaf
WHIRLPOOL
b9b9e06f766315d17c7414813312fd54fd223a4ab5a0d0ba21604a4e808cb5ad8d63d445fdf879d0f7ab82ebaa83fda0bf6f46433ed5055b999d09ae287d9044
DIST chromium-57.0.2970.0.tar.xz 523656564 SHA256
7cb5255d352e729a637e4939fa2561266b709aa3c9ea66aeebd80af8672c27fb SHA512
c059b1d5f33614c82a50394ce25c8fbd1ce2bc5ad6f9956caa9f088e73158751ad11a642edc5ba71dd7a6e432a74a036b2125dd73f290825470a23b7bc609576
WHIRLPOOL
98a6ad75dc49a464f532648d900cf9c4f39587bf2621b157ee762a8b2db0c1fd627253903c4e6d91c031f82150d2e760f80ceac468f35ab41ebef8db7a311a84
diff --git a/www-client/chromium/chromium-56.0.2924.18.ebuild
b/www-client/chromium/chromium-56.0.2924.59.ebuild
similarity index 96%
rename from www-client/chromium/chromium-56.0.2924.18.ebuild
rename to www-client/chromium/chromium-56.0.2924.59.ebuild
index 97b727f..4489e13 100644
--- a/www-client/chromium/chromium-56.0.2924.18.ebuild
+++ b/www-client/chromium/chromium-56.0.2924.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -33,7 +33,7 @@ COMMON_DEPEND="
cups? ( >=net-print/cups-1.3.11:= )
>=dev-libs/elfutils-0.149
dev-libs/expat:=
- dev-libs/glib:=
+ dev-libs/glib:2
dev-libs/icu:=
>=dev-libs/jsoncpp-0.5.0-r1:=
dev-libs/nspr:=
@@ -56,7 +56,7 @@ COMMON_DEPEND="
>=sys-libs/libcap-2.22:=
virtual/udev
x11-libs/cairo:=
- x11-libs/gdk-pixbuf:=
+ x11-libs/gdk-pixbuf:2
x11-libs/libdrm
x11-libs/libX11:=
x11-libs/libXcomposite:=
@@ -114,8 +114,6 @@ DEPEND="${COMMON_DEPEND}
dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
')
"
@@ -125,8 +123,6 @@ python_check_deps() {
has_version --host-root
"dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
has_version --host-root
">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
}
@@ -161,14 +157,20 @@ For other desktop environments, try one of the following:
PATCHES=(
"${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
- "${FILESDIR}/${PN}-system-jinja-r14.patch"
"${FILESDIR}/${PN}-widevine-r1.patch"
+ "${FILESDIR}/${PN}-glibc-2.24.patch"
)
-pkg_pretend() {
+pre_build_checks() {
if [[ ${MERGE_TYPE} != binary ]]; then
- if tc-is-gcc && ! version_is_at_least 4.8 "$(gcc-version)"; then
- die 'At least gcc 4.8 is required, see bugs: #535730,
#525374, #518668.'
+ local -x CPP="$(tc-getCXX) -E"
+ if tc-is-clang && ! version_is_at_least "3.9.1"
"$(clang-fullversion)"; then
+ # bugs: #601654
+ die "At least clang 3.9.1 is required"
+ fi
+ if tc-is-gcc && ! version_is_at_least 5 "$(gcc-major-version)";
then
+ # bugs: #535730, #525374, #518668, #600288
+ die "At least gcc 5 is required"
fi
fi
@@ -180,10 +182,16 @@ pkg_pretend() {
CHECKREQS_DISK_BUILD="25G"
fi
eshopts_pop
- check-reqs_pkg_pretend
+ check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+ pre_build_checks
}
pkg_setup() {
+ pre_build_checks
+
# Make sure the build system will use the right python, bug #344367.
python-any-r1_pkg_setup
@@ -243,6 +251,7 @@ src_prepare() {
third_party/hunspell
third_party/iccjpeg
third_party/inspector_protocol
+ third_party/jinja2
third_party/jstemplate
third_party/khronos
third_party/leveldatabase
@@ -259,6 +268,7 @@ src_prepare() {
third_party/libyuv
third_party/lss
third_party/lzma_sdk
+ third_party/markupsafe
third_party/mesa
third_party/modp_b64
third_party/mt19937ar
@@ -277,6 +287,7 @@ src_prepare() {
third_party/pdfium/third_party/libpng16
third_party/pdfium/third_party/libtiff
third_party/pdfium/third_party/zlib_v128
+ third_party/ply
third_party/polymer
third_party/protobuf
third_party/protobuf/third_party/six
