commit:     72f8eccab61301b5999c237b6f5d9074cfbc3858
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Fri Aug 28 19:21:01 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 14:10:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f8ecca

www-client/chromium: dev channel bump 86.0.4240.8

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17311

 www-client/chromium/Manifest                               |  4 ++--
 ...mium-86.0.4238.0.ebuild => chromium-86.0.4240.8.ebuild} | 14 ++++++++++++--
 www-client/chromium/metadata.xml                           |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fdc3df8a54f..2d872060b8c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 
929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec
 SHA512 
753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
 DIST chromium-85.0.4183.83.tar.xz 833156956 BLAKE2B 
ee5201994daa4c351da89437b6b65bec8c28d35e53c27708444b33dc7297535dd2489ae5014c8d29f62b44e90a968bc9bc4d981532bb764d144dfc090bc1aa31
 SHA512 
9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436
-DIST chromium-86-patchset-5.tar.xz 7364 BLAKE2B 
ffe7c616f38545750a7d9b64a27a4949b4d031671bcc3f814e998497d95b19e174cee209edaaeb3fa7369e40a5db51a542c72348e49608db919678d76e2f751a
 SHA512 
dbca28c28f956913da73c3d2ab870a47ba9b200fc58fc75981deb17fdff22ed82fbc7041827e7042e9dae899e5395cf098274d43e07ca620549273b2efa70580
-DIST chromium-86.0.4238.0.tar.xz 824888648 BLAKE2B 
9e835258700980df98464545f74ac0a9f0fe6c27e4f17394d67887f80f248434390aabd15def922d13744b6c677799d2d5c8538aa2de1b2e4c9f62ded8a31362
 SHA512 
97f32f8010365529d6605e58c1010e655b49c87b0155eabfe841b46f30ff56250d92be5fcc6d5cfd70659e2bb6e44f21316cf7e6905815a1044c77c6d1ba1dd4
+DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 
494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283
 SHA512 
68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
+DIST chromium-86.0.4240.8.tar.xz 826059060 BLAKE2B 
c304bb6e197e6b989dc9b5d1be33f8094813bd25b7a8245386bffe0a62463cb0c549e7febb6bb1487e8cd4f5d7707e81fc9b20b16b2cda6760e0e854fa09d749
 SHA512 
c2baff06004e2e74b92a2320acc0fda93ca296aa06558ffee7a7acbca6b1b80c1db886b7b5c222e414c42bf394c0cb8895dd7ec5646fb5f08f9eeb11c27a09da
 DIST setuptools-44.1.0.zip 858569 BLAKE2B 
f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68
 SHA512 
4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf

diff --git a/www-client/chromium/chromium-86.0.4238.0.ebuild 
b/www-client/chromium/chromium-86.0.4240.8.ebuild
similarity index 97%
rename from www-client/chromium/chromium-86.0.4238.0.ebuild
rename to www-client/chromium/chromium-86.0.4240.8.ebuild
index 5f3dfb4e393..52e0c137635 100644
--- a/www-client/chromium/chromium-86.0.4238.0.ebuild
+++ b/www-client/chromium/chromium-86.0.4240.8.ebuild
@@ -12,7 +12,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib 
ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/";
-PATCHSET="5"
+PATCHSET="6"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
        
https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
@@ -21,7 +21,7 @@ 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless 
+js-type-check kerberos ozone pic +proprietary-codecs pulseaudio selinux +suid 
+system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless 
+js-type-check kerberos official ozone pic +proprietary-codecs pulseaudio 
selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland 
widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 REQUIRED_USE="
        component-build? ( !suid )
@@ -722,6 +722,16 @@ src_configure() {
                fi
        fi
 
+       # Enable official builds
+       myconf_gn+=" is_official_build=$(usex official true false)"
+       if use official; then
+               # Allow building against system libraries in official builds
+               sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+                       tools/generate_shim_headers/generate_shim_headers.py || 
die
+               # Disable CFI: unsupported for GCC, requires clang+lto+lld
+               myconf_gn+=" is_cfi=false"
+       fi
+
        einfo "Configuring Chromium..."
        set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
        echo "$@"

diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 0c62ac0e9ae..5fcb0607cc0 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -10,6 +10,7 @@
                <flag name="component-build">Split build into more shared 
libraries to speed up linking. Mostly intended for debugging and development, 
NOT RECOMMENDED for general use.</flag>
                <flag name="headless">Build Ozone only with headless backend, 
NOT RECOMMENDED for general use.</flag>
                <flag name="hangouts">Enable support for Google Hangouts 
features such as screen sharing</flag>
+               <flag name="official">Enable Official build instead of 
Developer build.</flag>
                <flag name="ozone">Enable Ozone platform abstraction layer with 
X11 backend.</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>

Reply via email to