commit:     132bcec3313ca0a46c29c9bfce4b2da232f35598
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 23 06:11:15 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 06:11:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132bcec3

www-client/chromium: dev channel bump to 95.0.4638.17

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/chromium/Manifest                                 |  2 +-
 ...mium-95.0.4638.10.ebuild => chromium-95.0.4638.17.ebuild} | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8f98cc26faf..c116cc24cfa 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,5 +4,5 @@ DIST chromium-93.0.4577.82.tar.xz 1038808440 BLAKE2B 
ec6fd783b40b8e02bbf6cc48eb1
 DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 
3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd
 SHA512 
42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
 DIST chromium-94.0.4606.54.tar.xz 1039891076 BLAKE2B 
2591eb0f886f08e2fad3b8ebff109f1da7336417e9be9f480a4278554dff4886def6fb52b5e3488b9f85b7f5025f9f835469484c6a4860b0d38eb3f77a627a50
 SHA512 
3e5e2a800decd30d0297aa9926f7d0f47ab47f930ed42131c53b9533d0245b09d8f2b404b0f84ca083817c6c55f7dce6518046fde4889e5d79be505043fdc084
 DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B 
e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672
 SHA512 
152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
-DIST chromium-95.0.4638.10.tar.xz 1212124668 BLAKE2B 
74b1ca8200914768160ef9c358d1b448c4df587660b972c399b6ea456ed6519530776c6e83f3c14215ffc8476891dfe1c7e007bf8eb25a9373c1843ecd6728eb
 SHA512 
f2007d9f93478cddfa4e6a34c2c7f0c3d21317b9cdbd48ef8f25cb81c63350c6aeec18412e73b519c5a48a306d80050ec2ecd48ed3dd9ce983979d2c97d48653
+DIST chromium-95.0.4638.17.tar.xz 1212354740 BLAKE2B 
5f4d65a3c21814cebe10134e73ec6c546beef92a5c3dbfa4798dd42141c0705cabee9f3b11a22c01422cf7e41e197ff7d249d84422728eb5411f691f7029f1ff
 SHA512 
1e730e2855343d86d30a21e2d2cd7687b72f247e9e443c26f91aca3326bb70bacf525f23eea4b047ed441a6134774c1b0d931c601ff8125df226a1caff5989b7
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 
2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb
 SHA512 
d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb

diff --git a/www-client/chromium/chromium-95.0.4638.10.ebuild 
b/www-client/chromium/chromium-95.0.4638.17.ebuild
similarity index 98%
rename from www-client/chromium/chromium-95.0.4638.10.ebuild
rename to www-client/chromium/chromium-95.0.4638.17.ebuild
index 342045a937f..ec95c0b0bed 100644
--- a/www-client/chromium/chromium-95.0.4638.10.ebuild
+++ b/www-client/chromium/chromium-95.0.4638.17.ebuild
@@ -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 debug +hangouts headless 
+js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast 
selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless 
+js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast 
selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland 
widevine"
 REQUIRED_USE="
        component-build? ( !suid )
        screencast? ( wayland )
@@ -55,7 +55,7 @@ COMMON_DEPEND="
        >=media-libs/alsa-lib-1.0.19:=
        media-libs/fontconfig:=
        >=media-libs/freetype-2.11.0-r1:=
-       >=media-libs/harfbuzz-2.9.0:0=[icu(-)]
+       system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
        media-libs/libjpeg-turbo:=
        media-libs/libpng:=
        pulseaudio? ( media-sound/pulseaudio:= )
@@ -343,7 +343,6 @@ src_prepare() {
                third_party/google_input_tools/third_party/closure_library
                
third_party/google_input_tools/third_party/closure_library/third_party/closure
                third_party/googletest
-               third_party/harfbuzz-ng/utils
                third_party/hunspell
                third_party/iccjpeg
                third_party/inspector_protocol
@@ -488,6 +487,11 @@ src_prepare() {
        if ! use system-icu; then
                keeplibs+=( third_party/icu )
        fi
+       if use system-harfbuzz; then
+               keeplibs+=( third_party/harfbuzz-ng/utils )
+       else
+               keeplibs+=( third_party/harfbuzz-ng )
+       fi
        if use wayland && ! use headless ; then
                keeplibs+=( third_party/wayland )
        fi
@@ -612,7 +616,7 @@ src_configure() {
        build/linux/unbundle/replace_gn_files.py --system-libraries 
"${gn_system_libraries[@]}" || die
 
        # See dependency logic in third_party/BUILD.gn
-       myconf_gn+=" use_system_harfbuzz=true"
+       myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
 
        # Disable deprecated libgnome-keyring dependency, bug #713012
        myconf_gn+=" use_gnome_keyring=false"

Reply via email to