commit: f5e6a24103526a43f39d6ad2cb874f860d301b79
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 21:54:12 2016 +0000
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 22:00:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e6a241
www-client/chromium: dev channel bump (49.0.2618.8)
Package-Manager: portage-2.2.20.1
www-client/chromium/Manifest | 2 +-
...um-49.0.2587.3.ebuild => chromium-49.0.2618.8.ebuild} | 16 +++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2ecf8be..54c850d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-47.0.2526.106-lite.tar.xz 414871736 SHA256
e71bfbdb9293a79d5ab8096
DIST chromium-48.0.2564.10.tar.xz 432060420 SHA256
1902d75d49d46c32a8c33f6de53c9253a63a364b85eb4ada1e8a9ba7c0f523d0 SHA512
7753dc19a50c862211c10975b3ad64a0408e3645df7b0ea548f8437c4c5380ad0bb350920eb8c6791e0685ae7ec921c6be720e337a17dffe4b73c56b74a2bc9a
WHIRLPOOL
a9ccb2872ad639886288581e1c7d9244f16965ef924395531701289cc69c5a9dfdc4a25175151d27b150acc8e4398c8d91ca5f8f3e623c3c85c8b99d913c4f00
DIST chromium-48.0.2564.23.tar.xz 1099898120 SHA256
e9a5eeaedb1975a93d37bc865d3122cf28b7e3a246c06ba19204edaefbce1266 SHA512
72b253f39b561e53c0ef2220402ae15e8d2cdd1af8eab4d5fa8480316919df9059dddf4f4c0d027f78fd0db924b7cbd23d29d406808d18fa047ccddffb6701b3
WHIRLPOOL
c133e8e389b560efcc239e2f24bb3befd3fe8731bb2529aeee3f2ae04bf09e5d815ef805750c48dd549fb0b94c1ab77d94b03a0b8245cd537bdb204c79393761
DIST chromium-48.0.2564.41.tar.xz 1470877528 SHA256
b265ecb945fcf27dd9d856e18632ea6fa4f88aed7ed32cb5eefb6515b6dc651a SHA512
5d91c603a99ac092c9cc1d1300c826d0eab62092a961dde8dd2c6bcbb342120ff97aa76231407227563fb65c0791c69274d044ab81e261b66cfce76811b428d5
WHIRLPOOL
584638131774053511974722973f28b75f99ceb8241948af91e3de247ccee631c8dbbedac9bfd66b4f5f505bcef194970c361f60a0c9cae7179ad6af0ea55c35
-DIST chromium-49.0.2587.3.tar.xz 1487544844 SHA256
425292b10e645f5b6812bb901e0905300969405d197d7936c9818f81be69b016 SHA512
5fb793385665256c9dddce1766cbce2335baf2744591f532baf720a7097a21451ff0d22c1734100874e984debd05a5e061a46b0d0571ac3804a9ad4a763cdb5c
WHIRLPOOL
a2f33b75239fa6748d82082ad86bb7e16971d3b01c36cb3f5f5a3e5087c2ef93bc7c1b4665215401ef05f5403adabf33dde3c5d3921626211c01b7e0607ae920
DIST chromium-49.0.2612.0.tar.xz 1488847440 SHA256
3859c3b931de3fc5089c9f011624503bd864e24cea07fe630c346192c780de67 SHA512
655a12de47a0515e33fdcfe011df91727fb1b331d3d381663976172a72f22a736a1632aa08f24b6501415ea5b964948b79bc6fec6c3378c5f3f5d56549c11a0b
WHIRLPOOL
024f9ae374cca711eee4331523fbec97fc66bda59e76595380ef4b32b0c9add34ba52a620389446892f1911f494e9cc437ea3bd9b1d0e3f89b36aca56d1c856c
+DIST chromium-49.0.2618.8.tar.xz 450425684 SHA256
36eb7e14c6e0908650d941d4c566c0f574b38645d1fe6c71702862e0aa467ced SHA512
cc920c5d34f68504a585ad5fd1dc6402953f8cf33e35f1bdfb7250078258a172863cff36936f606c638b67a9ec3934509dd9da57c510615ccdaddc5b1feceac4
WHIRLPOOL
5d85d604fc9c2c0431cfed76c1f7c2dd9fc7705f3f66dbabf8f7cb49112cfaae490afd552697731ef03f64973bac27dd301ba5c59e5c45d6827f688dfc07d760
diff --git a/www-client/chromium/chromium-49.0.2587.3.ebuild
b/www-client/chromium/chromium-49.0.2618.8.ebuild
similarity index 98%
rename from www-client/chromium/chromium-49.0.2587.3.ebuild
rename to www-client/chromium/chromium-49.0.2618.8.ebuild
index ca78f85..77a433b 100644
--- a/www-client/chromium/chromium-49.0.2587.3.ebuild
+++ b/www-client/chromium/chromium-49.0.2618.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -79,9 +79,8 @@ RDEPEND="
>=dev-libs/libevent-1.4.13:=
dev-libs/libxml2:=[icu]
dev-libs/libxslt:=
- dev-libs/re2:=
media-libs/flac:=
- media-libs/harfbuzz:=[icu(+)]
+ >=media-libs/harfbuzz-0.9.41:=[icu(+)]
>=media-libs/libjpeg-turbo-1.2.0-r1:=
media-libs/libpng:0=
>=media-libs/libwebp-0.4.0:=
@@ -190,12 +189,11 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch"
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
epatch "${FILESDIR}/${PN}-widevine-r1.patch"
epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
- epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch"
- epatch "${FILESDIR}/${PN}-rpath-r0.patch"
+ epatch "${FILESDIR}/${PN}-snapshot-toolchain-r1.patch"
epatch_user
@@ -205,20 +203,19 @@ src_prepare() {
fi
if use gn; then
conditional_bundled_libraries+="
+ base/third_party/libevent
third_party/adobe
third_party/ffmpeg
third_party/flac
third_party/harfbuzz-ng
third_party/icu
third_party/jinja2
- third_party/libevent
third_party/libjpeg_turbo
third_party/libpng
third_party/libwebp
third_party/libxml
third_party/libxslt
third_party/markupsafe
- third_party/re2
third_party/snappy
third_party/speech-dispatcher
third_party/usb_ids
@@ -312,6 +309,7 @@ src_prepare() {
'third_party/polymer' \
'third_party/protobuf' \
'third_party/qcms' \
+ 'third_party/re2' \
'third_party/sfntly' \
'third_party/skia' \
'third_party/smhasher' \
@@ -357,6 +355,7 @@ src_configure() {
# TODO: use_system_libvpx (http://crbug.com/494939).
# TODO: use_system_opus
(https://code.google.com/p/webrtc/issues/detail?id=3077).
# TODO: use_system_protobuf (bug #525560).
+ # TODO: use_system_re2 (bug #571156).
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
myconf_gyp+="
@@ -374,7 +373,6 @@ src_configure() {
-Duse_system_libxslt=1
-Duse_system_minizip=1
-Duse_system_nspr=1
- -Duse_system_re2=1
-Duse_system_snappy=1
-Duse_system_speex=1
-Duse_system_xdg_utils=1
