From 7ff9ad864cb87cde0aa84ab70c1708c2d97d131a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Sat, 27 Jun 2026 10:10:16 +0200
Subject: [PATCH] app-emacs/emacs-jabber: Improve feature test in pkg_setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 app-emacs/emacs-jabber/emacs-jabber-0.11.1.ebuild | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.11.1.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.11.1.ebuild
index 04dd5624dd634..96c0d85013119 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.11.1.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.11.1.ebuild
@@ -26,19 +26,20 @@ SITEFILE="50${PN}-gentoo-0.11.0.el"
 pkg_setup() {
 	elisp-check-emacs-version
 
-	local i feat=(
+	local i missing feat=(
 		dynamic-loading "(fboundp 'module-load)"
 		sqlite "(sqlite-available-p)"
 	)
 
 	for (( i=0; i<${#feat[@]}; i+=2 )); do
-		if [[ $(${EMACS} ${EMACSFLAGS} --eval "(princ ${feat[i+1]})") != t ]]
-		then
-			eerror "${CATEGORY}/${PN} needs ${feat[i]} support in Emacs."
-			eerror "Emerge app-editors/emacs with USE=\"${feat[i]}\"."
-			die "Missing ${feat[i]} support"
-		fi
+		[[ $(${EMACS} ${EMACSFLAGS} --eval "(princ ${feat[i+1]})") = t ]] \
+			|| missing+="${missing:+ }${feat[i]}"
 	done
+	if [[ -n ${missing} ]]; then
+		eerror "${CATEGORY}/${PN} needs ${missing// / and } support in Emacs"
+		eerror "Emerge app-editors/emacs with USE=\"${missing}\""
+		die "Emacs misses at least one feature"
+	fi
 }
 
 src_compile() {