gentoo auto-resync : 15:02:2024 - 23:36:26

5 files changed, 62 insertions, 2 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 46d49be8dec8..93d93fb4c03a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/joplin-desktop/Manifest b/app-office/joplin-desktop/Manifest
index 4b7788080c93..1334b4bc8e9d 100644
--- a/app-office/joplin-desktop/Manifest
+++ b/app-office/joplin-desktop/Manifest
@@ -3,7 +3,7 @@ DIST Joplin-2.13.13.AppImage 210904202 BLAKE2B cb2496524cfa0510da5046f74f87a59cf
 DIST Joplin-2.13.15.AppImage 210896525 BLAKE2B 3474dc12fa083ff4d56e0c64343def5171dd7b739c845c2a3ade562de7ae63d3d79a434611d00b0763f43e2a97281f989128c1fdf5ca5acb64f3e8bdd9cbc7f8 SHA512 d5fc3eee37f506aabb131b14e61ce459602d9c80da61b63ef07a849987cce5ff59af913000ac27baad8e3af637ca6cb28ad4ecaea523b24b4aac1a8b0df76493
 DIST Joplin-2.14.11.AppImage 247754522 BLAKE2B c39b87ca790b41d30c505b1001b75b442790c314cfd1340e2a6c1df7fa9d83505a9664d9fa57f30f7d2dd4dd23e2e04abad3bced978023203e2d9de773aac1a6 SHA512 1f2ed8d9ca6c83d86e09eb039b7d200c926e6ccd02e3db0f1e276640204bf5d6cc2df511b302fcf8b28edcff8f3534b0d52d051439f4275ce1b8f6a55fa5ad78
 EBUILD joplin-desktop-2.13.12.ebuild 2370 BLAKE2B c31b3c291b6f68af1e6fc7857d696c0fb887fbb0a569351bd988e3aed51fc53649df0adb6ec74df71632dcbad718f36be945097507ed4003f2102d7f619e8a3f SHA512 6091bf7ca2898bf48bc15a9e4f004ff39c5b4546c3f39c390aa6a026603c1ac51d53568f71bc4df13252ebee23f7d8ef99da51013edaaeeec0bf03ba692d0eec
-EBUILD joplin-desktop-2.13.13.ebuild 2371 BLAKE2B 75f8638b02d789e48e0ab968aa862886478dfb8da8025ce1bb5ed014e6b0076c2dd1228c048ed0ee784310549a688096060446c7063e61a3057ef5d1a1ea7833 SHA512 f745f089a455cc3cf92a2ab4a1c443727002666ec951d0d47341899e852ec3c90334a1645a21d866ec105f9a953f2a8bab99c8f4b591ce577a6ecb55d11d782a
+EBUILD joplin-desktop-2.13.13.ebuild 2370 BLAKE2B c31b3c291b6f68af1e6fc7857d696c0fb887fbb0a569351bd988e3aed51fc53649df0adb6ec74df71632dcbad718f36be945097507ed4003f2102d7f619e8a3f SHA512 6091bf7ca2898bf48bc15a9e4f004ff39c5b4546c3f39c390aa6a026603c1ac51d53568f71bc4df13252ebee23f7d8ef99da51013edaaeeec0bf03ba692d0eec
 EBUILD joplin-desktop-2.13.15.ebuild 2371 BLAKE2B 75f8638b02d789e48e0ab968aa862886478dfb8da8025ce1bb5ed014e6b0076c2dd1228c048ed0ee784310549a688096060446c7063e61a3057ef5d1a1ea7833 SHA512 f745f089a455cc3cf92a2ab4a1c443727002666ec951d0d47341899e852ec3c90334a1645a21d866ec105f9a953f2a8bab99c8f4b591ce577a6ecb55d11d782a
 EBUILD joplin-desktop-2.14.11.ebuild 2371 BLAKE2B 75f8638b02d789e48e0ab968aa862886478dfb8da8025ce1bb5ed014e6b0076c2dd1228c048ed0ee784310549a688096060446c7063e61a3057ef5d1a1ea7833 SHA512 f745f089a455cc3cf92a2ab4a1c443727002666ec951d0d47341899e852ec3c90334a1645a21d866ec105f9a953f2a8bab99c8f4b591ce577a6ecb55d11d782a
 MISC metadata.xml 755 BLAKE2B 2f95bccd9fb7bf21b253a524950c4775273c2d1911ebf4b90a392f8c2c7f38e986af0fbd217287595ba39a684609d8df6f275e146388aa0331169e51ba6fc823 SHA512 b62f1dfc822413386115305900866f6cf16fc2071425d2f0f515f537a29bf282d65c31b7f59ccf9187280456eb759a5fcce7340fb983ff0f50413c649c8fc1d0
diff --git a/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild b/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild
index a9c365263d83..8178f87f501f 100644
--- a/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild
+++ b/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist"
 
 RDEPEND="
diff --git a/app-office/merkuro/Manifest b/app-office/merkuro/Manifest
index 53b627893f0c..7f5b12a7c15b 100644
--- a/app-office/merkuro/Manifest
+++ b/app-office/merkuro/Manifest
@@ -1,3 +1,5 @@
 DIST merkuro-23.08.4.tar.xz 981940 BLAKE2B e5cd7b057cfa143a1f90e0f2c3359bbdc10bdf2dca5c5ec397db140b9c7e298d32888a86158e9f60ae10f6e51978efd4df4d8c295166bda642d377a687d145dc SHA512 efa4fd461dff049799412578b4b29999987fb81c10b4a5b8e3404e5d488be386936daf41ce9fd43e9c57c98eb00a3a6e2ea60d02e9e08df5305d61f17a9efbec
+DIST merkuro-23.08.5.tar.xz 981888 BLAKE2B 26c93d9663b11f2221c62bab467e11c5938b11c34c21074688e3ad654d9e0d203d0f01cb76d07c629a9193e1481bef873f0cee0b6643b903747369b5e71cc13a SHA512 d3ce8f149a890890548e87e06fe480798410efc137fb602e173fa96b15bcb568e58d5f7064cbdddcdc0eef309f847dae3e9f5f112bc96ce6bac4b9a98b0ea38e
 EBUILD merkuro-23.08.4.ebuild 1698 BLAKE2B a8c8257720ce92a09b2f02d84b73be8c0f903a1a5d421d14d01189aad2f8eaf97b283e8fa006352e1fcfd2f4e998751bed10edb682cfb48ef8fae8a6da080baf SHA512 696afad940d9e67e49d6e53016f48545bcc68bf622e328bd28a6f6b3b9d89ec13d0316b5b5612a8a992a02ee88cfd5b344b2b2e806f183f5eedb5b239e31cbd8
+EBUILD merkuro-23.08.5.ebuild 1708 BLAKE2B 0d63e052240ddf98a7f1be496ff6d122f5dbbf0c163c8292f6f65e9943019bfedc56100fb2edb9d7b20007d6d7e47911fdf31057a984fa236346977920a69646 SHA512 2aa21ddf097d22e55a9f05eddf30029e33e5c1fe0fd4b0a097a44573b0bd7c3767189937a7bb337a3fee5bff6a2dbedb2514fd99560885b1391d97192e494a76
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-office/merkuro/merkuro-23.08.5.ebuild b/app-office/merkuro/merkuro-23.08.5.ebuild
new file mode 100644
index 000000000000..4581abaf03be
--- /dev/null
+++ b/app-office/merkuro/merkuro-23.08.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar application using Akonadi"
+HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# All of the tests involve interacting with akonadi right now (as of 22.04)
+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
+"
+# 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
+"