summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-03-01 20:19:07 +0000
committerMike Gilbert <floppym@gentoo.org>2014-03-01 20:19:07 +0000
commite382039d43b259def479ded358b62793b7f0aba1 (patch)
treed8f5ba2e9286626a7fc767eeb60b19cf7c1757e2 /www-client
parentRemove older revbump (diff)
downloadgentoo-2-e382039d43b259def479ded358b62793b7f0aba1.tar.gz
gentoo-2-e382039d43b259def479ded358b62793b7f0aba1.tar.bz2
gentoo-2-e382039d43b259def479ded358b62793b7f0aba1.zip
Switch to bundled protobuf, bug 503084.
(Portage version: 2.2.8-r1/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-34.0.1847.14-r1.ebuild (renamed from www-client/chromium/chromium-34.0.1847.14.ebuild)5
2 files changed, 9 insertions, 4 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e2cc5ce1081a..2411ae98fad9 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1030 2014/02/28 05:47:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1031 2014/03/01 20:19:07 floppym Exp $
+
+*chromium-34.0.1847.14-r1 (01 Mar 2014)
+
+ 01 Mar 2014; Mike Gilbert <floppym@gentoo.org>
+ +chromium-34.0.1847.14-r1.ebuild, -chromium-34.0.1847.14.ebuild:
+ Switch to bundled protobuf, bug 503084.
*chromium-35.0.1862.2 (26 Feb 2014)
diff --git a/www-client/chromium/chromium-34.0.1847.14.ebuild b/www-client/chromium/chromium-34.0.1847.14-r1.ebuild
index e655103fbfff..fe2b96939b44 100644
--- a/www-client/chromium/chromium-34.0.1847.14.ebuild
+++ b/www-client/chromium/chromium-34.0.1847.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1847.14.ebuild,v 1.2 2014/02/28 05:47:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1847.14-r1.ebuild,v 1.1 2014/03/01 20:19:07 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -44,7 +44,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
dev-libs/libxslt:=
dev-libs/nspr:=
>=dev-libs/nss-3.14.3:=
- >=dev-libs/protobuf-2.5.0:=
dev-libs/re2:=
gnome? ( >=gnome-base/gconf-2.24.0:= )
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
@@ -218,6 +217,7 @@ src_prepare() {
'third_party/nss.isolate' \
'third_party/ots' \
'third_party/polymer' \
+ 'third_party/protobuf' \
'third_party/pywebsocket' \
'third_party/qcms' \
'third_party/readability' \
@@ -287,7 +287,6 @@ src_configure() {
-Duse_system_nspr=1
-Duse_system_openssl=1
-Duse_system_opus=1
- -Duse_system_protobuf=1
-Duse_system_re2=1
-Duse_system_snappy=1
-Duse_system_speex=1