From 5a2cecfc8661e1d3a762adf05cf8eb142cd41710 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 22 Dec 2024 06:30:44 +0000
Subject: gentoo auto-resync : 22:12:2024 - 06:30:44

---
 kde-apps/Manifest.gz                               | Bin 36361 -> 36414 bytes
 kde-apps/akonadi-calendar-tools-common/Manifest    |   2 +-
 ...akonadi-calendar-tools-common-24.12.0-r1.ebuild |  17 +++
 .../akonadi-calendar-tools-common-24.12.0.ebuild   |  17 ---
 kde-apps/akonadi-calendar/Manifest                 |   2 +-
 .../akonadi-calendar-24.12.0-r1.ebuild             |  49 +++++++++
 .../akonadi-calendar-24.12.0.ebuild                |  49 ---------
 kde-apps/akonadi-contacts/Manifest                 |   2 +-
 .../akonadi-contacts-24.12.0-r1.ebuild             |  45 ++++++++
 .../akonadi-contacts-24.12.0.ebuild                |  45 --------
 kde-apps/akonadi-import-wizard/Manifest            |   2 +-
 .../akonadi-import-wizard-24.12.0-r1.ebuild        |  42 ++++++++
 .../akonadi-import-wizard-24.12.0.ebuild           |  42 --------
 kde-apps/akonadi-mime/Manifest                     |   2 +-
 .../akonadi-mime/akonadi-mime-24.12.0-r1.ebuild    |  36 +++++++
 kde-apps/akonadi-mime/akonadi-mime-24.12.0.ebuild  |  36 -------
 kde-apps/akonadi-search/Manifest                   |   2 +-
 .../akonadi-search-24.12.0-r1.ebuild               |  54 ++++++++++
 .../akonadi-search/akonadi-search-24.12.0.ebuild   |  54 ----------
 kde-apps/akonadi/Manifest                          |   2 +-
 kde-apps/akonadi/akonadi-24.12.0-r1.ebuild         |  62 +++++++++++
 kde-apps/akonadi/akonadi-24.12.0.ebuild            |  62 -----------
 kde-apps/akonadiconsole/Manifest                   |   2 +-
 .../akonadiconsole-24.12.0-r1.ebuild               |  46 ++++++++
 .../akonadiconsole/akonadiconsole-24.12.0.ebuild   |  46 --------
 kde-apps/akregator/Manifest                        |   2 +-
 kde-apps/akregator/akregator-24.12.0-r1.ebuild     |  62 +++++++++++
 kde-apps/akregator/akregator-24.12.0.ebuild        |  62 -----------
 kde-apps/calendarjanitor/Manifest                  |   2 +-
 .../calendarjanitor-24.12.0-r1.ebuild              |  40 +++++++
 .../calendarjanitor/calendarjanitor-24.12.0.ebuild |  40 -------
 kde-apps/calendarsupport/Manifest                  |   2 +-
 .../calendarsupport-24.12.0-r1.ebuild              |  42 ++++++++
 .../calendarsupport/calendarsupport-24.12.0.ebuild |  42 --------
 kde-apps/eventviews/Manifest                       |   2 +-
 kde-apps/eventviews/eventviews-24.12.0-r1.ebuild   |  44 ++++++++
 kde-apps/eventviews/eventviews-24.12.0.ebuild      |  44 --------
 kde-apps/grantlee-editor/Manifest                  |   2 +-
 .../grantlee-editor-24.12.0-r1.ebuild              |  40 +++++++
 .../grantlee-editor/grantlee-editor-24.12.0.ebuild |  40 -------
 kde-apps/grantleetheme/Manifest                    |   2 +-
 .../grantleetheme/grantleetheme-24.12.0-r1.ebuild  |  37 +++++++
 .../grantleetheme/grantleetheme-24.12.0.ebuild     |  37 -------
 kde-apps/incidenceeditor/Manifest                  |   2 +-
 .../incidenceeditor-24.12.0-r1.ebuild              |  67 ++++++++++++
 .../incidenceeditor/incidenceeditor-24.12.0.ebuild |  67 ------------
 kde-apps/kaddressbook/Manifest                     |   2 +-
 .../kaddressbook/kaddressbook-24.12.0-r1.ebuild    |  70 ++++++++++++
 kde-apps/kaddressbook/kaddressbook-24.12.0.ebuild  |  70 ------------
 kde-apps/kalarm/Manifest                           |   2 +-
 kde-apps/kalarm/kalarm-24.12.0-r1.ebuild           |  87 +++++++++++++++
 kde-apps/kalarm/kalarm-24.12.0.ebuild              |  87 ---------------
 kde-apps/kcalutils/Manifest                        |   2 +-
 kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild     |  34 ++++++
 kde-apps/kcalutils/kcalutils-24.12.0.ebuild        |  34 ------
 kde-apps/kdepim-addons/Manifest                    |   2 +-
 .../kdepim-addons/kdepim-addons-24.12.0-r1.ebuild  |  87 +++++++++++++++
 .../kdepim-addons/kdepim-addons-24.12.0.ebuild     |  87 ---------------
 kde-apps/kdepim-meta/Manifest                      |   2 +-
 kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild |  73 +++++++++++++
 kde-apps/kdepim-meta/kdepim-meta-24.12.0.ebuild    |  73 -------------
 kde-apps/kdepim-runtime/Manifest                   |   2 +-
 .../kdepim-runtime-24.12.0-r1.ebuild               |  83 ++++++++++++++
 .../kdepim-runtime/kdepim-runtime-24.12.0.ebuild   |  83 --------------
 kde-apps/kidentitymanagement/Manifest              |   2 +-
 .../kidentitymanagement-24.12.0-r1.ebuild          |  36 +++++++
 .../kidentitymanagement-24.12.0.ebuild             |  36 -------
 kde-apps/kimap/Manifest                            |   2 +-
 kde-apps/kimap/kimap-24.12.0-r1.ebuild             |  41 +++++++
 kde-apps/kimap/kimap-24.12.0.ebuild                |  41 -------
 kde-apps/kitinerary/Manifest                       |   2 +-
 kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild   |  48 +++++++++
 kde-apps/kitinerary/kitinerary-24.12.0.ebuild      |  48 ---------
 kde-apps/kldap/Manifest                            |   2 +-
 kde-apps/kldap/kldap-24.12.0-r1.ebuild             |  30 ++++++
 kde-apps/kldap/kldap-24.12.0.ebuild                |  30 ------
 kde-apps/kleopatra/Manifest                        |   2 +-
 kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild     |  68 ++++++++++++
 kde-apps/kleopatra/kleopatra-24.12.0.ebuild        |  68 ------------
 kde-apps/kmail-account-wizard/Manifest             |   2 +-
 .../kmail-account-wizard-24.12.0-r1.ebuild         |  52 +++++++++
 .../kmail-account-wizard-24.12.0.ebuild            |  52 ---------
 kde-apps/kmail/Manifest                            |   2 +-
 kde-apps/kmail/kmail-24.12.0-r1.ebuild             | 119 +++++++++++++++++++++
 kde-apps/kmail/kmail-24.12.0.ebuild                | 119 ---------------------
 kde-apps/kmailtransport/Manifest                   |   2 +-
 .../kmailtransport-24.12.0-r1.ebuild               |  37 +++++++
 .../kmailtransport/kmailtransport-24.12.0.ebuild   |  37 -------
 kde-apps/kmbox/Manifest                            |   2 +-
 kde-apps/kmbox/kmbox-24.12.0-r1.ebuild             |  20 ++++
 kde-apps/kmbox/kmbox-24.12.0.ebuild                |  20 ----
 kde-apps/kmime/Manifest                            |   2 +-
 kde-apps/kmime/kmime-24.12.0-r1.ebuild             |  24 +++++
 kde-apps/kmime/kmime-24.12.0.ebuild                |  24 -----
 kde-apps/konsolekalendar/Manifest                  |   2 +-
 .../konsolekalendar-24.12.0-r1.ebuild              |  37 +++++++
 .../konsolekalendar/konsolekalendar-24.12.0.ebuild |  37 -------
 kde-apps/kontact/Manifest                          |   2 +-
 kde-apps/kontact/kontact-24.12.0-r1.ebuild         |  44 ++++++++
 kde-apps/kontact/kontact-24.12.0.ebuild            |  44 --------
 kde-apps/kontactinterface/Manifest                 |   2 +-
 .../kontactinterface-24.12.0-r1.ebuild             |  28 +++++
 .../kontactinterface-24.12.0.ebuild                |  28 -----
 kde-apps/korganizer/Manifest                       |   2 +-
 kde-apps/korganizer/korganizer-24.12.0-r1.ebuild   |  79 ++++++++++++++
 kde-apps/korganizer/korganizer-24.12.0.ebuild      |  79 --------------
 kde-apps/kpimtextedit/Manifest                     |   2 +-
 .../kpimtextedit/kpimtextedit-24.12.0-r1.ebuild    |  42 ++++++++
 kde-apps/kpimtextedit/kpimtextedit-24.12.0.ebuild  |  42 --------
 kde-apps/kpkpass/Manifest                          |   2 +-
 kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild         |  24 +++++
 kde-apps/kpkpass/kpkpass-24.12.0.ebuild            |  24 -----
 kde-apps/ksmtp/Manifest                            |   2 +-
 kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild             |  29 +++++
 kde-apps/ksmtp/ksmtp-24.12.0.ebuild                |  29 -----
 kde-apps/libgravatar/Manifest                      |   2 +-
 kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild |  37 +++++++
 kde-apps/libgravatar/libgravatar-24.12.0.ebuild    |  37 -------
 kde-apps/libkdepim/Manifest                        |   2 +-
 kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild     |  27 +++++
 kde-apps/libkdepim/libkdepim-24.12.0.ebuild        |  27 -----
 kde-apps/libkgapi/Manifest                         |   2 +-
 kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild       |  37 +++++++
 kde-apps/libkgapi/libkgapi-24.12.0.ebuild          |  37 -------
 kde-apps/libkleo/Manifest                          |   2 +-
 kde-apps/libkleo/libkleo-24.12.0-r1.ebuild         |  36 +++++++
 kde-apps/libkleo/libkleo-24.12.0.ebuild            |  36 -------
 kde-apps/libksieve/Manifest                        |   2 +-
 kde-apps/libksieve/libksieve-24.12.0-r1.ebuild     |  56 ++++++++++
 kde-apps/libksieve/libksieve-24.12.0.ebuild        |  56 ----------
 kde-apps/libktnef/Manifest                         |   2 +-
 kde-apps/libktnef/libktnef-24.12.0-r1.ebuild       |  28 +++++
 kde-apps/libktnef/libktnef-24.12.0.ebuild          |  28 -----
 kde-apps/mailcommon/Manifest                       |   2 +-
 kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild   |  64 +++++++++++
 kde-apps/mailcommon/mailcommon-24.12.0.ebuild      |  64 -----------
 kde-apps/mailimporter/Manifest                     |   2 +-
 .../mailimporter/mailimporter-24.12.0-r1.ebuild    |  32 ++++++
 kde-apps/mailimporter/mailimporter-24.12.0.ebuild  |  32 ------
 kde-apps/mbox-importer/Manifest                    |   2 +-
 .../mbox-importer/mbox-importer-24.12.0-r1.ebuild  |  33 ++++++
 .../mbox-importer/mbox-importer-24.12.0.ebuild     |  33 ------
 kde-apps/messagelib/Manifest                       |   2 +-
 kde-apps/messagelib/messagelib-24.12.0-r1.ebuild   |  77 +++++++++++++
 kde-apps/messagelib/messagelib-24.12.0.ebuild      |  77 -------------
 kde-apps/mimetreeparser/Manifest                   |   2 +-
 .../mimetreeparser-24.12.0-r1.ebuild               |  34 ++++++
 .../mimetreeparser/mimetreeparser-24.12.0.ebuild   |  34 ------
 kde-apps/pim-data-exporter/Manifest                |   2 +-
 .../pim-data-exporter-24.12.0-r1.ebuild            |  58 ++++++++++
 .../pim-data-exporter-24.12.0.ebuild               |  58 ----------
 kde-apps/pim-sieve-editor/Manifest                 |   2 +-
 .../pim-sieve-editor-24.12.0-r1.ebuild             |  52 +++++++++
 .../pim-sieve-editor-24.12.0.ebuild                |  52 ---------
 kde-apps/pimcommon/Manifest                        |   2 +-
 kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild     |  64 +++++++++++
 kde-apps/pimcommon/pimcommon-24.12.0.ebuild        |  64 -----------
 157 files changed, 2562 insertions(+), 2562 deletions(-)
 create mode 100644 kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0.ebuild
 create mode 100644 kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi-calendar/akonadi-calendar-24.12.0.ebuild
 create mode 100644 kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi-contacts/akonadi-contacts-24.12.0.ebuild
 create mode 100644 kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0.ebuild
 create mode 100644 kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi-mime/akonadi-mime-24.12.0.ebuild
 create mode 100644 kde-apps/akonadi-search/akonadi-search-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi-search/akonadi-search-24.12.0.ebuild
 create mode 100644 kde-apps/akonadi/akonadi-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadi/akonadi-24.12.0.ebuild
 create mode 100644 kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akonadiconsole/akonadiconsole-24.12.0.ebuild
 create mode 100644 kde-apps/akregator/akregator-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/akregator/akregator-24.12.0.ebuild
 create mode 100644 kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/calendarjanitor/calendarjanitor-24.12.0.ebuild
 create mode 100644 kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/calendarsupport/calendarsupport-24.12.0.ebuild
 create mode 100644 kde-apps/eventviews/eventviews-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/eventviews/eventviews-24.12.0.ebuild
 create mode 100644 kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/grantlee-editor/grantlee-editor-24.12.0.ebuild
 create mode 100644 kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/grantleetheme/grantleetheme-24.12.0.ebuild
 create mode 100644 kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/incidenceeditor/incidenceeditor-24.12.0.ebuild
 create mode 100644 kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kaddressbook/kaddressbook-24.12.0.ebuild
 create mode 100644 kde-apps/kalarm/kalarm-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kalarm/kalarm-24.12.0.ebuild
 create mode 100644 kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kcalutils/kcalutils-24.12.0.ebuild
 create mode 100644 kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kdepim-addons/kdepim-addons-24.12.0.ebuild
 create mode 100644 kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kdepim-meta/kdepim-meta-24.12.0.ebuild
 create mode 100644 kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kdepim-runtime/kdepim-runtime-24.12.0.ebuild
 create mode 100644 kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kidentitymanagement/kidentitymanagement-24.12.0.ebuild
 create mode 100644 kde-apps/kimap/kimap-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kimap/kimap-24.12.0.ebuild
 create mode 100644 kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kitinerary/kitinerary-24.12.0.ebuild
 create mode 100644 kde-apps/kldap/kldap-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kldap/kldap-24.12.0.ebuild
 create mode 100644 kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kleopatra/kleopatra-24.12.0.ebuild
 create mode 100644 kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0.ebuild
 create mode 100644 kde-apps/kmail/kmail-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kmail/kmail-24.12.0.ebuild
 create mode 100644 kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kmailtransport/kmailtransport-24.12.0.ebuild
 create mode 100644 kde-apps/kmbox/kmbox-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kmbox/kmbox-24.12.0.ebuild
 create mode 100644 kde-apps/kmime/kmime-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kmime/kmime-24.12.0.ebuild
 create mode 100644 kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/konsolekalendar/konsolekalendar-24.12.0.ebuild
 create mode 100644 kde-apps/kontact/kontact-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kontact/kontact-24.12.0.ebuild
 create mode 100644 kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kontactinterface/kontactinterface-24.12.0.ebuild
 create mode 100644 kde-apps/korganizer/korganizer-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/korganizer/korganizer-24.12.0.ebuild
 create mode 100644 kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kpimtextedit/kpimtextedit-24.12.0.ebuild
 create mode 100644 kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/kpkpass/kpkpass-24.12.0.ebuild
 create mode 100644 kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/ksmtp/ksmtp-24.12.0.ebuild
 create mode 100644 kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/libgravatar/libgravatar-24.12.0.ebuild
 create mode 100644 kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/libkdepim/libkdepim-24.12.0.ebuild
 create mode 100644 kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/libkgapi/libkgapi-24.12.0.ebuild
 create mode 100644 kde-apps/libkleo/libkleo-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/libkleo/libkleo-24.12.0.ebuild
 create mode 100644 kde-apps/libksieve/libksieve-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/libksieve/libksieve-24.12.0.ebuild
 create mode 100644 kde-apps/libktnef/libktnef-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/libktnef/libktnef-24.12.0.ebuild
 create mode 100644 kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/mailcommon/mailcommon-24.12.0.ebuild
 create mode 100644 kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/mailimporter/mailimporter-24.12.0.ebuild
 create mode 100644 kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/mbox-importer/mbox-importer-24.12.0.ebuild
 create mode 100644 kde-apps/messagelib/messagelib-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/messagelib/messagelib-24.12.0.ebuild
 create mode 100644 kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/mimetreeparser/mimetreeparser-24.12.0.ebuild
 create mode 100644 kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/pim-data-exporter/pim-data-exporter-24.12.0.ebuild
 create mode 100644 kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0.ebuild
 create mode 100644 kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild
 delete mode 100644 kde-apps/pimcommon/pimcommon-24.12.0.ebuild

(limited to 'kde-apps')

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index e02ec2535f66..cb7d23006ece 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/akonadi-calendar-tools-common/Manifest b/kde-apps/akonadi-calendar-tools-common/Manifest
index 6104701be7db..834be4c9c2e9 100644
--- a/kde-apps/akonadi-calendar-tools-common/Manifest
+++ b/kde-apps/akonadi-calendar-tools-common/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-24.08.3.tar.xz 264972 BLAKE2B 42ac0a8451ac363d08b0ea322259c31423ced43aab36814b88e49adea48593a9806c36450ee5ca194f59ca6ecb621912890087d315e44b20438ebf5dec8b92d4 SHA512 0f7a5f7ef5939191b5a834a80f6b4f0bc32125dde62135eeb1a55235bbffeb7905b8e3c22b1aa57648e132a5f5a5172060c91025a0bbd4693bc363dfcefd36ef
 DIST akonadi-calendar-tools-24.12.0.tar.xz 269360 BLAKE2B 5fadc86b2788e3d0c21dc8c2ba258b964e65a49e676a9fe1d6f197b43c8b7ce4bedf70d08d1794149903f9516079546350ce45727bdc0c12fde988161bf262e9 SHA512 dbfcb7282f48cf3bd88d2f896bb6220d8ab5bfcb5cf86068e0b791b272e8d8e2957a89f3e12390baa408a9bee8a650f4cdc97d514a4ee34af1db749ce308f411
 EBUILD akonadi-calendar-tools-common-24.08.3.ebuild 360 BLAKE2B 6d743693f124e7896f03f6d8f90546c0157b7989c04fa60a713434fe20933fc498e49262c84c6255b4e712a57a711e0a7b78d259e1a920147f3a5fde7268ff3c SHA512 7de6eae7ea4af521bb454f0986128311898b7c3073d2a6d7e07f18d66d9771dc3df920f69ef9a02b4fd56a859c22bc816c008035311282a029a895b944b37d22
-EBUILD akonadi-calendar-tools-common-24.12.0.ebuild 362 BLAKE2B 2e9a22bf83e8bece99ff4d6ed848ba3e1160e3dc82f08f61aa30a829b3989310232d16646651ae787a15e77d5003d7765104448252a556212cf949037e240a9e SHA512 8cdafb1ce40278105264464553ed27b3a24736ac31d72466f1964e9cb0dfcf6b0a4ca5345e40dd1671090f68828fd10d0128a1b3feb0938cedc4c76f20d702ca
+EBUILD akonadi-calendar-tools-common-24.12.0-r1.ebuild 362 BLAKE2B 2e9a22bf83e8bece99ff4d6ed848ba3e1160e3dc82f08f61aa30a829b3989310232d16646651ae787a15e77d5003d7765104448252a556212cf949037e240a9e SHA512 8cdafb1ce40278105264464553ed27b3a24736ac31d72466f1964e9cb0dfcf6b0a4ca5345e40dd1671090f68828fd10d0128a1b3feb0938cedc4c76f20d702ca
 MISC metadata.xml 388 BLAKE2B 9e6ad08af2697daa84bd94a34450986acaf0f46c2715fc93de6049794b430786e88cc01a861bedb36fa4a6769f6868dfcd991e5c92a70d0ea5287b2d410be87d SHA512 795b6fc9030c09254d057ab70962daf231a41c9f9f0316d95dedf0a9dc7ec606b829863b931aa025e4245a4632ff48998ec26c8bffaf2aab42ee189e4d4a464b
diff --git a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..0a0bb03bd6c4
--- /dev/null
+++ b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2 handbook? ( FDL-1.2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	!<kde-apps/calendarjanitor-24.07.90-r1
+	!<kde-apps/konsolekalendar-24.07.90-r1
+"
diff --git a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0.ebuild b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0.ebuild
deleted file mode 100644
index 0a0bb03bd6c4..000000000000
--- a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2 handbook? ( FDL-1.2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	!<kde-apps/calendarjanitor-24.07.90-r1
-	!<kde-apps/konsolekalendar-24.07.90-r1
-"
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index d4720ff875fa..35f20dd0c29d 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-24.08.3.tar.xz 522188 BLAKE2B b42b8405e40f938d7cc9ee3e1d75ec40fa7d1bd438fc0a8a813ea13610155b3facd291fe2b2edf099d15f0ad5b64c7052ba7120fb2c9462c7b83ae3a6eb2d7f7 SHA512 d8f656ef675abe7d778ae6ffe92e49d37625c1420948ff97b10fa12505448565ed2104dda3c13b37e13c17af44f5c98fd6fe4b229423ab1f7d199257b597deea
 DIST akonadi-calendar-24.12.0.tar.xz 524592 BLAKE2B 74892e00eda8e9abd0b1254087030c362020f776ce3f9c93c999abb34a4ccc3254335ce5946c21256e6e47f11055b078a38125d109ace68ffaefdbb1ee933d69 SHA512 a26e5ef14a5a9c10b4be6cd8b1a6c1e760b5910bf3e9a3b98c14fa3add97d59450bafa0e733755e34eb02adf9717947562f0db48691a93baf37dba9f90e43f92
 EBUILD akonadi-calendar-24.08.3.ebuild 1310 BLAKE2B d77f9ee9ce0b7a1ab5b16dd94315cc758eefa814dc218b5e6a770779bedb0b9b6f4d16969c4630815c4cbe3e9b251823de8612997b3cfeb00513c63dc0087825 SHA512 e97068dd11bec0a070bc2d8a1a0f771e3633b0597373f419fdfa7f3a536179525c531df192615f74b557ef5c1bd34a4ffb9cdcb4c7f1fbc2731db946fb54909a
-EBUILD akonadi-calendar-24.12.0.ebuild 1348 BLAKE2B 69d84ad85722bb64e4b065efc031db9016c4874e4105d2f33dc245a3fe25e105ef80c24a5588508fc474feb30377c9db126610639c64d736c8470ef0a5d71615 SHA512 7d9df5ca83ba1f43979b7aa37e184732c1dced3bd371b0b70aa34f09075658ca103d885e8ca40d29230932c8716eb01b46b0e1987a5ec66edc6a0f962c325cfc
+EBUILD akonadi-calendar-24.12.0-r1.ebuild 1348 BLAKE2B 6337175cb0410002a06d5660961ee30fc82dde790eed59bed8f13c37517dafed354883a07cf23b9c26a5a009f6fcf21ba7bf83fa285812b1201feb2464b4cd82 SHA512 fab480ccbbc65dbdf81c3203b6a3647139931d22bc18500c9dc14487686cf75bbb3dce64ccfbe7f3d1c8ba50a03c80ae1736d71d62819cf831ac57e81080c5ed
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..01455ab03597
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=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/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0.ebuild
deleted file mode 100644
index 58ff8a044923..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=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/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 22c7b4f1586d..02c747e553bf 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-24.08.3.tar.xz 436188 BLAKE2B d9c91e39efb4ec98ce0c57668399454ce0f515b6256c134f1adb356ee437f206f1c793e973e17b485f4c5570f56aeb896e9eebf8ef5564aee362e45c0f87dff5 SHA512 a6a42c9219fa9bfbb5474d45b64daaca00bb6e551f5f655af6625096704458d40242d099e330d0390bac2126ed1cc54412f6222ba7d4a39f5e955de58fb6f92f
 DIST akonadi-contacts-24.12.0.tar.xz 436684 BLAKE2B d309b0c059bf60f5b0e8c92b88c849558d4b87f57babfd6ccf8a725031fd515205d8ed79a80e94d0ea05b82fc9b1fdd0b5d6d17001f964ea08367838d36d8b05 SHA512 e48a081384314f393480ace7541c7208e5036036f19f31c0b028a90feda891efd1b4e9bab942ee9d2138051cc9ee06def3085eeab243a554548a799f2c5292fa
 EBUILD akonadi-contacts-24.08.3.ebuild 1195 BLAKE2B 06b4d548a6df36c388522245b9024c712f0c04f639c158b856b8fdcd46f1257707990f2fa916dcfe172d2b4d3031ef0137db57c004364dd056c9fb162df313be SHA512 c7d0e054379b90a5d28045cedf58c1eab38bd2eda93677a9de5087a0aba0dedd9709f1bf4a11f84defc208a00085562d9f03039384d818933218c892b0edf52c
-EBUILD akonadi-contacts-24.12.0.ebuild 1237 BLAKE2B 3de28b75b75fee0c47863b8f4dbaac62fe89159519e0706f46df2d5870e954a8c956237a62b8f53dbdba1d6381fc5ea6aa4d368980b9afb800726b4f9c2ae8bd SHA512 d99a1da4215c6b93d11bb5a54b7ffb1547f636fc889e63dfa96daed7f0b2f09f918a01b20722a0599136261fea117a1c06ed756702159879eb7afcd009904e55
+EBUILD akonadi-contacts-24.12.0-r1.ebuild 1237 BLAKE2B 0ccacc443bdb73dd7cf7410faaf42d54e66f39f438b9dbc1c9ea1a924a30974faf326c258a99de4e616471e1904c1fa1e93332c55d4bb8ca562d5743ad2fcc36 SHA512 f24cc701a8d63db129ee5bb3ce57d81a1ae5ae4e997620e799083efcf749a3324c34088b54e57807fa400106f29b880b9bb57822eb5b4c5af49fad71a3e9fc61
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..c32c4fdafd2b
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi contact integration"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0.ebuild
deleted file mode 100644
index 623525e85d87..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/prison-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index fb71ee1af47f..159b08756688 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-24.08.3.tar.xz 490288 BLAKE2B b8b768cdc6f2de51d44069a5b8e16d19dcc1c796fcc2e6601b8bfc94841070a58cc690ceb966c9b51f0d418c9c4d0b8f001c41f095a9e35464aee67840d30274 SHA512 4f5c5e34f155a55ac1f063c2506d39cfaca1890456de1d6d7eebafd58fa5e9d94dcdf29fd2e65bc45f6c1ec098a02709c944871f6deb0474968c0e8fe12ce4e9
 DIST akonadi-import-wizard-24.12.0.tar.xz 491896 BLAKE2B 48ff8daf1515125c61efd38dd62aa19a32fd40ce1d4b4dfd6067d0370f29870d133ca61dca1f61c5450390a93cf8818080d84c0c4366746df23c69db1fb821f8 SHA512 d5217a4fb33d5829b3c3ad3b259ed6478aa6f626a445e177e79ea5e12dff4070823d38c39034b49a21723bb40fc9906b5635262f1234b6886d0fc3c0576223c2
 EBUILD akonadi-import-wizard-24.08.3.ebuild 1226 BLAKE2B 66342baf2b57309ea4db8370d347f3c465b4e5d003e123c48fd59ce7aedb96be1f38bf134b2442718c06a9971415cebd2ed82dcfdd13970b20959be18e81a1a2 SHA512 cd695f79c0208ddc0c9b4492cd26e4d39c9880213ba991514823e382e9aef7c60936498ae08f67f6be6eaed3960b46ddf7d039bcc356be86098da5dacd395e1c
-EBUILD akonadi-import-wizard-24.12.0.ebuild 1231 BLAKE2B a5dc6c93623705e2f03e047188abff6dc7cdc658d03e9c8c6f5bef4e4cb1be38b8fc1b1c52a318669f8c17180494596ca2a251382c0128124a78598b6c75af9e SHA512 8247ec3d73c441fd06cbcc631aaaddc7cbb371c2eb62f168b86b37352547599f3859f9e8f0348a2c21ed8583371ebc07e0bacc68924fbdb93d989a796d6d63cc
+EBUILD akonadi-import-wizard-24.12.0-r1.ebuild 1231 BLAKE2B c777e04e83a2cdb39372dd6b770cf9eb9112883bdd39623434612315ccc436faaff474bac540624596b2d3986bffce791aae556046c752734ece9862a13a9e84 SHA512 6af7fd500db632fbcb937714aa1cd2b213bca5ec6f8820405a6307c20498f4494bbaa3397db12f4b9e5b75dd0c789d18ee1ed266bffe4aed2f7b737fbe70c61f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..7d9516d0e3d3
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/mailimporter-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0.ebuild
deleted file mode 100644
index 7556d52df6aa..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/mailimporter-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 88107f6ae355..b077d5873395 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-24.08.3.tar.xz 174924 BLAKE2B 1977519c5ab63be610fd7c68a28f073cc28e4b42c72dc059d69520d51ee4cddb8e55b788838c976996eb1d8104c2cd12140374430f2f1b510d370b8d6f6b8d47 SHA512 bb3068fc13312569bf2c2be8c32f7c1e0ebc16b8bfe0cf65ff2335f5b07560261834754115aabf6c904acda3a8f74ba36087f90a8b6ca1be67dd50ad67018b25
 DIST akonadi-mime-24.12.0.tar.xz 175360 BLAKE2B 38cff3c0e72d855e156bb3c98ecab58316d35a1d8e72fce63ccb8e9031c01bc7a69cbc17a4b01c1ea0eca3b06704d7bbea9067351c6af63fd79bbd1d1660b14a SHA512 a1a182bdc8999379c2163b60ee0ac19a65a8a32811fcd7af2ca36d11f88280d8851a6443635f1b95a9e9fc8c8cb61a00d3006cc4d113660caad8588acbc32089
 EBUILD akonadi-mime-24.08.3.ebuild 865 BLAKE2B 2bfd9ccc8aee2113751dae6d2a2dadfaa8e6342c8912f03979b3a014007702b78022e3937febeb0d89abf637fd4b931ef9da89ee773c00fae47aef162019f3d9 SHA512 5ef244a017595e891255201fedcf844268869eb062576d4bfc3cbe4d9e48807b042d32f841d8d48f7b87157919dbb35937bc88375b970267fca7f86049bb8c40
-EBUILD akonadi-mime-24.12.0.ebuild 867 BLAKE2B 185069c45711749651e501f333081fd17577c3c91c984bd2e8778a0164a1d5cffc7842b8f5192c4150ebc224d093cb02b3e65ca0bfee31b82b7293c807203280 SHA512 0355989631db324a5c6da582f54371c4a49328f927c2d22fee13426afb01bb8362f7ef84ac0d0344418750b49ecf6c450473264810100c794f448f2892a33a16
+EBUILD akonadi-mime-24.12.0-r1.ebuild 867 BLAKE2B 9ac1e386338ca39f2a0ee3a09433578eb9e2f9fa58e949d553f23a1367bad02288e5f30b40808561104d4d3fb5c143d958aa8b5df05e00f2fbe7a313987f2690 SHA512 f9f04657ceb6128bf801841bfbcc0bd2cf09a14aec838a6a4f55647923b135af178d4efb6c3b2a3c09d146175e7320b68a7eda8289a70f1ee9feb81ee0dc2ae0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..50af438d0ea0
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi mime types"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.12.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-24.12.0.ebuild
deleted file mode 100644
index 99db6b690592..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 4858c6968b61..6e7ea1423ec2 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-24.08.3.tar.xz 113136 BLAKE2B c00f94bea69ff2d5b7bb9d91038a60320551e3a09d32a8577b5bd8e927fa7fc1a362e06a36d309ada4149412afb92f22325f27d6a1a3908e948f3863b4274a0a SHA512 ba35e8632703b22398c7221b98c01dc010fb2aba066fb89e74da1665380f2029aaee73532addcf99bdf149c024f6dd8846ebfa5af1cf4d62e574496164fe6efa
 DIST akonadi-search-24.12.0.tar.xz 113184 BLAKE2B 0c698e0eefb8fa5a568f4359474930c0bbaba5f34d91bf91db886a67c4b70cc15722f66ef1813c94ec12df4ceb07f74ff4ee36274ab7adb42a2a182f99e78819 SHA512 545f67b68425461af8c084e18778759903b982011645fa8e15c72432365dda00229a5f5637d427e62d5324e6ac26c79f9829f43a650739dbd47f97068fd32b97
 EBUILD akonadi-search-24.08.3.ebuild 1465 BLAKE2B f8460fae459dfd5f8c3c8032f1dc65e9a2e0077b1c03f887ad5964ec6f4ae7b93aac49bd35465382f46b9573f46c356de0a9a5b69220e9b56b8a22824410641c SHA512 d149cc887833fe17297cdf5348a336a72826bb6a3356b03a4bff70703f007a01a76f63d8100c6258e180d039572782e4a5995580739ea1c65506ff28f62ae985
-EBUILD akonadi-search-24.12.0.ebuild 1461 BLAKE2B 62bd063ad97a6986f9b177b7e0924f1ec7fe8e52ed347e9a287b3e6e8af8912f78bf228415dc904dda61f89a3643979fc2216720f0e26e58a194a921db1b423e SHA512 9b4bb33e2d6b206851412e2484eed1a900936b08fd19d94dcfebb02437b78f054b470d6db186b3af4647d353ff5bcc71b69c35a3909913c17e7f9e1a419fdbd4
+EBUILD akonadi-search-24.12.0-r1.ebuild 1461 BLAKE2B b0b97d689d65dbf46ab0b9e63e351d7eca28efe18e7f6dde5a045264518138f88e02b56f09bf71c80d25ddc4e341119dc0f96988b4294676a25be3cd86a464eb SHA512 a58d3d441aaa36204f62860e17b5d970f37b86a331f91eba1d289e65d441c07e6736f87d29089d8ad87a41e1155feb361432a7f5f15088a8578ef1d066ac23b9
 MISC metadata.xml 380 BLAKE2B 536a672214ff36b0f344cc6b91c802d6d58688cebb8733ff6b0a7ce59cf5a2dcf47d22c66a4698e720a85ec8684ac6aa666a8d72d70b8fed03fd2d810e39d415 SHA512 f026d3e180540eedde728f496f2827dad46c08f2115cab977b7c8f533184e0eb7dbece0ecce18be53551606663cffddf901af806545525eb08afa6ab80e0b9e8
diff --git a/kde-apps/akonadi-search/akonadi-search-24.12.0-r1.ebuild b/kde-apps/akonadi-search/akonadi-search-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..4ba23f417155
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-24.12.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # perpetually broken, bug 662378
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-libs/xapian-1.3:=[chert(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_configure() {
+	# not packaged (bug 911819), but if present leads to rust shenanigans (bug 927072)
+	local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
+	ecm_src_configure
+}
diff --git a/kde-apps/akonadi-search/akonadi-search-24.12.0.ebuild b/kde-apps/akonadi-search/akonadi-search-24.12.0.ebuild
deleted file mode 100644
index 1748f1a1373a..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-24.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # perpetually broken, bug 662378
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-libs/xapian-1.3:=[chert(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/krunner-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_configure() {
-	# not packaged (bug 911819), but if present leads to rust shenanigans (bug 927072)
-	local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
-	ecm_src_configure
-}
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index acfc18a4a8b9..a6241acfd38a 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-24.08.3.tar.xz 1705408 BLAKE2B c209d3edda626f0768e05d5f63060068b06113cd2d31c53b9e335b4fb815d97280614d161ba4619795ab2c8604270dd613f036f9bdff1bcc3c86740194e48047 SHA512 efed4b344ab25ba986269b79b9157e3c5d1542fe93c4cd037a030b6740d564baf651de1e2db206cb996a46a6d007c787cdae8eef32df9ed70d1eee5d537b2167
 DIST akonadi-24.12.0.tar.xz 1710188 BLAKE2B d4ed95eb1d0e70db3eec9566c885d935f45265e6348a102fc4c8f6121ee37f330fd4c5700b9b82f058cae86bce6444be3814ad937e53e3276b41f80d54bc2bff SHA512 c440a8def80f66332f383b84987ed972456ff8a5b8f86bbca13c2d213d610f831020d90041a994a7a39b40fd39ebcb4c414796d92a33e62072f9b1abaccdf384
 EBUILD akonadi-24.08.3.ebuild 2417 BLAKE2B 310f6d68b615232e8b010dec320c39646ce049334e899f0d17b7a1360a63a9c1f9cc5e35ccdb25845ccf96d4feff984dac873ebd9ecc2295115f445f7e978639 SHA512 c8f37d677218bc36f870a23f1e00ebc6fca21d1a79cf2bb158bdc0efe5288dafeb7463b1a27318d20113973ea7f77726fc3c20ed0ae4f268fe838be4cfba47ea
-EBUILD akonadi-24.12.0.ebuild 1521 BLAKE2B 97d35ff93a1e9cbd7f3f7234695049159a34439019ae328d7e41fe7bb47702184086eed99b501347e156e12fb1e2a82db15a83d2032fff5ea73819d80c7c281c SHA512 118a0cac9888a0c2828546330c7b95b6f8054db8cf18216d4244edb938f5f6a88096252565e1888fadd2672f30d2f93896716c173ccd3335feed93cea13c5e0f
+EBUILD akonadi-24.12.0-r1.ebuild 1521 BLAKE2B 802283a3da4b119eb92044c49eb1e6476dcdf2279831ffef1bedf0ec779b8dff796b359c2b67f2fda1ee3903615ac9755a61158af573859effa1cdf885e1374f SHA512 59ab54610f966fb679acf4ac9747099cca86d59995db962180d16db7bd97deb863d7efb88b914c0e31b2590e1ca7cea4282b8c8adaf98483e3e83ab2a9ddd0ed
 MISC metadata.xml 560 BLAKE2B b1df1d7961def428bfb47401edb020a743e13cc945f8df09458073e5269a07128f0388a3fe0e19051dc074c4b7c95b41f0c70d2b1fc29eeddd745321f32164e5 SHA512 abf8fc06d7abd90b49382d3e2f4c7b18c9fc71aec9fa227a466ae9db02a88ee2f6da8e0cee3980cdc0d2833ff6275f1bc2314fac1b5b6073fa39fa1ddab8c44b
diff --git a/kde-apps/akonadi/akonadi-24.12.0-r1.ebuild b/kde-apps/akonadi/akonadi-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..a24ee7c7e6e5
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-24.12.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+VIRTUALDBUS_TEST="true"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="tools +webengine xml"
+
+REQUIRED_USE="test? ( tools )"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.17[qt6(+)]
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/akonadi-config
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
+		$(cmake_use_find_package xml LibXml2)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/akonadi/akonadi-24.12.0.ebuild b/kde-apps/akonadi/akonadi-24.12.0.ebuild
deleted file mode 100644
index 504733476270..000000000000
--- a/kde-apps/akonadi/akonadi-24.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="tools +webengine xml"
-
-REQUIRED_USE="test? ( tools )"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	webengine? (
-		kde-apps/kaccounts-integration:6
-		>=net-libs/accounts-qt-1.17[qt6(+)]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/akonadi-config
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package webengine AccountsQt6)
-		$(cmake_use_find_package webengine KAccounts6)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index f9b27a753e16..bd1bfce3bcbd 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-24.08.3.tar.xz 304556 BLAKE2B 665295a2c220ec3898dac88c162959f907628a152902de4047d2b13500d654ee9ff4d7930e99451a8602c2b1a7234a7324ebabe7f08a6827c151a9715a43f4be SHA512 88a0874b32e1ba36d5e748414a37cd018dbb9c6b62f3f50da651be74fee4454045045d2b41f0a0a712294dd030eb60b50bce3342b1a9e3cc9bd91a976ed2ef61
 DIST akonadiconsole-24.12.0.tar.xz 313788 BLAKE2B 3d6d3a152091be25dd15d3ff1e4aaf3988ffbe3efe8dfd2938da85d1cfee8fb669ab9baa99ea9695667e0870d8e2994675dea8268215cb5734b0f22daae2de36 SHA512 889b3b63ee651188abc3632ad63f44394367a8f0330e0df7b7b4e3e898ceb2dd236defac48b88da48a3fc418abb18a36b76fdddf8380c49f59f3a20ba55a0241
 EBUILD akonadiconsole-24.08.3.ebuild 1402 BLAKE2B 510c84c7a3295fce8c090241e17b79a89df46d49853389db4c8fb840783904572e7f3bb1f4f1a7a4a7edf734e1b8de94858137def4aa20987c7bc08daa46fa32 SHA512 b1f99a7683d4a8bd4150cede78693b932f3746ac7b2fa66940db1839b495c9535f531aac542a2570d3e4e449442d196cd08e4f186cbdde0ca30f33b3ca652399
-EBUILD akonadiconsole-24.12.0.ebuild 1404 BLAKE2B 5f5818267c335caef8aee5a9aa495e26390492561beb0ec6724cb3f7bc5144d078b6bc3393e6d347ef56f17b86a3c75e3a0a8defb840d0eda562dc960ba0b14f SHA512 999b63c71f620755dc1d88e5a5cffb98b311ff9940629aed1978e701cf5132bda228941b7c6976b8430033a9e2e8ab83038de8c37a0882716d3080b101b4836a
+EBUILD akonadiconsole-24.12.0-r1.ebuild 1404 BLAKE2B 60de5d8a62ff7df67471f34669a21aa9a67d4aca41f7aa07793174e5c814a84916b6e863792840c984fa9fd0e3f209533a6aceb81b31ad3f30a793571202bc83 SHA512 b6d8c0551c5b98ae2d15d86292d34a4be9692f8c359cca7f413b1c64177168df483e7c85868bde5b8a74f50d6cacd87d390cc4c6565e2945056ae9f767113635
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..2dca39b528fb
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application for debugging Akonadi Resources"
+HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
+
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/xapian:=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-24.12.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-24.12.0.ebuild
deleted file mode 100644
index 250da3df197b..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-24.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 9ea182edbe37..a2c50cd89a6b 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,5 @@
 DIST akregator-24.08.3.tar.xz 2126716 BLAKE2B 212116876d2abd34584af7cc7ffb15ab7d1c2158c097ae7c12897bbb254dd2b303d0f8f9511b47a88f390ac1f250a404af7c98053f78476fa0e9447ba21a8294 SHA512 21226b7fad775e0ac4cb271e5040f0c426103ea76624bbe015c50b1f88dd2c0f35918aaf7efb3669a999aadbfd9633c0a324d10989b26f9b2aaba9034613a892
 DIST akregator-24.12.0.tar.xz 2134208 BLAKE2B 52f299bd73abdf94e03075a2b2bf33a9fd68d1b7bdbd25a32cc88ae579b5ff3e807f570267212f5928fc0a9d16283e439e47dc595833167eacd3546d7e03c88b SHA512 3683ff788243b73178b762815b511de939f51ce98f03e96bcb084dafab6cf2251b256eded8abfdc5c48ee73ea1395ac1f38ec1f39277e977b9f5913a1079fb57
 EBUILD akregator-24.08.3.ebuild 1797 BLAKE2B 22afc95113a9766a24f2cb49850e23835eb89c83dd35a51639512c7c1053cb9864b048c2b23e9fbc4eb3b1d558ba47dfc2775073296e530bf8b3b093233d1378 SHA512 212dea2291237c37fecc51475fadce99f05f916120f76018f5a46138f3dd159efec1eee58fa8dd72c700097b631504d9a2302a0428ccda4326d8b26bdd85df87
-EBUILD akregator-24.12.0.ebuild 1881 BLAKE2B e9941ed2bd0320921902cbdcdab3b668a67e76dfaf1e188264cad33c8da2789491de01e6ccfa1062805e038bd4fb7ea2d9f6e06e1ef54595ca3ac06327132795 SHA512 8092df4462b77d3afda477de1d737b574fdc2eff621b9702186b8c9ae6129f88ce7350ca730ab89efb0d92b842c6c285d0749950cf82912fb53d81b5298b773a
+EBUILD akregator-24.12.0-r1.ebuild 1881 BLAKE2B 271aca48ef22648b3697767324ef0f4336c9f25fe6f13e9348e4aa266b1e2ac1fa98062668e598489467d864cd984eff9ddec0f73fbe7d596ef3de66a85ddb93 SHA512 040ee0feca02f56eef80516469521d6d3c95762516f614571a5e21fa4e89b30ed7f57b7220e22de51bdf379857841d9dd40df94a522168edc8b6eafe67d92286
 MISC metadata.xml 500 BLAKE2B 9118be15bca519a21d9af85870ef6c37702ecb3d797057237b6d89eb1455141677484bbc1edf4daf2f3486891345c6ba516606cb3a2f7f72b995fd75a8e52ea5 SHA512 07e23ae81c13b953f536274a7b5e0ceef6fac4805e0d61d092a7ebaf7fc735824afbaecbebe155a57c09572b47c9c99265e6fda7955a095cf36a94264be0447f
diff --git a/kde-apps/akregator/akregator-24.12.0-r1.ebuild b/kde-apps/akregator/akregator-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..cd35476b4026
--- /dev/null
+++ b/kde-apps/akregator/akregator-24.12.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://apps.kde.org/akregator/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities speech telemetry"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syndication-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/akregator/akregator-24.12.0.ebuild b/kde-apps/akregator/akregator-24.12.0.ebuild
deleted file mode 100644
index 00efab431a23..000000000000
--- a/kde-apps/akregator/akregator-24.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/akregator/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities speech telemetry"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/syndication-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index ab121dc960c3..da17b3d17b92 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -2,5 +2,5 @@ AUX calendarjanitor-24.05.2-loggingcategory.patch 1510 BLAKE2B 468a353b10ec38031
 DIST akonadi-calendar-tools-24.08.3.tar.xz 264972 BLAKE2B 42ac0a8451ac363d08b0ea322259c31423ced43aab36814b88e49adea48593a9806c36450ee5ca194f59ca6ecb621912890087d315e44b20438ebf5dec8b92d4 SHA512 0f7a5f7ef5939191b5a834a80f6b4f0bc32125dde62135eeb1a55235bbffeb7905b8e3c22b1aa57648e132a5f5a5172060c91025a0bbd4693bc363dfcefd36ef
 DIST akonadi-calendar-tools-24.12.0.tar.xz 269360 BLAKE2B 5fadc86b2788e3d0c21dc8c2ba258b964e65a49e676a9fe1d6f197b43c8b7ce4bedf70d08d1794149903f9516079546350ce45727bdc0c12fde988161bf262e9 SHA512 dbfcb7282f48cf3bd88d2f896bb6220d8ab5bfcb5cf86068e0b791b272e8d8e2957a89f3e12390baa408a9bee8a650f4cdc97d514a4ee34af1db749ce308f411
 EBUILD calendarjanitor-24.08.3.ebuild 897 BLAKE2B b3dc4ddc22c9fd35203e3a87f23437e2d67324fcc9ae268546d21354ca15e714e70348c655fb46b71d5b39fac3fbef64b27e0d98895e642aaa0f766f847b6204 SHA512 e10561200a43c3c3ea297bc284f1ae9cb106c8c2a5ab6c0581c2e4d021b7c18b62dd308e32047a60445f8c3c7d34837658607e0650aa178341b0908d76d4007e
-EBUILD calendarjanitor-24.12.0.ebuild 899 BLAKE2B c062d6091f461dfd2e99f20791dd5f73108371500dc0a7df1fab0e920a22790d173093ac2aa8e503fc05616eb1b576aeb7137e671930dfd680824a5eab6aa6f1 SHA512 4468850e6a62fbb564a163b8ad70b13d7046592e3ffde3d6c01e8070679fb0cd88c32a04f40eac80d61689ba57f8cea892a06b84683d5a43b6aee619a98eea4a
+EBUILD calendarjanitor-24.12.0-r1.ebuild 899 BLAKE2B ca23b75f37b1d37881410d03201ad34dd1223aa1d123cf489ec8f54fd94251e9a4c86962a3e040ba0eebc2fcfa228cbf5e4a02bfe551c9a9053739ee8b524024 SHA512 06a12e07ded206a24bf974a4b6bd5995c17bec501f624c0c512491cea227b03355a13b3468a9f5c2eb8f7c8e96561e20d90d273cc70c3c1be596b7977984a690
 MISC metadata.xml 388 BLAKE2B 9e6ad08af2697daa84bd94a34450986acaf0f46c2715fc93de6049794b430786e88cc01a861bedb36fa4a6769f6868dfcd991e5c92a70d0ea5287b2d410be87d SHA512 795b6fc9030c09254d057ab70962daf231a41c9f9f0316d95dedf0a9dc7ec606b829863b931aa025e4245a4632ff48998ec26c8bffaf2aab42ee189e4d4a464b
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..4c816de40e8c
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="false"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	cmake_comment_add_subdirectory konsolekalendar
+}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.12.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.12.0.ebuild
deleted file mode 100644
index 4c96cf694ffb..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/akonadi-calendar-tools-common-${PV}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	cmake_comment_add_subdirectory konsolekalendar
-}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 75ed02fbbc0f..90db9b30c74c 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-24.08.3.tar.xz 1000872 BLAKE2B 7712b5960972f6d498258ac123bd2f31bbec4f9986bb764f3386974daa8caa29b49b998d00b8c8cbb6a2708931b240c98a7b476b72b66f9240f58ec6325abcfb SHA512 20429b65941dac523577c30489319fe3ef1c40f4802433f7783c58dcbf95e7b9a5b48c826899bdcebe7fe028e460f84addc86a26efddcf95b2828f785ab45564
 DIST calendarsupport-24.12.0.tar.xz 997704 BLAKE2B 60a3c2e7a97243034d906175f56f17ffbba0f4053fe74b42df5bdda490869bfb23599c2ea3b3c1cded96b17dd6861256a1058826528de7e3ef05cd1ced4779f2 SHA512 64f9e177a2014fa160c85c6716cacfab7fc4a9bbe99d3e5059ebc2a5832a8e4d54fba1dd82021983734836783dc50a38073521eb4451b3205edb834d58b433dd
 EBUILD calendarsupport-24.08.3.ebuild 1126 BLAKE2B d04bb817c3ead963b71e3804203d19d027fc1fe7d5052410d8362634f55662d5abe2d1f82b5cde82622b1253cbfb22759039c62656dd1a7669c23a7c219e767b SHA512 abe9c41e3ed0ddc9004f8f1c2746f5b2c9bf8e49b549612b1ab83fd17a2a14336790ebacb2c94557af9d13b3a6282275316c2e7bc191fd3690ebbb858024ed33
-EBUILD calendarsupport-24.12.0.ebuild 1091 BLAKE2B d988116c6ba0adbe8080b62d4cde9e876ebde30d3b33a8e764cff6fcccf8d36fa91af894cff2ceab89020420d7df7f7b897cde89ad8dcc1bdf1be5c35987e870 SHA512 2583bade9b600aa6ccb4dab1581505ff45b10f99ef2c4d8d87ed970f45e77c94ba23114b035c895a287ae437355b7be42e724f3dac0475596308bdc9a01ab30d
+EBUILD calendarsupport-24.12.0-r1.ebuild 1091 BLAKE2B 5cb43a4c159733daa41e97c41bc66874c6419ea09970ec4e106957f8c52a9e43140387ec4d6baa14a99fd6600198c0fdfb6e85cf8273a65c25f5da5aeecc7ac5 SHA512 5bacbeea33f9113a7233e4c7dc5a6a50a381f8b9381d0256d002a5ccf01e9a05ea6a75f25fad347f8c4bc6c73be3dcd222d5fdafe2cf885f3bc999fb39853ee0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild b/kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..3aceefdaf3ae
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="false"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar support library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/libical
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarsupport/calendarsupport-24.12.0.ebuild b/kde-apps/calendarsupport/calendarsupport-24.12.0.ebuild
deleted file mode 100644
index 8df47a24e791..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-24.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="false"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/libical
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 9f07849d1089..914ed63a85af 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-24.08.3.tar.xz 490544 BLAKE2B 5a5059044a5236b8512944b05b98f609e628816640fdd97d0c0dd60c942b91fd1ab99342265f39e8872d9f6e7647535087791c23959f6450c04d16a9f79a83c5 SHA512 fc9ca5f2f180e5a5a7e2232e4e73082d4df200a6be1c1cc737911dcf74f0be9abdda1dd73ba1bbff1a29cbbcb65e3e4023caab10e1ce088299930e4bccaab1c1
 DIST eventviews-24.12.0.tar.xz 497620 BLAKE2B ebb5536f0f905747d308124b38283862a7b0705c2832e35c147a1a446bb86d494bf3988abd7e9f48a919886c13d79bdc2afd2dada90039a603309898ce1ac8b7 SHA512 2df48f8c051f5131d277a7da73e561df7e70b2c92819a114e37d94b3351efdd97e2f23d756a73e3e68eb0f72b65d297644ff9efa5ef031d383ddee679e29374a
 EBUILD eventviews-24.08.3.ebuild 1205 BLAKE2B 10c7e49867370d77749db576ddefc9b10c3f2dad250e0b5d6399519c4bd75d610289a7703a15173ee85c4425846081f7762d93068bc31407f63cdd85854b7a73 SHA512 cf2f939f58706ea2276135deed766a882483e4499dee8966e30194ab6071b2a10b91b8e2a22267b7f29c4b3bbf6ef0f0755d55b49c1b5eb872f1ddee973b2f88
-EBUILD eventviews-24.12.0.ebuild 1163 BLAKE2B a325203f6ea36b4746c4bad6ed3261c97b34fc5a322bd6dd40b73c06d173782d13fcea6129013ccf9b4c4ea83def7608c8080168aeb6ef88fe80317c65a28662 SHA512 07e33679ad03064ff9cc2dafc9d28c9b952e2937d8761c4952b1ce66ab92c4315c8c58f29925d945308708d0638038fd3fb45b31e1999a2ca7ea45322cc12790
+EBUILD eventviews-24.12.0-r1.ebuild 1163 BLAKE2B d0ebdce48854d321acba361455deac084cdf33249859cc4f1f0a4eba2207a576106143a6f54315b676b2437715fc67ee9f678094936b4fae4bd5495248118273 SHA512 537622b1195bb7656760cea51d497d79d4c7d94ec7b4328a8ed955b970f67b0ecaf72a9d373ecdb8460d6bf14244a9dc28efa05ad10d31437d03df495849c5bf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/eventviews/eventviews-24.12.0-r1.ebuild b/kde-apps/eventviews/eventviews-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..ebe6249fc0af
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-24.12.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/kdiagram:6
+	dev-libs/libical
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-24.12.0.ebuild b/kde-apps/eventviews/eventviews-24.12.0.ebuild
deleted file mode 100644
index b9c74d4b5467..000000000000
--- a/kde-apps/eventviews/eventviews-24.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:6
-	dev-libs/libical
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index a7932a8cfc6d..08d3b10e032d 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-24.08.3.tar.xz 124416 BLAKE2B 39db3ecffa124c89936254df5b69925e6e3f4f6d2a9d00ea0be195a9a343648a2fdc0ed0a346159752a8f3cbd89a06341770c380f48ebcac00b26f3b334729ef SHA512 e6cf9e9a4c371fa4d3589de67732faff3853351a7c3649940c209655a016766c1c46a0aa3572440adac0237a854335d23474fc03776ca02c54da63059a071642
 DIST grantlee-editor-24.12.0.tar.xz 124352 BLAKE2B c809ac205c3e309092a1c96907f240d08aeb14f1caeb5bad17c05ff8fa505cffc5bb7cdd06786571cf14c6743d90ef2144fe1bc71ca6804ca40a6bbb0ed6f0a0 SHA512 be30d1b3b8d2233f651f16cd69af55a5bbc868c3c2e9521aa77aa0ae28cfe6f3c737da64cb4dc39a0925452c0a0c7e0ebc8eaa6c3b945222da61de01b16ee046
 EBUILD grantlee-editor-24.08.3.ebuild 1118 BLAKE2B 57c6ea110cdce3586932c3afe50f84291b1ad4940a0e0519bd56d5cfb440d88f3f3bcb402131923b95c7c13c249bad67758a8c46489f7b0a096c56fce337e312 SHA512 cad78f497217cd01133da96bf8946cebadc068ada53dc4dffd526cd86220430eca40bbcb6684568c87e8207154aadae5c413ff27b8b00c4a879dc5b1486d9b74
-EBUILD grantlee-editor-24.12.0.ebuild 1120 BLAKE2B b72cd5231c946f92f6e7fbd453a8c47af345b72cb24bc190991ca968183408c1575d4a5370c25aee1a3934a2e363ec677f03e079eb91251eddd14b145877a290 SHA512 078befaa8d4ce2c7d89bd5c9d572217026dc9b3633896b8307fbc7f0e0a1941def6939d192dc10212a9e9f61e901634955108fad069d24551cf13632d890e62c
+EBUILD grantlee-editor-24.12.0-r1.ebuild 1120 BLAKE2B df84e5d6b9242f0fe5a9f01f54194a21f663af81cf6a67f60bd90d7aaa7b53a745aec14a8aba3a0814591715db5e703a1e26e96515a3f0608bc6d3c40660649f SHA512 f601f7693c8aca7de1110ab59343ac50ccff34d22982abbfe0e4b8bdd444cd55c195155d0f69dc873894a5286e13089186e5937e39b45d9af270bb5ea73f9c72
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..df1c9d5d34d6
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-24.12.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-24.12.0.ebuild
deleted file mode 100644
index d6060c4fd43e..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 2649c942fe5f..0cf907c8b24f 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-24.08.3.tar.xz 63420 BLAKE2B cb6b0af35b69d218d605f328dbb649932c2e6c502c6d4d7ca74c6301a2302cacd031fd306a61cd13b5247df085e4ec46e137beb2c17b31da174bddb5e13cf047 SHA512 a114e4cb90450edc106a799ddb858022c8fdeb48c644768806d20d58b34fa8a85e40ca3a989532f649d670675c8a7518d5129595b8cb694e50de3556a61fd374
 DIST grantleetheme-24.12.0.tar.xz 63504 BLAKE2B f7e64b154a21c2473627913371095f7bcf3b0a784281019c633816dcb737e6c3aa8637e1c2fae4b745ef85505e7eeb43e6fd0eba419ed218682a51862395725b SHA512 78ce30fdcc4fdeafc3e99c39e17a9947c8f64962200f548fed181a66f115c2a334f3f2458bd96881366f16fa6e57925d517a7cf753a0fa012c9917cbf3e81552
 EBUILD grantleetheme-24.08.3.ebuild 886 BLAKE2B c94e79cf001b172c3940441ff8ebe2bfc6285a623d1480fe0b71d21be8548efad55d6246b548c011ed7c2ef854b2e88d1896e012344096a8445447fc0f8e3382 SHA512 0af4a1de64837e20d0f1b0b15dd73009e80fb0a5d8911d17839a4d959df269ba0ceef8b49ecf7c1660ed0280aa0155e2ea19cd2c464ed5a0eaed6ce7b323008b
-EBUILD grantleetheme-24.12.0.ebuild 888 BLAKE2B 56ea9c38726a351dee7c293825a4b63899253875b925eefb90373f8414d6a8668eacff8a4e4347a6ce4c6759248d467e6a7b1f29a37a497f6f068099a98e83fc SHA512 59acf6e4a3fce2fcf68b03d994e71a8f7dac3435177beaf3b3c34b973b8eac3a60d0ed626becdc80a25894dad8c40157e6ef2d739c463906ba021a903194454a
+EBUILD grantleetheme-24.12.0-r1.ebuild 888 BLAKE2B 5d15faeb071bcd83aae6ddc93d1cbf3753c72a471ad9214ceca540ceb9ac54bc468875ad128e008ce6604e27a2625b5923595508ff999e05dd46673e12d47eee SHA512 dc3b97f162a6ce9b18011a6ff4a27589602487f64e815562ef0b5d6655d1d1294a344032d0f5f87dd9c457d48e14ad4cbb26272fb43e5189fafa1eb54f88a08c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild b/kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..5e9b8df3b32e
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for Grantlee plugins"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# fails if package not already installed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+"
diff --git a/kde-apps/grantleetheme/grantleetheme-24.12.0.ebuild b/kde-apps/grantleetheme/grantleetheme-24.12.0.ebuild
deleted file mode 100644
index a5b1fbfbf572..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# fails if package not already installed
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[network]
-"
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index fe167734d5c0..5a19d42cb296 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-24.08.3.tar.xz 587876 BLAKE2B e0b36876c25988521997c23ee8a474612aec8abb66ffe6367818813ee0ccdca61d0c9f929b08993081655423814ba95fb99c8d643357c134b4819ce8026eafc1 SHA512 863f96496eb35c4d600e7c9de8aedebbb9c3b7c272db70cd159e186a8a17208a084e50da6423df8dd0d7ece7933201c035b3a376612ad69fc6b4aec80d45b624
 DIST incidenceeditor-24.12.0.tar.xz 587748 BLAKE2B 7aa4b4104678d5c451852c7482d43fbba6973f0fdc234044165d15d9ed976b787f541650b5f6486a6a8b85fa8bf987d38dc145cca9d2af0fee0febbbf3dcfce7 SHA512 6aa6bed93cb02692d59581ed13e49fbc4fb8b09c0aa3766041d35143f305e91f5683f99471f0ac31007262cf694676a255278a847907b2ee51c87ac9eb18c9d4
 EBUILD incidenceeditor-24.08.3.ebuild 1839 BLAKE2B e62823469ce30ae038017e541d15ac643ad8ecf5dee92324ed5a64c63172f23700cbac3b297ea3a422fdc52a3fb1042f0c0f22aea1fa5dead53ea98eec061505 SHA512 eeb2f0d87f91b6831bc50541a133fca008b218593c4cd8e31985eb31e81af3b8389a63b4f9fb02d136ab5db4b4f751fd330d802ca5d9d37f7fe8a2f82ca4be88
-EBUILD incidenceeditor-24.12.0.ebuild 1875 BLAKE2B 438b13e08c545d1d5d68383b4c7a819b4f2a7ed1f172d083ff643a2d3d63061639a819c4a58ed828d2cd44642be86e3ac8678876460400137f6c5a89b6f14102 SHA512 18cdd43c8419b8b89b422164bc3dac1b9110b7d3351a4879a07862385bf02a4b73bc45a46fa49f2c1025b7b9421ab65b14642917368fc02c49d07c16d0df3483
+EBUILD incidenceeditor-24.12.0-r1.ebuild 1875 BLAKE2B 27369180ade08525503a38a5ef7c5de895de9a2319ad2f23c1abbdeb5079b8f7007eb4c02b4aba08d9a6d86a0e16ca44af41274409a5de75fbfed2e56398f0a1 SHA512 ade486e4bf982e24a4ceca309bdead86e42c3a77a1110da4b1018a1ae52e3d70a23f5c2d8fd0418c3145945702196a0039e50932d6892336ae6152580ebd9dc1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..6a99bf4483fd
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Incidence editor for KOrganizer"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/kdiagram:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/eventviews-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_test() {
+	# Paths exceed unix domain socket limit, bugs 770775 and 837182
+	local myctestargs=(
+		-E "(akonadi-mysql-incidencedatetimetest|akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/incidenceeditor/incidenceeditor-24.12.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-24.12.0.ebuild
deleted file mode 100644
index 6f01f919c297..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-24.12.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Incidence editor for KOrganizer"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/kdiagram:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/eventviews-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_test() {
-	# Paths exceed unix domain socket limit, bugs 770775 and 837182
-	local myctestargs=(
-		-E "(akonadi-mysql-incidencedatetimetest|akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index ac9b7e2fbc9d..7acb96152fb9 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-24.08.3.tar.xz 3425176 BLAKE2B 2af3ba9ba771fae52602950d234203e501c601aa54f0597145328f70fedd33b2e038a69cff395b5f4264662ed2e80115e50c3339636dcfa89ab429fc9969df13 SHA512 c281e6127de0d3eb617da204c143d298a876f24779d11f12b3c49b0182c430c78ce44bf147a9e547e7ad14f5dba8897b68ba83b470225755f92c7fee3c386c60
 DIST kaddressbook-24.12.0.tar.xz 3429604 BLAKE2B 3e491ed0bc66c745776f2777479956c6f47dda97c21c8594c292eaa8386a5ecb4ef2c1b0ea42c207373df4aabfe787e4df1bf3a379e971c899d6bc0680363ac8 SHA512 c8fe729f2b3baa5aba2e7c804fe85d04dfb8183ccf317263a9c5069c81abce8afc3ec2444d460c3d2474d321f8ea7e6a11308116888b5ec95fea5817d3ecc45d
 EBUILD kaddressbook-24.08.3.ebuild 1862 BLAKE2B 0967ceeafcf49da3bc78226e5a4da26525f5cf6fefc7bb4f2632b6b915279a87d99c6db23597dd21269cb2243adb691756cc9d2f24054ef88297ce93d7377beb SHA512 c4df31fb87702e3cea45cc8fc5b9f120948d34ce031b90302cd34491ad59633f103dc8983ca28bfafd9c87b1ebf350253f4b8680644ec83a4fd83879df4be885
-EBUILD kaddressbook-24.12.0.ebuild 1975 BLAKE2B 80871df158a0d5ce3b67c1accad1637d62d2267c6f63087e6c2c32570665bce26ac84b71d61db7343d4a7214c6a508bac243f7c65b6150586654f1e93e0bf0b8 SHA512 0ecadfb7c9b8b2043bb1e5ac5221c9a293abf220a5590ae02355a8d55b2ddda48f7cea166cf5aa5703548bfd48fa6b22707b4bcd7ebaa4af73201915973a3026
+EBUILD kaddressbook-24.12.0-r1.ebuild 1975 BLAKE2B be92fd9bd57cc91e16e6cd66f130670f5c2db3a98cfb6a1e4c5f30cd50425fdbeeb7700c75c9d4ecf1964cd3627a47f9bd6e6b0316f80c2809aa5bd1cabb1216 SHA512 8233d0a08c0ac10af0648b1ac17e98bc55e3c2e54c1641a798029e839e558081e1d80099acb373d6fed828f033b3617ed8114498158f4d0b25c28b84d95c2aa9
 MISC metadata.xml 503 BLAKE2B 9aac0f7fa72bd40ecdd8bfec9417b62149d994f5fbf02fdd600fb30aba523b0bc46ad99f5e357a1e7dbda3ddd0647bc010182899081b755a3667d2926d91279d SHA512 873197976d024369e77c0ac5e8e2711107de6539d9ae78f397fbfcd9cd4ce653481c5b7bbf9d78a8f1f16178db5e8884229e6d7be16d8707e40a496820e515cc
diff --git a/kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild b/kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..35de1a84a528
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kaddressbook/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities telemetry"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Postal addresses" "kde-apps/kdepim-addons:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kaddressbook/kaddressbook-24.12.0.ebuild b/kde-apps/kaddressbook/kaddressbook-24.12.0.ebuild
deleted file mode 100644
index 273dd17beeff..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-24.12.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities telemetry"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libgravatar-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Postal addresses" "kde-apps/kdepim-addons:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 5674cf17f186..867297decf07 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-24.08.3.tar.xz 2619400 BLAKE2B f927a613da45e29ffe0f35c093c126cf97d067e4de5a43331332dcbab75cc17575a789c7fdb2b4a897336bbb17402461323425512ebefcf46691432581b6e966 SHA512 bb3ed33df9961b48681293e7adb1f65b0fec69f54bcb7bc76d219f941b97d8df448ed8f0bfc916178ecd05288de5f5401d503851d8a7b3a336c74d7ef55753f7
 DIST kalarm-24.12.0.tar.xz 2635624 BLAKE2B 1583ae42784e80e379d6e40b0b421d99ebc177ea50c4557534442fcf6c725d5dc21f768d0fbd172a4025703429c0b6461a4aabd392bb4c301d85543a28109985 SHA512 b992ec74ad3177a93a88ecb29971e69183c8e21316572a8675d88e99585004681658775130615a76174d4a8e093c0f74b19eb23ea0905c3dd68d7748a620e334
 EBUILD kalarm-24.08.3.ebuild 2482 BLAKE2B 8bb8d06b043d38455ae14d409a980759750d75955718d85569107ebe97831031c8a3386a3484d30ece6ca71b1da19051f10e1d42473f83d04e425cc6b1b480df SHA512 1a279943d7ba25dd4acbcd71b21797a961c5603e653b9fb0a4cebadb74a3af0601a79141146247c3fbaaa501c8310da90120442fbbc883f387c741e5a3b7bb2e
-EBUILD kalarm-24.12.0.ebuild 2604 BLAKE2B 41e3761dec2af499c65a1dd622580e87674367d8d6cb0271b825bb616e727ac7bbc63eaacf61f4f5e6673b59ca43003054a972f57cf7e137a998a9871cead29d SHA512 1030a74c93f713382ab7bfb41a9d7cd0cc236458e0b1c11b7ae0aece846218629640e95f0a776686ce33c24490910d3937d5db9869876c9df6f20b1544827acd
+EBUILD kalarm-24.12.0-r1.ebuild 2604 BLAKE2B 159ed6e0f964aa23735b60333fbf05d9efe66df0377c16da753e0224329ae66f4361e0d9ab6b6530a2b275f34f59a44fe4eb18f32fdbd268eddcfa69374a7157 SHA512 431b0175f438bc1415e8d1a4b345383afe05387a9d7200d08b4f37f96b2f305393b7e9e0505643b6ea21dde64b0769df44f495aa83990e079d48b31a84a2b68e
 MISC metadata.xml 611 BLAKE2B 202f2006b0d48edf112bdb7038cbf3df1ce7416fd542ae02f03f137c69aab95d4e0e31ab35b0ba6ff499291fc4e886cb732dc7ff3b309e2ea6271595e69ed417 SHA512 803d3ddea785a3ff1acd2ebf7fe7b84f5be8aff81781171127491cddede16b9536acdc3ac1db16dd4c7eccb62c8fc896983b3deed178ce0554381da256f4958b
diff --git a/kde-apps/kalarm/kalarm-24.12.0-r1.ebuild b/kde-apps/kalarm/kalarm-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..99400aaaa437
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-24.12.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="mpv +pim speech X"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	mpv? ( >=media-video/mpv-0.37.0:=[libmpv] )
+	!mpv? ( media-video/vlc:= )
+	pim? (
+		>=kde-apps/akonadi-${PVCUT}:6
+		>=kde-apps/akonadi-contacts-${PVCUT}:6
+		>=kde-apps/akonadi-mime-${PVCUT}:6
+		>=kde-apps/kmailtransport-${PVCUT}:6
+	)
+	speech? ( >=dev-libs/ktextaddons-1.5.4:6[speech] )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${COMMON_DEPEND}
+	pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	speech? ( kde-apps/kpimtextedit[speech] )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_LIBMPV=$(usex mpv)
+		-DENABLE_LIBVLC=$(usex !mpv)
+		-DENABLE_AKONADI_PLUGIN=$(usex pim)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		-DWITHOUT_X11=$(usex !X)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# LC_TIME bug 665626, 857012
+	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
+	LC_TIME="C" TZ=UTC ecm_src_test
+}
diff --git a/kde-apps/kalarm/kalarm-24.12.0.ebuild b/kde-apps/kalarm/kalarm-24.12.0.ebuild
deleted file mode 100644
index 05908fe731a1..000000000000
--- a/kde-apps/kalarm/kalarm-24.12.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="mpv +pim speech X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	mpv? ( >=media-video/mpv-0.37.0:=[libmpv] )
-	!mpv? ( media-video/vlc:= )
-	pim? (
-		>=kde-apps/akonadi-${PVCUT}:6
-		>=kde-apps/akonadi-contacts-${PVCUT}:6
-		>=kde-apps/akonadi-mime-${PVCUT}:6
-		>=kde-apps/kmailtransport-${PVCUT}:6
-	)
-	speech? ( >=dev-libs/ktextaddons-1.5.4:6[speech] )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${COMMON_DEPEND}
-	pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	speech? ( kde-apps/kpimtextedit[speech] )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LIBMPV=$(usex mpv)
-		-DENABLE_LIBVLC=$(usex !mpv)
-		-DENABLE_AKONADI_PLUGIN=$(usex pim)
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-		-DWITHOUT_X11=$(usex !X)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# LC_TIME bug 665626, 857012
-	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
-	LC_TIME="C" TZ=UTC ecm_src_test
-}
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 4ab8c18305da..5a31992843f6 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-24.08.3.tar.xz 355356 BLAKE2B bda9f737222b69b82276741716fbacdcba15c3a31cc5f7bae46f25a4d99f617034c3d1d69c89fd2278b8eeecbebc2e3ad6b99b909513a49d017c15e135c017a5 SHA512 bfaeb7ab2f3f3a9f46922fc72337d84de302dd04a4ad3c51e6f0f6fc386fdb40c8c7818ccbe80a77d1de3b3fa5fb15baa9e82face305eaf993ad4772e869c876
 DIST kcalutils-24.12.0.tar.xz 355396 BLAKE2B 49df2c70a95960da04acfc9ab63435409c0ef70a93cea24f01cd12cbd375fb22374fb60b12993cbf5d8c6e97dd0b612a3c883744c881f6da4ab4bb270da66f11 SHA512 069630b7064a558791bdd14a86cf93a3a1bffdb0db01f23550d3dded3f71d9bd865952967d82106cb9effe556a1d5d038d1216a5276d50bf1558cdfa8e067c69
 EBUILD kcalutils-24.08.3.ebuild 873 BLAKE2B ca33309e2a5a4e512f391e0e76a4647b55a70ada13bc1810379117b4fa21d74de970d0f8d5549b4b45caf9796e661332eeacb849e10bcfb77adbb5686178d06b SHA512 14f4bc7f88b9cd25f9a3c70dc2afe2c25a6fda26382a99e50e5deec58264366d71a97b1c68541828ef7be4c7b5188ad865ff0472ee35e62bd2b8280ea89d082d
-EBUILD kcalutils-24.12.0.ebuild 875 BLAKE2B d73767eca4c5174fa663642c725fb39bc25f042a6933b04106f12596ee8d63bafddd8721fe6ebaa3f15ee4831c5bc73e75e5a9e2bc30436671f90368e396742a SHA512 b6ea4473afc61e6717f555cd54c1b428a2cc4de79d98140c738286ce197aa8cff1773f46e6d9c502135f75ddcc58900e09c93f1820a8b229b2d53ed8d1c68937
+EBUILD kcalutils-24.12.0-r1.ebuild 875 BLAKE2B 1b30feb7bbdcd02faf410300f8ea47b8b3c07e372e4bb3a411b86ab4a8f5f756328b1bb41a5d121f299b3b975d934df56addb7bc5576a6cd487c1191c440b447 SHA512 7ed2d1e928c7027d6e6ed03e8f4356a169a5bf06db7730b6a6252df362f9a1574dc1b09e5e093535c24c3b0ca5ed017df4a58ee3a517898bc84b0393e32d14cd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild b/kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..ad91e2cbe837
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library providing utility functions for the handling of calendar data"
+HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bugs 653616, 711666
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalutils/kcalutils-24.12.0.ebuild b/kde-apps/kcalutils/kcalutils-24.12.0.ebuild
deleted file mode 100644
index 681dc08c4a62..000000000000
--- a/kde-apps/kcalutils/kcalutils-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bugs 653616, 711666
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 44cd32a50657..401b447bd091 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-24.08.3.tar.xz 2611624 BLAKE2B 8b22be76cb97c7d64019d4926ebad07e344ae7f5f0933848ba3bd71126bb8ae80842e76c786896cdfdd850fcf0ef17f1eb7738b9b428f5a32446625ff4ffff30 SHA512 a4ef7c07cf0930c4ca683144dc7f64fab4ff65371b98d6ab7f90c361c8e3d19cf1821bfdc7faf3c6a8f295b55d3e603d0b6a12c14981b71f5eb5320316e8ccf5
 DIST kdepim-addons-24.12.0.tar.xz 2617728 BLAKE2B 04f1c5825d806a1cf9c0bc640c62df7b507a0efb5abe498b60a4b302773f62fe84ba38a17893a6a59590b163b6e19d1c84c8e8aaa140813346f00792d88f64d0 SHA512 dbf7708a3fee0d256319fcb84f3c110da53a25ebd545ba96e90aa7e977a867420d38f11263d58f0ccfec8e435190627892ed39c6edc7691b6d33eba50c646386
 EBUILD kdepim-addons-24.08.3.ebuild 2541 BLAKE2B ff67987102fa2ee21aa5e763298a8b4d20519dad18b741311c03b93e6e0a9acd9b94567ba30ca71013ac7201fd42bb2e77e6ad6300d343b18b255ff72341d90b SHA512 fd1f5ca8a3139a20fb45a01a97646daf8931385f8585a4e07b0fcab98daf5b3a14eea1f353b8ac2d298955ac1c56993caab7acb00012df7d148d7d5dd35676ed
-EBUILD kdepim-addons-24.12.0.ebuild 2738 BLAKE2B cdb2ea012b1e6d57f83868ae37cfa2af054ca39a3202eadc0e0689956e6b8f385393cdc99b6067eed37d52049c8dba7f6f739e082ae5dc1db3a6575257134e07 SHA512 26e5e2a235800712ecdb3da40943c223bfa912e6b18f1722a4e50688269e09599f3b64217b2d68aa814f4d8770a808b515114e516cc438e0ce26e46edd3aedf7
+EBUILD kdepim-addons-24.12.0-r1.ebuild 2738 BLAKE2B 7f2b46b8b2d2567e5e16e43b7c625fe6e2b7d1fdc0e0f3574e38c30a4720f856a5c364140c3d14e7ff22d1523243f25d6290a461510228bf8213e5fcda9d2a0e SHA512 33b033dc55737635f06a637f0d1564758448ddf2168f420ca0fccf08a73ee51761e016b0424e2780409bf6726a5fd01a05e948f11ade7b756b5a3808757c1263
 MISC metadata.xml 634 BLAKE2B bc38913e35cc529483c887f882aea06c4657d4d088a1f0719c6fb989a8833bfe76ba2f6f855f53f8b5ca6efa3e576a7e5b47cb1a05ac999a1563ca9d37eb59f5 SHA512 d92590663ef759ab6f446f9669b9f8bd53906aa031efda462fe2632da580358b44144123a48c4e6d5c016a759a15d66076c2a073011c3cae3850852b5ce247db
diff --git a/kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..a543aea752db
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities importwizard markdown"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/incidenceeditor-${PVCUT}:6
+	>=kde-apps/kaddressbook-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kitinerary-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpkpass-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/libktnef-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:6 )
+	markdown? ( app-text/discount:= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# not packaged (bug 911819), but if present leads to rust shenanigans
+		-DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON # for adblock support, bug 940898
+		-DCMAKE_DISABLE_FIND_PACKAGE_KLLMCore=ON # utilities/alpaka, not packaged
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package importwizard KPim6ImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-24.12.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-24.12.0.ebuild
deleted file mode 100644
index 570c13610f07..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-24.12.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities importwizard markdown"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/incidenceeditor-${PVCUT}:6
-	>=kde-apps/kaddressbook-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kitinerary-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpkpass-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/libksieve-${PVCUT}:6
-	>=kde-apps/libktnef-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/prison-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:6 )
-	markdown? ( app-text/discount:= )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		# not packaged (bug 911819), but if present leads to rust shenanigans
-		-DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON # for adblock support, bug 940898
-		-DCMAKE_DISABLE_FIND_PACKAGE_KLLMCore=ON # utilities/alpaka, not packaged
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package importwizard KPim6ImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 93d1b480cc3c..27d072ba9a95 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-24.08.3.ebuild 2232 BLAKE2B fcf3bde45d632fc4cfc54a5f8d9d5605913718046c29bf31f774085c201dfe10964689163331c47895ad7c53b5417614a50aeba939f6dd501c4fd72c36da5af1 SHA512 12fd53d3a3863edc4acd53227c7c4481aaa393515186475ca4159139fc32711f8c326562b9ed4e578f2f5da57bd1f37a7cccf72653b16a5043ebd4abc1921dff
-EBUILD kdepim-meta-24.12.0.ebuild 2200 BLAKE2B f3b69769ccc5476afecd67b85921dede087ace764f4b6348b16335fe99507a22fe28a92d1ebc181f5d54eb4f03ecd6d38b9345eb00505ae80c2b9e5fa79a78d1 SHA512 3a43d02065fc5d9a963328b14f1ffa4fa22942b49afa188a85faa2c8f5560f02a0072dd01998fb5c7e3e42fcdbe17ffb6f104970659ab934ee66673f171dcd75
+EBUILD kdepim-meta-24.12.0-r1.ebuild 2200 BLAKE2B f3b69769ccc5476afecd67b85921dede087ace764f4b6348b16335fe99507a22fe28a92d1ebc181f5d54eb4f03ecd6d38b9345eb00505ae80c2b9e5fa79a78d1 SHA512 3a43d02065fc5d9a963328b14f1ffa4fa22942b49afa188a85faa2c8f5560f02a0072dd01998fb5c7e3e42fcdbe17ffb6f104970659ab934ee66673f171dcd75
 MISC metadata.xml 719 BLAKE2B 5738f59b4f5659b529f74f7f35fc8773408b45baf022e0b4e55656e45246e4217e130566dcb8ed0fe8f51d2198802a71cdf81ea7b1740de2bba3f289fb94c949 SHA512 5f9cb7928079b28d9125665f25c90c3bf3acc51d65760ba93ccda918fac56ba399a501fbe8d283d20aba5d83ffb9aa0ee5d7a2ba37e613d5ae7ab680a04cfe1a
diff --git a/kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..9d92898550b4
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="bogofilter clamav spamassassin"
+
+RDEPEND="
+	>=app-office/merkuro-${PV}:*
+	>=kde-apps/akonadi-${PV}:*
+	>=kde-apps/akonadiconsole-${PV}:*
+	>=kde-apps/akonadi-calendar-${PV}:*
+	>=kde-apps/akonadi-contacts-${PV}:*
+	>=kde-apps/akonadi-import-wizard-${PV}:*
+	>=kde-apps/akonadi-mime-${PV}:*
+	>=kde-apps/akonadi-search-${PV}:*
+	>=kde-apps/akregator-${PV}:*
+	>=kde-apps/calendarjanitor-${PV}:*
+	>=kde-apps/calendarsupport-${PV}:*
+	>=kde-apps/eventviews-${PV}:*
+	>=kde-apps/grantlee-editor-${PV}:*
+	>=kde-apps/grantleetheme-${PV}:*
+	>=kde-apps/incidenceeditor-${PV}:*
+	>=kde-apps/kaddressbook-${PV}:*
+	>=kde-apps/kalarm-${PV}:*
+	>=kde-apps/kcalutils-${PV}:*
+	>=kde-apps/kdepim-addons-${PV}:*
+	>=kde-apps/kdepim-runtime-${PV}:*
+	>=kde-apps/kidentitymanagement-${PV}:*
+	>=kde-apps/kimap-${PV}:*
+	>=kde-apps/kitinerary-${PV}:*
+	>=kde-apps/kldap-${PV}:*
+	>=kde-apps/kleopatra-${PV}:*
+	>=kde-apps/kmail-${PV}:*
+	>=kde-apps/kmail-account-wizard-${PV}:*
+	>=kde-apps/kmailtransport-${PV}:*
+	>=kde-apps/kmbox-${PV}:*
+	>=kde-apps/kmime-${PV}:*
+	>=kde-apps/konsolekalendar-${PV}:*
+	>=kde-apps/kontact-${PV}:*
+	>=kde-apps/kontactinterface-${PV}:*
+	>=kde-apps/korganizer-${PV}:*
+	>=kde-apps/kpimtextedit-${PV}:*
+	>=kde-apps/kpkpass-${PV}:*
+	>=kde-apps/ksmtp-${PV}:*
+	>=kde-apps/libgravatar-${PV}:*
+	>=kde-apps/libkdepim-${PV}:*
+	>=kde-apps/libkgapi-${PV}:*
+	>=kde-apps/libkleo-${PV}:*
+	>=kde-apps/libksieve-${PV}:*
+	>=kde-apps/libktnef-${PV}:*
+	>=kde-apps/mailcommon-${PV}:*
+	>=kde-apps/mailimporter-${PV}:*
+	>=kde-apps/mbox-importer-${PV}:*
+	>=kde-apps/messagelib-${PV}:*
+	>=kde-apps/mimetreeparser-${PV}:*
+	>=kde-apps/pim-data-exporter-${PV}:*
+	>=kde-apps/pim-sieve-editor-${PV}:*
+	>=kde-apps/pimcommon-${PV}:*
+	>=kde-misc/zanshin-${PV}:*
+"
+# Optional runtime dependencies: kde-apps/kmail
+RDEPEND="${RDEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )
+"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-24.12.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-24.12.0.ebuild
deleted file mode 100644
index 9d92898550b4..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=app-office/merkuro-${PV}:*
-	>=kde-apps/akonadi-${PV}:*
-	>=kde-apps/akonadiconsole-${PV}:*
-	>=kde-apps/akonadi-calendar-${PV}:*
-	>=kde-apps/akonadi-contacts-${PV}:*
-	>=kde-apps/akonadi-import-wizard-${PV}:*
-	>=kde-apps/akonadi-mime-${PV}:*
-	>=kde-apps/akonadi-search-${PV}:*
-	>=kde-apps/akregator-${PV}:*
-	>=kde-apps/calendarjanitor-${PV}:*
-	>=kde-apps/calendarsupport-${PV}:*
-	>=kde-apps/eventviews-${PV}:*
-	>=kde-apps/grantlee-editor-${PV}:*
-	>=kde-apps/grantleetheme-${PV}:*
-	>=kde-apps/incidenceeditor-${PV}:*
-	>=kde-apps/kaddressbook-${PV}:*
-	>=kde-apps/kalarm-${PV}:*
-	>=kde-apps/kcalutils-${PV}:*
-	>=kde-apps/kdepim-addons-${PV}:*
-	>=kde-apps/kdepim-runtime-${PV}:*
-	>=kde-apps/kidentitymanagement-${PV}:*
-	>=kde-apps/kimap-${PV}:*
-	>=kde-apps/kitinerary-${PV}:*
-	>=kde-apps/kldap-${PV}:*
-	>=kde-apps/kleopatra-${PV}:*
-	>=kde-apps/kmail-${PV}:*
-	>=kde-apps/kmail-account-wizard-${PV}:*
-	>=kde-apps/kmailtransport-${PV}:*
-	>=kde-apps/kmbox-${PV}:*
-	>=kde-apps/kmime-${PV}:*
-	>=kde-apps/konsolekalendar-${PV}:*
-	>=kde-apps/kontact-${PV}:*
-	>=kde-apps/kontactinterface-${PV}:*
-	>=kde-apps/korganizer-${PV}:*
-	>=kde-apps/kpimtextedit-${PV}:*
-	>=kde-apps/kpkpass-${PV}:*
-	>=kde-apps/ksmtp-${PV}:*
-	>=kde-apps/libgravatar-${PV}:*
-	>=kde-apps/libkdepim-${PV}:*
-	>=kde-apps/libkgapi-${PV}:*
-	>=kde-apps/libkleo-${PV}:*
-	>=kde-apps/libksieve-${PV}:*
-	>=kde-apps/libktnef-${PV}:*
-	>=kde-apps/mailcommon-${PV}:*
-	>=kde-apps/mailimporter-${PV}:*
-	>=kde-apps/mbox-importer-${PV}:*
-	>=kde-apps/messagelib-${PV}:*
-	>=kde-apps/mimetreeparser-${PV}:*
-	>=kde-apps/pim-data-exporter-${PV}:*
-	>=kde-apps/pim-sieve-editor-${PV}:*
-	>=kde-apps/pimcommon-${PV}:*
-	>=kde-misc/zanshin-${PV}:*
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 7ffccdadfe54..1fae18aa8ca3 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-24.08.3.tar.xz 1665232 BLAKE2B 71327b74c7c0c52d1998ab08b55cabb433776c6238370a9bf08c14b9f6f8b6965ae4bbe5947625e1e041f89271beb0ec67750265e4940eb1b854cb5e86a207fb SHA512 498b5f5dfee4678a1daab505ab4e98645107ba71752bee2cb858d78283b0ffc9e7091b54652aa2c5d9174512d46f6247fd3fb0fc75007c93bf97910f2a529d9e
 DIST kdepim-runtime-24.12.0.tar.xz 1664668 BLAKE2B a787e5319e04f7189f12832174228ebad6f99bba565c778d990e634df7af87fcb08f7f0c59b8b3f7d402b8c7b59ef6a52aade5884fcb95243f72d55670c9a548 SHA512 37577abc4d305a4a034ac2af7e84e55765cf63d0479a080e678cceba607bff8df89e6a46bd766987321af3f6fb1cd5568346f2f47cd160101106b484a38b843e
 EBUILD kdepim-runtime-24.08.3.ebuild 2386 BLAKE2B 32298eb0960ca25c794a3f32aa3bdd73060e73a218641c2d95eb62f08842bd5276e8f42c249e539b069646ce59fff2325993e670880282925b3da6e728f25896 SHA512 5f2f3ddfa51872df222a1d33fec864f637bd5bad09577ee0c6a5e04cddbe4b42c9be3f0a548f607251dd98e14c416c59861db0278278015721da210338442dbb
-EBUILD kdepim-runtime-24.12.0.ebuild 2472 BLAKE2B fe400029fe87f8cc229a08d9ca14290fd74b19a140a38de79819ee76c96d84847efdec45ecdbdf8062716c43d9c8d50b2725253e58f43d6319facc84e8058ddb SHA512 a7cc0d45fda38eab3238a5d1cf77efc38cfe69090e9476ebb483e6739b9a04cec85746d3a6a89a26d5f1d4645e916386ad72edc351f7b0148cf9d11fdf2a6b03
+EBUILD kdepim-runtime-24.12.0-r1.ebuild 2472 BLAKE2B d77fce27808fd61868bb95322b76cd776e77075f6eb7cf8331c7874879a0afe605f946e4adf26ee1ed7b05d3dcbce4b52d228d66ddffc1974415efaa7e396bd0 SHA512 16766f469367703657dc99dc8653d12531a9980deab31658900920a57e82940be4e3f238ebf520343ed08710a0c85b02e9ffefd886a6ff26a466f164672e6774
 MISC metadata.xml 432 BLAKE2B e1448668a5840f38d305e7f89abb55e2fb132b5e513cdf533cdf47ede98e544cacfa4c03fb827a7438dde7c5f11fe377e4337b7438f929e1bdb28e4670f0d6e8 SHA512 42477ce73bda3ea00aa5c431291fd68768af852226c39ac59d73e2a9c83a8d1ce92ba68311d1ebe5fc21912432986c493842bc36d047d2d6c4651693534e5c62
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..0490ef41efc4
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities speech"
+
+RESTRICT="test"
+
+# TODO kolab
+RDEPEND="
+	>=app-crypt/qca-2.3.7:2[qt6(+)]
+	dev-libs/cyrus-sasl:2
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${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/kimap-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkgapi-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdav-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=kde-apps/akonadi-${PVCUT}:6[tools]
+		>=kde-apps/kimap-${PVCUT}:6[test]
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package speech Qt6TextToSpeech)
+		-DKDEPIM_RUN_AKONADI_TEST=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0.ebuild
deleted file mode 100644
index cdc7b236d9c2..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities speech"
-
-RESTRICT="test"
-
-# TODO kolab
-RDEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6(+)]
-	dev-libs/cyrus-sasl:2
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
-	>=dev-qt/qtnetworkauth-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${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/kimap-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkgapi-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdav-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=kde-apps/akonadi-${PVCUT}:6[tools]
-		>=kde-apps/kimap-${PVCUT}:6[test]
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package speech Qt6TextToSpeech)
-		-DKDEPIM_RUN_AKONADI_TEST=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 972df9c0496b..15f97de4d303 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-24.08.3.tar.xz 195592 BLAKE2B f4e191eba245dacc0d0dfad538d97822623ec4fd7f31b3be0c1549001a777c4687c2dc7ae413f200d55b5a408aa38e0786f1d104db2369919909cd623f34ce0b SHA512 ac241507ee2741f6be37a4371d1073c2c3d04a71012671c9bb63bfcbb85bbe332592aa44a55751c49c40a8af6d34604f4dee0f31e13c8dabe0e8267c5fba3925
 DIST kidentitymanagement-24.12.0.tar.xz 196792 BLAKE2B 4ec8de4a347714679340b695f3c3fa27ad12d8963b5b02c87f6ab13cb6e6d634870de7a270a0539bbf1c02a67628a2c8c68d56d3de46b3118f5cb930d9fe4471 SHA512 5ae4f093e45979b4338110245dfa9767c0430e692d38fe87c29a33417cfa519963646a6d43e7a02e04cc98f5c5163a486bb6138880e3328580c0df71464493fa
 EBUILD kidentitymanagement-24.08.3.ebuild 837 BLAKE2B b6def379fc6da7f1f5534d778c63ec82b0fa7962634db7177671028276a6ac85c35c2064104a436645470ad6169624f75ca6eab8b3b5997bb858e40efadf2cc6 SHA512 b834f99bfc0b773b8658240ccc961e3667a2a3e699879290586129ecad958ffe936d5fc325ea9f50f9f33163d578f7ad03046f14f5923187641c678da713f715
-EBUILD kidentitymanagement-24.12.0.ebuild 839 BLAKE2B 3583ec52b7193e5a2d57583591bfc0ddfeed13fc6ba7a4ae112d160be864036d2ec5ae8208f64ca0a3368a2b1c4534274c133860be73fe3a46217eaf6e4439a0 SHA512 755f8fc97d17494785470aa58fbc7edda22f8dc3c5e59af9f3ee327d5f2e557dbcdf63aa5e16e6dd3efd5877707905d1ee7a6e7a8fbecea97e5307426c72eea0
+EBUILD kidentitymanagement-24.12.0-r1.ebuild 839 BLAKE2B 5857bd27c709ebdf576a2126754cbad6d5a92b959431c6967f34d8c7d9bcc6d32536f117bd96e6b1db59c3a005419979bdf859c8a9cb3a1bc8c42d0d273c81c1 SHA512 412f769ffc8cd748f5b6278a5d9fcad74e9ac06fd461d38dac01ea5b1bd2a0e4dd170a55605ca2695f63e348ad978c71eac52196d8c7cfd6d2e47f396c56fe99
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..5dc75c495d60
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for managing identitites"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-1.0:6
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0.ebuild
deleted file mode 100644
index 2f25e208d9da..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-1.0:6
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 264e9b67b5a9..0b2a1fac37ec 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-24.08.3.tar.xz 132356 BLAKE2B 1f9001d933415edc39c29c1d1baa21322520f9d08f88a22291dabf302f8c6fc13cdecf5752395feada310968b7636ab980e46f523eddadabed7a724f38ba0809 SHA512 97d76ba2c8656273028e90d88ca8668ed6f7122096a945278d7edd476f050d97e9f818a300cfb51e81a30d68c669619d834bd264a5aae6798594dac296047a6a
 DIST kimap-24.12.0.tar.xz 132396 BLAKE2B 067b184e57bba1cf3a2a3ee13340496a1ff049efad2bca08ce3cca0e631e2f4ccdd6d4e48192379a1e30bd0f9cb6bc20f21355a1422e711c50d0870685507f1d SHA512 fc8fea3b7f9e046d26a4fc4b7d6f64b18950e6eff6baebcd6749c6d9b7f47a45e0e11ca7b10d78a1ef5b29569a9afca2425bb46e3e2065093809a77ac463fe88
 EBUILD kimap-24.08.3.ebuild 872 BLAKE2B 5f0508b984ae98b4618a5a908f5969784c6e7e1bbe00d4444402b9e48672e484bfa68018e35605890e45dd4cfb08f2dfd38bc6e309fdc9b94756c3786b677f90 SHA512 2fe38166f5418a7cc4efb6f05e1ef39bfda66b3bb86ed8946350ba080c747641ea799b9a3f84470d39412596a675371a5ae88b12529480b905f4599931aef888
-EBUILD kimap-24.12.0.ebuild 874 BLAKE2B 5315e5692045699d5f26f18acfc2a7cddde9d3251b37e891f40d0a68978ee20de470ce226a67e6da6c8ea06187008496e27282abafd713f401ec7e3407f40edd SHA512 e0b3136a5332e969bca5851be4eff5b61fa432d1cdc45f3f0dde4ddb4c6a1675cfd170c4b063fa3ba21e4fbb2e2288a865146cd35c5f0b94f197790e56ac1464
+EBUILD kimap-24.12.0-r1.ebuild 874 BLAKE2B a13873c730377e2901f1fea41f06bfae76529da07c570ea08f0b68654dff45482f40c46a683a014b08d41c0272d4809851713aeba595a96210038b76b8260c8e SHA512 5d2f1119032d190eef83734f08f99fc62bdfd4372737dd966135a36f267dfa2d24b1f963a64ed0ce9b26a178a02b484030d6638e7906ec90b00509b8428e521b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kimap/kimap-24.12.0-r1.ebuild b/kde-apps/kimap/kimap-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..0755210e579a
--- /dev/null
+++ b/kde-apps/kimap/kimap-24.12.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for interacting with IMAP servers"
+HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+# TODO: Convince upstream not to install stuff with tests
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
+"
+
+src_test() {
+	# tests cannot be run in parallel #605586
+	local myctestargs=(
+		-j1
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/kimap/kimap-24.12.0.ebuild b/kde-apps/kimap/kimap-24.12.0.ebuild
deleted file mode 100644
index 125096e57b23..000000000000
--- a/kde-apps/kimap/kimap-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index da4c4de5a233..5a634223040f 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
 DIST kitinerary-24.08.3.tar.xz 1992056 BLAKE2B b1e146c3056debd184fc7ca25c401be6de79fb02300b83681d6d8c4d0455de27e829a9305c435b48ba38699eecb24015dc49a1f3854c21591b332a24abf0757d SHA512 6f4fbe88a7ac14e90e2811661c2f8d747f4789e588ccbc109aefb2a5c958efb49e5d30fe2faf8b6384d8dd7ed5b2d7720872209d624be21c11a1e3c19942da0f
 DIST kitinerary-24.12.0.tar.xz 2004820 BLAKE2B 1de13a4b888e56f060ed918b284fa72667e8c174a26ae6199d707e7eeca95493f5a80645125ff51b75af221e490315b3f0e8687a5019bbdccdeeda886b195397 SHA512 7a019ab55b7c165f58fac7e1bc42f08a8e0fea3273ddf578c714c6cf8b1280259789ea899187c3836d1493ec816e8f6244734a8fca8c2549c96e9db46dc34f9d
 EBUILD kitinerary-24.08.3.ebuild 1108 BLAKE2B 88eb29218a97e74c91b860a7ba2d157c02bc6580cb53123a32ed1741383bcd70ef04c88d8696fbf8ae0d662483e1e765cc2ea90db22aabc74ab63c5fb66d25ff SHA512 e6113123d1b387bc0d0fd7d630b179be679226b78d697b80a66661bbe7af6ce03d8933e27287d925ec60bb16301c5b1b351bef1304124251c247715eb2bbd56e
-EBUILD kitinerary-24.12.0.ebuild 1110 BLAKE2B 6781c40fc0ca5bb2a5092615a9a0f1556b86eb942354817b7308f85b7812acaf9510e032c4c5336537f954eac19c6198ecac781d90311d1aa5893df7d2747294 SHA512 d98c664a1dbe3473bc9e2810a8ce32ebfcb2046efb0e8002c4baecc91204a222fbd4b6449327b505c733329072e2013c70bfb37ac882ca743a59f9af4053a541
+EBUILD kitinerary-24.12.0-r1.ebuild 1110 BLAKE2B 74bd507c329f8c661499568802381789309a61e4e1421566f6be14d4acb53570474c144c305232127c9abdf0ff500341e515edc1b1228d87ea1d8804d1608949 SHA512 8a7b13dd7b9fb5fa383a5bc2ae5411f9c6f8c3954bc534e7b68341dcf6e3eabcf19ad5f91267d7885bc2f81749565aee704684bf02e0977c04bc8964886444c4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild b/kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..510f004dc353
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 907957, 851000, 739732...
+
+DEPEND="
+	>=app-text/poppler-23.12.0:=[qt6]
+	dev-libs/libphonenumber
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpkpass-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=media-libs/zxing-cpp-1.1.1:=
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="x11-misc/shared-mime-info"
+
+src_configure() {
+	local mycmakeargs=(
+		# sci-geosciences/osmctools; TODO: useful at all?
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kitinerary/kitinerary-24.12.0.ebuild b/kde-apps/kitinerary/kitinerary-24.12.0.ebuild
deleted file mode 100644
index eb3241490ac0..000000000000
--- a/kde-apps/kitinerary/kitinerary-24.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 907957, 851000, 739732...
-
-DEPEND="
-	>=app-text/poppler-23.12.0:=[qt6]
-	dev-libs/libphonenumber
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpkpass-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=media-libs/zxing-cpp-1.1.1:=
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="x11-misc/shared-mime-info"
-
-src_configure() {
-	local mycmakeargs=(
-		# sci-geosciences/osmctools; TODO: useful at all?
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 662c7f64167c..b0627b2ca9ef 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-24.08.3.tar.xz 189696 BLAKE2B f0579501df748587bb38524387c117b6e1825417d5741191f28d88f71023a2e0e8c1113e675127efeeeac732f777f32414283a3cda99855af8deac214ac6edda SHA512 ca77c2e7048fb873174509414251f2a5ac717fd7d093183a1b9b4f14086ad832b354a1ae72da9830c4a6ed4261a804f1662f25ee485394cfded4a702f21cc047
 DIST kldap-24.12.0.tar.xz 190344 BLAKE2B ddc249853f4ca3a7aef38a5d16de3a8f699480a6b56b2eac2e2ab02abdab8baf0c610db033eb86a00b96234fe1f7679e417eb7d64248ac9d420610057cce4be0 SHA512 df59f93e54f7f36f8ad0152ba4c051f7af3a88e6eb0de9944979a8025b45d72e4c72be939178af576620a160fe9e376689f1a9a6ead97999b74dcae95d962891
 EBUILD kldap-24.08.3.ebuild 658 BLAKE2B 11aa4379d9be1b786ff17f705359c47eb4257254e4dd3b4996e9d8891182a31959c8d83b532bcad2a3009152c27110fa793f554d2c1681b5348391d342896e64 SHA512 dcaa828374fe82a041542ffbefa47e35a925642550be0a48d5c53f7ebd71eeb1e653d7d5edd8170c97c9861e06899c25e098090c5133d10b1195658aa054a878
-EBUILD kldap-24.12.0.ebuild 663 BLAKE2B 11936800d95435653c8342c83b92b2f1cf8e0f1b54646bd6e4b00bd5dd1bb06ea8f9b4b0bc9ec8221227bd1be870a2d09ed866c220a13a561934d74491733ab1 SHA512 420ba2caf59c1650033c063f8ef4970a82445e852d61bb63e6b769d8b519ca58573cae1aa45c7dedde39113d268007bae2a05326ab383576893f7447ada43467
+EBUILD kldap-24.12.0-r1.ebuild 663 BLAKE2B 7dffd11647217f1d678446dec4adbaaeed66172a1669e853b8337d24512c68ba7f5a8f829cf64308a7ddec4cef6de5c8da08586402451e47d0f617cc710f5ffb SHA512 f5f44b6f4651fbe81150842f18fcaf5a40c8a2024159de24bd10c9e319e13008cf9a9dfa255c55fea36f13ad89dd287c161eda2ef038e408714440e68ada28ea
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kldap/kldap-24.12.0-r1.ebuild b/kde-apps/kldap/kldap-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..4718a926aa35
--- /dev/null
+++ b/kde-apps/kldap/kldap-24.12.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for interacting with LDAP servers"
+HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	net-nds/openldap:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/kldap-24.12.0.ebuild b/kde-apps/kldap/kldap-24.12.0.ebuild
deleted file mode 100644
index 2957955b4941..000000000000
--- a/kde-apps/kldap/kldap-24.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	net-nds/openldap:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 734e626103ae..27241e823d7a 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-24.08.3.tar.xz 2983256 BLAKE2B 162a77493f25a81fe04901c6823870a4f80c51b30bde807502ec1390dbebba838b05718feafd559c3493554a46021d75eb74a7ffdca6e58a7b13247005a1c5ee SHA512 8fd5e8d08c23ccf5559d0cf7b14e7b013b9d13791869f564c624db39156550cbb4e45fa7ce63c076890d938e8c0342b90cbbd53ea98a2eeec167d5f13b551871
 DIST kleopatra-24.12.0.tar.xz 2785572 BLAKE2B ffd9620424651e82738710a6ccbd7ee990391b8332552a956c9efa57fe1e02508819d6c270fe446efb88962322d5a045374ed6ec56c291c65cafa5d56ed5f854 SHA512 da8faf28264cc42d684278739bddf6db9c8384c09b947965c4114b236c75697851fbeb6ca27d0332310f5cf3c94d0432cc30ef7ba0bdc1562701bdb08a622cf3
 EBUILD kleopatra-24.08.3.ebuild 1846 BLAKE2B 129a7e5ed6473d3a8e449fd0ad78d559cbfcefcebe6ce19d790cdbe0677934339f6a0c72212c5bc45191ca01e779846d5092d94a46ce180cf591acada0510010 SHA512 2dce72773403571e2c757e42d39879d715bdfa4ec08dc32c50aca341b9ff54b2162ba585f34a5dd73a97d052a294e83f8b471f1c118935b5442bc590acb1307e
-EBUILD kleopatra-24.12.0.ebuild 1885 BLAKE2B 00a0123733ef46e16e72520b0a94fe2fe8f898ba50f1846475ebffb59d62b7aa878dc28ca7733fcc2ff8925aa2026e67a5ce23062da4c8ebdab52004458f1fbd SHA512 8f77838bfc88156d4a9b73d221be893c22c84c286c6d6af1b12a56132a7764d35c1c7c697b33591a609611f06c9388db1f09c2a0529dcfd34d47c9694035c9f1
+EBUILD kleopatra-24.12.0-r1.ebuild 1885 BLAKE2B 26033f5a796c18bf455a1a7cd0f2c58313bca4a9c73470cbba73ac0810de29bc961c9eb8f1a85f04b516e84ffce1323101d1727931f965d84de88a156d6eb8fa SHA512 37c69f7ac020c7950d27151a16051a1be2648ab0287af311eee7944b003607b1d493b02adca59d54a0ca53ea25a14b1ac2b027e91c749fa0756905196decec91
 MISC metadata.xml 421 BLAKE2B 2d59a8c375d953a93b35184503bffd26005b4ce8e5408ffc0e1f6dd5283d031d2ed2d6bd7036d380391499ce50d4dda3fde3432e6f4f0106145beac01641c87e SHA512 df430c37f0b8c4f78b9490bdaa784bbb676d9f4e103d5a016b3f46492dde84bc7763597864c42e7be1d4c070951f49cfd0dcda10e90cf0fe20d7b212eb07db16
diff --git a/kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild b/kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..6ed5f9e80f2f
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://apps.kde.org/kleopatra/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="pim"
+
+# tests completely broken, bug #641720
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/mimetreeparser-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	pim? (
+		>=kde-apps/akonadi-mime-${PVCUT}:6
+		>=kde-apps/kidentitymanagement-${PVCUT}:6
+		>=kde-apps/kmailtransport-${PVCUT}:6
+	)
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package pim KPim6AkonadiMime)
+		$(cmake_use_find_package pim KPim6IdentityManagementCore)
+		$(cmake_use_find_package pim KPim6MailTransport)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kleopatra/kleopatra-24.12.0.ebuild b/kde-apps/kleopatra/kleopatra-24.12.0.ebuild
deleted file mode 100644
index 09e71b13ed86..000000000000
--- a/kde-apps/kleopatra/kleopatra-24.12.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://apps.kde.org/kleopatra/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="pim"
-
-# tests completely broken, bug #641720
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/mimetreeparser-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	pim? (
-		>=kde-apps/akonadi-mime-${PVCUT}:6
-		>=kde-apps/kidentitymanagement-${PVCUT}:6
-		>=kde-apps/kmailtransport-${PVCUT}:6
-	)
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pim KPim6AkonadiMime)
-		$(cmake_use_find_package pim KPim6IdentityManagementCore)
-		$(cmake_use_find_package pim KPim6MailTransport)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 1da3218045f8..ab7a18ea6787 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-24.08.3.tar.xz 166356 BLAKE2B b2a8c13846a2ba7c1ac658f5ec278415032eee7b335ec87356d9d2ede4e99bdf7f0874e65f165456dad4e4fe06dcf46e0cfde03efbfc4025ffc3cb656329b6db SHA512 cfe4bb7d1536cad4fa6d441431ac8f3df6c849de2cdd6cf8c9a80080329d4a271b09b70615f96a783e241aa333bf6fd164853e027198777be5ed936a144f53de
 DIST kmail-account-wizard-24.12.0.tar.xz 167652 BLAKE2B dc4723f67b57dbcefc4d68f15075f9e5011528edec85443c68bd87975b3a5abf1f88767bfc0e983f4e537f00498967ab81312934aa09900bfd4ac24a9f8af7c0 SHA512 712571bb6cff329db446b49bd7a2f59d2862d876199c7084bfd85e55a798dc45011248f29055a4a17fa1a0cefdf91c505bb4cfbee97e733a82a02ba312ffa611
 EBUILD kmail-account-wizard-24.08.3.ebuild 1597 BLAKE2B cbf01fa0ffb0b2b1da5c01d78016ec715ed07690385aa9b5de281984ae9f65e7d29fe0ac7fe87431852ab4ff9cd118063d1c6c62a92e432d8c552cedae03ca05 SHA512 d74f57f4fa59b44fcd66d13baede9b3698253a85be1c8033850b03b9def37f4d994525053bc037c7bccfa129e4fa5826ed9dccc0be92bb24f3a138e445a41fc8
-EBUILD kmail-account-wizard-24.12.0.ebuild 1602 BLAKE2B 47b819435222658f1c1bbdd29a1cc8882e86750d1e0fb6a7bd529af48da7f5f4f69d5be56a15cf45d3ca2b319da7540fc927e1dcd2ed3af4d5b9a76a2dfe5cc2 SHA512 4e8e542a3aa5517ad88b8cef551e8f382f025ca2ca4f977b455b6de737ccf1c78333edcb0ccb5e2649e14d7c92ea15448a2aa8d0897058084d6a262c936071c6
+EBUILD kmail-account-wizard-24.12.0-r1.ebuild 1602 BLAKE2B ea25a3422e5558f65fad7ec8844f0306e0c45222cf254254343c39855adf4edb36f9c31e426b1b47d5d5b902c47ff484ba377e90c7cdea9aa0208049445e6619 SHA512 d7084b635be8530bd72fc005055a5d9df41cb319eea881ef2d3b1507e95c349fb062aa5a90e345e7750dd9f107c26554564bdb050cdf15d15ec9ac3582c9b23f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..2e2d5c691bea
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 926456; requires akonadi server
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0.ebuild
deleted file mode 100644
index 117a28d6fdbb..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 926456; requires akonadi server
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 4b21e83e2623..765bdaf6698a 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-24.08.3.tar.xz 7742152 BLAKE2B 2fde35b83d4e0924bfe7321f085dd7e6f9caa3a51c5163829b4d41410a9e5e1388c0db7e6dac109cdb2999d3a93693dfc5987dcca8d6eef1aa4ee12cfa005084 SHA512 7d61b49423ba8d0b9630022d63ef4c4efd3c63f74d94d80841b96a92928e2f61e0e16997bacb962f25d49a683868d2a94b35e069c0435e88f86bb728d959af48
 DIST kmail-24.12.0.tar.xz 7771708 BLAKE2B f4760eecdbd60164f019ca882c174d573cc1177bd2afe10169df0e563334c52fecaa24da0bd9e2a014f1cc26ac0b1e3fb81b2a9a797ed90b9c16c91100b4ca67 SHA512 bf4d73347357dfd1abb9c5a2721f43cd3969eafa7f0a76bd79fc6a93b70255cb59bdec79a90ada02938f3c766296267585dcd7a12d0b58f478f50efcf8e4a86f
 EBUILD kmail-24.08.3.ebuild 3846 BLAKE2B 0895dde9afa03566043bc4b3f3ea881171abef1a5a6108c81a0dcfa8d6999e30f6026b6ea705ea2aae2500707f58dcbb47951d6b1f32513bdd7b9390141d12bb SHA512 fb0e18430c203c5efbb81725a0678fb3b5e27527460f1b8bcb42d8c4d2f3e4ffe6f1e7782e3e6973c5e6744bce6958f4e6673426ad68b26d2e6680cd517dd77d
-EBUILD kmail-24.12.0.ebuild 3883 BLAKE2B c86d5c85458c4cb7cea523ef12c5046f81ee1162d35fa2e53836846bd93298e39eba79db21531587131750c354ea35bd4831438c2558d3062bb8ba4fc67d86e2 SHA512 43e0ac809576ec8850a43c39e4021c2e45d5073b5ce81c8309e561a6c53f4db4959fcc19cc755e2c5e639b30fa6e0a85b5c3f33a772978225522a79849c93754
+EBUILD kmail-24.12.0-r1.ebuild 3883 BLAKE2B ed06fe07b6ece3339e88595626dc85010a5ef8d8707634fbfe308d7c5d96a1648eecc7b5270ec4b76ecd798bf48dd0c64801d7e23f65e4d177f6648d02e31b69 SHA512 94876b3742d066981b215e731d5740db994b06cc5d29d00b679bf9ceda1601047a5566ed93d468aacf025bde047158038c391fff2cf7a5d1470f6a02d7292692
 MISC metadata.xml 496 BLAKE2B 3a1f9cb1712438b640bfb0acb46a971148b3db414c5f1f214e893f13b4f3d6a95de2fc13d808000321fbbec220ee53052b0e5cbc8b10794d6828a7a1dd72e0f6 SHA512 5b2a74cb5f0a568570bb71cd46a2aaffbdde4984e61246f61061e451a93489887acc526079c64ab5040af67e6537e4e76294332c6686bdf8bacca3fc526d20cc
diff --git a/kde-apps/kmail/kmail-24.12.0-r1.ebuild b/kde-apps/kmail/kmail-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..7ea605bd4506
--- /dev/null
+++ b/kde-apps/kmail/kmail-24.12.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/libktnef-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( kde-apps/akonadi-config[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+	>=kde-apps/kmail-account-wizard-${PVCUT}:6
+"
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "virus detection" app-antivirus/clamav
+		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+		optfeature "fancy e-mail headers and useful plugins" "kde-apps/kdepim-addons:${SLOT}"
+		optfeature "crypto config and certificate details GUI" "kde-apps/kleopatra:${SLOT}"
+		optfeature "import PIM data from other applications" "kde-apps/akonadi-import-wizard:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmail/kmail-24.12.0.ebuild b/kde-apps/kmail/kmail-24.12.0.ebuild
deleted file mode 100644
index 42c33775bcce..000000000000
--- a/kde-apps/kmail/kmail-24.12.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
-HOMEPAGE="https://apps.kde.org/kmail2/
-https://kontact.kde.org/components/kmail/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities pch speech telemetry"
-
-RESTRICT="test" # bug 616878
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
-	>=kde-apps/libgravatar-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/libksieve-${PVCUT}:6
-	>=kde-apps/libktnef-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	test? ( kde-apps/akonadi-config[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-	>=kde-apps/kmail-account-wizard-${PVCUT}:6
-"
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "virus detection" app-antivirus/clamav
-		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
-		optfeature "fancy e-mail headers and useful plugins" "kde-apps/kdepim-addons:${SLOT}"
-		optfeature "crypto config and certificate details GUI" "kde-apps/kleopatra:${SLOT}"
-		optfeature "import PIM data from other applications" "kde-apps/akonadi-import-wizard:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 320002d2babf..51d0d9edc35d 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
 DIST kmailtransport-24.08.3.tar.xz 187928 BLAKE2B 376048249b7a3a1b7ae27d1d500f78157e37013734f787921c6ec3b2bf998c3eb7b1dafe90e30b0f04abbd2464479807ce62f8fba09cd1adb6458707b574df8c SHA512 769fb75a37a12968e0d9c0ec48aa691a80ee67a4b462269d9ad35ee2765b405f313eb6a4d662a263af851c1501f9829a3b88561fe94440d9a7260799f152ba63
 DIST kmailtransport-24.12.0.tar.xz 189076 BLAKE2B 14d0f715e7e21aed1a476ec74e0263f3359cd879b841e5a12c1f9237d17ec89c1fa0ac08c2165ad3ac5522ec548648bc45f8df6c65e6d53d4e9a9dd46a24463f SHA512 ecbe5eadf4fb29f2cb8aedce8d3084a12223e1c84f8877d6af1781da7931f073788536e1e06f5c818fc1c22d1d0cd003e4537dd3d6548608ebfc7e18e890a967
 EBUILD kmailtransport-24.08.3.ebuild 849 BLAKE2B be3a927e68889e2a72677474f8de51637783ed4251e622ec95f7d5791894642075a81db164d9b03af63d112295a34fccd51b732ad6a6714a33069b0a2ac85468 SHA512 04756b6ae1bbb399e9815a999e5823241675417feaea51de8dca76615560eb710889e518b8f4cfa37170a63220ae6e6671bd3ec2325f1985c1f47ca39969dc99
-EBUILD kmailtransport-24.12.0.ebuild 851 BLAKE2B 544eee992a3fe9bc3912c6e323fab55d211b1b80151fb740d164fa5af046fcfcda4ab5ee5504f52f014a10b976575331f64754d653997428ae21b87fe66b680f SHA512 6e28365f21441c74e4bbe54ed15ab6fd331297566e5cc29f19378747e47847eb30d75ee9d56809abd9fb0ee059518cc732b183ea2ba3dbf37704f6da32a8adb1
+EBUILD kmailtransport-24.12.0-r1.ebuild 851 BLAKE2B 05683a57ebb1919c3d9d9d3834bf16ee8271d5d63338411400e1c5df07f10ca7ff567abd753258634087248dd8c3d9c6eb90ea9ecbc49136036f048264bc9480 SHA512 4567f85642938dae62ec8650ff37b5eec39900878f7d467d4e9d3f26f287717af8f719c5c857f8146ded217115b137bf105b310721dbc288147c6aa251f3740f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..0b4f3ece3a70
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mail transport service"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/ksmtp-${PVCUT}:6
+	>=kde-apps/libkgapi-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:6 )
+"
diff --git a/kde-apps/kmailtransport/kmailtransport-24.12.0.ebuild b/kde-apps/kmailtransport/kmailtransport-24.12.0.ebuild
deleted file mode 100644
index 2d8bce288612..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/ksmtp-${PVCUT}:6
-	>=kde-apps/libkgapi-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:6 )
-"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 9dedc2ece827..55e636dc4638 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-24.08.3.tar.xz 29184 BLAKE2B ce7142776598e77a741a4ea5f7f5ff98e35f6acc88122a88f019cb92a6ba8727a2bde633f190bc5f9dd5c3c3c1fd39fe7407ab3b62f1f2fe2c5950c1f6811c4c SHA512 07dbae5a0d88a4ec476ff7e1df2864618c7e2bbaab48a612fadfee76f27c2f6a7c075d0cb23137bd84528cbb6e41cd26ef656768a6d06d24da6d31f7d9d6564f
 DIST kmbox-24.12.0.tar.xz 29248 BLAKE2B 7ce79635dff3587e5bcfe8c5f1a3e460c65f999c9122f32e4bc622c9aba7a367cb4dd78f11bda6d674085256c72a3663ecaa2915b0185a9cb6eac05697206683 SHA512 ee357c273bcd5ab73e3f21cc0d1ce0d10025c2ce0563989083c400594eea1067954bf333ba5f771d9e99858e253349ad8d99f976be36de2e3543ba96a6062fad
 EBUILD kmbox-24.08.3.ebuild 384 BLAKE2B 5eafbbfa4dd17a48a19e7a69b6de0070c9fda1ed02c4caef9b2be3dc6fc5e17b60cae94e5301ce96eeb56bd0d3f8fe45eebebb0367da910cc682bd8057921cf5 SHA512 a777fabf9b23e34631400ebf3bed18bffb1273daecace809ec85443fbde4198f222ed67c0278dfcc80b4defaec21186a0fc845c345b29f244c6cf1a219e9c3d9
-EBUILD kmbox-24.12.0.ebuild 386 BLAKE2B 5d4b9bfee96b0efcbe0e2737f31db4cc8ee572c5655bbc2dbebac4b2feb55928e2493ae492cd35383d83eabefdd8c1735bbe13138fd3a9a6b092292cf8c057f7 SHA512 5dbdd376b4fcb3c8cf1cdeade9e96b53b525c99ef221a10888f530599c6fda3b9a52f00f08155d8d763765e774e9ee5174e117e965036a4bd362ec5eeebb1cad
+EBUILD kmbox-24.12.0-r1.ebuild 386 BLAKE2B d18dbb04039313e0dad1d70e5fc3fbf3e5afdedb66a6c12f8a398453a28e7285cd01f86521cb4118c068b0e1dfb0be12e06d3525638ccfcc451adcd0b136163f SHA512 bc6f079affadb79b2dec013d757661d83860aeadda8dea3803cac06de1a2780281bedd0d9ff813de00b25e63605dc3f453625dcd264444f2f59d5b977dd21abb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmbox/kmbox-24.12.0-r1.ebuild b/kde-apps/kmbox/kmbox-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..fdfadb588cdc
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-24.12.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing MBox format mail storages"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND=">=kde-apps/kmime-${PVCUT}:6"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-24.12.0.ebuild b/kde-apps/kmbox/kmbox-24.12.0.ebuild
deleted file mode 100644
index d8237edbd160..000000000000
--- a/kde-apps/kmbox/kmbox-24.12.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:6"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 38d701b5fa9e..20804613f47a 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-24.08.3.tar.xz 166120 BLAKE2B 961b9beb6e83cc73322d76dc0346da2a8b50a379be513b0ef3323096a3e8433e680ccd0e3a48d2b98d380cb1232b59862cb321d5c2fa71fccd3ec12fbce6ec72 SHA512 38792d68c934150f4abc30589752902eff36e00f9b104c92bcdbeefb9c58b90bfb39ec63a65d1c6483fe1b8ae3fcccae9c4dbd3daaf873046921dd11735409c5
 DIST kmime-24.12.0.tar.xz 164956 BLAKE2B 8684190d1fe233ef20659aef610ca86efb73c4f608287da1efa6e6b6f93625ee357c4ac368b447b1f281406ea6e73c6ca3d645838ffb1a8fa60cb70373f5076f SHA512 c33e8822c13f525bc72aba80af9f22a0c66568809c3702fafab0703643582a2d74484e4464df2b5030e9aabfca7cd7e68a96a6d006ef06008dd50019fdc5f895
 EBUILD kmime-24.08.3.ebuild 449 BLAKE2B a32f876a2699557cdee2170d990606805360f41ccedd0659fcffa5c27e196fd03d9ac36869abfac074537458b8bd2f435320342834065c8f384a856be80f56f5 SHA512 71ccf90adabe113238e11e0b9636341eadb95bb46761e9cd773f564606e324b6e2a6e963a47e35362692bfcbd2f0ffecc54081bdbb15409d8e5c3379609b73e8
-EBUILD kmime-24.12.0.ebuild 451 BLAKE2B 1110a87e343ef84a5d0de9fb8d09b3dbcffcba269940c957b7b5be861584978a42d5a3c274d7119fb58996334afded63446e4de82445103aa9702da199ce289a SHA512 0703a4be0097a1364d3ea39f49d6c0fca8f0178e7bfa55e4f01c6f607235ca779c9d65c4623cdfc7cb673090a7f3821e1bf748329b2693a7c56a56ae0b52fb82
+EBUILD kmime-24.12.0-r1.ebuild 451 BLAKE2B 836007c8376750376bf0613ff9d5c7c64a6ab99a156e0eb8a98dd97fc8b35dbcac707f77e4c26a88e4a22a99428f7fefe748db1724d1094fb0e76b53d48c498b SHA512 5dc82ee72e7c7d0fcbc7717e1726487990ba9e36777855b20167b8868b5ae0ea4cb4793342f0f0d0e891d4dc78a3f06c081df2b7217c03439c022247c6a2c308
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmime/kmime-24.12.0-r1.ebuild b/kde-apps/kmime/kmime-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..4ae4d89fd3b3
--- /dev/null
+++ b/kde-apps/kmime/kmime-24.12.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=">=kde-frameworks/kcodecs-${KFMIN}:6"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# bug 924507
+	kmime-{header,message}test
+)
diff --git a/kde-apps/kmime/kmime-24.12.0.ebuild b/kde-apps/kmime/kmime-24.12.0.ebuild
deleted file mode 100644
index d28b7c444d13..000000000000
--- a/kde-apps/kmime/kmime-24.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=">=kde-frameworks/kcodecs-${KFMIN}:6"
-RDEPEND="${DEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# bug 924507
-	kmime-{header,message}test
-)
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 21c46343f88e..b0e7911cfbc1 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-24.08.3.tar.xz 264972 BLAKE2B 42ac0a8451ac363d08b0ea322259c31423ced43aab36814b88e49adea48593a9806c36450ee5ca194f59ca6ecb621912890087d315e44b20438ebf5dec8b92d4 SHA512 0f7a5f7ef5939191b5a834a80f6b4f0bc32125dde62135eeb1a55235bbffeb7905b8e3c22b1aa57648e132a5f5a5172060c91025a0bbd4693bc363dfcefd36ef
 DIST akonadi-calendar-tools-24.12.0.tar.xz 269360 BLAKE2B 5fadc86b2788e3d0c21dc8c2ba258b964e65a49e676a9fe1d6f197b43c8b7ce4bedf70d08d1794149903f9516079546350ce45727bdc0c12fde988161bf262e9 SHA512 dbfcb7282f48cf3bd88d2f896bb6220d8ab5bfcb5cf86068e0b791b272e8d8e2957a89f3e12390baa408a9bee8a650f4cdc97d514a4ee34af1db749ce308f411
 EBUILD konsolekalendar-24.08.3.ebuild 852 BLAKE2B 37fef2689fd3cdc17c80956862289fa9db46b764a61c349298f8f1b0e4be84093a50713082e34374aeb6392f0ea928484d242d88beb988a4f2408ba4bca11dc2 SHA512 62075090a4ae07d1afc3ee0ebef58031624293c5c79908057594ec7bd9563ff70ab12d2b8da6e29eaa82d5aa233ad8b4e7be3725dcfce716ddf0e03cf5a8688b
-EBUILD konsolekalendar-24.12.0.ebuild 854 BLAKE2B f9138962915a4c4fb2eae6fc4f2a9e6ba8b121e62803b3c4fa96622e6193e8c60485a88b55a038feeacd5cd542b98e261335e858123f29460ad05dba0f103b20 SHA512 2b8c1d6d9e29dca02efaa870bcf52f3c81c48d3bba91eb10da30909617d8ef4941ddf22dbae3606ececa03f7ec30683c2d782c41dd9d140ce42f2cf0119e0278
+EBUILD konsolekalendar-24.12.0-r1.ebuild 854 BLAKE2B 507e5d285093d331646e74a47bc1544da2edb8b69bb70f3b6487cddc32cf8f00422c8c5813ade9e46d4847a1dace765331ac801b183716e10d44fc36714e6790 SHA512 bbecffccee76eeb2e0e1c2e063770e061d4a3a137ccd03e67699c21beee8cfa110dd367f5055f0f1a1487b46b2b8048379636ad09bc384206a86cdf3a36fcf74
 MISC metadata.xml 425 BLAKE2B 534fd2a6288795397f52fc9511c695da745727096e4c52ba3f8dab501996379936c091a287f2795ba6f622d9a376f2449cbc5502f8167ca03e98e192722a14f0 SHA512 0d417ca670fc5e3acedb04b163383d2821ecd9e23b91da3e4e44493b781b92644e06bf13f5906006f142529ed8e8e70059109c1d216ecabf89089bdee5c8d4f3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..b7b0a359dfa9
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.12.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.12.0.ebuild
deleted file mode 100644
index 32e049d9d4ca..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/akonadi-calendar-tools-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 528bab7ddbb0..c6b41200ec64 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-24.08.3.tar.xz 868664 BLAKE2B cd7c317c1b16fe2090c4fb176e62cfbadb13c5a16aa7f2762ba03e353a1c8b9d2be34902009be8be63e864e5eafb5c85c6aed0d21ccbbb998c49b4813d2ebc8a SHA512 20e8ad2aad370746a8ecd4277ffd66c786386023fde19199eb15423c84d0c9c90084dcfdc9818bd4cc3093232ad9cfced6a5264ff69c34951610c594e4a52c31
 DIST kontact-24.12.0.tar.xz 868648 BLAKE2B 28ffc8f01aa124762a47abdcd4d4f58fcb86bbf554dd78617a744bbdd59dc8fae23c19add3d9222fc0ff5d87dbc88e1d89333c1b9c06ba2c47b94de8cbe29baa SHA512 e6c3d9a89aa42f87045361c13f98cc8a00b86865e5dc12eca65b2311e3edce53520cc9415dd80d1426ddb5a46f81d70151c9fe6274a107f10b8873be22a574a0
 EBUILD kontact-24.08.3.ebuild 1321 BLAKE2B f0992a5870c5ecdeb553d1f434a017ca57a70196e60f044951bc0246e66ccad4c82526b6204a5e26a2469e4625d9c3902027d569cd77b17b45a3e882ae934835 SHA512 01d951d7c8290569ac341563f15928265fcccd682e94e52fad3148a8cf095d8bd899d0774836b36c2dbdba64fddefae9e2a3ab243368c8619257f11b14aed53a
-EBUILD kontact-24.12.0.ebuild 1323 BLAKE2B 392d2f424c0f195f9629e0dc4c860d1b0bb908145bf7b93f6c61ddfa6e5964bddc2774e29abaee2b17fced0f5b3fa5aff7d91070fc7dc720036ab9759c19b8d6 SHA512 c388af67efd910cb34ca3ac281b4c766fd3b14a63bd52fa2809fc65399c693cd764af7f5f72504b0a38ee347454887b48d5e82747018cc3975ca48ee8d4ed846
+EBUILD kontact-24.12.0-r1.ebuild 1323 BLAKE2B 3e5e8e8c3a2f3c0164f8aedbd98f01944ae2fafe80861ecb8513e5d65dcf52250905c473a509bb3689392c9a8a7a754a31db4cad6973484420bca96cc2f8ad9d SHA512 f158fa6725e7e9e1102b070ba18cb3f0fdac7017276ba9708f2adb376d7b27074a049d5950a43c37fcd5b28d81c80800f5c6a6db0c577947ffb86b90048b94a2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kontact/kontact-24.12.0-r1.ebuild b/kde-apps/kontact/kontact-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..b3c7eff0fbf1
--- /dev/null
+++ b/kde-apps/kontact/kontact-24.12.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontact/kontact-24.12.0.ebuild b/kde-apps/kontact/kontact-24.12.0.ebuild
deleted file mode 100644
index c8bb6de7b973..000000000000
--- a/kde-apps/kontact/kontact-24.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 9fa60979caf5..d9b71d303cb7 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-24.08.3.tar.xz 40704 BLAKE2B 5f7f534cf53a6f66bab54a666cea7d457040184ddf6015286fc41456696a30b942e4e14bc6ec4ae1d33c1073a2f71fa3c70d9254815ddd3a62695b7ad0055de5 SHA512 cabe78c820b1d98a3ea9931f223746064271fc34547642c6f3198806242e4edf49be9ce0d4e4765cd39833bcfc20e9f29077f4cf1ea71868c16b4d4cfaf545fd
 DIST kontactinterface-24.12.0.tar.xz 40736 BLAKE2B fd3c4d49b32f367a496550d5b272860cf039144bb5851fa175f31b1b3493b3a361bf1dbfa053b3d10345e9f44c0d7166ff6686a8bbbf71170b9be7ef58de3949 SHA512 1457a6a7065bc8d22670b9fe156ebe393339db3b476fdd64b792e5e5241220712a2a5fc7cd7f7e5e14ace6e204c9eb6248b99fe525988d469e774f8e8d9a0776
 EBUILD kontactinterface-24.08.3.ebuild 715 BLAKE2B 1578804a40e97321a7517335a32acc3ea0fa38a3d5934326640f7dac1e3ec7299d4eff249d2992d89c7e7299b90a5f699e448565ce10ba522fc0262b6ffdfb36 SHA512 28b2e8af097863c959615cfb8606c8af0a93325f7e13475c27c749da304d3d83a3432cfa4d56b32ab01744151537792b1dd2a561a69ae23518521aa3f2dafe86
-EBUILD kontactinterface-24.12.0.ebuild 717 BLAKE2B ba02edfec5796a3bf22324bc8dded86a099565fa53c238a7f174a4346242d99536cee1c447041be49d9f39281b93128183dbd2c75294827b5b690b7ebbc69def SHA512 31d12ee4a944cf723a9da54519cafb4c2c4e6386a7eacff506bd11cb5f95f02400594f309d7fda4d8f544c2b371c5c15f0a8ac5f3cbe180ff6ba1aff5e4f0641
+EBUILD kontactinterface-24.12.0-r1.ebuild 717 BLAKE2B e963d4a569a95fa28b5ce83959b2aae101f978ab322af9f324a6ac8ec2a5c2b69b276f4fee4e6ac0c0fa4be9595b82325bb24ff18391a24c0d44c069579a72c0 SHA512 4b6716174f6bb0976b8db372d13ecbd336a185c3dce9a4fea39421e670a111d5f61c8debf58472e53ffaf165d974f0b1a3d9714cf1bb53f50a177fa458f842c4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild b/kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..30425afe867e
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for embedding KParts in a Kontact component"
+HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-24.12.0.ebuild b/kde-apps/kontactinterface/kontactinterface-24.12.0.ebuild
deleted file mode 100644
index 4edc1534bf45..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-24.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 7314cce9963f..e2dfbac175f0 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-24.08.3.tar.xz 2938660 BLAKE2B 23f4294c4e657e1dc7f9d69a37378d8c49f584f67ccd41d5e5cbf5462b108e2388cc85a36163fd6a3a09c7c268daa3d27dd6b931286ac39524b0122172ca82db SHA512 dfcf2725f1c0b626aeee1b4050798eece465cb8660f7bf64bbb9c49852109d1dd5891332b2c17c78e3147d451eff35edb5ae675f7152cacd8e78f5a84242cf6f
 DIST korganizer-24.12.0.tar.xz 2940220 BLAKE2B 097737d76d7609776043a5dd9eb4c206029d7f7271f04698b750e85cf15427ed309c1cb6fe1a5d5c84c929a34bb6eb792957422827f4a110b33410b4e73bd836 SHA512 fe66102bf00c34571a329895e4dcbb45c2cbdf3927e3c8127467913ae3d054cd78b1dff460d290b0e14607f9d87a030656954d2418adadeb0c56013192a8c538
 EBUILD korganizer-24.08.3.ebuild 2361 BLAKE2B 0f41fa903bbdf78dd24dcc0a356eb91dd3706d7457c8d5857b1ed4b48507ef2de5763a2f137b4dc830f6853351b0db7b0e35bcf3c5640061e37c2a489753b8ea SHA512 600edd8fff172eb6e52fbbc22bf4a3436ae5fa23548195a8a4f24e88c4b6cecdfbb031d91d2de32018e9ac3643f00955b280118af2f046bf2548835cd6556ade
-EBUILD korganizer-24.12.0.ebuild 2400 BLAKE2B a1bc81a1dfdeed781a9a218094ca00c5c026abd787e689c533f261ddb48e8ee689ee3c600b56cdec04b0981e7072abb27fb7e7ceba214ccaded38a0a47626605 SHA512 aef4800c1baf5f1792ae5dc15ec7a69b0b8e3df4ee9dca8ceb1689f4fae54a94a631f5f6ca0060c0efb90fcff5ec7e0aa07fa5dcfeab5ed76662ac7055b4a7a6
+EBUILD korganizer-24.12.0-r1.ebuild 2400 BLAKE2B 4845e698f5495393ecd1b88ef8bb72d005e86b282fd3a2b5e52b126b27ea2987aa68a27b5d2a07e24ae34e7ae00e133de38e21165e23109a573543c212f575e8 SHA512 f40f099a0565e50ff7c90edc87cc98b3744d331ef2d9ea908b024dbf81f8ca2c7ae71ca4f789a1d4159cacdae7cbea66fe6b508ec938e4e261b52c1709a51e3b
 MISC metadata.xml 501 BLAKE2B dd84401ad5205529684d15a56c6dc7df386b846997ca25bd6fe6c5075ad72375309a040fb535c76f377374d3a0304e53484112053a5113bce48992769c89f9f9 SHA512 1199d6d4d1a6dc4311c39afdc0953e16bad7f268840352be18f320423dbac52b52d9ca9932152c8580f8620af067e0574efdd0c30427422c37ee77eec3e9c1a5
diff --git a/kde-apps/korganizer/korganizer-24.12.0-r1.ebuild b/kde-apps/korganizer/korganizer-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..3f45f20bf9e4
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-24.12.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://apps.kde.org/korganizer/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities telemetry"
+
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qttools-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/eventviews-${PVCUT}:6
+	>=kde-apps/incidenceeditor-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	x11-libs/libX11
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( kde-apps/akonadi-config[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-addons-24.07.50:*
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+"
+BDEPEND="test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/korganizer/korganizer-24.12.0.ebuild b/kde-apps/korganizer/korganizer-24.12.0.ebuild
deleted file mode 100644
index 1753d83d1f5f..000000000000
--- a/kde-apps/korganizer/korganizer-24.12.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/korganizer/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities telemetry"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qttools-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/eventviews-${PVCUT}:6
-	>=kde-apps/incidenceeditor-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	x11-libs/libX11
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kldap-${PVCUT}:6
-	test? ( kde-apps/akonadi-config[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-addons-24.07.50:*
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-"
-BDEPEND="test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 6e09ad3b3697..b7236ce012fc 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-24.08.3.tar.xz 176384 BLAKE2B abebd9233ecd9c02b4697bd74a21443f64a75194041215078d0b6d74eaf137c90baa3f8e9511fd5402c3b18820d34a2db854d7ae961a65900d69a6205b8d6118 SHA512 9de055ef7f12bc65411f901c9b694e07c51bfdb388f294cc7d64affcc3e899d31f2af39765e207bd2d3b6eaea33473c1f67449ed55fdd04eed691d5f1b6409e7
 DIST kpimtextedit-24.12.0.tar.xz 176660 BLAKE2B e8c276eb469c4e399b3e6163ec316826e9294d4ff4414f53bf3e27d60a8a56b382428872088ab407d2c6405a5852248b2d254a7cfe14412dc68c6448970eaae1 SHA512 402e34bdc93bd4f5fe3647cbb9363d706b8dd95cd7364aec4e1152a16646fe4e1e542ee5ecb8f8a5c3ef1bfb0fc999aec42f2dee1871a12283ad199c2eaaa196
 EBUILD kpimtextedit-24.08.3.ebuild 961 BLAKE2B 34f29abb94e97e3b60502aae4a581c25bd44ccb61624f01b5a8887f646693f563bf74c15964fa0fd44951150dbed73b2b82e33a132f440be5314c7c98c03c97a SHA512 447faed15b2cfa902bfb952ffa443c66adbe6657efe27fb18d7e9c869274e5efce242e043b190acaf2ad493ca2573b0bd084dc72254d46dd432d15046e8879df
-EBUILD kpimtextedit-24.12.0.ebuild 963 BLAKE2B ce51edbde48003be66592366c3c16f7878dc8b2d2c280514db0f781b425c12c685855c7e6e8f516d603ed8fed539e342e6510c1bc4a5e720907ee0e8642572d8 SHA512 dc2bd7701b6a913c44e271fa02c81bab7d317248b42be7e1e863cac3016af4d3abde4b9ec97ba96fde1501477dfaa9b337f2f277e0c86abc1e63c10140e64770
+EBUILD kpimtextedit-24.12.0-r1.ebuild 963 BLAKE2B 01a998ee4efd9c5b62b6dbd2fb58e31c9f9a608517a2a7abb025d430e8f394ac21576a8cf4977635e60e6212f880858ead8432052d2382576c7e308c3703d872 SHA512 7bb42c455d33b1b5944362b9372d6a6879e690db3fe5756ac2733755e63d366249856b4a1b73542a7bbced466d472263a405314b530562ff38614be9734430df
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..0d90f7ea031c
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Extended text editor for PIM applications"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="speech"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kpimtextedit/kpimtextedit-24.12.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-24.12.0.ebuild
deleted file mode 100644
index 02e9c5c5686b..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-24.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Extended text editor for PIM applications"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="speech"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index e2bd8f4e367a..9ac1291764ac 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
 DIST kpkpass-24.08.3.tar.xz 29428 BLAKE2B 5a86af1f6ffb1c0ec2bf6aa21942a01fe7ddf50e9096b8bf6a91dac545c60a076125dc5c8a827ae08875eac75637e880212e4acb4c9ce51a33a05e9a4e2b7add SHA512 41604ac1db4571d6119e1673648b02c5ac2d42e311153042be9bab1e4ed9755bffaf454a6e4ee1582de6d0cceb170c98d7af18fccce2ac1d93c339839e27aa2b
 DIST kpkpass-24.12.0.tar.xz 29480 BLAKE2B 573852f5ccc7eaf9fa01d40842b47fcf3d4e99b3c67b374d559f8ab0870cbd90f651368934d01876ba72c56a59c756d5a133a5aca9ed1d2d6d612c684efbdf56 SHA512 b84840ab20b3725f36e6f9f4a7fa32f179e86d015c9b9cdd2dca4359b469dd618b472d9117008d25d58f93f827080729031bd8bcf699015504f3d598a28049f4
 EBUILD kpkpass-24.08.3.ebuild 461 BLAKE2B 3445c745dfc2308d9b88bb458c2b0faed8c5a0b8372753f0d51d76b0d45be8e4a5880d2ce2c1543dfb33c4406db17b58eaf275d7b93268089bf11e2bc0a94224 SHA512 4be6a832bfdc7794f7732c0ca504205caf18eaaeb104f572398d1f47c9e31fd55641564704defb552a84a57950d4f03a36797a793cb5a22ebe9f66c5dd396a49
-EBUILD kpkpass-24.12.0.ebuild 463 BLAKE2B fc598a476e32b019f42642cd49adda35524025a2073e526ec45dcfe04a2efee8deb56d6c04960973604971edf36fbc7c66a6ad3741e7b89359e47c504e456ad0 SHA512 365c51232857e50c6cb6e38e5eb3354bd394a64c099b7688acc34352f361a8e578a2fdc65267a3b52b1000421816785e6e86b51670260bd5c2f62b8b72c10b72
+EBUILD kpkpass-24.12.0-r1.ebuild 463 BLAKE2B 35c5c6ce2d745702279b081d0629c9b8c1477d2c66d31e7fea34e5baec1db4c8d100663a71347953478a1d55818ca37d6899d568cf38f34c98389711d5756264 SHA512 01fd5477827885c9a9ae304970c4933ded79978933997698f00ffebfa64d2a6624d9e449ffd3c0f15643dd095967f9e90c019d10da93524306f3831bbbd822ae
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild b/kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..0f3ac7c222de
--- /dev/null
+++ b/kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library to deal with Apple Wallet pass files"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/karchive-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpkpass/kpkpass-24.12.0.ebuild b/kde-apps/kpkpass/kpkpass-24.12.0.ebuild
deleted file mode 100644
index d1dff5e03d89..000000000000
--- a/kde-apps/kpkpass/kpkpass-24.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-frameworks/karchive-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 7f367a8281e4..d2464300ad68 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-24.08.3.tar.xz 53096 BLAKE2B 200291395bfc2058c6d3a23e7edf1c693d9e315810c25f95418389ccf974428bb3b8d29a6189c1199969cf2184fa359aba7d09fdfaa2663a8043b1c1a21308b7 SHA512 5af330e3ac610d8c4beb5f7c9cdebea69c646f374540721d00309692d20b34c190c1ae284a322fe0f6e933884c3ba635e6ba46dd17fa66e4593a82f0cf1d340a
 DIST ksmtp-24.12.0.tar.xz 53216 BLAKE2B 562d884a95a6187292df78822e1eb741a46a8111b86a06a461d85190e02af92b3f6573016f617d5082fad50e594045342f608feb4955eea1f488bac8022cd7ef SHA512 2067d7392a5bed5d393e90b26d458f4f395abc443380611236a651c74b18439847555d77d2772f6fae2cdf02677854ce96d4e4e1bbc0da0a20326c7723ff8ea7
 EBUILD ksmtp-24.08.3.ebuild 616 BLAKE2B f55f055dc4be3296833c46ebdf16ee7b26666ab006637dde41fe2faccf302c7f9034bbe99ff7832cff433d8a29f19490d5110c41f21b2c52f95c3bc357e2fd6e SHA512 5fa41a6b2a2348497a0040f49fc47b7beaf9cfa32dfb6914f50b64528a09668327e389a9b6ab7a2749243bcd56402a84201a39ec7a2e3481c39a671eb21d65fe
-EBUILD ksmtp-24.12.0.ebuild 618 BLAKE2B 837d7a2bf8f4a990b6a8a9c9e240b6f850881478a04249345c62def1191f4b89409cddd2a06f1e2dbd1936181e88b25d9adf5d95e505b5c72f6a0396cb68e1f0 SHA512 ff18fa5b0e8bd88901becf39a9b5b806b92e5c697ef8f1b8a827d73648ba7e4e0a7d628e73103c2c6a2fb80b9cd4135ae5a28ef1c9271875b31d1f1114dbb866
+EBUILD ksmtp-24.12.0-r1.ebuild 618 BLAKE2B 9d86fc550c4b51f279dd650b60cd4f20180b2491fcef0422de7865cb8dcbc73baa2bd33da5222184c04bf0c3c6c126f828192a8796e24a50ec092b39e038f8fe SHA512 28d4fb123a753f42ebb9089ae69b3a04c4186a896a9e25ebea1789f8dbf911fa410c9ce3c3ea41550cdbc0630d2955cbf9ba342fd1811fde1e7cf47689145e4e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild b/kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..5771bd688ee1
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Job-based library to send email through an SMTP server"
+HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 642410
+
+DEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksmtp/ksmtp-24.12.0.ebuild b/kde-apps/ksmtp/ksmtp-24.12.0.ebuild
deleted file mode 100644
index 55d5654293ae..000000000000
--- a/kde-apps/ksmtp/ksmtp-24.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 642410
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtbase-${QTMIN}:6[network]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 1abcdac57c9b..c3c3a676e8e5 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-24.08.3.tar.xz 38056 BLAKE2B 8b765c749ac877269a8cdea30d90cafe1fd4d0e1217e1b30aac273a3985b09e78cc5042f73c490a30da3c87986c40c7cfcc0c4843bd12be0fae4f25164982383 SHA512 90e14c4a6b8c07267bc606c91f3db9b70efc43691e89b7ec51317d0f063e7b503b9b3bf0f5307b13a08e8914aee9b908e4bb17dae48cdcc04510f8e9551c8d4b
 DIST libgravatar-24.12.0.tar.xz 38628 BLAKE2B 0ba5d76e6696a2542e75c6118f75f391ea30a159c08a5cfd6bd437baf9eceefc9ab15f050f6c710e8d2b0e3cb8a224bf934a163f0bf686d29f720dddb6cb213d SHA512 8e40458ccfa8ec9045d58e71ceca14a59122326207b87f9aaa2da71f4c03a43302287175ac1a509ecf618cec7af8fe2d50a2b722f629d917cd453453a6045609
 EBUILD libgravatar-24.08.3.ebuild 758 BLAKE2B 4297a612bc5af05b5591f8379216ba209515c1d9d0eb9d385209569866bc9b5f69811b617c85181b533b01cf0279794f65394e56e96d32c6ee2426571f35043b SHA512 db7f025d22d7f158a5f33d0c15f1ca23375b0f6057e8526a480fa1e58bba26e7cdd31f1af427a6b56a921d6ed46ecfcd0fe4c65f9f47a4a9ffa0a23f0a643a31
-EBUILD libgravatar-24.12.0.ebuild 762 BLAKE2B 06af1d9093e5df4b77192d8743d5f53d9a4ecda00af15d22d357746c3e3eb683c301d591d3f72d0f38332640e8425ed3164ac41f90592b39547db222b347bc7b SHA512 c691d6d6ecb04b8bd09d3663a98fd2dbc743cdbaa17f093c002aee1a95ffcdcfe47a74b8fb1ee66f53c66d77142c076934790627631df111b6c412d82d27e463
+EBUILD libgravatar-24.12.0-r1.ebuild 762 BLAKE2B d943a7abd726fb76c0b68b3d9af8a82130ec412273a601ebe523bb805706f9458c511ff258352557f7dec89a23824f94ab17be4c02a0052797cf5cd1adc164e5 SHA512 c15258bd2b4a1219e80ae46e4e78f030fc256a4afeb0b4d5a1af4e6ac2025dcb12e3ef50de792b0d197ca496b68e8da108f70479b355934b950fc15155a1b399
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild b/kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..effa9da4eaf9
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for gravatar integration"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 624584 - needs internet connection
+	local myctestargs=(
+		-E "(gravatarresolvurljobtest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/libgravatar/libgravatar-24.12.0.ebuild b/kde-apps/libgravatar/libgravatar-24.12.0.ebuild
deleted file mode 100644
index ee2353ba1a4b..000000000000
--- a/kde-apps/libgravatar/libgravatar-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index f9438d582645..8d6ae3c5338f 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-24.08.3.tar.xz 282868 BLAKE2B cb3ec7257c1d721a2ec26256441482d3dffe577fcc7727bc1411f2c3b89c85daf030d01481ed391857e85c9aa901f4f140c1a2cc4ac17545de18458d9800685f SHA512 5690f1d28e4c654c5ac00de7cd3f16659715155aa2ea74fc5cf6bb409348a437f38c66ac74798aff7de9c65430dbab6aafdd85e8329b8d9b84e1ba32a5ca9ed8
 DIST libkdepim-24.12.0.tar.xz 282920 BLAKE2B 87eb8f36948f92ddc141b68e25b53b49731ad61476a93097b2e60a9e8c42928e09f4c174fa3ea724b993d7cef616a4ca20e3eef0d005d6f40c2bccce5e17cc19 SHA512 26a3674b7df0a7c381377f292a1c177a8c05f10fa1a50f24e5ad1cb0a65886b0fa237e5bf80dd1615f2cb97b7236561af68a3d7438fb41bf97fd219dfe894b0b
 EBUILD libkdepim-24.08.3.ebuild 562 BLAKE2B 0a16d7d2c5f36b4afaae65806afb92bc7926300028815400a63222b3fe823389e6e893b8a50a987022746a7cd8a083cf9b9a8cf0f340463978748dbcf231b23a SHA512 f858260888aa270c9ee138070f384e25f67fef2d9e3d469d1d2f95a56feab67971d22934de1d5d9be121fe936ed00c58abad310e620039cb32449394ced7d553
-EBUILD libkdepim-24.12.0.ebuild 564 BLAKE2B e5d65b92e1da97892a0fb00cba6a44d35ed4c73d7d2e48672782e7dbfcda8c63b88ecaacda2f62dcf83100f0d5ca8e60c00ec4b7853b1fb435eb40578269e418 SHA512 d0b7a3c54439367a2f6664a70169845872ff59b0c6fa1a489a821b3579288713569f323ab06414f0d8d6fe63519074c029c254db8fb898de119020b11bed8825
+EBUILD libkdepim-24.12.0-r1.ebuild 564 BLAKE2B 8fbdb0acb5f5b0f56e691188c7732a6162d639178c3826cf506f77d94358c4dc74e2cab4db73514ffcfa29ac3b57463d51bbeb10d766ebc856cb38d4bb2fe7d2 SHA512 d176f2fdbc24a1def39c6602850924a2c4ce7ab7470fe7f6b4e48fb0dbe300f1c62d6661ae7a51d16a5bc7352f770bcfb9a47087cf4af1d35640785f9fce0c2e
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild b/kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..fa6715522cda
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-24.12.0.ebuild b/kde-apps/libkdepim/libkdepim-24.12.0.ebuild
deleted file mode 100644
index bc4d755bb45b..000000000000
--- a/kde-apps/libkdepim/libkdepim-24.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index a08b07c3ce8d..1f389253a184 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -3,5 +3,5 @@ DIST libkgapi-24.08.3.tar.xz 339412 BLAKE2B 91d4f43b2bf2485f64d9c66caededa21f880
 DIST libkgapi-24.12.0.tar.xz 339456 BLAKE2B a70d746d4ac9cd390712e0f668b15472ce40058b7f65b667b978c914fb5cb0c3d114d81a582884918a1d0503e2eff6d6f74c2cd8236784233c00b4826d678e13 SHA512 d6751e103ea87ae6f9353f3aa2c490a22bbc7ca394731cf992e8ab688c516d102fb2500a7524adb6367f9520136432872510ca9032c7c37b4bb7fa043c2c4d21
 EBUILD libkgapi-23.08.5-r2.ebuild 1491 BLAKE2B e11df228149f2c914f76f18b11abca8d343c876eb7ad2bf00eb32adf784940670b071422c53fc70e65b1f0bd55978bc99ef8a28244fefb48b313a9e4170aa5b0 SHA512 b00cb897a7c7f250d43569129bdc13884e13686b6033567c5b5c9e4454e89289a217506e04ee6298c85e767154464c9e01f194989a4b6f1e253bdbf37dc24fbd
 EBUILD libkgapi-24.08.3.ebuild 888 BLAKE2B 98fac1536ab5bc5da8667c31983461bccbd30db88a54a4eb5f9e307bc3c3f450905175a490550fd25121364c4c2dcb210a220712968661af8e1dbc607cfd5a26 SHA512 f7132dc972922c681040722f93ae72f82cfbfd2d265787bb42ce08084826d544647aa96515d86e709253b8dfa49d022d76f9c873e45b83c5edd5a029c7420b09
-EBUILD libkgapi-24.12.0.ebuild 890 BLAKE2B 461507de09d22e65fac865da05a2f990b6141db3577c38901ead66a5c9528c7e7c819afef1ebd334d4d371c5c8a9662c7d01d0e5d61ecef050f46d142348d383 SHA512 6eeaa09de415d1878c63fd4f37b5c4bf7d797019175a3f8d4cf255a47e5010359ea3d093ad6aa0df4fc68231414bde1b555d73816c7d3b7aadd7360a7fa6109a
+EBUILD libkgapi-24.12.0-r1.ebuild 890 BLAKE2B e12bc6c8c0d7a029f6c8b6a05ba656b83143ec8c633eeffa52254d8085eb957fc3d9fcdc3814f9e10cd5a4173f1b8dfc18b1b83fbde16db9a9d179644897593c SHA512 c82abf0da74bea60ea75470b6c70a5cfa64bd5c1e16694f5e5d17265d29071e761e3c62b9311bfc5faf85ed8f4cf26451e4055f6ec49043e1212389d36cdfcb3
 MISC metadata.xml 437 BLAKE2B 2003b1d95cf9e5003a00dee70b38f274c19409d922c0f9db381c0b64631541183d642951af2c2e088fdd4ca019728e4692346397a664cfbfea5adf76bd154901 SHA512 742e962cd1f78a6eee879e58da6d665211f55c30f84c1cd6f0b87921646965c1e6348b9c8ec161cbc7ef2983f0f950b9f05b28836671fa5c298262eaf4db473e
diff --git a/kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild b/kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..a4bb5a0961ee
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/cyrus-sasl:2
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+	# Failures not specific to Gentoo, bug #852593, KDE-bug #440648:
+	calendar-event{create,fetch,modify}jobtest
+	# bug 924625
+	tasks-task{create,modify}jobtest
+)
diff --git a/kde-apps/libkgapi/libkgapi-24.12.0.ebuild b/kde-apps/libkgapi/libkgapi-24.12.0.ebuild
deleted file mode 100644
index d0666d083e0e..000000000000
--- a/kde-apps/libkgapi/libkgapi-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-CMAKE_SKIP_TESTS=(
-	# Failures not specific to Gentoo, bug #852593, KDE-bug #440648:
-	calendar-event{create,fetch,modify}jobtest
-	# bug 924625
-	tasks-task{create,modify}jobtest
-)
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 7fefaa6213dd..747fd044cbbf 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-24.08.3.tar.xz 605864 BLAKE2B df2e9691b8fdcd30a1f50c4c912c8564318c1324e9b96c50429757893abbc6f2940994b48f034cfe7b8513d0abf1ec9af5171539259c54bae46341fd62b57bdc SHA512 fd1ba8060a0859decb8f7cc6ab0815a0a733b10a13f8db0e186252ad48d630180883ef2735ae2a4343161087424dd32e08321e63fcbe5160245b16d821e47b77
 DIST libkleo-24.12.0.tar.xz 638100 BLAKE2B a859c5b7b05c73c0c24373cc47f8c3ecf34be9d82224aa6c7479f3f99a466df8935911da3d0e852e8b4fbeac99a350d0a7c72813fe167595f676469451c5b91b SHA512 7b9721ac905d6a5a9bacb56771832eebc0e71788804f67f2fe6d503b43805c7b4f6dd5b4835b498bc5c2795a52e5f69247d6d9940d08dbc022644b30b8d5c4a4
 EBUILD libkleo-24.08.3.ebuild 867 BLAKE2B 95c4dca8e27e9797ba29671e8c62ba0106435571e170d9e322042fd80ec37950f932bdbe53bfb86ee6b4bf92ba583343e5c890ab25bd39f4211509de9800724a SHA512 cc921a1178a32f359b819a871b4e311ca6baffa9ded4b1ac824746a046fec3a10317da0506312bdfe358c31a88a20e99f063b34d22ca2ca02dbac42cb981bad8
-EBUILD libkleo-24.12.0.ebuild 866 BLAKE2B a0622d93e717407eb107b50f3547a6e0414858d0488fbbfbcf0b521849d70f23052755a9df3e7dcd9327dbd31b7cc7f9f22381fd311a61a1f1e0b8982e6b822b SHA512 01e5f6e14e827bfde738beffb1519692b21c8090e306ed41f9afa88a855fb2cf3820b6dd1f8ed211027e60b19e7e98c789f12a5f483a2cec3b640694e51ec6c6
+EBUILD libkleo-24.12.0-r1.ebuild 866 BLAKE2B cd997514045c9b871acbc900f5662846444c064e82a5ebb088a3b2a15dd9b12cf8974b2057e59753c8cc76b53f6ae9a178c0098259d22fe8810076f8ccc1d37b SHA512 33739a6e3d477f9727be6e6a5cde22ef7d83cd36308476e7e0131b196c5bfec54b9129dbae0f9681a8b5dc51100302ea3d647966cfef5a19e941b3a196b99d61
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkleo/libkleo-24.12.0-r1.ebuild b/kde-apps/libkleo/libkleo-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..f4387b8ccfe1
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-24.12.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for encryption handling"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
+	>=dev-libs/libgpg-error-1.36
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-apps/libkleo/libkleo-24.12.0.ebuild b/kde-apps/libkleo/libkleo-24.12.0.ebuild
deleted file mode 100644
index cdef99f18969..000000000000
--- a/kde-apps/libkleo/libkleo-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
-	>=dev-libs/libgpg-error-1.36
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 2f3e391d5d60..d78828680ee2 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-24.08.3.tar.xz 602368 BLAKE2B 51fb70e4cd112dfb43f0cc9b9459e374210043b557511e5d2d8e0529a0a1db1b05f3d94ee4cf462adf6a5d31c6ecb28688e26aa434109e632a48e03086c9c1a8 SHA512 15788acc3c28afc8738f95f68e9367b900c6e199cd5d08255d462a438e798786ebd6b5ce54dd3793737b1466faecded6980abe160a4166f9435df0724334c950
 DIST libksieve-24.12.0.tar.xz 603588 BLAKE2B 0d6bbe9a43900e856076e977b1105e1fe97dc9335cef739d3d625a58f8e4845cce808ed9e276555a775935b5db34f3d85134649f021b4b10411676c162288d2b SHA512 08a7c0daa649527a4612011b7b17e0e4dd0fae89457ce9f8c6f885d147dfc2f823f5d715e871ba30d3bdbc9b728868fb34a56b8cc629cd63557d5c8b169d88d0
 EBUILD libksieve-24.08.3.ebuild 1331 BLAKE2B bc05193d0bfa8ef3d9eae25e998d5b62ec4835e9319f1e9951e70347da5d249bc5d1583020cd1864260c8315e822eb44bb11cde718877f5e517ada3e632d24a1 SHA512 b2eed653c9c86e0c831e2fcbd8cb6a9790e4018c03bea8d60e39b311031e0adf0857069d2055ceebd5aef6a70aef86aaa05a1d6f4b928a38d56d0bb417d03435
-EBUILD libksieve-24.12.0.ebuild 1375 BLAKE2B 4eb4cbd88ad8f1955b8a38b9f9aec6ef36a858f42da8ed0f642201cc5fe3fb688a81cad1fd6091e678e354f0e28bfa85bd3ade6843f9f15935f65ffd8ce288f4 SHA512 3ee9a9693573ff518f4f920c511ace2679ededa6137810610d0cb255b096cad9c05ca9b77fede5ed6141574c84e7b0e64515eea990dc18f3a091ce8e295a75dd
+EBUILD libksieve-24.12.0-r1.ebuild 1375 BLAKE2B cf619a7f0efabbcf71c1bee4095a4b883cf765cfde584e244484f14a98920cf2395b1414002e17fdd595075e07dee6ae086f1a148e58c756f475797ffdcfbc3e SHA512 c4cc41f79b9b52cddf9f3c8fc73a77f0bd8aa50e190711cc20954f5502b39985691e3e357259106a8df985619f741c70cf2bf0ac48175e117fa1c32055f5a14e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libksieve/libksieve-24.12.0-r1.ebuild b/kde-apps/libksieve/libksieve-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..2bf8f21d85e8
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-24.12.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="speech"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/libksieve/libksieve-24.12.0.ebuild b/kde-apps/libksieve/libksieve-24.12.0.ebuild
deleted file mode 100644
index 3e84af02f05a..000000000000
--- a/kde-apps/libksieve/libksieve-24.12.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="speech"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 0a3a23db44b8..1c2923bfd0e1 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-24.08.3.tar.xz 313236 BLAKE2B d67f20587cef41bf42442f727e1c17313abf458bd921242df0d62a7489cbca8baa805140011bd7eb7d0f4dc2ea7d8bcde7ea467bfb2445186d8353a762dea8f7 SHA512 817195fe825cf287390a4e3300f80fef741bd8f5f0285583054374ec1952585c6559c5da140983b43112b4a1e09d8da93a32f6a3fe45cf83301ac0633872bd47
 DIST ktnef-24.12.0.tar.xz 313476 BLAKE2B 2ba6344e2e1a18f5c6267b9550024289b7c71b6432b56df0078e8300dbce1d9a28972ae9552fae4949e404cba67b4b6ccbb91f8ccc12726541bb0a9cb98256db SHA512 651027d38e96920b572f6703b30bdb0351271cba33a537cc32c5c1fb11bd16b818ebcff21f33faaa06a93550ac0561e749e46f0732deb59bcd40d4269f7d2b1b
 EBUILD libktnef-24.08.3.ebuild 561 BLAKE2B fb99fb1dc5aa80100862ac3ff78a7c75a543efa55533c65d44f83d4e278e77df50d577b7c35d857162d050f4189699666fead204a8673bc3a0545102d86c0a57 SHA512 3cf982ff441ee1f5153d47ed16bffe46ca174c710ab3eab403fac67d4cb2ff901c20b2a3282f7521d89891adf8d3f20238c1923fed4b8c6d9722c2ee22281b53
-EBUILD libktnef-24.12.0.ebuild 563 BLAKE2B c13689707ae92043403acce20a853753fb88ab7fec93d67dbd9e71542b9addb587b840db378dd264bb482bd1368679c4e5a2e940967c907137608413c6d4f781 SHA512 eac089db03cb5fc2a2938a30318b98cd0b6ae4fd548023dd5f870dc2670ae00466fe4afdc0a62c723f58d92f3f9dda160774f2924926e9ad1f717563e02aec00
+EBUILD libktnef-24.12.0-r1.ebuild 563 BLAKE2B 7cecb7a4c5a3c37d60b12dbb0d858ec9bf7a7e73d598fb0c1e1dd8544a8bfa7007ef38e03543506005a7864b5163596861a26adafb61361b7cb8736fd66426ce SHA512 4456434c0e7584c89372259536d275efd9b2d54645c08a73defa03a1b723d6d356d48aa639d19ef4c67ad6468bcc9f9e367651b7d286b3c14bc7b6b2f40535ef
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libktnef/libktnef-24.12.0-r1.ebuild b/kde-apps/libktnef/libktnef-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..f85aa37fc92b
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-24.12.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_ORG_NAME="ktnef"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for handling TNEF data"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-24.12.0.ebuild b/kde-apps/libktnef/libktnef-24.12.0.ebuild
deleted file mode 100644
index 932409339015..000000000000
--- a/kde-apps/libktnef/libktnef-24.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 6197fa5d17c3..189d7109ad59 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-24.08.3.tar.xz 782720 BLAKE2B 57e40394fc3ee63e5948173a76b2bd2c609fbf0c8d784f944d99b09642b5cda1aed5a3c6edf76361f1811adda066e99ae08e1b1b9f9629db6faa1d41b6df99c7 SHA512 59c2aad3a44a2f52d9609a29fb178085adb6e8008c3a617bfa793431e5cf323e4d0c6ba3c83ead6588a8cc9f3b3f3412ad24c23a1f9704ef0e0ac9f02da74730
 DIST mailcommon-24.12.0.tar.xz 789620 BLAKE2B f35c38529df8df25365649750990b52d573781b14a6fc11fce4b95afbe60acce9521eddc12fb3486eda080aaa636bdf53ecb5b5adea62911a153d47cf72592ca SHA512 cdad87e77e0494281ff265dfd6f2fc5128d784e74773129177cf3af904939effec55aa6245d7d1fdc8f8024fff418f88024f1ca79d8781e155c8fe025d2cb3d5
 EBUILD mailcommon-24.08.3.ebuild 1620 BLAKE2B 57dd0f51c41d992b4369eb9007e9c57e42160042fff7081504b57bc95d8c9b098868f97fc8dda850b70a1a8e4300f2163638bf1056b6d14874a68dc9d4f45305 SHA512 83782fecb16dc2500dc30bce3b8aac27108595cb8d1ef1f03ac1d7cd839911c8e23a74f9b2f10eeb563c9f21236fab3464728328bf1d11e37426538b9469fbe0
-EBUILD mailcommon-24.12.0.ebuild 1767 BLAKE2B e46d4d545cc1fbc1921eb72a52c521067a732174b9f158fcff4f9e856651a1e949f9362665a4fa0d7aee65dc1aef6dd2d8993b8caf6dc0b4c79dea221f01482c SHA512 d484e279b485b4d48f69a3a486206421fc1fb6109ad01c5bf2841ff7f134d7d6fec5ba4bd7b7ab476ee6d77bccff4e7c56b2dc909319bb542d9414beff93891a
+EBUILD mailcommon-24.12.0-r1.ebuild 1767 BLAKE2B b095f6092f21cb5c26e559d9d3befb07b93422a8284b6e9ce50a7a90751bf4c3beedfccea46e92b9d7df2540c158094a74ada2b7cbf47a6170b9ec878e546683 SHA512 63cb0748b60e500c07237396dd986249739815b4e126cc040ea93239cadc349c74ab81e6e7f36de5d45963fec0aba305821c3dddb75f77df4ea670e01d4ed253
 MISC metadata.xml 577 BLAKE2B d86d63beb4ea6cc762972e3760a980ac524cb51e199a93338e59c05e1125a336328882d239f210427791f78a5e4723f1f6a07b6b0ccc0d16befe7f7bae33c0d8 SHA512 7b20c826591bdf987db87043b0ef7683721269f4deea7ea7a951c1f1296e962459054b9b5e3fbd335e248cf83b69b7a5faf0ac82df5a508afdabf889f8742d46
diff --git a/kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild b/kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..b0c2f46eb736
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common mail library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/mailimporter-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	activities? ( kde-plasma/plasma-activities:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/mailcommon/mailcommon-24.12.0.ebuild b/kde-apps/mailcommon/mailcommon-24.12.0.ebuild
deleted file mode 100644
index 7ea677de6b4c..000000000000
--- a/kde-apps/mailcommon/mailcommon-24.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities"
-
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/mailimporter-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	activities? ( kde-plasma/plasma-activities:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 87970aa720bd..857caea3fb8b 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-24.08.3.tar.xz 595968 BLAKE2B cf1f0b37bcb3cb52d7e58faaf8aab3bad4eadee454555b5fcfc200bec2100db8bf6d8d234ea375aa56760342f3e0d883676e5b8cafbb7dbcde80108e8bd98e7a SHA512 402c5dcea63cee1388170cfd5458f12942b0d96d256b0113934975cfece934b43b3316b26efb799349bdeab4bfb01f7e33966b60f7f7f21c650a17429505e8d4
 DIST mailimporter-24.12.0.tar.xz 596632 BLAKE2B 1865f0f5d655a54b099cf905a75a92babd4f46cac09a6cece25113dd81817bd13b31475f9e3051eb07d3bf92248917db797bd26539732723fed60f308fc47bf9 SHA512 233130c73c2d6c8fed2dea87f49437a19b078efa16af4f968270cce6416feb83834db7e564868e7c28dc2a019575295bfe6c3c58ab7db14d99ba94c0f4d81e27
 EBUILD mailimporter-24.08.3.ebuild 734 BLAKE2B 2b7d879749c89470ca162b1c3a57b6309a701c624e56af8a649b8a585e55ebe32750203d1a2bfaba010de7df85420b4bd7bbf67186b3ed137e9a4a4c3b3d96e3 SHA512 242e54d2b930dfeb39b7272689d20584a49ac6a7b8b6f42fc02bc995bd259cfde8140b0f58b8b8e0ec9eae00c51a49ef88e62dfa36a865604fbd9221afd19af5
-EBUILD mailimporter-24.12.0.ebuild 736 BLAKE2B 1ee839beeb54131b17539c8a3033d26d0c62db4d39835e446208eff99da4808bc9a4945ad98cc2d44fc1679e868edcc7992e393ca49b8a8f53797f0e37954257 SHA512 0f1c526d295ca500972d0e69cf2b1bbef647d89b70986ba15975d1039551152256e053a374fb6ee1158619ed32be82c28a273486c230228977877bc00b7fbbd7
+EBUILD mailimporter-24.12.0-r1.ebuild 736 BLAKE2B ceacbb096c219aba6876ddef4eb9561417bb61830bf85a22239b593164baa292aa7d2590772857b08dd9e86463dd3128840084e905e5327f4f0638a0ecf553fa SHA512 6db36a90025d94948d10ce77923db3d1a5ee6438b391485934d07b77b7864a129cd7029940e20be921bbd8d0fc7a32c110684ed1f25dd0e88a7cba445e89c35c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild b/kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..4ebff533e9bd
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library to import mail from various sources"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-24.12.0.ebuild b/kde-apps/mailimporter/mailimporter-24.12.0.ebuild
deleted file mode 100644
index ea6f0b53f420..000000000000
--- a/kde-apps/mailimporter/mailimporter-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index b451919c5de0..633f3a51c5c4 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-24.08.3.tar.xz 31860 BLAKE2B 392f2e01da1de3683557bd0d3dbe16186b5181f86a88608b4690564c7be081e99fd327d890e8864969a823a360494ec092db423181be241f823122a82489cbbe SHA512 be1a662a37151ff093c750fceb3e6dd032323946b53ad6c7dfb157235260073261b4a3b222102a061bc3b30ca451097815567ca197a94793a970e252d3081c9f
 DIST mbox-importer-24.12.0.tar.xz 31936 BLAKE2B 073069646081cc3bb084c5673d1a57761faf585183f215ed204bdb00dea93447aa8d54ce7a613076725b1ec61fb829ffde2ab9a66ad5cbd9fb35c890fb45a302 SHA512 b0239e814eafb444eac50b0ce942900773f98f335295faf28899910a437bcaa3be43a750a925088fa18c878ae018674d1b5f3e773c4983220484893d91f7ec26
 EBUILD mbox-importer-24.08.3.ebuild 897 BLAKE2B 6a8bc7335859b6905d6347a2c28fff9bfabc8c6b21eda4757b3afe8933b6b78a2413186bb69ea0c30f30a364483f6c97ad303933fcf2c677852103aff4156372 SHA512 0ab6480563353e894664ea76fdc38b64d23daed732a6f034ac962a9cc402a151172f2c1f651097295abe1a96db6abb5e744c18d1b40dddff3faf0c5abb7cefd4
-EBUILD mbox-importer-24.12.0.ebuild 899 BLAKE2B dd6e134dfde37cb7f9371757de7ec54b97712afef0a1fe56bb577b5bc8080aec6f464e48a6ff1c34a552ad73e7bef643646600a36ef24bbad7ca2275f234cf1b SHA512 59f99e719833a6b4eecc19a67283592d9815f09a9617e9a1abefd6922d9ae3702ad6400d9c65a23f432f4b86ff97b5683634df03897097bd13a51fb9832aeb21
+EBUILD mbox-importer-24.12.0-r1.ebuild 899 BLAKE2B 49842c6f6f7661c3efffd3cfaaa8ce3f04810e00d9a3760b6d1f512651c9f89d1b52374cc99a2f9685f2bab7b7fd1c3ea2a9ac19ddf15d009b53dea716377687 SHA512 65b7ff20c84d6970ab86ad35f122f9a7f08e8b9103ee56e14e44d9f1243c3a2d8b507a4aebd87ad8d1757ab8b22cd58530f276c253251513c557e5f53e08c724
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild b/kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..7deb3694b236
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/mailimporter-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-24.12.0.ebuild b/kde-apps/mbox-importer/mbox-importer-24.12.0.ebuild
deleted file mode 100644
index a2716a8b9fe8..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/mailimporter-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 618e3a060a09..1867410f0040 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-24.08.3.tar.xz 7369236 BLAKE2B ed5f07c79404843fde5fe4f6c95c7ed031879836c5c327a2ed37870023baf85fd00a784711a50647b3b5dc59b590555683717c9f87abc65ee5f10783cbc940e7 SHA512 b45c6ec26118fe0ade5f839e524da28b7f9ec1397031054fcff558f27eb03c853b61d3fa77c0c3aa1b9c14db6dd81ce072f7713af68ab5e24549e9d467684ac9
 DIST messagelib-24.12.0.tar.xz 7418952 BLAKE2B 2c96632d8b15f7a4adc4a551913cc1460ffb5f45a117fa1210fa64c74e099a78a3ba4cb10e1d20416b8eb09f721f348239122a84f01c57c906f62ea59ac16c8d SHA512 b3c9fb1e3d9858e522f8ccb735d50ea2f0059a28522ba57aa5540ccd0c4040ff65f77187fb7453d4e5d1bbc781ad3690bd8b523e53ac6b7db6d89842afc0fd7d
 EBUILD messagelib-24.08.3.ebuild 2225 BLAKE2B f5daeddc4f9d3be08218da4493f5ebe36c066d936d72c3941f46843b2d576436ac966a168ab22865dec119ad915392f142cdfc7b9af53011943067a2a062498e SHA512 37c822b46f7ea594464f8f5055c2010eac9a376f21788e12f76f83ec42a3014267bfbac68b1bf409c493152b0fe01c7078b4c719e985a195b92dcc98531dc7e3
-EBUILD messagelib-24.12.0.ebuild 2225 BLAKE2B 96388f3131ac0cc93dab1c6f756a08b0cc90c1f8c272098171ea918d6c15a4f896cadd27f026d1e0f3d9b3ef9d2904a723de3a40e30b633091f882fac911926f SHA512 c0ba6c71d3f38e586f6d7095ef56dddf6ee103da8788c465b79f0d3a2579c4ff1704dd1c06a4c4a184404668937d9ac85c7b0055ff272e8cd21309a1c4498371
+EBUILD messagelib-24.12.0-r1.ebuild 2225 BLAKE2B 59a6d4f2f9b5c32b7d6205edce33e6771e8c5d66c55a3870e32f911476088c23a269ea5e72e064c7643e3855db1f0fe159571fa2dcd3ae6a6f36434bb79cab62 SHA512 72d8023d5121c8fbdc6876a040d76f6e877af15dbcc0cdd0425619992981f8e167a7b18a7eebbc16051fbf9c511cf3052d9eb2ef9f0ae5b33fb7f6c5c3b0058d
 MISC metadata.xml 376 BLAKE2B c0e382740e7426d19e30704acc764914dd33412d9d87d57807600864844285e6737a8bbf590455ba17604d0d5fff4358d5eb97176be99a3d337e3d5d27a1466c SHA512 0f160e665e3870cf01f9b810b750934051b236ca5eb596a129ff4485099c3d333ce60932d8e75dd98613f8b7eb60f6ac4c57e8097e06b144e741a3650fb12e2b
diff --git a/kde-apps/messagelib/messagelib-24.12.0-r1.ebuild b/kde-apps/messagelib/messagelib-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..7b96f1eb6da5
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-24.12.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="speech"
+
+# bug 579630
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/openssl-3.0.0:=
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/mimetreeparser-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/messagelib/messagelib-24.12.0.ebuild b/kde-apps/messagelib/messagelib-24.12.0.ebuild
deleted file mode 100644
index c81517119941..000000000000
--- a/kde-apps/messagelib/messagelib-24.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="speech"
-
-# bug 579630
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/openssl-3.0.0:=
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
-	>=kde-apps/libgravatar-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/mimetreeparser-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/mimetreeparser/Manifest b/kde-apps/mimetreeparser/Manifest
index 4f8da6ae6792..e100bf8564d3 100644
--- a/kde-apps/mimetreeparser/Manifest
+++ b/kde-apps/mimetreeparser/Manifest
@@ -1,5 +1,5 @@
 DIST mimetreeparser-24.08.3.tar.xz 646032 BLAKE2B e3611b9cdf68f1cc51b43c5a1bcde101bd94a383500a9c488fb68ac1ea4737fa92278e1a0cb076bee938c02cdcf28a57d81c97040812ae4bde730858731fed1f SHA512 121b0d90de7407c9ae57c1640a4dc33cdd18a51ea6112c4ead7f182774b664952fa434b2921c3456e2d26b91d24a948b47d1a334f51b20fff0ff2a820242d35c
 DIST mimetreeparser-24.12.0.tar.xz 646928 BLAKE2B 55c9171adc9b8aafbfefa782f9246eeee5219f6fd289e550643ac94ad4e50063f01a4fb27e74996d88a0920b36eb92b4c66ea147a2d1b8d4445280dd9ce07b46 SHA512 741cd2dce17f34c157892891596c17f73b659ff21ace37c029848c918b569058e4c954e7cc4a358050bdf10642121de071da282777f45a1705c2ce00d18f165e
 EBUILD mimetreeparser-24.08.3.ebuild 758 BLAKE2B e86898da74906286482e60ee9bcbdb11a41506736c799d0d28f0fcf508c27b0d2c344b3b3c7e03803f4528d6cb09df1711367a24afa606893fa68d616151fc45 SHA512 d69bf0445e97f66bb04e41ec3180677866788845ee252a1dfae72e40541215d99c41cd9b2539293b03e6106d3594f0b23c94fd90eb47a2b8177c16912120b0e2
-EBUILD mimetreeparser-24.12.0.ebuild 760 BLAKE2B e206bb7164e465075aceed739327ae8b894207fc72f00344d6492f67249ecab4b51a08a182553ca5732ba6812abcb62c4cb9ad33906e52f55d0173ecd89117fa SHA512 760a808ac8526f0822f9bdd66be920aefb4e162ba56255c8fb87e04453800026c260f12d453e5b74a1220e8599e2813051576fd7fdb23b7dd014e352cbaf8bf4
+EBUILD mimetreeparser-24.12.0-r1.ebuild 760 BLAKE2B 47772bd707c65ba7d226216c50751d2b56809df5d9350f1a104b20bc0cd616a401400681028fdb0224c85c0b86a98f16b2cd430a867f062a2de186b84e79a679 SHA512 62c1e999a150cb82158f62127a0b0a90d307f3598b4fbed0197e8e96c63f8d33dd38657fc3b4ccd1ae23c743a4f8dd9fbda10377e5cc332959f53634fe584af5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild b/kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..e195b9d6af0d
--- /dev/null
+++ b/kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="pim"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 926482, needs gpg-agent
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mimetreeparser/mimetreeparser-24.12.0.ebuild b/kde-apps/mimetreeparser/mimetreeparser-24.12.0.ebuild
deleted file mode 100644
index a2885e4a3ef0..000000000000
--- a/kde-apps/mimetreeparser/mimetreeparser-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="pim"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 926482, needs gpg-agent
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index ed0593775441..0979c081ee1a 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-24.08.3.tar.xz 426472 BLAKE2B 8c032c2c4b6b76047a713b32a0da9d35d3012692ba55b7270bec5380f84c5f14c5d589367977e66c45896b80ddd89a0837db5b1b83dd2c286617b6f14aefe3d7 SHA512 4690af4ec9d758ccdeedcd51495c3ae96d2c9542b20fb031a79225ad75d40e30b29ae0ffcd9e14bf017144b7c493b0eeb2a90cc6a4500a2ae9fa4da69a3960c1
 DIST pim-data-exporter-24.12.0.tar.xz 421368 BLAKE2B 76c506687b9c8820e19ec31f2e9ff32e65159241efeca7081d78f425689504476db3fdef3cf1656ca82b0c1e30552e3fd55a78c17c5d51ee058bd8e30935a010 SHA512 835e9694dceb2d592bdc23e4c9e056b08c15eeeb63b91a334e33c985e79024291dadebba26db5ef5a17d607878faade16bf851c089e6e590db286be690046075
 EBUILD pim-data-exporter-24.08.3.ebuild 1615 BLAKE2B 76652996d31ce4255977c1090a356fb8aa7e301e086d4531455262c700cec886a9189a8ab38b5418e515d7cc771c9c7269a0901e9527b76dc3a1d862d95ec992 SHA512 726ad36004bc518e75c7dc4003a3122216d41bc4e2790c15f369c9869a9d671e3e9d08add1cbb67fcab444f37f8c94197c47e5f4bb6551ec156706d5ff4f5ef9
-EBUILD pim-data-exporter-24.12.0.ebuild 1617 BLAKE2B b4cc71f6e6ca25030603986aa2796f13942733c444cb775db8505d7e9ab9962081c52876a0baded01de6a57dca138ccd27a538b5f8e3f68b7d717efa5a4c4f1b SHA512 117ef3e2c0d8a6d0797d0b0be736c9ff1ecc276e6fc00704b7893b628cd2c32e660957f4448b254d1072b4c33cce593097a5b0b33e92c417a075677cbf415b23
+EBUILD pim-data-exporter-24.12.0-r1.ebuild 1617 BLAKE2B ee3bfe4cc0dd4203c7cac78886cc3f7dae78477b8b27e9881074b14a8c32b0608eed57854cf21494c2e77aca2313a84a8d075c0183e10332c3d1bb0c4a443e67 SHA512 a1c18ca3d393452d858e14cc5cf7686d50ad939fe18db90bfbcdbe167cc8211f4b706a78c1c3f8bfd56b2a0def8ab60f3af4e2bce1054c2ed3fb332f74a59cb6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..e9dec14f4cc0
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE="https://apps.kde.org/pimdataexporter/
+https://userbase.kde.org/KMail/Backup_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="telemetry"
+
+RESTRICT="test" # 11 out of 21 tests fail...
+
+DEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0.ebuild
deleted file mode 100644
index 3c38fd75be00..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://apps.kde.org/pimdataexporter/
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="telemetry"
-
-RESTRICT="test" # 11 out of 21 tests fail...
-
-DEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 34c7e667f52b..9ec544a834c0 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-24.08.3.tar.xz 470068 BLAKE2B 841b0cacc8ebcaf0a54588ae6b4e82ef1fd385b781aa307f00fce680944deb1a4db2aca92b2d4b27504f97d1f337583fa8fd049726c37ef5fc98dc46bcfbdbbf SHA512 036dcd11de5057c6c2887ac7eaa925a370a9b35d6facba96e044ee82fb6428e596b528c006c1fe7e48bbb43acc922e3d9733a6260eef1a85d236405be989102b
 DIST pim-sieve-editor-24.12.0.tar.xz 470480 BLAKE2B 570d6e22e1867c9b356c46c4500860574248fffec21c06248f887dba99fa8a094e3c0f5f6de977a25893628d035c539a56f7403636baa27b78e8be9f6fa939b4 SHA512 7c1758af596d13b26edf495f9244ef62471c76811717540399cb7c473e8972c13ffa37e553901942912785ae16cdcb4f524f828f90e4d8b64e14fc847198c55b
 EBUILD pim-sieve-editor-24.08.3.ebuild 1392 BLAKE2B 0e99fa504372f3aabf885d0210eb7371cd201f39d5251f37266e1757dd24c104e1a58c3015d01b38e7bd939977beb8626c4aa8acb1c01b166ded509229014c9e SHA512 055e0e91cd47904afa6510db9456f50e94652770782001a2c9a2c4e55552b0992e792f59d490c3f2fbc4ffc3b424e74cca02bcfce6847a9be1642323846075bc
-EBUILD pim-sieve-editor-24.12.0.ebuild 1397 BLAKE2B 7a79922b0346f606c3e7f0edd1b686e34124d60b8e20011c102024d2077b123cf9cc9ec4a5b1ec41d09b680f1045a16983ea25dcadb7822d114d590acc9c144d SHA512 a71e25d358fddd8ab39cc031e2a06837b2d40b08f45ab7947da4077060a5cc710bbdcbb7b41cc7784f980ce30110242f79c3e49d6fec541240220d6f7a839ec9
+EBUILD pim-sieve-editor-24.12.0-r1.ebuild 1397 BLAKE2B 8da22dfbaadceffd23816cf0a0b2bafb76e16c2261e6ab2bdd6a50e5acfa5ce52d4e58544251a0e07cba0c78990b3d54e839d6f10324cd658b1a6d500a2379a9 SHA512 60038f3f8768ae017be0c0adf8e86a1afc444c8fbd093225ce43023603d7daf91ae3f3287fcca6f16fe8ea83dc57ba62cb11930b71ed8c1ac16198ed12996ad5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..1bba17628264
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="telemetry"
+
+DEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0.ebuild
deleted file mode 100644
index 28d886c584fb..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/libksieve-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index b221f58dbb2a..a1d9149fa6f9 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-24.08.3.tar.xz 351164 BLAKE2B 7cc03932a9cc67285de4e40baec693bb24b3323d6d780b69d8cc8f7152c49b010b3560f5fd2b2934f89144d888f5c12cf5150fcfd37dfa928cf339113ef23f7b SHA512 000aca6f02dca149ea5b2e10cf805a45f0e7855a6953f58b6bca63903add877715625c484d6d00deed8eb41589fce05e5c2b55d05e460d5f9a18fd619a970d2c
 DIST pimcommon-24.12.0.tar.xz 365608 BLAKE2B 7a5e69b06b583b591855ce22ded334205d71a32937ed7d8e31d353fa767ddea5b8cbe5383a7661f84be0e17c932c0b28e94d813712c06600b24354eab9c3e254 SHA512 dc60d3fd36c13c0046414dec0663c96e706e234f8c349621664b8d64410f1212503a0f9647d71e90cf81d80ce10653999dfe381487bfc1ccc2107ac538717cf5
 EBUILD pimcommon-24.08.3.ebuild 1402 BLAKE2B 8fd1251634bce5b8e7279ef5fc3c7cf42e1334c53084a63743ed423c5d053ee4c44823ae225161deeda8ddeb6e83d65ca27a9154df764e3607c3124ae91686f7 SHA512 852369a27265330eb56fe5c23d6bc07c942dc84ed7b41f50d441de2cdd4ee3adb3604d303fca109da93f42d608d187902484255f3d7f625e3ad2837d2670370d
-EBUILD pimcommon-24.12.0.ebuild 1579 BLAKE2B 2777f2c4de9b2accd47f17df09e1b61b7d0bf735812c31ecaa75c09310ec10ee6e63dd7b1f64e07c7aaa224bacbfcf84ed87d9886fa0db79c113d1dc2946190b SHA512 c024c97689bd94ad879699ba80a99c0e8fe9e3e6cb2ca41d008a52510ed95f51a64f21d7e5747385242d709891c411086d47aba00bb0936a39951ad89932f6f5
+EBUILD pimcommon-24.12.0-r1.ebuild 1579 BLAKE2B ea79fd1a6eeda84635495aed96537e5ea76e5e693c1c96b189ea5af3025963ff9e3e6828a619c592f9408a382f75976e702f4d46bc73238de6439befb375003b SHA512 b085e1903fc9ae518ae61078148e57633161ecbe6f6c38a46d19ef3a0b8840f7d20a8158a2e4684ab64bf5f8fc22e1e90a1ce8eff33dd0f09e0744762c4e6708
 MISC metadata.xml 576 BLAKE2B d714bf53f18fa0512ef2091704f7a89543af54c6a8a6c7c30cacd393721a15d7512f0d8e606902b7cdd7746303f6ba1cb73dac4c67c3249e358a85c3b501b7da SHA512 7752ae589f114320d0417b5d6bbe17d31191000f0f6ca01d702b1d1d094a77f58fc1db5c07ca508ad7fd1181fc82485332ef580d891dc1fa99f99e9eb0dac533
diff --git a/kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild b/kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..189b36cc82be
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs 641730, 661330
+	local myctestargs=(
+		-E "(autocorrectiontest|pimcommon-translator-translatorwidgettest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/pimcommon/pimcommon-24.12.0.ebuild b/kde-apps/pimcommon/pimcommon-24.12.0.ebuild
deleted file mode 100644
index 363a01814ab2..000000000000
--- a/kde-apps/pimcommon/pimcommon-24.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatorwidgettest)"
-	)
-
-	ecm_src_test
-}
-- 
cgit v1.2.3