summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2015-03-04 19:48:08 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2015-03-04 19:48:08 +0000
commit7f4797a4c010b365bb3a7037569031efd4eb8216 (patch)
tree5f8b998d7af8b27557390cd9c07c2ef593993af5 /www-client
parentVersion bump wrt bug #525156. (diff)
downloadgentoo-2-7f4797a4c010b365bb3a7037569031efd4eb8216.tar.gz
gentoo-2-7f4797a4c010b365bb3a7037569031efd4eb8216.tar.bz2
gentoo-2-7f4797a4c010b365bb3a7037569031efd4eb8216.zip
Dev channel bump. Fix bug #541816 by Toralf Foerster. Remove old.
(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-42.0.2311.15.ebuild (renamed from www-client/chromium/chromium-42.0.2305.3.ebuild)15
2 files changed, 19 insertions, 4 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 750e41a26f92..4de97d9a6396 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1205 2015/03/04 14:45:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1206 2015/03/04 19:48:08 phajdan.jr Exp $
+
+*chromium-42.0.2311.15 (04 Mar 2015)
+
+ 04 Mar 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-42.0.2305.3.ebuild, +chromium-42.0.2311.15.ebuild:
+ Dev channel bump. Fix bug #541816 by Toralf Foerster. Remove old.
*chromium-41.0.2272.76 (04 Mar 2015)
diff --git a/www-client/chromium/chromium-42.0.2305.3.ebuild b/www-client/chromium/chromium-42.0.2311.15.ebuild
index 41ccfb2fefd1..67e4d8ba8e85 100644
--- a/www-client/chromium/chromium-42.0.2305.3.ebuild
+++ b/www-client/chromium/chromium-42.0.2311.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2305.3.ebuild,v 1.2 2015/02/19 11:22:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2311.15.ebuild,v 1.1 2015/03/04 19:48:08 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
sv sw ta te th tr uk vi zh_CN zh_TW"
-inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
DESCRIPTION="Open-source version of Google Chrome web browser"
@@ -158,6 +158,15 @@ pkg_pretend() {
[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
fi
+
+ # Check build requirements, bug #541816 .
+ CHECKREQS_DISK_BUILD="5G"
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ CHECKREQS_DISK_BUILD="25G"
+ fi
+ eshopts_pop
+ check-reqs_pkg_pretend
}
pkg_setup() {
@@ -280,7 +289,6 @@ src_prepare() {
'third_party/smhasher' \
'third_party/sqlite' \
'third_party/tcmalloc' \
- 'third_party/tlslite' \
'third_party/trace-viewer' \
'third_party/trace-viewer/third_party/components/polymer' \
'third_party/trace-viewer/third_party/d3' \
@@ -290,6 +298,7 @@ src_prepare() {
'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
'third_party/undoview' \
'third_party/usrsctp' \
+ 'third_party/web-animations-js' \
'third_party/webdriver' \
'third_party/webrtc' \
'third_party/widevine' \