gentoo auto-resync : 14:01:2024 - 07:13:52

2 files changed, 25 insertions, 9 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5f52f698539a..355f83c03ad1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,15 +10,14 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-120.0.6099.109.tar.xz 3284819132 BLAKE2B b339d8879909f8f06320dd99b45c57e2ad1f74f7260a4bdc6385359cb2a82e6685dcbff2d21a9c829bc1ba5c7f51576f2276ec4a353b14e1053bda432af6f6fd SHA512 874e05294535b588a450110f52a69e973f9a3b2e0980330f4dcd94c10a3f637d877dd89f4d453b018afd86d3b59162c5671d784be802c18dbcf78bec63b9f344
 DIST chromium-120.0.6099.129.tar.xz 3283749920 BLAKE2B 889b91eec84fc12d42d0bfe04f41c779b84aab704b47f05a276fa9725696740fc0308764602e87161b1ad73a5bb260cc75e88a8133791dd1b074780363670e51 SHA512 2b12d2af7b469d2896000c785f0252eb260bffb523d8e1b82f1d8ab4098de8e297dd6fe901de58a1f57672c9699523d88342637fc69b5260fe5cf296183e3edf
 DIST chromium-120.0.6099.199.tar.xz 3285099132 BLAKE2B 36836c7fe3b1a41bf18d94569ad1026d6e3db60d7c91e740e41a49cc504c5da26d5b165ba614484e918edfb1636d7ce311e082a890930e54f8b0f7951d69c061 SHA512 0efb15c56c081f10ab1db8ac8850e56752d70b93f6b20c9ebfd24f866fe5e194abdac8dbc43fff0f51b38e7f6ba1d9cdbcb32e14a74f6526265ed09d93186db2
-DIST chromium-120.0.6099.71.tar.xz 3283091280 BLAKE2B 1e5096b8d03f1ee65b5c1ea98cdc2230bb3f789bcf87750891d47c5c79e79997602997b72c3c5f4f8f10a5f7bb754ccf1065e789ff5949c2ce084b1759e7280b SHA512 a46a7e92615e35433959db5e3dbd7f829fc8ddda61cb88f46d99091de0c8ab65c847c8cdc881e34abdabaf1b638416e5a70eaee9c7e3a489e53ee55d09b8a790
+DIST chromium-120.0.6099.216.tar.xz 3296304596 BLAKE2B 7c13673323fb64eaa6a4956daf41012886998d63a5f9d1f378c695a38592faa4e32b11bff560d79bc60cf2bf122775ab0a1be59c44b5e9cf95bc8cb21fd2f2e1 SHA512 4202a7a2e34ddaad2d786d9caee9cebf497616a8fd90076e550ab2c4ed33d3d5743bb58452c36c3858571d842ca14973c152790b707c39b8c662cdc550ad5008
 DIST chromium-patches-120.tar.bz2 8630 BLAKE2B aa815521d027036757e5316478c2974e107185662d4c6a200bc7f448558730a3cb11e0a6e28d6a48ff60379813eed10d91c04917002228cf97c8448423cc0994 SHA512 1af05a17c54ea2f23b6f18b40c21304a94076eda4f9dcdf34ff93e1a729ae5a6b69816d32b5855b1cbb412eefaefb3d343fce05afd99347dcf9302a1d47ad3e6
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-DIST chromium_119.0.6045.159-1raptor0~deb12u1.debian.tar.xz 522464 BLAKE2B 687636b3c8f9b89db64b16643f6832cd2711f54f4be309d7e8dbaf0b8647bb3400ac095fa497f8a887bde628b521724f21f97a1273ab719f16d9f4114c36a6f0 SHA512 a4724ec5df4f3cfac7ede1514d8e886de20580bb812fed3a3e240e4ad91522b047a7bb065ab9e4402cffb9e8608c5cdc71d10c8b132f27d294ebb44db12294e4
 DIST chromium_120.0.6099.109-1raptor0~deb12u1.debian.tar.xz 534108 BLAKE2B ebfe063c5a141e3cd0f861c753c366297f868a5b475a6d4cfe136baec9b979f909e24f9d6eceeb215b9084a9c087c5fb5eb49e8d26921028b943c119a440356a SHA512 62d4d492f579d1bffeaec9778f275df5ee615f434c1ea5764f7feecec6004bc9862c114caf6b86737a433d97e822f14df5a5871b9cbc7bc891bf48d706d5bccf
 DIST chromium_120.0.6099.71-1raptor0~deb12u1.debian.tar.xz 534000 BLAKE2B e366c798018d7ca1eceb0d2ee01894a0da355c0ae9754b82b35cf552feeeef7c4746208701cd73f72061660543cc9fc0ee305c8d9ad8aa2591354c026aca5965 SHA512 f0c95f9b504c71904c3a27f3bbae47b6aacaf1c21986008c3a474fdf4110144c052dc5520718a3f77536a008719698d79068ae95b703c9350fc853b96b5fc6bf
 EBUILD chromium-120.0.6099.109.ebuild 39600 BLAKE2B ca33eb042b00017349f2a8a50cbcf94fe325ce46ae688260d7533cb57da027a28295112a5ba4d52e685561ab437794bbfff8243404a82601bbc24d466461baa6 SHA512 382a2e22be9b8a85234ccc709c07005218ff953576fc54be4b444fe8cc13c8d716d0ef5546b24005c5e810346f7f649bf15c6efcbe1d9358a3981d3733031a42
 EBUILD chromium-120.0.6099.129.ebuild 40153 BLAKE2B a81cae23afd757b605b9caa0e61b59df23b0ef15963eb3f3d97f2b13e84a26e4172ad8517e6ba0efff4d8caf8c0170c39bf66df9276533b91ba074a5f09fefa0 SHA512 c6c749376debaccf98c997cdb3168d9894a5b86a72c36214392e0e8af478805835f4bea43a299be25c0e05b4529c8d1a881ac4445c3fd0a6b1dcffbfb5fe45f9
 EBUILD chromium-120.0.6099.199.ebuild 40155 BLAKE2B 0142002f2222064061de2514fd8599516342701a2c09130c5ffcff64a240cb7941dd90b6acdba5372c2e789fb8d26e2796af0e71efb64e42dc9e8fd2069a03bb SHA512 b7af9938d45611db235bc1b65589bed43dfdd6bd3c86c6ca179592408224a7f0f3e42d410f7fdd474e350db3a08729890a8a3f9a0ac12974f468048b2fbdab1b
-EBUILD chromium-120.0.6099.71.ebuild 39596 BLAKE2B 768ea789fc3d79f9394d3c7e3ff3aab15b2a2e264c68d08d85104661c1ac0f24073f97072c0bd63c2220c6b98280aba4c4c430359618b9c8a284ad9ce4a988b4 SHA512 66221a4e57040dafe260d13cc22a202482fc5aefdb0a6437e7cda729946ab14c33b6dc47c464ffefb954b7543f8d4ebfcd80e09fcf49f8d61b4f03d7ee53fb0f
+EBUILD chromium-120.0.6099.216.ebuild 40155 BLAKE2B 0142002f2222064061de2514fd8599516342701a2c09130c5ffcff64a240cb7941dd90b6acdba5372c2e789fb8d26e2796af0e71efb64e42dc9e8fd2069a03bb SHA512 b7af9938d45611db235bc1b65589bed43dfdd6bd3c86c6ca179592408224a7f0f3e42d410f7fdd474e350db3a08729890a8a3f9a0ac12974f468048b2fbdab1b
 MISC metadata.xml 1992 BLAKE2B ef74dcdbcaf0dd2bdc190775f9ca899f4b519f4195a52e10e295c0159c3ca785428bc85768e6ebf98ffcde63bb58af445b00408533277b959dbd74537a1e340b SHA512 d0a2151e8fb7af824ad9e1b7f81dd776cb345fe0e97b919a654e9091bf98345bfb3e235c4e257bcf53fa3d3a4ee2dc20fc4e5f21116bfdee45baf66271372c44
diff --git a/www-client/chromium/chromium-120.0.6099.71.ebuild b/www-client/chromium/chromium-120.0.6099.216.ebuild
index bbc4faaad039..a2f56bac427e 100644
--- a/www-client/chromium/chromium-120.0.6099.71.ebuild
+++ b/www-client/chromium/chromium-120.0.6099.216.ebuild
@@ -23,6 +23,9 @@ GN_MIN_VER=0.2122
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120:
 #    webrtc -  no matching member function for call to 'emplace'
 : ${CHROMIUM_FORCE_LIBCXX=yes}
+# This variable is set to yes when building with bfd is broken.
+# See bug #918897 for arm64 where bfd can't handle the size.
+: ${CHROMIUM_FORCE_LLD=no}
 
 VIRTUALX_REQUIRED="pgo"
 
@@ -35,7 +38,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="119.0.6045.159-1raptor0~deb12u1"
+PATCHSET_PPC64="120.0.6099.109-1raptor0~deb12u1"
 PATCH_V="${PV%%\.*}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
@@ -47,7 +50,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
 IUSE="+X ${IUSE_SYSTEM_LIBS} cups debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio qt5 qt6 screencast selinux vaapi wayland widevine"
 REQUIRED_USE="
@@ -152,7 +155,7 @@ DEPEND="${COMMON_DEPEND}
 depend_clang_llvm_version() {
 	echo "sys-devel/clang:$1"
 	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
+	echo "sys-devel/lld:$1"
 }
 
 # When passed multiple arguments we assume that
@@ -210,6 +213,13 @@ if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
 	BDEPEND+=" >=sys-devel/clang-${LLVM_MIN_SLOT}"
 fi
 
+if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then
+	BDEPEND+=" >=sys-devel/lld-${LLVM_MIN_SLOT}"
+else
+	# XXX: Hack for arm64 for bug #918897
+	BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )"
+fi
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
@@ -247,6 +257,11 @@ python_check_deps() {
 	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
 }
 
+needs_lld() {
+	# XXX: Temporary hack w/ use arm64 for bug #918897
+	[[ ${CHROMIUM_FORCE_LLD} == yes ]] || use arm64
+}
+
 needs_clang() {
 	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
 }
@@ -257,8 +272,8 @@ llvm_check_deps() {
 		return 1
 	fi
 
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+	if ( use lto || use pgo ) && ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+		einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 		return 1
 	fi
 
@@ -705,7 +720,9 @@ chromium_configure() {
 	fi
 
 	# Force lld for lto and pgo builds, otherwise disable, bug 641556
-	if use lto || use pgo; then
+	if needs_lld || use lto || use pgo; then
+		# https://bugs.gentoo.org/918897#c32
+		append-ldflags -Wl,--undefined-version
 		myconf_gn+=" use_lld=true"
 	else
 		myconf_gn+=" use_lld=false"