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/
Date: Wed, 28 Feb 2024 09:09:08 +0000 (UTC)	[thread overview]
Message-ID: <1709111331.02225dc1f8b3f27ac232d08d3e6397697d19cd6a.asturm@gentoo> (raw)

commit:     02225dc1f8b3f27ac232d08d3e6397697d19cd6a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 08:51:30 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 09:08:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=02225dc1

kde-misc/kio-gdrive: Port 24.02 to KF6, block kio-gdrive:5[-kf6compat(-)]

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

 kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild      | 33 ++++++++++------------
 .../kio-gdrive/kio-gdrive-24.02.49.9999.ebuild     | 33 ++++++++++------------
 kde-misc/kio-gdrive/kio-gdrive-9999.ebuild         |  1 +
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild
index 5ff81ded0f..3987cb040e 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.0.ebuild
@@ -6,37 +6,34 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
 KDE_ORG_CATEGORY="network"
-KFMIN=5.113.0
-QTMIN=5.15.9
+KFMIN=6.0
+QTMIN=6.6.2
 inherit ecm gear.kde.org
 
 DESCRIPTION="KIO worker for Google Drive service"
 HOMEPAGE="https://apps.kde.org/kio_gdrive/"
 
 LICENSE="GPL-2+"
-SLOT="5"
+SLOT="6"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+share"
 
 COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	|| (
-		kde-apps/kaccounts-integration:6[qt5]
-		kde-apps/kaccounts-integration:5
-	)
-	kde-apps/libkgapi:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	kde-apps/kaccounts-integration:6
+	kde-apps/libkgapi:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtbase-${QTMIN}:6[network]
 "
 RDEPEND="${COMMON_DEPEND}
-	kde-apps/kaccounts-providers:5
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	kde-apps/kaccounts-providers:6
 "
 BDEPEND="dev-util/intltool"
 
@@ -44,7 +41,7 @@ DOCS=( README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package share KF6Purpose)
 	)
 	ecm_src_configure
 }

diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild
index 5ac41e8993..5e755dc696 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.02.49.9999.ebuild
@@ -6,37 +6,34 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
 KDE_ORG_CATEGORY="network"
-KFMIN=5.113.0
-QTMIN=5.15.9
+KFMIN=5.249.0
+QTMIN=6.6.2
 inherit ecm gear.kde.org
 
 DESCRIPTION="KIO worker for Google Drive service"
 HOMEPAGE="https://apps.kde.org/kio_gdrive/"
 
 LICENSE="GPL-2+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="+share"
 
 COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	|| (
-		kde-apps/kaccounts-integration:6[qt5]
-		kde-apps/kaccounts-integration:5
-	)
-	kde-apps/libkgapi:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	kde-apps/kaccounts-integration:6
+	kde-apps/libkgapi:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtbase-${QTMIN}:6[network]
 "
 RDEPEND="${COMMON_DEPEND}
-	kde-apps/kaccounts-providers:5
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	kde-apps/kaccounts-providers:6
 "
 BDEPEND="dev-util/intltool"
 
@@ -44,7 +41,7 @@ DOCS=( README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package share KF6Purpose)
 	)
 	ecm_src_configure
 }

diff --git a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild
index f246113cc4..5e755dc696 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtbase-${QTMIN}:6[network]
 "
 RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 	kde-apps/kaccounts-providers:6
 "
 BDEPEND="dev-util/intltool"


             reply	other threads:[~2024-02-28  9:09 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-28  9:09 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-16 23:10 [gentoo-commits] proj/kde:master commit in: kde-misc/kio-gdrive/ Andreas Sturmlechner
2024-08-21 21:47 Andreas Sturmlechner
2024-08-18 22:30 Andreas Sturmlechner
2024-04-21 19:42 Andreas Sturmlechner
2024-02-28 10:33 Andreas Sturmlechner
2024-02-27 22:28 Sam James
2024-02-26 19:59 Andreas Sturmlechner
2024-01-07 17:13 Andreas Sturmlechner
2024-01-07 13:26 Andreas Sturmlechner
2023-12-19 22:00 Andreas Sturmlechner
2022-07-21 10:23 Andreas Sturmlechner
2022-03-24 14:53 Andreas Sturmlechner
2021-04-15 20:03 Andreas Sturmlechner
2021-02-15 14:39 Andreas Sturmlechner
2020-10-26 13:56 Andreas Sturmlechner
2020-07-18  8:57 Andreas Sturmlechner
2020-07-01 10:03 Andreas Sturmlechner
2020-04-23 13:59 Andreas Sturmlechner
2020-03-23 23:47 Andreas Sturmlechner
2020-03-23 23:47 Andreas Sturmlechner
2020-02-23 13:27 Andreas Sturmlechner
2019-08-25 15:58 Andreas Sturmlechner
2019-05-19 19:12 Andreas Sturmlechner
2018-03-30 22:41 Andreas Sturmlechner
2017-10-19 19:03 Andreas Sturmlechner
2017-10-19 18:54 Andreas Sturmlechner
2017-09-03 11:34 Andreas Sturmlechner
2017-05-31 18:44 Andreas Sturmlechner
2017-05-27 15:03 Andreas Sturmlechner
2017-01-26 14:33 Michael Palimaka
2016-10-08 17:55 Michael Palimaka
2016-10-08 17:40 Michael Palimaka
2016-10-08 17:40 Michael Palimaka
2016-10-08 17:40 Michael Palimaka
2016-10-08 17:40 Michael Palimaka
2016-10-06 14:17 Michael Palimaka
2016-10-02 17:30 Michael Palimaka
2016-08-21 20:22 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=1709111331.02225dc1f8b3f27ac232d08d3e6397697d19cd6a.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