commit:     4879171db8eb30a2ee79d62f3c61ae7b729ddcba
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 14:20:31 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 14:20:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4879171d

www-client/chromium: beta channel bump to 97.0.4692.56

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

 www-client/chromium/Manifest                                  |  2 +-
 ...omium-97.0.4692.45.ebuild => chromium-97.0.4692.56.ebuild} | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 58e9187924b1..7798a41bf0b5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,6 +2,6 @@ DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 
5d82d212b8ec1689be6f4a7a06462563
 DIST chromium-96-ppc64le-1.tar.xz 29224 BLAKE2B 
3369a3b15eb4f42761e01758135995a1f34e40cecbfc0372a4bc17b393d50b276ea5a0813d1c57f73f0dd34cf2a021356d25c2b4dcaa95998ffc082545dc915c
 SHA512 
256d64fbf192e55d77c6580d36766a67dadfbd0f1e34e49bfc6d55114da7f2252d783db0dd09123996a71a01ec4a3d5c70fd1a5c8852db135857b8495f7cfbf1
 DIST chromium-96.0.4664.110.tar.xz 1209944416 BLAKE2B 
1cec11b248b9225e47caf6bf8ec243e301bb63df2b0a070fb55b829b712e513b2510944f72306cebde3715704cae5b2c6be83847e91b358cb5135b56d55255b3
 SHA512 
7db962dc7016f531c33e915408303f06f429b53d1c5a69b281e64f6204d4bdb413fd281c3d891bb696d846f80f6182289c10f4b19b3b4c2c8b7fd72070de3f02
 DIST chromium-97-patchset-4.tar.xz 4240 BLAKE2B 
450d013b6fd68f7e0bcb21a2b0828d531eda86965e636fe24fc36c2e7e1f74fe93f27f0d4b1d03e67c605797e28db37de4949ff78d5106e07b0362bec4bc5d8a
 SHA512 
181c706c83bdbe07b2e7f02b654922a860aea761ad267e6545fb7d56b66373b003c1c79fae5cd45eeb3be8917782fa45df1c05bbb00e170f0146e7385f4246c4
-DIST chromium-97.0.4692.45.tar.xz 1213732240 BLAKE2B 
cd722330f4f84f29331974a0663fc39b021fb4cc7b1e96e4c355397bf7e37386938e5be05618c37692d29e8cfb514fdd069cbdf9ca44073d8da10fafaba598f8
 SHA512 
bac8367c7494dea46477d70af9dc2f8fa360936c4996cea92c623a503f2965a24afc1f83c15ccfa10bb3d331d21ed65f9c73799c0efe5b6180767ae36c17c2e1
+DIST chromium-97.0.4692.56.tar.xz 1213710744 BLAKE2B 
566e0d937b50b3636e3520069f7f7d62f310e98d9cb333b13c2565abe57d4adc0ffd060ae10bc98629d9a3ff012487e9d8e2ff569221943f6e7515c6949cc029
 SHA512 
f2ee447ffa35b98618154466e913cbaeef87485614848aaa78b8f89828664f039d2d76f73a5c3bddd772a596138c6b871d0c85a3d44264663fe4b2bea9d8df17
 DIST chromium-98-patchset-3.tar.xz 6164 BLAKE2B 
be4fa2997e13e89a0c8db1e99fa80adb937c0c02f1e18bd0ec93bdbdd484da4a8507baf13c5e6e602d5f5ecb2921f33bc3afdc3c3103b1b5314b62f59c1a71ad
 SHA512 
47026635ca5c2e1d3965c82a449077380e6518b33e16b83bd105085cca50f512d08027eebd34d7ce5ce39d988f0120deccfb72697abac0d41e4502b6ad8abdf3
 DIST chromium-98.0.4750.0.tar.xz 1230864580 BLAKE2B 
b8b5d05bf15a9429f3f5fa851415d21f6e757a99fce9ac47bdeb7f534f9eefc77d13c5f8ba93bfa140bdb536c13e1b6141ac4d7e0f17b742039c403044789c56
 SHA512 
7f8cc349aa50af0d149ba08e5ed60171e94943bbd52cb0f820f3c7d56749d9e2fd6d71761262ac012cfcad1f7e4f63c0404f39f044df531e776ae6fce951544f

diff --git a/www-client/chromium/chromium-97.0.4692.45.ebuild 
b/www-client/chromium/chromium-97.0.4692.56.ebuild
similarity index 99%
rename from www-client/chromium/chromium-97.0.4692.45.ebuild
rename to www-client/chromium/chromium-97.0.4692.56.ebuild
index 7d53bac24055..78dde3c997dd 100644
--- a/www-client/chromium/chromium-97.0.4692.45.ebuild
+++ b/www-client/chromium/chromium-97.0.4692.56.ebuild
@@ -21,7 +21,7 @@ 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0/beta"
 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-harfbuzz +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 +system-png vaapi 
wayland widevine"
 REQUIRED_USE="
        component-build? ( !suid )
        screencast? ( wayland )
@@ -57,7 +57,7 @@ COMMON_DEPEND="
        >=media-libs/freetype-2.11.0-r1:=
        system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
        media-libs/libjpeg-turbo:=
-       media-libs/libpng:=
+       system-png? ( media-libs/libpng:=[-apng] )
        pulseaudio? ( media-sound/pulseaudio:= )
        system-ffmpeg? (
                >=media-video/ffmpeg-4.3:=
@@ -486,6 +486,9 @@ src_prepare() {
        if ! use system-icu; then
                keeplibs+=( third_party/icu )
        fi
+       if ! use system-png; then
+               keeplibs+=( third_party/libpng )
+       fi
        if use system-harfbuzz; then
                keeplibs+=( third_party/harfbuzz-ng/utils )
        else
@@ -593,7 +596,6 @@ src_configure() {
                #harfbuzz-ng
                libdrm
                libjpeg
-               libpng
                libwebp
                zlib
        )
@@ -603,6 +605,9 @@ src_configure() {
        if use system-icu; then
                gn_system_libraries+=( icu )
        fi
+       if use system-png; then
+               gn_system_libraries+=( libpng )
+       fi
        if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
                # unbundle only without libc++, because libc++ is not fully ABI 
compatible with libstdc++
                gn_system_libraries+=( libxml )

Reply via email to