diff --git a/app-office/kalendar/Manifest b/app-office/merkuro/Manifest similarity index 100% rename from app-office/kalendar/Manifest rename to app-office/merkuro/Manifest diff --git a/app-office/kalendar/kalendar-23.04.3.ebuild b/app-office/merkuro/merkuro-23.04.3.ebuild similarity index 98% rename from app-office/kalendar/kalendar-23.04.3.ebuild rename to app-office/merkuro/merkuro-23.04.3.ebuild index 388e6c0130d3f..9d1f618d4a6e1 100644 --- a/app-office/kalendar/kalendar-23.04.3.ebuild +++ b/app-office/merkuro/merkuro-23.04.3.ebuild @@ -4,6 +4,7 @@ EAPI=8 KDE_ORG_CATEGORY="pim" +KDE_ORG_NAME="kalendar" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-3) KFMIN=5.106.0 diff --git a/app-office/kalendar/kalendar-23.08.2.ebuild b/app-office/merkuro/merkuro-23.08.2.ebuild similarity index 98% rename from app-office/kalendar/kalendar-23.08.2.ebuild rename to app-office/merkuro/merkuro-23.08.2.ebuild index 4604775f9e5f9..8b487b27f20c6 100644 --- a/app-office/kalendar/kalendar-23.08.2.ebuild +++ b/app-office/merkuro/merkuro-23.08.2.ebuild @@ -4,7 +4,6 @@ EAPI=8 KDE_ORG_CATEGORY="pim" -KDE_ORG_NAME="merkuro" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-3) KFMIN=5.106.0 diff --git a/app-office/kalendar/metadata.xml b/app-office/merkuro/metadata.xml similarity index 100% rename from app-office/kalendar/metadata.xml rename to app-office/merkuro/metadata.xml diff --git a/kde-apps/kdepim-meta/kdepim-meta-23.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-23.04.3.ebuild index d6cdbcba1b0c3..9a5c955ec5376 100644 --- a/kde-apps/kdepim-meta/kdepim-meta-23.04.3.ebuild +++ b/kde-apps/kdepim-meta/kdepim-meta-23.04.3.ebuild @@ -12,7 +12,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~x86" IUSE="bogofilter clamav spamassassin" RDEPEND=" - >=app-office/kalendar-${PV}:${SLOT} + >=app-office/merkuro-${PV}:${SLOT} >=kde-apps/akonadi-${PV}:${SLOT} >=kde-apps/akonadiconsole-${PV}:${SLOT} >=kde-apps/akonadi-calendar-${PV}:${SLOT} diff --git a/kde-apps/kdepim-meta/kdepim-meta-23.08.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-23.08.2.ebuild index c4559438b9df0..cce01c031649d 100644 --- a/kde-apps/kdepim-meta/kdepim-meta-23.08.2.ebuild +++ b/kde-apps/kdepim-meta/kdepim-meta-23.08.2.ebuild @@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="bogofilter clamav spamassassin" RDEPEND=" - >=app-office/kalendar-${PV}:${SLOT} + >=app-office/merkuro-${PV}:${SLOT} >=kde-apps/akonadi-${PV}:${SLOT} >=kde-apps/akonadiconsole-${PV}:${SLOT} >=kde-apps/akonadi-calendar-${PV}:${SLOT} diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask index 39e48f0b998ec..032af55695375 100644 --- a/profiles/arch/amd64/x32/package.mask +++ b/profiles/arch/amd64/x32/package.mask @@ -63,7 +63,7 @@ app-doc/zeal app-editors/ghostwriter app-editors/retext app-misc/anki -app-office/kalendar:5 +app-office/merkuro app-office/kmymoney:5 app-office/skrooge:5 app-office/texmaker diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask index 5bcf186478611..fb2cb8588f447 100644 --- a/profiles/arch/arm/package.mask +++ b/profiles/arch/arm/package.mask @@ -13,7 +13,7 @@ app-doc/zeal app-editors/ghostwriter app-editors/retext app-misc/anki -app-office/kalendar:5 +app-office/merkuro app-office/kmymoney:5 app-office/skrooge:5 app-office/texmaker diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask index e15ff225dc34e..79eec835b81eb 100644 --- a/profiles/arch/x86/package.mask +++ b/profiles/arch/x86/package.mask @@ -13,7 +13,7 @@ app-doc/zeal app-editors/ghostwriter app-editors/retext app-misc/anki -app-office/kalendar:5 +app-office/merkuro app-office/kmymoney:5 app-office/skrooge:5 app-office/texmaker diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023 index a72fa0f84d1bf..7e8c67a0577d1 100644 --- a/profiles/updates/4Q-2023 +++ b/profiles/updates/4Q-2023 @@ -18,3 +18,4 @@ move dev-python/py-amqp dev-python/amqp move dev-python/pyre2 dev-python/fb-re2 move dev-python/python-sshpubkeys dev-python/sshpubkeys move sys-kernel/installkernel-systemd-boot sys-kernel/installkernel-systemd +move app-office/kalendar app-office/merkuro