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

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

commit:     ea4b2a9841623743a83cd7106d68d19af1dbf1f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 05:43:57 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 12:04:31 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea4b2a98

net-libs/signon-oauth2: drop multibuild

We can't build plugins for both qt5 + qt6, so only build one, and depend
on the corresponding qt version in net-libs/signond.

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

 net-libs/signon-oauth2/signon-oauth2-9999.ebuild | 40 +++++++++---------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
index be93637379..e0f72c6c28 100644
--- a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MY_PN=signon-plugin-oauth2
 MY_PV=VERSION_${PV}
 MY_P=${MY_PN}-${MY_PV}
-inherit qmake-utils multibuild
+inherit qmake-utils
 
 if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/nicolasfella/${MY_PN}.git/"
@@ -24,6 +24,7 @@ HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,9 +33,10 @@ RDEPEND="
 		dev-qt/qtnetwork:5[ssl]
 	)
 	qt6? ( dev-qt/qtbase:6[network,ssl] )
-	>=net-libs/signond-8.61-r1[qt5?,qt6?]
+	>=net-libs/signond-8.61-r1[qt5=,qt6=]
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	test? (
 		qt5? ( dev-qt/qttest:5 )
 		qt6? ( dev-qt/qtbase:6[test] )
@@ -48,36 +50,24 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.25-drop-fno-rtti.patch"
 )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
 src_prepare() {
 	default
 	sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die
 }
 
 src_configure() {
-	my_src_configure() {
-		local myqmakeargs=(
-			LIBDIR=/usr/$(get_libdir)
-		)
-		use test || myqmakeargs+=( CONFIG+=nomake_tests )
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			eqmake6 "${myqmakeargs[@]}"
-		else
-			eqmake5 "${myqmakeargs[@]}"
-		fi
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
+	local myqmakeargs=(
+		LIBDIR=/usr/$(get_libdir)
+	)
+	use test || myqmakeargs+=( CONFIG+=nomake_tests )
 
-src_compile() {
-	multibuild_foreach_variant default
+	if use qt6 ; then
+		eqmake6 "${myqmakeargs[@]}"
+	else
+		eqmake5 "${myqmakeargs[@]}"
+	fi
 }
 
 src_install() {
-	multibuild_foreach_variant emake INSTALL_ROOT="${D}" install
+	emake INSTALL_ROOT="${D}" install
 }