summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-01-23 17:28:18 +0000
committerMike Gilbert <floppym@gentoo.org>2015-01-23 17:28:18 +0000
commit42c2c1d82c8daeb2e9d58d46216f9f853a8eb573 (patch)
tree2d2d320b20b23b803d09958ac4cf5c2a87618a96 /www-client
parentversion bump, drop old (diff)
downloadgentoo-2-42c2c1d82c8daeb2e9d58d46216f9f853a8eb573.tar.gz
gentoo-2-42c2c1d82c8daeb2e9d58d46216f9f853a8eb573.tar.bz2
gentoo-2-42c2c1d82c8daeb2e9d58d46216f9f853a8eb573.zip
Stable channel bump.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-40.0.2214.91.ebuild (renamed from www-client/chromium/chromium-40.0.2214.69.ebuild)12
2 files changed, 17 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 627978ad83d2..da03aaa51b29 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.1184 2015/01/22 20:52:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1185 2015/01/23 17:28:18 floppym Exp $
+
+*chromium-40.0.2214.91 (23 Jan 2015)
+
+ 23 Jan 2015; Mike Gilbert <floppym@gentoo.org> +chromium-40.0.2214.91.ebuild,
+ -chromium-40.0.2214.69.ebuild:
+ Stable channel bump.
*chromium-41.0.2272.12-r1 (22 Jan 2015)
*chromium-40.0.2214.85-r1 (22 Jan 2015)
diff --git a/www-client/chromium/chromium-40.0.2214.69.ebuild b/www-client/chromium/chromium-40.0.2214.91.ebuild
index 8c441ac14978..d9fd9ba3b173 100644
--- a/www-client/chromium/chromium-40.0.2214.69.ebuild
+++ b/www-client/chromium/chromium-40.0.2214.91.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-40.0.2214.69.ebuild,v 1.1 2015/01/09 02:11:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-40.0.2214.91.ebuild,v 1.1 2015/01/23 17:28:18 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,7 @@ inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
@@ -148,6 +148,13 @@ For other desktop environments, try one of the following:
- x11-themes/tango-icon-theme
"
+pkg_pretend() {
+ if [[ $(tc-getCC)$ == *gcc* ]] && \
+ [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+ die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+ fi
+}
+
pkg_setup() {
if [[ "${SLOT}" == "0" ]]; then
CHROMIUM_SUFFIX=""
@@ -178,6 +185,7 @@ src_prepare() {
# fi
epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+ epatch "${FILESDIR}/${PN}-cups-r0.patch"
epatch_user