[gentoo-commits] proj/kde:master commit in: kde-apps/kaccounts-integration/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     a1102d5120d2bbbe084672c54827c1da00cf54a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 21:43:06 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 20:22:53 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1102d51

kde-apps/kaccounts-integration: Drop IUSE qt5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kaccounts-integration-24.12.49.9999.ebuild     | 54 +++-------------------
 .../kaccounts-integration-9999.ebuild              | 54 +++-------------------
 2 files changed, 14 insertions(+), 94 deletions(-)

diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-24.12.49.9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-24.12.49.9999.ebuild
index 952d0ec4e3..b6bef5dd4c 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-24.12.49.9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-24.12.49.9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_TEST="forceoptional"
-KF5MIN=5.115.0
 KFMIN=6.7.0
 PVCUT=$(ver_cut 1-3)
-QT5MIN=5.15.12
 QTMIN=6.7.2
 VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org multibuild
+inherit ecm gear.kde.org
 
 DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
 HOMEPAGE="https://community.kde.org/KTp"
@@ -18,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 SLOT="6"
 KEYWORDS=""
-IUSE="qt5"
+IUSE=""
 
 # bug #549444
 RESTRICT="test"
@@ -32,27 +30,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=net-libs/accounts-qt-1.17[qt5(-)?,qt6(+)]
-	>=net-libs/signond-8.61-r100[qt5(-)?,qt6(+)]
-	qt5? (
-		>=dev-qt/qtdeclarative-${QT5MIN}:5
-		>=dev-qt/qtgui-${QT5MIN}:5
-		>=dev-qt/qtwidgets-${QT5MIN}:5
-		>=kde-frameworks/kconfig-${KF5MIN}:5
-		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
-		>=kde-frameworks/kdbusaddons-${KF5MIN}:5
-		>=kde-frameworks/ki18n-${KF5MIN}:5
-		>=kde-frameworks/kio-${KF5MIN}:5
-		>=kde-frameworks/kwallet-${KF5MIN}:5
-	)
+	>=net-libs/accounts-qt-1.17-r2
+	>=net-libs/signond-8.61-r102
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/qcoro
 	>=kde-frameworks/kcmutils-${KFMIN}:6
-	qt5? (
-		dev-libs/qcoro5
-		>=kde-frameworks/kcmutils-${KF5MIN}:5
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	kde-apps/signon-kwallet-extension:6
@@ -60,30 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="sys-devel/gettext"
 PDEPEND=">=kde-apps/kaccounts-providers-${PVCUT}:6"
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) default )
-}
-
 src_configure() {
-	my_src_configure() {
-		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
-			local mycmakeargs=( -DKF6_COMPAT_BUILD=ON )
-		fi
-
-		ecm_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant ecm_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant ecm_src_install
+	local mycmakeargs=( -DKF6_COMPAT_BUILD=OFF )
+	ecm_src_configure
 }

diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
index ac64a15b23..3d15ecc53e 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_TEST="forceoptional"
-KF5MIN=5.115.0
 KFMIN=6.9.0
 PVCUT=$(ver_cut 1-3)
-QT5MIN=5.15.12
 QTMIN=6.7.2
 VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org multibuild
+inherit ecm gear.kde.org
 
 DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
 HOMEPAGE="https://community.kde.org/KTp"
@@ -18,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 SLOT="6"
 KEYWORDS=""
-IUSE="qt5"
+IUSE=""
 
 # bug #549444
 RESTRICT="test"
@@ -32,27 +30,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=net-libs/accounts-qt-1.17[qt5(-)?,qt6(+)]
-	>=net-libs/signond-8.61-r100[qt5(-)?,qt6(+)]
-	qt5? (
-		>=dev-qt/qtdeclarative-${QT5MIN}:5
-		>=dev-qt/qtgui-${QT5MIN}:5
-		>=dev-qt/qtwidgets-${QT5MIN}:5
-		>=kde-frameworks/kconfig-${KF5MIN}:5
-		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
-		>=kde-frameworks/kdbusaddons-${KF5MIN}:5
-		>=kde-frameworks/ki18n-${KF5MIN}:5
-		>=kde-frameworks/kio-${KF5MIN}:5
-		>=kde-frameworks/kwallet-${KF5MIN}:5
-	)
+	>=net-libs/accounts-qt-1.17-r2
+	>=net-libs/signond-8.61-r102
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/qcoro
 	>=kde-frameworks/kcmutils-${KFMIN}:6
-	qt5? (
-		dev-libs/qcoro5
-		>=kde-frameworks/kcmutils-${KF5MIN}:5
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	kde-apps/signon-kwallet-extension:6
@@ -60,30 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="sys-devel/gettext"
 PDEPEND=">=kde-apps/kaccounts-providers-${PVCUT}:6"
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) default )
-}
-
 src_configure() {
-	my_src_configure() {
-		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
-			local mycmakeargs=( -DKF6_COMPAT_BUILD=ON )
-		fi
-
-		ecm_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant ecm_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant ecm_src_install
+	local mycmakeargs=( -DKF6_COMPAT_BUILD=OFF )
+	ecm_src_configure
 }