public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/
Date: Mon, 26 Aug 2024 06:31:04 +0000 (UTC)	[thread overview]
Message-ID: <1724625373.b43132c812a75fd6bf4526aaf6874b4d4b45c525.asturm@gentoo> (raw)

commit:     b43132c812a75fd6bf4526aaf6874b4d4b45c525
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 22:34:34 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 22:36:13 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b43132c8

kde-misc/kio-gdrive-common: Accept kde-apps/kaccounts-integration:6[qt5]

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

 kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild | 5 ++++-
 kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild          | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
index f43aac9cdf..d2f0a8a641 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.49.9999.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 ECM_HANDBOOK="true"
 KDE_ORG_CATEGORY="network"
 KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF5_BDEPEND=( "|| (
+	kde-apps/kaccounts-integration:6[qt5]
+	kde-apps/kaccounts-integration:5
+)" )
 KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
 KFMIN=5.115.0
 inherit ecm-common gear.kde.org

diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
index f43aac9cdf..d2f0a8a641 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-9999.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 ECM_HANDBOOK="true"
 KDE_ORG_CATEGORY="network"
 KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:5" )
+KF5_BDEPEND=( "|| (
+	kde-apps/kaccounts-integration:6[qt5]
+	kde-apps/kaccounts-integration:5
+)" )
 KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
 KFMIN=5.115.0
 inherit ecm-common gear.kde.org


             reply	other threads:[~2024-08-26  6:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-26  6:31 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-09 11:42 [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive-common/ Andreas Sturmlechner
2024-09-09 14:39 Andreas Sturmlechner
2024-08-21 21:47 Andreas Sturmlechner

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=1724625373.b43132c812a75fd6bf4526aaf6874b4d4b45c525.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