www-client/seamonkey: bug fixes on 2.53.17

Adds dependencies for clang and llvm using the llvm.eclass.

Fix for ffmpeg build failure on ~ARCH.

Closes: https://bugs.gentoo.org/911830
Bug: https://bugs.gentoo.org/911679
Bug: https://bugs.gentoo.org/911582
Signed-off-by: Myckel Habets <gentoo-bugs@habets-dobben.nl>
Closes: https://github.com/gentoo/gentoo/pull/32210
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

3 files changed, 38 insertions, 8 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index fbef5be04b90..5205a1cb5685 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,6 +1,6 @@
 DIST seamonkey-2.53.15-r1-patches.tar.gz 33649 BLAKE2B ebee28386a1ed9a0b2f82029099d5488559ba14321b0b519d70b76c39a0f557a28955715d2c75a9e949bfb8aac54f9893c6ed37033b62439655479af4019f8d4 SHA512 2023ba24bb5e1de63617e67eb058608233bc873b5c4e994990f6db50c6c23fe58979ec4eb8b8a15d2aaf882ddd5c72194d09197df93bb310688c2a01b16a488e
 DIST seamonkey-2.53.15.source-l10n.tar.xz 13657060 BLAKE2B 128de12ad087be2f0c9f8e2622c837144bc2422f692f16babca7f69daf45432bb3ee547ec75cd3ddc1464818eb36ded09e6f3613a9d4f86b867328e4213e76f2 SHA512 91a3be1dfcd6c06953430afd2d07036c525b73e0132690575275430bca5ffe3082cb5c30df4cd921d961aa79333b6cefb6eace157fc65368254f4099ae879131
 DIST seamonkey-2.53.15.source.tar.xz 260787300 BLAKE2B 1efa2a0fd3e4b2fa4d264eb2f373ec1208d3009b69e907cafab216b539b69598948dd8646e4c6365caaf764a00d6212b870f23dfa33fe6fd87df757ff5f115f3 SHA512 f4735af98be0e27a935852de9d309317e1639a420189b0432cb7bdf9707bab706ceec65e96b94953a6e4285b4501dcd25745fb9250b8bf30845d2b855dcc8b13
-DIST seamonkey-2.53.17-patches.tar.gz 24647 BLAKE2B f0c685bbd282d824b21aa76b8e041acc7f4a50e01142f6f72c2c31b6d555fda57e63cd205030348a570d1a3d80f7f47add2e14a0774bd2f3571adfbaed984578 SHA512 507bf544cb9ca27504dc66ba4024c5cb48fdcf125c7a7aaf1aae62397c911291dc54ff5e1057ccdb3ecb20fc23285a4e838ed7a4fa1201ac2b9de4e4d4834972
+DIST seamonkey-2.53.17-patches-2.tar.gz 25528 BLAKE2B 5a39a98c1292e3b70cea1f68e77fcee9f97c1962e6e81f5fca29f1ed9fe9f7fdd082ecf3d31fd5fb91533914665fa92ea1d3796fae48c30700a706f5cf48211d SHA512 7df818546c1fc69f41d8431a4d780f5fd5e1b608444198587fbb9afb736fff22c592bb5590300969e9b0ae7ff28255bc0d26d3409ef5849afae6708ad234972c
 DIST seamonkey-2.53.17.source-l10n.tar.xz 13661552 BLAKE2B 1006e3468d28bb04a9c2dd3ce3822153e5181ed84eb368acae28e22ad51a8b616caa35ff5b15e0cb0096d478034a30fa2ace5db87686e24d669607966338a42d SHA512 792b4f54617ffb7afb6c7a3cebcdbbcd0295322b68595f6c416b9bd32201f9295bccd96d633765c7ba6e46eeef687b325cd47817f46e476b2f7cda1304e466ab
 DIST seamonkey-2.53.17.source.tar.xz 266150192 BLAKE2B 2c79e4594ad6ad5b6b7ed594e86a8ae26a9137c84de055fd13bb77f98ebf382c31514efe311d8050ce75c27a5d3b8860fbee73f40afa7ce3334ed6ebcaa64d6a SHA512 479feca324dfe7bdb6e2a63da38251cafe1169d087d767b5857683f547417b4a5a388913e84bb8d0a9a292aef0d88aeaf25660670aa518bc4e45efcef8f2cfa7
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index ceb788d90506..8b4a210f8e75 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -9,6 +9,9 @@
 		<email>mozilla@gentoo.org</email>
 		<name>Gentoo Mozilla Team</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">BioMike/gentoo-seamonkey-patches</remote-id>
+	</upstream>
 	<use>
 		<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
 		<flag name="custom-optimization">Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
diff --git a/www-client/seamonkey/seamonkey-2.53.17.ebuild b/www-client/seamonkey/seamonkey-2.53.17.ebuild
index 289ac518a75a..bc0d31bf84d0 100644
--- a/www-client/seamonkey/seamonkey-2.53.17.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.17.ebuild
@@ -8,6 +8,8 @@ WANT_AUTOCONF="2.1"
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
+LLVM_MAX_SLOT=16
+
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
 # note - could not roll langpacks for: ca fi
 #MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
@@ -21,7 +23,8 @@ MOZ_PV="${MOZ_PV/_beta/b}"
 MOZ_PV="${MOZ_PV/_rc/rc}"
 MOZ_P="${P}"
 MY_MOZ_P="${PN}-${MOZ_PV}"
-PATCH="${PF}-patches"
+PATCH="${PF}-patches-2"
+PATCH_S="${WORKDIR}/gentoo-${PN}-patches-${PV}-2"
 
 if [[ ${PV} == *_pre* ]] ; then
 	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
@@ -31,13 +34,14 @@ fi
 
 SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
 	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz
-	https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PV}.tar.gz -> ${PATCH}.tar.gz"
+	https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PV}-2.tar.gz -> ${PATCH}.tar.gz"
 
 S="${WORKDIR}/${MY_MOZ_P}"
 
 MOZ_GENERATE_LANGPACKS=1
 MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
-inherit autotools check-reqs desktop edos2unix flag-o-matic mozcoreconf-v6 mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+inherit autotools check-reqs desktop edos2unix flag-o-matic llvm mozcoreconf-v6 mozlinguas-v2 pax-utils \
+	toolchain-funcs xdg-utils
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="https://www.seamonkey-project.org/"
@@ -59,6 +63,16 @@ BDEPEND="
 	dev-lang/perl
 	dev-util/cbindgen
 	>=sys-devel/binutils-2.16.1
+	|| (
+		(
+			sys-devel/clang:16
+			sys-devel/llvm:16
+		)
+		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+		)
+	)
 	virtual/pkgconfig
 	virtual/rust
 	amd64? ( >=dev-lang/yasm-1.1 )
@@ -67,7 +81,7 @@ BDEPEND="
 "
 COMMON_DEPEND="
 	app-arch/bzip2
-	dev-libs/atk
+	>=app-accessibility/at-spi2-core-2.46.0
 	>=dev-libs/glib-2.26:2
 	>=dev-libs/libffi-3.0.10:=
 	>=dev-libs/nspr-4.23
@@ -98,7 +112,7 @@ COMMON_DEPEND="
 	jack? ( virtual/jack )
 	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
 	pulseaudio? ( || (
-		media-sound/pulseaudio
+		media-libs/libpulse
 		>=media-sound/apulse-0.1.9
 	) )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
@@ -143,6 +157,15 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 
 BUILD_OBJ_DIR="${S}/seamonk"
 
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build." >&2
+}
+
 pkg_setup() {
 	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
 		ewarn
@@ -151,6 +174,8 @@ pkg_setup() {
 		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
 	fi
 
+	llvm_pkg_setup
+
 	moz_pkgsetup
 }
 
@@ -185,7 +210,7 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
-	eapply "${WORKDIR}"/gentoo-${PN}-patches-${PV}/${PN}
+	eapply "${PATCH_S}/${PN}"
 
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |
@@ -194,7 +219,9 @@ src_prepare() {
 		edos2unix "${file}"
 	done
 
-	use system-libvpx && eapply -p2 "${WORKDIR}"/gentoo-${PN}-patches-${PV}/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch
+	if use system-libvpx ; then
+		eapply -p2 "${PATCH_S}/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch"
+	fi
 
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user