commit: df339c659fdb3b9088838d210dd2dfa8d4974aee Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Apr 14 23:56:26 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Apr 14 23:56:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df339c65
www-client/chromium: use a local copy of setuptools Closes: https://bugs.gentoo.org/717456 Package-Manager: Portage-2.3.99, Repoman-2.3.22_p29 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> www-client/chromium/Manifest | 1 + www-client/chromium/chromium-83.0.4103.7.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 5084dd9bb66..29665edc4d2 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,2 +1,3 @@ DIST chromium-81.0.4044.92.tar.xz 785906276 BLAKE2B af8e40391362c5ea182b917b085cfc1c2fe605503621316196e4a60d7031fe3b3075af9040ad756bddbad77058b5210d265731990a828ca6a11829e41c7cb807 SHA512 2d5817c84ac17e7b4d2e4473df841f53a074528e0ac997345ee68db4a9f8b45d84ef50c1d475608428f49ae40fe5315cda9d501ee22b829156c9e533044fb5af DIST chromium-83.0.4103.7.tar.xz 802381832 BLAKE2B 5e1d204dd799a11726e9e8247598e28268e0689462cdd0b35867c63b1f578fcd356fbaa0f9181e26ed67f798100464f0cd218d83874df6d3b9c55f29aa4e176f SHA512 42bc38921ece136cfc24a5b9c15739f336524a5a178e57b11ffebd897b1092354e35da144f9b11d91569f07ed480c3e565e4d6086ca3be84d139633e000a71d6 +DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-83.0.4103.7.ebuild b/www-client/chromium/chromium-83.0.4103.7.ebuild index 57c680190c4..bac5b079ad6 100644 --- a/www-client/chromium/chromium-83.0.4103.7.ebuild +++ b/www-client/chromium/chromium-83.0.4103.7.ebuild @@ -12,7 +12,8 @@ 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/"; -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"; +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"; LICENSE="BSD" SLOT="0" @@ -89,6 +90,7 @@ DEPEND="${COMMON_DEPEND} BDEPEND=" ${PYTHON_DEPS} >=app-arch/gzip-1.7 + app-arch/unzip !arm? ( dev-lang/yasm ) @@ -638,6 +640,9 @@ src_compile() { # Calling this here supports resumption via FEATURES=keepwork python_setup + # https://bugs.gentoo.org/717456 + local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0${PYTHONPATH+:}${PYTHONPATH}" + #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die # Build mksnapshot and pax-mark it.
