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>

1 files changed, 34 insertions, 7 deletions

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