gentoo auto-resync : 04:01:2025 - 06:31:29

2 files changed, 13 insertions, 66 deletions

diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 7b916f6ababc..e4221a623575 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -12,5 +12,5 @@ AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c211
 AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
 AUX signond-8.61-consistent-paths.patch 11609 BLAKE2B 2ad71837dfd949b79b7a5e9501567027b552860be43d94176c19df7a551835e4f5cd00c7661ace881416a38faa61f6aa09c1dfff7ab1b56a063445c701fbf930 SHA512 7869361c25766fbbb2973cae38251c85d19a15fb0bb7c1c5d578c792c50e7b16006ecff889fb6a47d5c7ef9ebbaa2ec029859373e1ddbf19456ad4f56c77f839
 DIST signond-8.61.tar.bz2 203066 BLAKE2B 2f78e08143d346777ab3517ef6b76b54ab1b17efa6d15b2c5a16487c2e11f38c88cb2820bff8dd04deb334d0c178c16bd061c0eba694c5edfb0e31411581648a SHA512 95e83bc672792ec10493f1f456788af7e8051ce0bed6b047b6b6f5fa9ac019dd3392063152930be49cf68d590567fd7467c544d642cc58624b1aabdc0b405258
-EBUILD signond-8.61-r101.ebuild 4172 BLAKE2B 309578bb52d8c53d0601b286bb84656223c4cdd6f2f3e0968b799198e5d628d8bdea910d25d7ef364ecdd946746702cde559a55bba0963ef998790e8636abf2c SHA512 1fb781cf81f5f30b7d3a4afb6fcfd7d3e1a845d4d3cc532b218e56263c7710ce2ab88b7b470b479aaa8d7e43ce9aebfdb2a38f6932a1245e5a31325382d96592
+EBUILD signond-8.61-r102.ebuild 3040 BLAKE2B 67837b5f7f4db2ebf98f42b13c65f0d46dfca987d6a0ef805180b2b39b4c029f6aa30c9144845688fbb4195238b525ca600c0a88db8275735f22869f0b875076 SHA512 e162ee33ba12b344baff9480f4ca1dc1a812d7cad13333910fd5f8ce0130f1ad6c0659e36ab3fbd96c99472186f26d90cc4becd5ed0c2d0c9e072be8d5c6a2a9
 MISC metadata.xml 402 BLAKE2B cbca0310ab027fc70e2c6f3c4fc84a4de8847d4899ed19e848796279c0b03b9ffcc59269487def4b3e6298adfb095a9cf3417a1c7bf083efa30a8894ecfa858f SHA512 1831ad67394a82c3839fb80196982f3252e2bc9c7cf116c782d731a7d315e97cc2e6a299e951f73f92d2a4598a33c7251d8a68c47102c6186344b61486a72515
diff --git a/net-libs/signond/signond-8.61-r101.ebuild b/net-libs/signond/signond-8.61-r102.ebuild
index fc2ba59a52dd..1c7706ad5d07 100644
--- a/net-libs/signond/signond-8.61-r101.ebuild
+++ b/net-libs/signond/signond-8.61-r102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qmake-utils multibuild
+inherit qmake-utils
 
 if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/nicolasfella/signond.git/"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${PN}-VERSION_${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Signon daemon for libaccounts-glib"
@@ -22,10 +22,7 @@ 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 test"
+IUSE="doc test"
 
 # tests are brittle; they all pass when stars align, bug 727666
 RESTRICT="test !test? ( test )"
@@ -33,24 +30,12 @@ RESTRICT="test !test? ( test )"
 RDEPEND="
 	dev-qt/qtbase:6[dbus,gui,network,sql]
 	net-libs/libproxy
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( qt5? ( dev-qt/qttest:5 ) )
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		app-text/doxygen[dot]
-		|| (
-			dev-qt/qttools:6[assistant]
-			dev-qt/qthelp:5
-		)
+		dev-qt/qttools:6[assistant]
 	)
 "
 
@@ -70,23 +55,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-8.61-consistent-paths.patch" # bug 701142
 )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) qt6 )
-}
-
 src_prepare() {
 	default
 
-	local qhelpgeneratorpath
-	if has_version "dev-qt/qttools:6[assistant]"; then
-		qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec"
-	elif has_version "dev-qt/qthelp:5"; then
-		qhelpgeneratorpath="$(qt5_get_bindir)"
-	else
-		eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)"
-	fi
-
-	sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \
+	sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libdir)/qt6/libexec/&|" \
 		-i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die
 
 	# install docs to correct location
@@ -102,43 +74,18 @@ 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)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			eqmake6 "${myqmakeargs[@]}"
-		else
-			eqmake5 "${myqmakeargs[@]}"
-		fi
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	my_src_compile() {
-		emake -C "${BUILD_DIR}"
-	}
-
-	multibuild_foreach_variant my_src_compile
+	local myqmakeargs=(
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR=$(get_libdir)
+	)
+	eqmake6 "${myqmakeargs[@]}"
 }
 
 src_install() {
-	my_src_install() {
-		emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install
-	}
-
-	multibuild_foreach_variant my_src_install
+	emake INSTALL_ROOT="${D}" install
 }
 
 pkg_postinst() {