summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-07-02 15:01:48 +0000
committerMike Gilbert <floppym@gentoo.org>2015-07-02 15:01:48 +0000
commit1b9c3dade60992a7059e47693f0a8f4f78a14b37 (patch)
treeeb3a8322e31b8182de4fa17b164509583488c34e /www-client
parentVersion bump. (diff)
downloadgentoo-2-1b9c3dade60992a7059e47693f0a8f4f78a14b37.tar.gz
gentoo-2-1b9c3dade60992a7059e47693f0a8f4f78a14b37.tar.bz2
gentoo-2-1b9c3dade60992a7059e47693f0a8f4f78a14b37.zip
Beta channel bump.
(Portage version: 2.2.20/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-44.0.2403.61.ebuild (renamed from www-client/chromium/chromium-44.0.2403.18.ebuild)13
2 files changed, 14 insertions, 7 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index abf4ce6fc57a..9e9c8edd85d4 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.1263 2015/06/29 01:30:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1264 2015/07/02 15:01:48 floppym Exp $
+
+*chromium-44.0.2403.61 (02 Jul 2015)
+
+ 02 Jul 2015; Mike Gilbert <floppym@gentoo.org> +chromium-44.0.2403.61.ebuild,
+ -chromium-44.0.2403.18.ebuild:
+ Beta channel bump.
29 Jun 2015; Mike Gilbert <floppym@gentoo.org> chromium-43.0.2357.130.ebuild,
chromium-44.0.2403.30.ebuild:
diff --git a/www-client/chromium/chromium-44.0.2403.18.ebuild b/www-client/chromium/chromium-44.0.2403.61.ebuild
index df6060b99499..3a4e08db1c3d 100644
--- a/www-client/chromium/chromium-44.0.2403.18.ebuild
+++ b/www-client/chromium/chromium-44.0.2403.61.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-44.0.2403.18.ebuild,v 1.2 2015/06/04 19:06:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2403.61.ebuild,v 1.1 2015/07/02 15:01:48 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
@@ -16,10 +16,10 @@ DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/"
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-LICENSE="BSD"
+LICENSE="BSD hotwording? ( no-source-code )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
RESTRICT="proprietary-codecs? ( bindist )"
# Native Client binaries are compiled with different set of flags, bug #452066.
@@ -54,7 +54,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
>=media-libs/libjpeg-turbo-1.2.0-r1:=
media-libs/libpng:0=
>=media-libs/libwebp-0.4.0:=
- >=media-libs/libvpx-1.4.0:=
+ >=media-libs/libvpx-1.4.0:=[postproc]
media-libs/speex:=
pulseaudio? ( media-sound/pulseaudio:= )
sys-apps/dbus:=
@@ -187,6 +187,7 @@ src_prepare() {
# fi
epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+ epatch "${FILESDIR}/${PN}-hotwording-2403.patch"
epatch_user
@@ -217,6 +218,7 @@ src_prepare() {
'third_party/cld_2' \
'third_party/cros_system_api' \
'third_party/cython/python_flags.py' \
+ 'third_party/devscripts' \
'third_party/dom_distiller_js' \
'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
'third_party/ffmpeg' \
@@ -358,6 +360,7 @@ src_configure() {
$(gyp_use gnome-keyring use_gnome_keyring)
$(gyp_use gnome-keyring linux_link_gnome_keyring)
$(gyp_use hidpi enable_hidpi)
+ $(gyp_use hotwording enable_hotwording)
$(gyp_use kerberos)
$(gyp_use pulseaudio)
$(gyp_use tcmalloc use_allocator tcmalloc none)"
@@ -580,8 +583,6 @@ src_install() {
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
- doexe out/Release/libffmpegsumo.so || die
-
# Install icons and desktop entry.
local branding size
for size in 16 22 24 32 48 64 128 256 ; do