public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/merkuro/
Date: Sun, 17 Dec 2023 12:04:35 +0000 (UTC)	[thread overview]
Message-ID: <1702814668.c5ef13acabaa6d53bdf72c6b86744b17b1a99510.sam@gentoo> (raw)

commit:     c5ef13acabaa6d53bdf72c6b86744b17b1a99510
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 21:34:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 12:04:28 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5ef13ac

app-office/merkuro: Port to KF6

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

 app-office/merkuro/merkuro-9999.ebuild | 62 ++++++++++++++++------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/app-office/merkuro/merkuro-9999.ebuild b/app-office/merkuro/merkuro-9999.ebuild
index 680605a913..a3cd63d41a 100644
--- a/app-office/merkuro/merkuro-9999.ebuild
+++ b/app-office/merkuro/merkuro-9999.ebuild
@@ -6,15 +6,15 @@ EAPI=8
 KDE_ORG_CATEGORY="pim"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Calendar application using Akonadi"
 HOMEPAGE="https://apps.kde.org/kalendar/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
@@ -23,36 +23,34 @@ RESTRICT="test"
 
 DEPEND="
 	app-crypt/gpgme:=[cxx]
-	>=dev-libs/kirigami-addons-0.7.2:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
 # qtlocation is needed at runtime only or fails to start
 RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtlocation-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtlocation-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 "


             reply	other threads:[~2023-12-17 12:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-17 12:04 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-23 15:46 [gentoo-commits] proj/kde:master commit in: app-office/merkuro/ Andreas Sturmlechner
2024-01-07 18:05 Andreas Sturmlechner
2024-02-25 21:34 Sam James
2024-05-18 18:16 Andreas Sturmlechner
2024-08-10 18:53 Andreas Sturmlechner
2024-08-11  6:58 Andreas Sturmlechner
2024-11-11 17:13 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=1702814668.c5ef13acabaa6d53bdf72c6b86744b17b1a99510.sam@gentoo \
    --to=sam@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