summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-10-20 02:13:51 +0000
committerMike Gilbert <floppym@gentoo.org>2013-10-20 02:13:51 +0000
commitc22c11dcf90aa4d0bfd856f85483cc1229f582d3 (patch)
treef6f9e2e2b3c6b449d2e513a50cf70cb59dfd15a1 /www-client
parentBump http-types to 0.8.2 (diff)
downloadgentoo-2-c22c11dcf90aa4d0bfd856f85483cc1229f582d3.tar.gz
gentoo-2-c22c11dcf90aa4d0bfd856f85483cc1229f582d3.tar.bz2
gentoo-2-c22c11dcf90aa4d0bfd856f85483cc1229f582d3.zip
Beta channel bump.
(Portage version: 2.2.7/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-31.0.1650.26.ebuild (renamed from www-client/chromium/chromium-31.0.1650.12.ebuild)12
2 files changed, 11 insertions, 9 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 031a5e012841..9314cec2e496 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.967 2013/10/18 03:30:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.968 2013/10/20 02:13:51 floppym Exp $
+
+*chromium-31.0.1650.26 (20 Oct 2013)
+
+ 20 Oct 2013; Mike Gilbert <floppym@gentoo.org> +chromium-31.0.1650.26.ebuild,
+ -chromium-31.0.1650.12.ebuild:
+ Beta channel bump.
18 Oct 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
chromium-31.0.1650.12-r1.ebuild, chromium-32.0.1671.3.ebuild:
diff --git a/www-client/chromium/chromium-31.0.1650.12.ebuild b/www-client/chromium/chromium-31.0.1650.26.ebuild
index 7d5d34e376a0..3ac5e1b2e027 100644
--- a/www-client/chromium/chromium-31.0.1650.12.ebuild
+++ b/www-client/chromium/chromium-31.0.1650.26.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1650.12.ebuild,v 1.2 2013/10/09 03:49:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-31.0.1650.26.ebuild,v 1.1 2013/10/20 02:13:51 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -56,7 +56,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
media-libs/harfbuzz:=[icu(+)]
>=media-libs/libjpeg-turbo-1.2.0-r1:=
media-libs/libpng:0=
- media-libs/libvpx:=
media-libs/opus:=
media-libs/speex:=
pulseaudio? ( media-sound/pulseaudio:= )
@@ -77,7 +76,7 @@ DEPEND="${RDEPEND}
)
dev-lang/perl
dev-perl/JSON
- dev-python/jinja
+ >=dev-python/jinja-2.7
dev-python/ply
dev-python/simplejson
>=dev-util/gperf-3.0.3
@@ -166,6 +165,7 @@ src_prepare() {
'third_party/libphonenumber' \
'third_party/libsrtp' \
'third_party/libusb' \
+ 'third_party/libvpx' \
'third_party/libwebp' \
'third_party/libxml/chromium' \
'third_party/libXNVCtrl' \
@@ -230,6 +230,7 @@ src_configure() {
# TODO: use_system_hunspell (upstream changes needed).
# TODO: use_system_libsrtp (bug #459932).
# TODO: use_system_libusb (http://crbug.com/266149).
+ # TODO: use_system_libvpx (bug #487926).
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
# TODO: use_system_libwebp (http://crbug.com/288019).
@@ -242,7 +243,6 @@ src_configure() {
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
- -Duse_system_libvpx=1
-Duse_system_libxml=1
-Duse_system_libxslt=1
-Duse_system_minizip=1
@@ -262,10 +262,6 @@ src_configure() {
-Duse_system_yasm=1"
fi
- # TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
- myconf+="
- -Dmedia_use_libvpx=0"
-
# Optional dependencies.
# TODO: linux_link_kerberos, bug #381289.
myconf+="