commit: aa31249b287e975aa25451cfc2f33f474b454932 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sat Apr 10 10:40:48 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sat Apr 10 10:46:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa31249b
www-client/chromium: dev channel bump to 91.0.4469.4 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 4 ++-- ...omium-91.0.4464.5.ebuild => chromium-91.0.4469.4.ebuild} | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 08a4bb8d77c..72334096ea2 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,6 +2,6 @@ DIST chromium-89-patchset-7.tar.xz 4640 BLAKE2B 6150f92a4cb83025b7521c573e9a14bf DIST chromium-89.0.4389.114.tar.xz 890898912 BLAKE2B b9590f83eb54fc1b524a7893f8ce0317cb5648aae84853b8958f2a0f65ae2f8331e65732322f4956fb5bc58ef3691755ae66ed901567e2b5a9749a99fc6096c4 SHA512 5b8d92ecde3ab35847dc4981caa12434334f81fc576e8809c5832a18989b6d1465ae8c43f0ad0ea8a3da7a5876c52679c57ec8323109de2b81ac467419fa1a4c DIST chromium-90-patchset-6.tar.xz 3828 BLAKE2B bbd1378868cf4d699ff097ea41226ff694d58468f8f93860f2d6cc60924f35fb1f0b17fcf5a916f04545171d1219b699072222f138240fd483c704874cfce178 SHA512 70321eb4e9fe27818d5e6ae3109d3871a870a7fb6886328dcc9fc8291ac72fc003d678aec7f9925afe0c5667c70ce9bca8f61434b11a331fc1a29d61ad7b59e3 DIST chromium-90.0.4430.61.tar.xz 917389704 BLAKE2B 58f79e1b7365d22d9f8fa0deb52dab3f5e027f18f5bda926e733035b5f2e5c7af07265806f5a88f5d5fb556164dd7221a6546f3b6c8dd013048e17f4202dd18a SHA512 9e029d08e396b85b9a3cbc67910ba47b67ecb8acaf607844cbeddb18907b3b8f15444034487c6258f253eb84835d21fccee4d654fbc5b815cc03b8be032eccac -DIST chromium-91-patchset-3.tar.xz 3256 BLAKE2B fcca836134e5a8fdd43a2bd7fc588b02ae0827cbee2c92ab35b0472ff1c3f416ad34fe7dbc4937eed94b52ac3a42f349b85f3ee467f45287b201270300439c0a SHA512 3817e17ee180185fab0a21f575f57172b9995cd27cbf78ee3071b8fa3ee093437c4a3926e13381bd417f4d984abc50f2216e6e19f537583e5b6954ee50dc00ad -DIST chromium-91.0.4464.5.tar.xz 933757036 BLAKE2B 76ea72d5a3500e85dde293b7cb86e7de2d70c835b78526ddcf84d2fd98240c5960ce1c30425b4cd51c0a70671af21bf3a9073f36801a1639c83280dc9d91045a SHA512 3f585de9f65f6a4d7224fe5a9e4273353767754b4788a50c55816ecf59eefd7acead386d85b70fac226fe3a4be83205c0502854187b4cdfac3ae02c060bd30ec +DIST chromium-91-patchset-4.tar.xz 3188 BLAKE2B 34d64f4124cb5c020d7d20c883c3409f710b96d5412f8881936e86d78ed034c1d70bd16f9324c5af21f735c3c5f98b4b4cd28cbd7f86f9513df2a5f1ff404772 SHA512 79c1640a7248d628c31fdbf3df296aa888e80f3c90cc6a74be56ac1389d9748b7cce88641e626cd4a5ae298e82fb325a8604fda68378706f0f26a2570e8983a2 +DIST chromium-91.0.4469.4.tar.xz 949712784 BLAKE2B 99453196fb9f2336afffb03affcf7441a1ee5f8c9ce50c76888783b8520f2490299e5fc3448c7f61c270c175e48e55a1f947f8cfdf0053a02513676d9ed8daeb SHA512 413452da449198713e6d10f05b937f95a6c0ffb11b2408dc9ced1048af6f7a406af07f8112fe39f73482723802ff25e51ce0085c598d03dba207a5658385871d DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-91.0.4464.5.ebuild b/www-client/chromium/chromium-91.0.4469.4.ebuild similarity index 98% rename from www-client/chromium/chromium-91.0.4464.5.ebuild rename to www-client/chromium/chromium-91.0.4469.4.ebuild index 3929267936d..e9fb9b7d3ab 100644 --- a/www-client/chromium/chromium-91.0.4464.5.ebuild +++ b/www-client/chromium/chromium-91.0.4469.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_8 ) PYTHON_REQ_USE="xml" CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he @@ -13,7 +13,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="3" +PATCHSET="4" 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 @@ -109,6 +109,7 @@ BDEPEND=" >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl + dev-lang/python:2.7[xml] >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 @@ -138,7 +139,7 @@ else dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= - system-icu? ( >=dev-libs/icu-68.1:= ) + system-icu? ( >=dev-libs/icu-69.1:= ) " RDEPEND+="${COMMON_DEPEND}" DEPEND+="${COMMON_DEPEND}" @@ -236,6 +237,12 @@ src_prepare() { mkdir -p third_party/node/linux/node-linux-x64/bin || die ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die + # adjust python interpreter versions + sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die + sed -i -e "s|python2|python2\.7|g" buildtools/linux64/clang-format || die + sed -i -e "s|python|python2\.7|g" \ + third_party/dom_distiller_js/protoc_plugins/json_values_converter.py || die + local keeplibs=( base/third_party/cityhash base/third_party/double_conversion
