[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

["Sam James" <sam@gentoo.org>]

commit:     4d72e5b0e08226161feff394b585d1e1b8e6ea01
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 20:48:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 20:49:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d72e5b0

net-irc/quassel: fix unused warnings

They're unused in some cases.

Closes: https://bugs.gentoo.org/830708
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 15 +++++++++++----
 net-irc/quassel/quassel-9999.ebuild      | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index f25fed0bc1d5..d6aa1c14902d 100644
--- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
@@ -99,19 +99,26 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake_use_find_package snorenotify LibsnoreQt5)
-		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
+	if use X || use monolithic ; then
+		# We can't always pass these (avoid "unused" warning)
+		# bug #830708
+		mycmakeargs+=(
+			$(cmake_use_find_package dbus dbusmenu-qt5)
+			$(cmake_use_find_package dbus Qt5DBus)
+			$(cmake_use_find_package snorenotify LibsnoreQt5)
+			$(cmake_use_find_package spell KF5Sonnet)
+		)
+	fi
+
 	if use server || use monolithic ; then
 		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index d4dca6dc95f1..b00f930b98b5 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -95,19 +95,26 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake_use_find_package snorenotify LibsnoreQt5)
-		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
+	if use X || use monolithic ; then
+		# We can't always pass these (avoid "unused" warning)
+		# bug #830708
+		mycmakeargs+=(
+			$(cmake_use_find_package dbus dbusmenu-qt5)
+			$(cmake_use_find_package dbus Qt5DBus)
+			$(cmake_use_find_package snorenotify LibsnoreQt5)
+			$(cmake_use_find_package spell KF5Sonnet)
+		)
+	fi
+
 	if use server || use monolithic ; then
 		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi