public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive-common/
@ 2024-08-26  6:34 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-08-26  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     715cf47f3990e9859afbc02ac8ceaa066022946a
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: Mon Aug 26 06:33:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715cf47f

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.05.2.ebuild | 5 ++++-
 kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
index 732c572a03e6..ebca41bc6d18 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.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-24.08.0.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild
index 732c572a03e6..ebca41bc6d18 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive-common/
@ 2024-08-31 21:19 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-08-31 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     4cea38bf9672932f0f76510e038ea080a9dc788f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 21:13:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:13:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cea38bf

kde-misc/kio-gdrive-common: Stabilize 24.05.2 amd64, #934478

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
index ebca41bc6d18..4bea6854cbdc 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
@@ -16,7 +16,7 @@ inherit ecm-common gear.kde.org
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	!<kde-misc/kio-gdrive-23.08.5-r2:5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive-common/
@ 2024-09-01 19:36 Arthur Zamarin
  0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-09-01 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     69d5e847255e50c1d4d93d44773973184be34f0f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 19:34:02 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 19:34:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d5e847

kde-misc/kio-gdrive-common: Stabilize 24.05.2 arm64, #934478

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
index 4bea6854cbdc..8cd7e701394b 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
@@ -16,7 +16,7 @@ inherit ecm-common gear.kde.org
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	!<kde-misc/kio-gdrive-23.08.5-r2:5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive-common/
@ 2024-11-09 11:53 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-11-09 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4d6c7d4b5c5318a5ec5d541fa5aa143758834205
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 11:22:25 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 11:52:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6c7d4b

kde-misc/kio-gdrive-common: Cleanup KF5-compat remnants

Amends ce1293d2437263ef7ce8d54c00114197786af0f8

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

 kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.1.ebuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.1.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.1.ebuild
index 3dc5cfddea98..a8422e9e5d12 100644
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.1.ebuild
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.1.ebuild
@@ -6,8 +6,6 @@ EAPI=8
 ECM_HANDBOOK="true"
 KDE_ORG_CATEGORY="network"
 KDE_ORG_NAME="${PN/-common/}"
-KF5_BDEPEND=( "kde-apps/kaccounts-integration:6[qt5(-)]" )
-KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
 inherit ecm-common gear.kde.org
 
 LICENSE="GPL-2+"
@@ -18,16 +16,13 @@ RDEPEND="
 	!<kde-misc/kio-gdrive-23.08.5-r2:5
 	!<kde-misc/kio-gdrive-24.05.2-r1:6
 "
+BDEPEND="kde-apps/kaccounts-integration:6"
 
 ECM_INSTALL_FILES=(
 	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
 	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
 )
 
-ecm-common-check_deps() {
-	return $(has_version -b "kde-apps/kaccounts-integration:6")
-}
-
 ecm-common_inject_heredoc() {
 	cat >> CMakeLists.txt <<- _EOF_ || die
 		find_package(KAccounts6 REQUIRED)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-11-09 11:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-09 11:53 [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive-common/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-09-01 19:36 Arthur Zamarin
2024-08-31 21:19 Sam James
2024-08-26  6:34 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox