summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2023-11-09 13:16:52 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2023-11-09 13:16:52 +0000
commitaa5f6a998d8a54aad760d2efef1fbc648d7d349e (patch)
treef02ffe2975980b24ddbd329f3ddcb61be354deff /profiles
parent2023-11-09 12:46:54 UTC (diff)
parentsys-libs/kpmcore: drop 23.08.2 (diff)
downloadgentoo-aa5f6a998d8a54aad760d2efef1fbc648d7d349e.tar.gz
gentoo-aa5f6a998d8a54aad760d2efef1fbc648d7d349e.tar.bz2
gentoo-aa5f6a998d8a54aad760d2efef1fbc648d7d349e.zip
Merge updates from master
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/amd64/x32/package.mask2
-rw-r--r--profiles/arch/arm/package.mask2
-rw-r--r--profiles/arch/x86/package.mask2
-rw-r--r--profiles/updates/4Q-20231
4 files changed, 4 insertions, 3 deletions
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 39e48f0b998e..032af5569537 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 5bcf18647861..fb2cb8588f44 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 e15ff225dc34..79eec835b81e 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 a72fa0f84d1b..7e8c67a0577d 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