commit: b47f4d80795cac60305f1c0da7d138e5ada6b803 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 8 10:56:40 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=b47f4d80
net-libs/accounts-qt: fix multibuild Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/accounts-qt/accounts-qt-9999.ebuild | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/net-libs/accounts-qt/accounts-qt-9999.ebuild b/net-libs/accounts-qt/accounts-qt-9999.ebuild index 8147971f05..1cdc4f1adb 100644 --- a/net-libs/accounts-qt/accounts-qt-9999.ebuild +++ b/net-libs/accounts-qt/accounts-qt-9999.ebuild @@ -21,6 +21,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io"; LICENSE="LGPL-2.1" SLOT="0" IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" # dbus problems RESTRICT="test" @@ -79,10 +80,14 @@ src_prepare() { sed -e '/^SUBDIRS/s/tests//' \ -i accounts-qt.pro || die "couldn't disable tests" fi + + multibuild_copy_sources } src_configure() { my_src_configure() { + cd "${BUILD_DIR}" || die + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) else @@ -94,9 +99,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 }
