[gentoo-commits] proj/kde:master commit in: net-libs/signond/

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

commit:     558bd85599f1bb0956529e1a734ba863b84aec2a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 10:50:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 12:04:30 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=558bd855

net-libs/signond: fix multibuild

The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252
1) the library is coinstallable for qt5/qt6
2) signond (the daemon) must be built for only one Qt version, matching the
Qt version of all consumer plugins.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/signond/signond-9999.ebuild | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/net-libs/signond/signond-9999.ebuild b/net-libs/signond/signond-9999.ebuild
index 5982a22663..1a9d0d7290 100644
--- a/net-libs/signond/signond-9999.ebuild
+++ b/net-libs/signond/signond-9999.ebuild
@@ -20,7 +20,12 @@ HOMEPAGE="https://gitlab.com/accounts-sso"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+# The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252
+# 1) the library is coinstallable for qt5/qt6
+# 2) signond (the daemon) must be built for only one Qt version, matching the
+# Qt version of all consumer plugins.
 IUSE="doc +qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
 
 # tests are brittle; they all pass when stars align, bug 727666
 RESTRICT="test !test? ( test )"
@@ -90,10 +95,14 @@ src_prepare() {
 
 	use test || sed -e '/^SUBDIRS/s/tests//' \
 		-i signon.pro || die "couldn't disable tests"
+
+	multibuild_copy_sources
 }
 
 src_configure() {
 	my_src_configure() {
+		cd "${BUILD_DIR}" || die
+
 		local myqmakeargs=(
 			PREFIX="${EPREFIX}"/usr
 			LIBDIR=$(get_libdir)
@@ -110,9 +119,17 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant default
+	my_src_compile() {
+		emake -C "${BUILD_DIR}"
+	}
+
+	multibuild_foreach_variant my_src_compile
 }
 
 src_install() {
-	multibuild_foreach_variant emake INSTALL_ROOT="${D}" install
+	my_src_install() {
+		emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install
+	}
+
+	multibuild_foreach_variant my_src_install
 }