Make 'hotwording' optional at build time, bug 552298.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 16 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 46a48a93677f..de7a7abe347e 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.1255 2015/06/17 18:47:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1256 2015/06/21 20:07:47 floppym Exp $
+
+  21 Jun 2015; Mike Gilbert <floppym@gentoo.org> chromium-45.0.2431.0.ebuild,
+  metadata.xml:
+  Make 'hotwording' optional at build time, bug 552298.
 
 *chromium-45.0.2431.0 (17 Jun 2015)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6aea4eb23bb7..0b7a236a555d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -25,25 +25,15 @@ EBUILD chromium-43.0.2357.73.ebuild 20189 SHA256 f769f9f82bd1d1b3589b09e978d38be
 EBUILD chromium-44.0.2403.18.ebuild 19414 SHA256 7e353e25fcd8eb1c38301d5dd8867b63837b368e4ede5efc5482380c1dfcbb74 SHA512 a62294ea0bca837ea89efd395a1ee0e27868cac1bb0c53ebc00c654fa61f085020fa0417e87466553f2d78ee09c80edac53fca65a5eb51ffb7d96a96faebade9 WHIRLPOOL 7eefd1dbbe1ed3a94ce5f70b3debd96121ad1ad5c62a18b3e41ac170f8e58b85eae14ddf868aa38d5ace014fba8907e6476e4b842a95de906e007065a018d764
 EBUILD chromium-44.0.2403.30.ebuild 19411 SHA256 8378d5e1c871fa95557a0a751ede7575aa308fe28141f3e883361c766a3c1506 SHA512 ebec5f2820d911366ec435557b551faa853ae64d2772786f6c69a267c929b620cd9b19d4b0813c62eece0fbc24f554221a304ed9ba4c3656c8c8c7810e45a85e WHIRLPOOL e9ba0f1fdb0ca7874c25164138bb667326120bc304224a6dda7965ef027571f348492c2c2f9a8dc38e885357caa31b7a506afe75daf7cb3e4fa17577b76ada7c
 EBUILD chromium-45.0.2427.7.ebuild 19438 SHA256 28a163c7bc7dd7017df94effa904dcae269db0cdd65ecb5bb1b607c574038319 SHA512 ebe6fccad6394723628140775ba1a0173584660e91e84452bc4bf432c4142851c054e680efb3755153996335d38b183e72f6e6a2e76ee8958f4dcec7d5f5299d WHIRLPOOL e0551ee24b7d8e332fa4d39ddb7d74cd1d279a61e321f88a6559725d76c123a82cd56996fe01feac1e9942f93a47e13ffae19302cc6b5a889a6dd629c7018522
-EBUILD chromium-45.0.2431.0.ebuild 19423 SHA256 90c0b14d44446da8be55e414bb0d4b9661f95895d2ec0acd87de5221433c5f47 SHA512 b9cf314388933607fd7f51943c5d4acaad22ff82d05e51be1ce424e41a886ffe3a8f18d296aa3ac1802bb0498133c616e76402869bea9d37dd74da24004615f7 WHIRLPOOL ea866f9b24dda174cf9fe9b94843252a4ddb801f3d9c39a3d43f4d0824e73e43d185a832eb735083c1fed6718d8654bcd31243f6538a6de2e4b75ce3efa03af4
-MISC ChangeLog 14549 SHA256 25d3bbb837d3c324612f1de77cc4141bc2d9b8f1fef1de375fc305cd3d4ffb0a SHA512 1e1935bfe75cc01d0b2da31f8d2ebee34f556a352acbe001fb75bbbfd1f277a98243dc9d9e84ede59d5215498c3d57bb6a48a64d655970125200587b52c12186 WHIRLPOOL 73fced226f172a57be018d85f80a0dca316e02f104a182a70d4ab40791cc33bc8284886c388c2566935e805414ab48a83d63c9cbb708388b65b87783af757426
+EBUILD chromium-45.0.2431.0.ebuild 19504 SHA256 220de24b1e4273cb0fa70a8f4eba000c11fea8b9116570b0948e5d7b6233dd18 SHA512 cb1820d526cad95f77672b1e4defd1490b32c9019a72ca9da4cf02de45618d0e31757b7417098c574433bf8abce19057d14f94923ba60e509c0cdb790a3b639e WHIRLPOOL 71e453915a73b5777041d5e6ef89afb0ee60057cf7727fc7878e95ad6599584edab4cd776c92c03a31bfa307ec4c3211173979b220427c11fffb2ac542f327c6
+MISC ChangeLog 14697 SHA256 df8de4f814def918cba359cccddc46a9912a6456a57e7181767fe0b5da0d5fe4 SHA512 6a204e5fcba5415d7b2b45adf3d8b651285b37caa399ec7c06c9067923ab5854fe18d382577170ecdc8e280b53362835fc8280b3762937ffc5a1c5c3afa3a11c WHIRLPOOL 03fee52c62dbba244e639cc3786647706e6e64bbfa092f0fd2508574f8668e8b9a2c421120bf141363b2d04cb5a514a824a093a002ad42e4fe1375aed4395452
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
-MISC metadata.xml 719 SHA256 edbbfa7039ad145f0f22eeb1dba7f7b209d2a58ae8cb930e2e92772e71cb2c0a SHA512 b8cd8c96a404c4e37a9d3bf3652dc291b7bac353e6f76e7989ffd65fec774847c1c9c9bb6511d0532bd2ea72921b60931b0c5cee40a8e20022e4edecebcdf47d WHIRLPOOL 097471d7c223a4a17417ac24d04a98c6661ad758ad83456333724017592a41a505a391ea8296a8de062e9271b41649a588f9f185625e485a34a389f717664652
+MISC metadata.xml 797 SHA256 9451bea483278759eefedd02679e297db90c9b43d774889a0356a0f31b848d54 SHA512 07f1deb87ea3aa8356cefe036da96210a1bf7b4c1545229c08620e73e7d0b8c249c244e780fdd02ff91f0ee0fb352a0838ab85aedc44cd32150249ae28163d56 WHIRLPOOL aa055b8617bdb15c5194100bd44cf746913da5c33c797512613c4abaed37de3821915a152a7ed097f78a02984441857a16271c442273861980fe7b23b95f08d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVgcDIAAoJEE8aJVXqcZkd+yUQAJcPaPN3+QFmrrX+r2sZfqtQ
-hAES46u+Js00l5gUFceADZoFekVy3Y5iQV7WH7rAPQvUEB8nrweMO9WlwrZWbJv/
-xCB+lgzgc1fOoc/ATDs1TO+DOzG1tq2bXdjB/GS9fhbsQ0lu2Jzk4QC+XFwkHvnb
-8q93RK4Vv0xkw0D2XZz9S+unTEsyHdLMkYQLjrhMEcX9AuM3LWa3Ie+ArVYXPdAV
-Ba9htnR84WNWVeHC+b/F9R7bVVcmGs8JXPniTzxBGTpxs3ZtKjMI5A3QX3oflh0k
-+IwIq+ZO+wxd6uwDrnpa44BrgbjLDi3QgPPzDxy0ufQnYQikalutWIVdwaYblTog
-lfNWIXyAEs529cr+sGl1VosIFXoMBf6y2bVHZmH6Q/ic1EZdn1JiQ02VNKkx94Hr
-ubB04C2ApIP7HmWmxRpAXORrcb+GufWg1bFo62uQy2Y6Aw8xVEoQdWNf2g/ii2nj
-RE1baVdbTaAnM/Bp/Rn/IlsOYbLRVC16x3Ums5tV+CSggrDUr7p2Z/yseohd8Byx
-Xm4AMKfm+uB4jE6lzfkbZTW8D2+7hQQF5TCkDk3b9KbskUZ7AXRSC0a8L87RDMx8
-mp5aF1alg3okbOAKY2yOLT0QUDTswv2m/MxpRdpuSWRfr7bfmuvMTpF/WuxdrJkO
-r19WZLt3RDlWLOExQRtr
-=53Ae
+iF4EAREIAAYFAlWHGZQACgkQRxvnM+8pGj8dmQD/S74/Rzvmrgz+tA08jScNA1sC
+lrQ5tAVY1g51W0xTNNwA/0saj93Ccoc5VH3YGIS4UJvB1SDLBZ2xI5YF5WJ8HSt+
+=c7tg
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-45.0.2431.0.ebuild b/www-client/chromium/chromium-45.0.2431.0.ebuild
index 3d0a84ffb470..05624ce7874b 100644
--- a/www-client/chromium/chromium-45.0.2431.0.ebuild
+++ b/www-client/chromium/chromium-45.0.2431.0.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-45.0.2431.0.ebuild,v 1.1 2015/06/17 18:47:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-45.0.2431.0.ebuild,v 1.2 2015/06/21 20:07:47 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.
@@ -358,6 +358,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)"
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 66ff678ab23c..3af641b76d89 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -5,6 +5,7 @@
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
 		<flag name="hidpi">Enable support for high-resolution screens (high dots per inch)</flag>
+		<flag name="hotwording">Enable voice-recognition support (Ok Google)</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>