gentoo auto-resync : 15:10:2022 - 01:47:28

2 files changed, 10 insertions, 29 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 939c89f2b2eb..6ebd82a09edf 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -7,5 +7,5 @@ DIST seamonkey-2.53.14-patches.tar.gz 64614 BLAKE2B b63a3ebfea69f27a3057a21871f6
 DIST seamonkey-2.53.14.source-l10n.tar.xz 13656176 BLAKE2B daa2697d51ea74ef085a5e610cdce35c256e2d052ff7c557af47d0204bfe49b08c62de963574c22427b6ccbdab484fc8b7f122eeb7f1dc171514c2626b3a794c SHA512 18cd269df9d603a319f83f9e8a90182fdcdb44c3f4fc606abe2d30a5706a0a00f8f488b574e59b1885eecd2b0490c679222ebaaf77b60aa432e2412a61d34dfc
 DIST seamonkey-2.53.14.source.tar.xz 256277216 BLAKE2B baf48d89ae84d19c3accb0045658bad9e265e402ddbe7325a1df37682ea54bae1c09336e44312cf66dae037ec89672e8078ffb285e3f8588e42f6f484a7fd5c6 SHA512 19b35d7301b3a3c4cff41ea90bd401f9b41ec8ea1207e8ccd738eb2f52068cc39b4838eabb60a04596926035a143472656a291cab8adcea608bd569b30b5b7e3
 EBUILD seamonkey-2.53.13.ebuild 17164 BLAKE2B 17e833b5ce99dbe8f223b3493d71f71c0088a650d585c846b684ced28e2963940e760ae2e656539aa0de88ebecbd58a455edf67ea6d8c958e31fdfc14f4c8924 SHA512 259a5ef286024c64ef68df263d4ded5a6937be4157d1705d7e510edee4b2f710e8239df87dbab19070f845bd5a865dc6fda5af233ef5451a7dd87d5c80aec093
-EBUILD seamonkey-2.53.14.ebuild 17639 BLAKE2B da4b8d846bc7873a4048c97e08b2700a16b44d98e5ddf190a035878fa41161103507960cb6f6d7f197e3f748ffaf11407d6f0e79fb7232e9f09b0b5eb8692cad SHA512 d86879c4ea7044e2179b85db768f053349467424bf5f3d673d9aa15a21ee9b5774237cdd8fdad1ed73e1afd04788ade63b20f483d08a623421a1272f63c63391
+EBUILD seamonkey-2.53.14-r1.ebuild 16930 BLAKE2B 8dc2b46f3fd05fc6e6d97490e4a2b1c4122ac419f3f1a19740e36f085ba5447fe2d1a7f01afb04e5b78d6473baafba6cc9b6f44f212be0f52b6e3eebb5b28146 SHA512 3f0949d0d0c67dbea0cf799dc779eadec0fcc809ce0d019940698ee848f21e215176b6a67cf39023641bf590e7e3a08caacb0cd46ae7701587fee55f9d25e2ca
 MISC metadata.xml 2085 BLAKE2B bdc1da446f817a45f519f41f0eaba8c8437e81a1c4387cd94e168ed35548692b0b137e98a890cdd3cbb10fe3876820123fa22f64f69be8cb2fde31548184eca2 SHA512 50d64f3eba08f582c723328d7face922a67f62c08e3f23e719fe49092584e2e59e3e5e6a82e4b7bae6f9b05180f70e2e3cd5246315bd980a89207bb9172ed230
diff --git a/www-client/seamonkey/seamonkey-2.53.14.ebuild b/www-client/seamonkey/seamonkey-2.53.14-r1.ebuild
index 57fc76cd3cb3..0ac462443e0f 100644
--- a/www-client/seamonkey/seamonkey-2.53.14.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.14-r1.ebuild
@@ -60,7 +60,7 @@ BDEPEND="
 	dev-util/cbindgen
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
-	<=virtual/rust-1.63.0
+	<virtual/rust-1.65.0
 	amd64? ( >=dev-lang/yasm-1.1 )
 	lto? ( sys-devel/binutils[gold] )
 	x86? ( >=dev-lang/yasm-1.1 )
@@ -147,11 +147,11 @@ pkg_setup() {
 		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
 	fi
 
-	if ver_test $(rustc -V | tr -cd '[0-9.]' | cut -d" " -f2) -ge "1.64"; then
-	    ewarn "Rust-1.64 is currently unsupported for building ${P}."
+	if ver_test $(rustc -V | tr -cd '[0-9.]' | cut -d" " -f2) -ge "1.65"; then
+	    ewarn "Rust-1.65 or newer is currently unsupported for building ${P}."
 	    ewarn "Please use 'eselect rust' to switch to a lower version, then resume"
 	    ewarn "building ${PN}."
-	    die "Rust-1.64 detected. Use eselect rust to choose <1.64"
+	    die "Rust-1.65 or newer detected. Use eselect rust to choose <1.65"
 	fi
 
 	moz_pkgsetup
@@ -382,32 +382,13 @@ src_configure() {
 	# use startup-cache for faster startup time
 	mozconfig_annotate '' --enable-startupcache
 
-	# Elf-hack is known to be broken on x86 and arm64.
+	# Elf-hack is known to be broken on multiple archs.
+	# Disable it by default, because on the archs that still work,
+	# it also gives more problems than it solves.
 	# https://bugs.gentoo.org/851933
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=1706264
-	if use x86 || use arm64 ; then
-		mozconfig_annotate 'elf-hack is broken on x86 and arm64' --disable-elf-hack
-	fi
-
-	# Elf hack should be enabled by default on architectures that support it.
-	# On archs that don't support it, it should not be enabled by default.
-	# www-client/firefox says building with clang breaks elf hack on archs that
-	# support it, so they disable that. We assume this is the same for www-client/seamonkey.
-	# The code below is copied over from www-client/firefox.
-	if tc-is-clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
+	if use x86 || use arm64 || use arm || use amd64 ; then
+		mozconfig_annotate 'elf-hack is broken' --disable-elf-hack
 	fi
 
 	# Disabled by default. See bug 836319 , comment 17.