From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kaccounts-integration/
Date: Tue, 19 Dec 2023 22:00:59 +0000 (UTC) [thread overview]
Message-ID: <1703021883.8d2ed19804df1fca7c2384299cddaa1ca2430ea2.asturm@gentoo> (raw)
commit: 8d2ed19804df1fca7c2384299cddaa1ca2430ea2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 21:38:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 21:38:03 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d2ed198
kde-apps/kaccounts-integration: Add IUSE qt5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kaccounts-integration-9999.ebuild | 55 ++++++++++++++++++++--
1 file changed, 51 insertions(+), 4 deletions(-)
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
index f9bb76b5e2..d0fe2fa698 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
@@ -4,10 +4,12 @@
EAPI=8
ECM_TEST="forceoptional"
+KF5MIN=5.106.0
KFMIN=5.246.0
+QT5MIN=5.15.9
QTMIN=6.6.0
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org
+inherit ecm gear.kde.org multibuild
DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
HOMEPAGE="https://community.kde.org/KTp"
@@ -15,7 +17,7 @@ HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
SLOT="6"
KEYWORDS=""
-IUSE=""
+IUSE="qt5"
# bug #549444
RESTRICT="test"
@@ -31,13 +33,29 @@ COMMON_DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kpackage-${KFMIN}:6
>=kde-frameworks/kwallet-${KFMIN}:6
- >=net-libs/accounts-qt-1.16-r1[qt6]
- >=net-libs/signond-8.61-r1[qt6]
+ >=net-libs/accounts-qt-1.16-r1[qt5?,qt6]
+ >=net-libs/signond-8.61-r1[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/kdeclarative-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kwallet-${KF5MIN}:5
+ )
"
DEPEND="${COMMON_DEPEND}
dev-libs/qcoro
>=kde-frameworks/kcmutils-${KFMIN}:6
kde-plasma/kde-cli-tools:*
+ qt5? (
+ dev-libs/qcoro5
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ )
"
# KAccountsMacros.cmake needs intltool
RDEPEND="${COMMON_DEPEND}
@@ -46,4 +64,33 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="
>=kde-frameworks/kpackage-${KFMIN}:6
sys-devel/gettext
+ qt5? ( >=kde-frameworks/kpackage-${KF5MIN}:5 )
"
+
+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
+}
next reply other threads:[~2023-12-19 22:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 22:00 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-07 20:24 [gentoo-commits] proj/kde:master commit in: kde-apps/kaccounts-integration/ Andreas Sturmlechner
2024-11-09 11:42 Andreas Sturmlechner
2024-10-04 21:55 Andreas Sturmlechner
2024-07-01 19:10 Andreas Sturmlechner
2024-07-01 19:10 Andreas Sturmlechner
2024-02-25 20:12 Sam James
2023-09-14 19:43 Andreas Sturmlechner
2022-12-24 23:48 Andreas Sturmlechner
2020-03-19 0:00 Andreas Sturmlechner
2019-08-06 13:04 Michael Palimaka
2018-10-23 18:52 Andreas Sturmlechner
2017-12-25 10:30 Michael Palimaka
2016-04-07 15:15 Michael Palimaka
2016-03-25 17:14 Michael Palimaka
2016-02-25 9:11 Michael Palimaka
2015-12-29 12:48 Michael Palimaka
2015-10-19 18:21 Michael Palimaka
2015-10-08 13:07 Michael Palimaka
2015-10-08 13:07 Michael Palimaka
2015-08-28 11:58 Johannes Huber
2015-08-28 11:39 Johannes Huber
2015-08-28 11:39 Johannes Huber
2015-08-28 11:39 Johannes Huber
2015-08-28 11:08 Johannes Huber
2015-06-12 18:29 Michael Palimaka
2015-06-12 18:29 Michael Palimaka
2015-06-03 21:05 Johannes Huber
2015-05-23 16:13 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1703021883.8d2ed19804df1fca7c2384299cddaa1ca2430ea2.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox