Adding metadatav21.1.5

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-03-01 00:37:58 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-03-01 00:37:58 +0000
commit: 8ddb1a3d1229412a438971f82d37d518a0223726 (patch)
tree: 83438b5ddb9d23a390f1a3fc505303d3d2223bf2 /kde-apps
parent: 9acab46e1a820daece7b2e631485c157ce2210ad (diff)
download: baldeagleos-repo-21.1.5.tar.gz
baldeagleos-repo-21.1.5.tar.xz
baldeagleos-repo-21.1.5.zip
449 files changed, 2334 insertions, 4881 deletions
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 2d0914d51f1e..358f3a3aca4e 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-20.08.3.tar.xz 344600 BLAKE2B 0f478e41b7b43119c6c1fc4abcc7bab2d7c7e48ccdf83d97471cb34f6364beb606dcf09e61e838c8601b7d0834bd4115c2273db11a3cf319b03dcf7aebf9581e SHA512 f9b48dd1f8820ddb4a3c1259b20eeb814ffd0f0209407cc0412c21491b42f4744b7fd09e9a0e56249f5e8cd9c8d29a0265ccf46607a6617a1b605b2e20f15c02
 DIST akonadi-calendar-20.12.2.tar.xz 342764 BLAKE2B 0c71a7a2f5949eff8ccd0c93d31f4c332d04015b507477f6d03d06ac930622ac9704794a18ae7fc263eeaee3c6e3550f7d4bedc62be90e275c11b412adef9263 SHA512 80d7d9e77d176c157e885d1229fee07def248728679d5fea90124518aefd6f998cde4a2a22a0b5087c49547ba4fda3811b1a6980a920c47d13bc9039a17e02ae
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild
deleted file mode 100644
index 2b6af811dee1..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
index c0cb12f6b932..909df4b925d1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-calendar/metadata.xml b/kde-apps/akonadi-calendar/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadi-calendar/metadata.xml
+++ b/kde-apps/akonadi-calendar/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index e3c368922dc3..c26f6dc7fea3 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,2 +1 @@
-DIST akonadi-contacts-20.08.3.tar.xz 409772 BLAKE2B c974d8b48c12bce036f833089f8a59eb523b65d3cd8e9649bb573eaaa7fb5cfd8fa56a7842dafd67bc816ab298c942721c4cc1ef0c5c4ed12d8a2fc40ba62f94 SHA512 1b6d10a4cce9b84092673f5779cbd1db71beef86887ef6c809174445fbc13d7a0b6d8417eb54e3cbd10504ed12155d53e148a7667569b9458e900eebd16ce943
 DIST akonadi-contacts-20.12.2.tar.xz 414208 BLAKE2B d0cdd880e6a05422afed82d7ec0d69424928c9bc9a2d7ff1565fb89163d5f4842388cfc8a6805bd052a0aa06f2fd895f34103809f9e4c7072bc0c569594a14fe SHA512 9e6bb8162619a484fffe822d448ab3aae5199c5deacb2ce10ccfdafb025b19e1f1a3aa0241f013c261205f6e7c9b7501c755589d69b082d3bc00d5d6fb58ccb9
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild
deleted file mode 100644
index cbb86208bfea..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
index b546743d414b..f42c78dd86cf 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for akonadi contact integration"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-contacts/metadata.xml b/kde-apps/akonadi-contacts/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadi-contacts/metadata.xml
+++ b/kde-apps/akonadi-contacts/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index dcc4d39336d0..29dc02625bed 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,2 +1 @@
-DIST akonadi-import-wizard-20.08.3.tar.xz 506104 BLAKE2B d11db50eaae05cbf1fd7e6322d3e56ef9c8b6738107134e6db6417f1d155e4d36d623af50569126a7fe43cced56e8001e2bc8b7fce2a743d52ee30567ea59be5 SHA512 d0319d42b9ed4eef654c1bd2728c17919f3b04c806b12ed01c872ade5094309f0fb2dfd01462e1ec860515f8a989470549da8aae2e933251e69951f067b12da5
 DIST akonadi-import-wizard-20.12.2.tar.xz 506672 BLAKE2B fcb9c46b509787d68296e96ad55e960c994ce4bcc87e7d541a8ead254378433efde46339565e01894949ddeb69378078e469e21833a49b8406fc9a64fabd0d2f SHA512 459014c383e62566b85535468ea0ac2970315248b98cf2aa7b5581e01a799ad35aa0fb5488e66e71ca3e6a1d94eb3dc1421e9ff638d2b87e8ec7dc3b6461906b
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild
deleted file mode 100644
index a045325c928c..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm 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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
index 9b0d68e29440..2a87744f374d 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-import-wizard/metadata.xml b/kde-apps/akonadi-import-wizard/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadi-import-wizard/metadata.xml
+++ b/kde-apps/akonadi-import-wizard/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index c73f950568e2..308b574130db 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1 @@
-DIST akonadi-mime-20.08.3.tar.xz 137936 BLAKE2B ceb9e46da5ba1cf62f3d47c54bf60ed0ab25d20a4006dc6b9f667f1b7f449cd216508de4a76a04784f686383f70447467144e990a564e10c3af214ac9a348ad0 SHA512 d5f996f5e8e1e1c148d7b78e48d88d622e190881cc522fbd3cb0bb683888ba037ac9f84d5ba964eec356ff1c201b88e5339351d489a8647d8cab5fef22a882a1
 DIST akonadi-mime-20.12.2.tar.xz 135892 BLAKE2B 29ee94c335728ffd815ddf75a4b9839707654a4894647e097398b7c148cb211e2a19ca951bfd4c249798e248c5b97bb256bd02615c10a7a6c266f551929783e5 SHA512 7d4aadacdeb2c9627bea5494ca3d986365af1aea3cb87482e7d671edb4aa3055a6069709bb57bdf8cd3a4e291160af548044ec42f2e3c3aa2dcacfc0ae018aaf
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild
deleted file mode 100644
index 2a6c242d5996..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
index 610e0e0a9e08..ad9c82303281 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi mime types"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-mime/metadata.xml b/kde-apps/akonadi-mime/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadi-mime/metadata.xml
+++ b/kde-apps/akonadi-mime/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 169131cfbb9b..84c71ac62c93 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,2 +1 @@
-DIST akonadi-notes-20.08.3.tar.xz 22784 BLAKE2B eb88c528218d2853f8182f37fbb0f93bd34b78a76a5cbb03f35983fb79eb1361c1bb8836c8bb65fc106530d49b5e7e48cc3e7633b1b881b741561d0c8f49f618 SHA512 7b38bfa0854da839b40c455a87bba59574af5ebb69019ce4f58aeb2811df5b652e34aaebd942d8a9f5519e8d93faaa713a2dc8298abffcf4b7af41cca1416cf6
 DIST akonadi-notes-20.12.2.tar.xz 22916 BLAKE2B 54928a4adf67d4e6afb6692067e177f634142bae2fa0041663c6154bef5bcd2ed051bcf0a1a597d27d9d4685ca18627f001401e7f7b70eec802e64468fd896ef SHA512 30e4fc0753abee49f69c5c0727b123ff8bf2e8e8c127043895e6f3a221f0cf1e6bf5ca89ed87687d83184e082c8cf7fad7f490f1bc5678317cac8c18d2e83b49
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild
deleted file mode 100644
index 16e6cb72422c..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
index 0b141def05b6..bc1ec9fcad70 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi notes integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-notes/metadata.xml b/kde-apps/akonadi-notes/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadi-notes/metadata.xml
+++ b/kde-apps/akonadi-notes/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index c305eac7ac46..b7ddbbc11ec2 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1 @@
-DIST akonadi-search-20.08.3.tar.xz 94772 BLAKE2B a1ab156b0306dc543eff92711a7c3e3d94fde423a16fead67559b4b01b937178e549421d41dd486e3f68e4743c13a3667d7f432b656d990f02cac6edb0968a1c SHA512 db6246e428bfbe77239089e1bc4036b99dd8c070a70a995c698785ab202e5f975e30a7e0f36ac3fa41c859b928821f626f545c2be21479ffe5809e83068dbee8
 DIST akonadi-search-20.12.2.tar.xz 93988 BLAKE2B 42b62605b4dbe27dae073761ccb78e6063b65fc9ad934aa77065baa380e4dba38b38062f30ac800ec9546697d1b10b275f1bc0ca21426ebe16f5d8e399560720 SHA512 cbb9bb579b0545198ebc145d41ca3ffdc84a5cdab00941ef133c5d2fba2e720eefdb4ea52edfa065bcd2baffe5a612c15058fd5d7a2106c8728ad4ff6e531de0
diff --git a/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
index 10513b4e2695..55be7024c781 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.75.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -45,5 +45,5 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	test? ( =kde-apps/akonadi-${PVCUT}*:5[mysql,postgres,sqlite] )
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
 "
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild b/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild
deleted file mode 100644
index 2d08a7e07333..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm 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="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # perpetually broken, bug 662378
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-RDEPEND="
-	>=dev-libs/xapian-1.3:=[chert(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[mariadb,postgres,sqlite] )
-"
diff --git a/kde-apps/akonadi-search/metadata.xml b/kde-apps/akonadi-search/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadi-search/metadata.xml
+++ b/kde-apps/akonadi-search/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 4649cb718990..78ad98c9c798 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1 @@
-DIST akonadi-20.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720
 DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c
diff --git a/kde-apps/akonadi/akonadi-20.08.3.ebuild b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
index cd1506e09ba6..c0e9eb4ea8cc 100644
--- a/kde-apps/akonadi/akonadi-20.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.75.0
+QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -22,7 +21,11 @@ IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) 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/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -42,7 +45,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	kaccounts? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
+		>=kde-apps/kaccounts-integration-20.08.3:5
 		net-libs/accounts-qt
 	)
 	sqlite? (
@@ -61,10 +64,10 @@ RDEPEND="${COMMON_DEPEND}
 	postgres? ( dev-db/postgresql )
 "
 
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch"
+	"${FILESDIR}/${P}-mysql8-conf.patch" # bug 709812
+)
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
@@ -86,8 +89,8 @@ pkg_setup() {
 	fi
 
 	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
+		ewarn "We strongly recommend you change your Akonadi database backend to"
+		ewarn "either MariaDB/MySQL or PostgreSQL in your user configuration."
 		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
 	fi
 
diff --git a/kde-apps/akonadi/akonadi-20.12.2.ebuild b/kde-apps/akonadi/akonadi-20.12.2.ebuild
deleted file mode 100644
index ec7b1bb392c9..000000000000
--- a/kde-apps/akonadi/akonadi-20.12.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm 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="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+kaccounts +mariadb postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mariadb postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-	)
-	mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] )
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mariadb? ( >=dev-db/mariadb-10.4:* )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MariaDB, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mariadb && DRIVER="QMYSQL"
-
-	if use mariadb && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi MariaDB database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
-		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
-		ewarn
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to"
-		ewarn "either MariaDB or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	if has_version "kde-apps/akonadi[mysql]"; then
-		ewarn "Due to configuration incompatibilities we are unable to provide"
-		ewarn "the option to use dev-db/mysql. You must switch to dev-db/mariadb."
-		ewarn "  https://bugs.gentoo.org/709812"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=421922"
-	fi
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mariadb && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch b/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch
new file mode 100644
index 000000000000..8edf9d605dde
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch
@@ -0,0 +1,75 @@
+From 9c666d0d6039a87f6286014c7d9c7281a5bd9dd1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Feb 2021 21:38:14 +0100
+Subject: [PATCH] MySQL server settings: Make use of 'loose_' option prefix
+
+Idea by one of the Gentoo MySQL maintainers. This makes MySQL skip over
+unsupported options rather than fail, which is important with >=MySQL-8.
+
+See also:
+https://dev.mysql.com/doc/refman/8.0/en/option-files.html#option-file-syntax
+https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-prefixes
+
+BUG: 421922
+
+Thanks-to: Thomas Deutschmann <whissi@gentoo.org>
+---
+ src/server/storage/mysql-global-mobile.conf | 6 +++---
+ src/server/storage/mysql-global.conf        | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/server/storage/mysql-global-mobile.conf b/src/server/storage/mysql-global-mobile.conf
+index 19649d347..48e150af7 100644
+--- a/src/server/storage/mysql-global-mobile.conf
++++ b/src/server/storage/mysql-global-mobile.conf
+@@ -65,7 +65,7 @@ innodb_large_prefix=1
+ log_error=mysql.err
+ 
+ # print warnings and connection errors (default:1)
+-log_warnings=2
++loose_log_warnings=2
+ 
+ # Convert table named to lowercase
+ lower_case_table_names=1
+@@ -80,10 +80,10 @@ max_connections=256
+ # (make sense when having the same query multiple times)
+ 
+ # Memory allocated for caching query results (default:0 (disabled))
+-query_cache_size=0
++loose_query_cache_size=0
+ 
+ # Do not cache results (default:1)
+-query_cache_type=0
++loose_query_cache_type=0
+ 
+ # Do not use the privileges mechanisms
+ skip_grant_tables
+diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf
+index ab4a4a1e3..b67a4ec1e 100644
+--- a/src/server/storage/mysql-global.conf
++++ b/src/server/storage/mysql-global.conf
+@@ -62,7 +62,7 @@ innodb_log_file_size=64M
+ log_error=mysql.err
+ 
+ # print warnings and connection errors (default:1)
+-log_warnings=2
++loose_log_warnings=2
+ 
+ # Convert table named to lowercase
+ lower_case_table_names=1
+@@ -77,10 +77,10 @@ max_connections=256
+ # (make sense when having the same query multiple times)
+ 
+ # Memory allocated for caching query results (default:0 (disabled))
+-query_cache_size=0
++loose_query_cache_size=0
+ 
+ # Do not cache results (default:1)
+-query_cache_type=0
++loose_query_cache_type=0
+ 
+ # Do not use the privileges mechanisms
+ skip_grant_tables
+-- 
+2.30.1
+
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index c6b73ba5cfce..4efac7621c2d 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
-		<flag name="mariadb">Enable support for using <pkg>dev-db/mariadb</pkg> storage backend</flag>
-		<flag name="tools">Install tools for developers and testing</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+  <flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
+  <flag name="tools">Install tools for developers and testing</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 39a244cf74d0..ef4f4788efa1 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1 @@
-DIST akonadiconsole-20.08.3.tar.xz 195032 BLAKE2B 589266d05e295ab80c891937faa204fad3ab56d4f6cbffcb2a435b93fed407be03c95cbf8c8a9ef2e74f2fecae16b41b74555cf878aa051515ddbbacf2497932 SHA512 2770bd9a89f3e64d82d689301392285ccbd580edadceebb83ba5c456fd9fc1a8149cadea3b6eb14ba9a8d7e68c1c4308957df21111d721304dc6268fece3dfd9
 DIST akonadiconsole-20.12.2.tar.xz 198012 BLAKE2B 1cbbb43d7d20d45a5afe112345b1a4a17b1492fd128e885c61925d9ef7a34a3347f3440ab577b6d81309c378ad6ddef9e56d8b2beb51a68ad4c412bed99a8fff SHA512 f4b33bd2b8add0e09beb5443d6360d2bfd226249950233d8dd44e1e408e199e3d3e625e2b6a1e0d4b6c756371c2b1ee5e486394ca4b2bc47e48e476e0711a6e4
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild
deleted file mode 100644
index cb5a1ac88cad..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm 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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
index b06d71b02a82..402f00b62a0d 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
 
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadiconsole/metadata.xml b/kde-apps/akonadiconsole/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akonadiconsole/metadata.xml
+++ b/kde-apps/akonadiconsole/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index a8125c61b8fe..a60e08cdd47f 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1 @@
-DIST akregator-20.08.3.tar.xz 2204024 BLAKE2B efe9b4acf8140eb018ce0b414f3829da2e4622348a54d43dc6707dd2a140eeec5bddcea1f33a04b8e3a96b312363d041b49d653597ff0985e9a8e2a1a8c89a02 SHA512 6df49879061e7163ab7c433929cfcb1ebbf2f8a974b7df9247c5576dd0e7aae4b8288daad2e65b0f302e0d208ef01de4dff838264b812f5f6d584051e3ca5c11
 DIST akregator-20.12.2.tar.xz 2205104 BLAKE2B 56a05146aca50a419a659c93bbd9b8c5903e2465f80cd5125a01be14f53a67d1d9da6e7e7b2a97550ec86d28e85431f8f56392475d7c3f371b9c86754246ed17 SHA512 b8fef0b5f4a825d8854373810f173dc0c3d9e95007f6e96647d8b537801910f572d7b8593801137b078cbd754447e70af08c1ff3c2863e733be10dcfbc4c0913
diff --git a/kde-apps/akregator/akregator-20.08.3.ebuild b/kde-apps/akregator/akregator-20.08.3.ebuild
deleted file mode 100644
index 43aa546717ac..000000000000
--- a/kde-apps/akregator/akregator-20.08.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/en/akregator"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/grantlee:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/akregator/akregator-20.12.2.ebuild b/kde-apps/akregator/akregator-20.12.2.ebuild
index 3fce873a34ae..2f6b14d2bdc9 100644
--- a/kde-apps/akregator/akregator-20.12.2.ebuild
+++ b/kde-apps/akregator/akregator-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/akregator"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/kde-apps/akregator/metadata.xml b/kde-apps/akregator/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/akregator/metadata.xml
+++ b/kde-apps/akregator/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/analitza/metadata.xml b/kde-apps/analitza/metadata.xml
index 006469792bc7..35b1f568138c 100644
--- a/kde-apps/analitza/metadata.xml
+++ b/kde-apps/analitza/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ark/metadata.xml b/kde-apps/ark/metadata.xml
index 5ec30e7f0b1d..68158f564736 100644
--- a/kde-apps/ark/metadata.xml
+++ b/kde-apps/ark/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="zip">Enable ZIP archive support via <pkg>dev-libs/libzip</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:kde:ark</remote-id>
+ </upstream>
+ <use>
+  <flag name="zip">Enable ZIP archive support via <pkg>dev-libs/libzip</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/artikulate/metadata.xml b/kde-apps/artikulate/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/artikulate/metadata.xml
+++ b/kde-apps/artikulate/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/audiocd-kio/metadata.xml b/kde-apps/audiocd-kio/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/audiocd-kio/metadata.xml
+++ b/kde-apps/audiocd-kio/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/baloo-widgets/metadata.xml b/kde-apps/baloo-widgets/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/baloo-widgets/metadata.xml
+++ b/kde-apps/baloo-widgets/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/blinken/metadata.xml b/kde-apps/blinken/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/blinken/metadata.xml
+++ b/kde-apps/blinken/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/bomber/metadata.xml b/kde-apps/bomber/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/bomber/metadata.xml
+++ b/kde-apps/bomber/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/bovo/metadata.xml b/kde-apps/bovo/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/bovo/metadata.xml
+++ b/kde-apps/bovo/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 3e429bca6f88..36783e8c4152 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-tools-20.08.3.tar.xz 228576 BLAKE2B 53d3beb42c766f0ac47ea54b5294b61680a6e712ed624489b7df2c182f014ec07fbcb81bd47ab6a2b045515a7d85f7efd1616b9aa672338e84b80258d98298b0 SHA512 d8dc7fbd74cce1081f2398d1d5478e08cd0b7e9c4aed5dc89b3a54b43e0427526c9a47f7304667b796bec2cb53d0f17d4541345f647165f50edfff44c7ee91a3
 DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild
deleted file mode 100644
index a9da3e17b958..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
index 0ee234b1a929..6e6c5bf7979d 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tool to scan calendar data for buggy instances"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/metadata.xml b/kde-apps/calendarjanitor/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/calendarjanitor/metadata.xml
+++ b/kde-apps/calendarjanitor/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 795b904cfb14..2bbf96696f09 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1 @@
-DIST calendarsupport-20.08.3.tar.xz 661708 BLAKE2B cf7ef77afe14db2e5eddd48617f47f3d32c93b6d2697ed35f8dfacb73ca50d39e04ab459f8fb5ba18f48068034828c5d6fdd1af2604ae97586bfa4bac33b3029 SHA512 dc1f1eb8b633f19edf841e9b4d50b78afea9297918a4b3d8bab47352b53caec2737566504c9487fe1e36a01873e6e4bda8e257f997742d244d276992ddcc77f5
 DIST calendarsupport-20.12.2.tar.xz 665200 BLAKE2B dbaf358e0295c27f663b87f91598a4aae6449f37bd470648f8416c69e654b8db39a37c9429c32ba204232118e7dc67cf3a1ef7927fdc2b84a04812620e0499f8 SHA512 63878598f52634e6dcd4aca527dd3f6278b9d2569b169d2a81a78d31b2cce632b45713da8fd4b97d241aa041fd9805a909b59aa2c090f6b55e685fe60e2f8cde
diff --git a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
deleted file mode 100644
index 58478c498820..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libical
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
diff --git a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild b/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
index be894e0fd1b4..85d97b997ff4 100644
--- a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calendar support library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch b/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index af94c2e7a0de..000000000000
--- a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From b4193facb223bd5b73a65318dec8ced51b66adf7 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Wed, 9 Sep 2020 17:26:46 +0200
-Subject: [PATCH] Port away from deprecated QPrinter functions
-
-This implies changing from QPrinter::Orientation to QPageLayout::Orientation. The actual values are the same tough.
----
- src/printing/calprintdefaultplugins.cpp | 14 +++++++-------
- src/printing/calprintdefaultplugins.h   | 10 +++++-----
- src/printing/calprinter.cpp             |  6 +++---
- src/printing/calprintpluginbase.cpp     |  8 ++++----
- src/printing/calprintpluginbase.h       |  2 +-
- src/printing/printplugin.h              |  4 ++--
- src/printing/yearprint.cpp              |  6 +++---
- src/printing/yearprint.h                |  2 +-
- 8 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp
-index 862b74d..e3d802d 100644
---- a/src/printing/calprintdefaultplugins.cpp
-+++ b/src/printing/calprintdefaultplugins.cpp
-@@ -805,7 +805,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
-         QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
-         QString line2 = local.toString(mToDate, QLocale::ShortFormat);
-         QString title;
--        if (orientation() == QPrinter::Landscape) {
-+        if (orientation() == QPageLayout::Landscape) {
-             title = i18nc("date from-to", "%1 - %2", line1, line2);
-         } else {
-             title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
-@@ -1050,14 +1050,14 @@ void CalPrintWeek::saveConfig()
-     }
- }
- 
--QPrinter::Orientation CalPrintWeek::defaultOrientation() const
-+QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
- {
-     if (mWeekPrintType == Filofax) {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     } else if (mWeekPrintType == SplitWeek) {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     } else {
--        return QPrinter::Landscape;
-+        return QPageLayout::Landscape;
-     }
- }
- 
-@@ -1099,7 +1099,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
-         do {
-             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
-             line2 = local.toString(curWeek, QLocale::ShortFormat);
--            if (orientation() == QPrinter::Landscape) {
-+            if (orientation() == QPageLayout::Landscape) {
-                 title = i18nc("date from-to", "%1 - %2", line1, line2);
-             } else {
-                 title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
-@@ -1126,7 +1126,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
-         do {
-             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
-             line2 = local.toString(curWeek, QLocale::ShortFormat);
--            if (orientation() == QPrinter::Landscape) {
-+            if (orientation() == QPageLayout::Landscape) {
-                 title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
-                               line1, line2, curWeek.weekNumber());
-             } else {
-diff --git a/src/printing/calprintdefaultplugins.h b/src/printing/calprintdefaultplugins.h
-index 4df72f6..3f62d0b 100644
---- a/src/printing/calprintdefaultplugins.h
-+++ b/src/printing/calprintdefaultplugins.h
-@@ -53,9 +53,9 @@ public:
-     }
- 
-     QWidget *createConfigWidget(QWidget *) override;
--    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
-+    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
-     {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     }
- 
- public:
-@@ -166,7 +166,7 @@ public:
-     /**
-       Returns the default orientation for the eWeekPrintType.
-     */
--    QPrinter::Orientation defaultOrientation() const override;
-+    QPageLayout::Orientation defaultOrientation() const override;
- 
- public:
-     void print(QPainter &p, int width, int height) override;
-@@ -222,9 +222,9 @@ public:
-     }
- 
-     QWidget *createConfigWidget(QWidget *) override;
--    QPrinter::Orientation defaultOrientation() const override
-+    QPageLayout::Orientation defaultOrientation() const override
-     {
--        return QPrinter::Landscape;
-+        return QPageLayout::Landscape;
-     }
- 
- public:
-diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp
-index 182e0e3..10e9db6 100644
---- a/src/printing/calprinter.cpp
-+++ b/src/printing/calprinter.cpp
-@@ -126,13 +126,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati
-     QPrinter printer;
-     switch (dlgorientation) {
-     case eOrientPlugin:
--        printer.setOrientation(selectedStyle->defaultOrientation());
-+        printer.setPageOrientation(selectedStyle->defaultOrientation());
-         break;
-     case eOrientPortrait:
--        printer.setOrientation(QPrinter::Portrait);
-+        printer.setPageOrientation(QPageLayout::Portrait);
-         break;
-     case eOrientLandscape:
--        printer.setOrientation(QPrinter::Landscape);
-+        printer.setPageOrientation(QPageLayout::Landscape);
-         break;
-     case eOrientPrinter:
-         break;
-diff --git a/src/printing/calprintpluginbase.cpp b/src/printing/calprintpluginbase.cpp
-index e96f3b2..9db198e 100644
---- a/src/printing/calprintpluginbase.cpp
-+++ b/src/printing/calprintpluginbase.cpp
-@@ -232,9 +232,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFooter)
-     mPrintFooter = printFooter;
- }
- 
--QPrinter::Orientation CalPrintPluginBase::orientation() const
-+QPageLayout::Orientation CalPrintPluginBase::orientation() const
- {
--    return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
-+    return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
- }
- 
- QColor CalPrintPluginBase::getTextColor(const QColor &c) const
-@@ -326,7 +326,7 @@ int CalPrintPluginBase::headerHeight() const
- {
-     if (mHeaderHeight >= 0) {
-         return mHeaderHeight;
--    } else if (orientation() == QPrinter::Portrait) {
-+    } else if (orientation() == QPageLayout::Portrait) {
-         return PORTRAIT_HEADER_HEIGHT;
-     } else {
-         return LANDSCAPE_HEADER_HEIGHT;
-@@ -356,7 +356,7 @@ int CalPrintPluginBase::footerHeight() const
- 
-     if (mFooterHeight >= 0) {
-         return mFooterHeight;
--    } else if (orientation() == QPrinter::Portrait) {
-+    } else if (orientation() == QPageLayout::Portrait) {
-         return PORTRAIT_FOOTER_HEIGHT;
-     } else {
-         return LANDSCAPE_FOOTER_HEIGHT;
-diff --git a/src/printing/calprintpluginbase.h b/src/printing/calprintpluginbase.h
-index ff1113c..b3d41ac 100644
---- a/src/printing/calprintpluginbase.h
-+++ b/src/printing/calprintpluginbase.h
-@@ -108,7 +108,7 @@ public:
-     */
-     static int weekdayColumn(int weekday);
- 
--    QPrinter::Orientation orientation() const;
-+    QPageLayout::Orientation orientation() const;
- 
-     /** Returns the height of the page header. If the height was explicitly
-         set using setHeaderHeight, that value is returned, otherwise a
-diff --git a/src/printing/printplugin.h b/src/printing/printplugin.h
-index 57afdfe..73bf467 100644
---- a/src/printing/printplugin.h
-+++ b/src/printing/printplugin.h
-@@ -140,9 +140,9 @@ public:
-       config settings), implement this function in your subclass and
-       return the desired orientation.
-     */
--    virtual QPrinter::Orientation defaultOrientation() const
-+    virtual QPageLayout::Orientation defaultOrientation() const
-     {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     }
- 
-     /**
-diff --git a/src/printing/yearprint.cpp b/src/printing/yearprint.cpp
-index 3287ca6..e57a1c4 100644
---- a/src/printing/yearprint.cpp
-+++ b/src/printing/yearprint.cpp
-@@ -82,9 +82,9 @@ void CalPrintYear::saveConfig()
-     }
- }
- 
--QPrinter::Orientation CalPrintYear::defaultOrientation() const
-+QPageLayout::Orientation CalPrintYear::defaultOrientation() const
- {
--    return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
-+    return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
- }
- 
- void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
-@@ -131,7 +131,7 @@ void CalPrintYear::print(QPainter &p, int width, int height)
-         QString stdate = locale.toString(start, QLocale::ShortFormat);
-         QString endate = locale.toString(end, QLocale::ShortFormat);
-         QString title;
--        if (orientation() == QPrinter::Landscape) {
-+        if (orientation() == QPageLayout::Landscape) {
-             title = i18nc("date from - to", "%1 - %2", stdate, endate);
-         } else {
-             title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);
-diff --git a/src/printing/yearprint.h b/src/printing/yearprint.h
-index e59bf87..cd46a50 100644
---- a/src/printing/yearprint.h
-+++ b/src/printing/yearprint.h
-@@ -48,7 +48,7 @@ public:
-     }
- 
-     QWidget *createConfigWidget(QWidget *) override;
--    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
-+    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
- 
- public:
-     void print(QPainter &p, int width, int height) override;
--- 
-GitLab
-
diff --git a/kde-apps/calendarsupport/metadata.xml b/kde-apps/calendarsupport/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/calendarsupport/metadata.xml
+++ b/kde-apps/calendarsupport/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 20e3a5914aa1..3d6f5d2086cc 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
-		<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
-		<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
-		<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
+  <flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
+  <flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
+  <flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/cervisia/metadata.xml b/kde-apps/cervisia/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/cervisia/metadata.xml
+++ b/kde-apps/cervisia/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/dolphin-plugins-dropbox/metadata.xml b/kde-apps/dolphin-plugins-dropbox/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/dolphin-plugins-dropbox/metadata.xml
+++ b/kde-apps/dolphin-plugins-dropbox/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/dolphin-plugins-git/metadata.xml b/kde-apps/dolphin-plugins-git/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/dolphin-plugins-git/metadata.xml
+++ b/kde-apps/dolphin-plugins-git/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/dolphin-plugins-mercurial/metadata.xml b/kde-apps/dolphin-plugins-mercurial/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/dolphin-plugins-mercurial/metadata.xml
+++ b/kde-apps/dolphin-plugins-mercurial/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/dolphin-plugins-subversion/metadata.xml b/kde-apps/dolphin-plugins-subversion/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/dolphin-plugins-subversion/metadata.xml
+++ b/kde-apps/dolphin-plugins-subversion/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/dolphin/metadata.xml b/kde-apps/dolphin/metadata.xml
index 976727be8357..ae4fd5e057ac 100644
--- a/kde-apps/dolphin/metadata.xml
+++ b/kde-apps/dolphin/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="activities">Track which folders are frequently accessed on a Plasma desktop</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="activities">Track which folders are frequently accessed on a Plasma desktop</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/dragon/metadata.xml b/kde-apps/dragon/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/dragon/metadata.xml
+++ b/kde-apps/dragon/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 7300ff06af2a..30cb71e2319e 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1 @@
-DIST eventviews-20.08.3.tar.xz 445292 BLAKE2B 41fae6233d333a99fcecfc7f4a75acd1edd92b4398f6c149d708554b1a93377ed708745c98d9309293e6b1015b60be1d1daa5873749b333f322476f58057066a SHA512 a7fb4750ce5ac6f490a6cfead314e72334500c45b886fd3f24843bbe1eeca94aec340411217db9f223ed1546ceb09fdac8866249ba1e1c25fc0b67f9bf9a6e91
 DIST eventviews-20.12.2.tar.xz 444096 BLAKE2B 937d4a1d390536140af60fe11a0cb8725b1ba7aefb89bba2984890f6fe4433e5e6a708c2e4b0d4461a003fbd276691a14ade7deeb86de4e48fec4f0f6bd35d56 SHA512 c76427eff7f14db5b58529e6c62ab1606e68fd90ce397f2d1b44013ea2d6c19761bf8b3900acee16a4aec29e6c5082a03ed349409063e0dbfa933bf68000732a
diff --git a/kde-apps/eventviews/eventviews-20.08.3.ebuild b/kde-apps/eventviews/eventviews-20.08.3.ebuild
deleted file mode 100644
index 95975bd39c9b..000000000000
--- a/kde-apps/eventviews/eventviews-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	dev-libs/libical
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-20.12.2.ebuild b/kde-apps/eventviews/eventviews-20.12.2.ebuild
index d83fb4df63f7..38e701200e41 100644
--- a/kde-apps/eventviews/eventviews-20.12.2.ebuild
+++ b/kde-apps/eventviews/eventviews-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Calendar viewer for KDE PIM"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/eventviews/metadata.xml b/kde-apps/eventviews/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/eventviews/metadata.xml
+++ b/kde-apps/eventviews/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ffmpegthumbs/metadata.xml b/kde-apps/ffmpegthumbs/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ffmpegthumbs/metadata.xml
+++ b/kde-apps/ffmpegthumbs/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/filelight/metadata.xml b/kde-apps/filelight/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/filelight/metadata.xml
+++ b/kde-apps/filelight/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/granatier/metadata.xml b/kde-apps/granatier/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/granatier/metadata.xml
+++ b/kde-apps/granatier/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 9c45e34176cf..2a367f347e44 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1 @@
-DIST grantlee-editor-20.08.3.tar.xz 111832 BLAKE2B 49a0f3f0e8d5c281a9ccbd6e19fea17f77080dea7ff1b555ab52ca898042179ee9b852e5ca5a8b6509e45813f823b885d6adf3cfdee5dd3ab7235de423dad29e SHA512 908b0e1071731b458e8ee74ffecfbc482805086549b4db09893475f011b3659727b5381fab781a2a7edc5d17083ec1ac9a1cd56960e5cca6e20d2671b69bf0b2
 DIST grantlee-editor-20.12.2.tar.xz 107480 BLAKE2B 6363c03ca0b020dd411f689a539002af822c09f0a1c2d63d131acf634e649db603c69b9ec13c3472052910846041ff62f263092332a30538d93d0fb3d1cca336 SHA512 b430d535b3c0e15c32dea5ac7aea73cd3d2353f84972fb3cdeb6c5f5d946fcc9b3058d175e998cf1b8d3dc9db5b16251d0c8cdf5d15cb710f0f7fec6ba3d4132
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild
deleted file mode 100644
index bbc82fe0c2d0..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
index 14c95bd7e7d7..2c70baa0c538 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/metadata.xml b/kde-apps/grantlee-editor/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/grantlee-editor/metadata.xml
+++ b/kde-apps/grantlee-editor/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 3f3f3ffd7cff..04c352f34c2a 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1 @@
-DIST grantleetheme-20.08.3.tar.xz 56280 BLAKE2B 8bdb1257d1315201ec9b2a4a4911d0de0de4e5902ed21477a9fbf1ba1bec40b3a3401b3a7e02932dac113cb590a9e374c987b8a39b1736795ea341fe9c683427 SHA512 2ef1cf5986a2e5956d888090c40760b5caebea4357e55ec6cd19679ec6e7fa3c683d7e57ca9bb21f60728b3c1cce73e95367e0584b7d587d4b48ec350cc3d048
 DIST grantleetheme-20.12.2.tar.xz 56536 BLAKE2B 58a15b4beed8b2712bb6df6c7645cd41532b873422145c13e1b932faebecf30eda57bffa5fa214c58b3f994727341c2808b9e0a681cddcb5f2857c45c7347f80 SHA512 6f587ea30e4c5954fd09bfdacb5ebadb406c333ce04758e99ff31d7b219eb65c3be68d426f8677ad6816c38e409717f1a77fec4d4d97797fa3ee525d72380979
diff --git a/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild
deleted file mode 100644
index c799d1fd5382..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild b/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
index 55ab02ade230..662f50179731 100644
--- a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/grantleetheme/metadata.xml b/kde-apps/grantleetheme/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/grantleetheme/metadata.xml
+++ b/kde-apps/grantleetheme/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index b1994f4579cc..fa5c43bdba1d 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="activities">Enable kactivities support</flag>
-		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
-		<flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
-		<flag name="mpris">Enable support for MPRIS2 interface, requiring <pkg>dev-qt/qtdbus</pkg> as dependency.
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="activities">Enable kactivities support</flag>
+  <flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
+  <flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
+  <flag name="mpris">Enable support for MPRIS2 interface, requiring <pkg>dev-qt/qtdbus</pkg> as dependency.
 		</flag>
-		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
-	</use>
-</pkgmetadata>
+  <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index e5d24703df4a..16836cd37406 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1 @@
-DIST incidenceeditor-20.08.3.tar.xz 543076 BLAKE2B 7990a6aa13098f92d0ab8b767c87592011f55e2847c7b21aac8a324a70c2e4cec8d9d5763760feb785b5eb8e3801cb862ed9f1e1aff2c30811f301c606f7a8a8 SHA512 d471a646ecb5a3ba9f0e932baa0fbccf2e159d7b69fd797003dd60f526bdfcc63dd7145bc335c3d850ec5934ccaaac52e682205f55a668bf93f713e575d5b5d0
 DIST incidenceeditor-20.12.2.tar.xz 546144 BLAKE2B 2a7ee26b398347595a26b4a74c2dbfbd3c99e3cf576b484497b418b7522c9fe3ed0c218434da79b2fe72063224ab11add669e02dd033529f24a02cbf001f429b SHA512 4c28ccdbc7e389a26f93072309626966570392bb05af2457c8a8c73581f7ca9e04d030eb7d4bc45c16a5545218e928d66575cd9f5fb2333131be136f3b52c0ad
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
deleted file mode 100644
index 6000ab94f038..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
index abaf121ed4ad..72a8cbb949a6 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
@@ -14,10 +14,10 @@ DESCRIPTION="Incidence editor for korganizer"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-libs/kdiagram:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -52,4 +52,18 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+
+src_test() {
+	# Paths exceed unix domain socket limit, bug 770775
+	local myctestargs=(
+		-E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/incidenceeditor/metadata.xml b/kde-apps/incidenceeditor/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/incidenceeditor/metadata.xml
+++ b/kde-apps/incidenceeditor/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/juk/metadata.xml b/kde-apps/juk/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/juk/metadata.xml
+++ b/kde-apps/juk/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/k3b/metadata.xml b/kde-apps/k3b/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/k3b/metadata.xml
+++ b/kde-apps/k3b/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kaccounts-integration/metadata.xml b/kde-apps/kaccounts-integration/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kaccounts-integration/metadata.xml
+++ b/kde-apps/kaccounts-integration/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kaccounts-providers/metadata.xml b/kde-apps/kaccounts-providers/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kaccounts-providers/metadata.xml
+++ b/kde-apps/kaccounts-providers/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index b69982d41d6c..a6309f68a00e 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1 @@
-DIST kaddressbook-20.08.3.tar.xz 3168192 BLAKE2B d7776c19b4cbe6eb0a1034b25c1ba4efe26d965091b749dd3691557d8202bf8ea13afcf9125454aeea986394b8e23ace4af4be7a38512a4a860639c65c90ab12 SHA512 ff63a0a0b5f8d45bfde0a41f15157bbc338aceebc9455b70626a3baab5b294b24951f72c9c110f356f04dd0f5f1ed191454e1b11a13ffe10df95d99efbf6f052
 DIST kaddressbook-20.12.2.tar.xz 3257200 BLAKE2B 8c5c8a31400533d145999b9d574c44d9466854da3480746d435d4d556db603ea4baf52a5563a96972281db9453d7d0212183b018a5b4d7f4fd75def79df0374b SHA512 fd7e8213db1061807b3ad509d92627282d0782af9c528d940a493fecc50c1680b97170d38d00d4b044722a598d4c5717a2561ec25171369f672518d24c99911b
diff --git a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index 888febed0fa3..000000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Sun, 25 Oct 2020 18:22:58 +0100
-Subject: [PATCH] Compile with recent Qt 5.15
-
-More QPrinter methods got deprecated there. DevicePixel no longer exists
-as a unit, visually Point looks pretty much the same though.
----
- src/printing/compact/compactstyle.cpp        | 2 +-
- src/printing/grantlee/grantleeprintstyle.cpp | 2 +-
- src/printing/mike/mikesstyle.cpp             | 2 +-
- src/printing/ringbinder/ringbinderstyle.cpp  | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp
-index d950a963..71e74c0f 100644
---- a/src/printing/compact/compactstyle.cpp
-+++ b/src/printing/compact/compactstyle.cpp
-@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
- 
-     // print
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp
-index d7afe8ef..49b5e494 100644
---- a/src/printing/grantlee/grantleeprintstyle.cpp
-+++ b/src/printing/grantlee/grantleeprintstyle.cpp
-@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
- void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp
-index 9f698c53..81a4bd6f 100644
---- a/src/printing/mike/mikesstyle.cpp
-+++ b/src/printing/mike/mikesstyle.cpp
-@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
- void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp
-index 60a39c86..5f600d6a 100644
---- a/src/printing/ringbinder/ringbinderstyle.cpp
-+++ b/src/printing/ringbinder/ringbinderstyle.cpp
-@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
-     config.sync();
- 
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
--- 
-GitLab
-
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
deleted file mode 100644
index 4a9f7e41299e..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
index 2bf21097d8c8..c0eb71bdae66 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kaddressbook"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/metadata.xml b/kde-apps/kaddressbook/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kaddressbook/metadata.xml
+++ b/kde-apps/kaddressbook/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kajongg/metadata.xml b/kde-apps/kajongg/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kajongg/metadata.xml
+++ b/kde-apps/kajongg/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 669915131b9c..27df6e14ece4 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1 @@
-DIST kalarm-20.08.3.tar.xz 1985344 BLAKE2B 6a6f44d9479370834c89dad00aca7fcbbf9c0f655450b29e0cc9bad0a5376946f24d36554088afcc2ec279d530ca6c43e31efb079f09808965ff74242053f137 SHA512 d564922bf41f176034535fd795d25eeabfbcd8e7eea115c29e5c0f1a2313de5b33406f87e1f7e705d7f814b9a2b826ac4cf7ac50723bf90beea5ecc92c750496
 DIST kalarm-20.12.2.tar.xz 2080628 BLAKE2B dbb9109f6ed67b08cd57a575cd008bff7eafded5a64a49b13e507f54b0f982a202d9673e958c8a80cebab9df3c19ad6513ee6f8aab9f93791e8d8c7ce7cac614 SHA512 ff3b86679a98aa3da30691989b90bccaa1b400b5d11e6e8c2c730f999d64146c0913c4b321da7fd20a6e409c5200dad2a997036bffcb380957e6ec1b69d7f898
diff --git a/kde-apps/kalarm/kalarm-20.08.3.ebuild b/kde-apps/kalarm/kalarm-20.08.3.ebuild
deleted file mode 100644
index 65e000e16906..000000000000
--- a/kde-apps/kalarm/kalarm-20.08.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://apps.kde.org/en/kalarm https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="X"
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-20.12.2.ebuild b/kde-apps/kalarm/kalarm-20.12.2.ebuild
index 2e220c77ac31..b5da90eae87f 100644
--- a/kde-apps/kalarm/kalarm-20.12.2.ebuild
+++ b/kde-apps/kalarm/kalarm-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kalarm https://userbase.kde.org/KAlarm"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-apps/kalarm/metadata.xml b/kde-apps/kalarm/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kalarm/metadata.xml
+++ b/kde-apps/kalarm/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 0ec91aeb5cd8..87b9046f6721 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,2 +1 @@
-DIST kalarmcal-20.08.3.tar.xz 575188 BLAKE2B c565d1fbd134fc7a6c06691730e23a75bea2a5e0e24d7e0924d492821f931d96e5ba6ad18eb58779a27fea3f9715a9166f3f275fae0452f5b9ad369e47f974f7 SHA512 a0bcd1aa8ff46dbd6b58386538a78741eed1252b423c6f22e15a43c3131655918b1f97512fcd9d9fef06d7c7f192210db9ef7f442eaf3c2aa46b0ed649108e22
 DIST kalarmcal-20.12.2.tar.xz 576636 BLAKE2B 0b0eae2df5bb31d285c0c484133e233f1b1b42b34c99bd45fea5886e550f1f1669799f0f0661b133a183990fb7477ab017f0baba4946ddf3b63850ceaca80600 SHA512 af5522ff68bda3f6443aa3049f2826d85567fec77adf72721c79f4a1767272ae8181e663e1b904b7c49953630185df37f4b50999a961f964caa65911653038ba
diff --git a/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild
deleted file mode 100644
index ea2571f0e7f1..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-
-src_test() {
-	LC_TIME="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild b/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
index 1ad9db797272..01b92b99042d 100644
--- a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Client library to access and handling of KAlarm calendar data"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kalarmcal/metadata.xml b/kde-apps/kalarmcal/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kalarmcal/metadata.xml
+++ b/kde-apps/kalarmcal/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kalgebra/kalgebra-20.08.3.ebuild b/kde-apps/kalgebra/kalgebra-20.08.3.ebuild
index 2d32d0a18c51..eea999dba62b 100644
--- a/kde-apps/kalgebra/kalgebra-20.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
 HOMEPAGE="https://apps.kde.org/en/kalgebra https://edu.kde.org/kalgebra/"
 
-LICENSE="GPL-2" # TODO: CHECK
+LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
 IUSE="readline"
diff --git a/kde-apps/kalgebra/kalgebra-20.12.2.ebuild b/kde-apps/kalgebra/kalgebra-20.12.2.ebuild
index aa2852e09251..85d8d730e234 100644
--- a/kde-apps/kalgebra/kalgebra-20.12.2.ebuild
+++ b/kde-apps/kalgebra/kalgebra-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
 HOMEPAGE="https://apps.kde.org/en/kalgebra https://edu.kde.org/kalgebra/"
 
-LICENSE="GPL-2" # TODO: CHECK
+LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="readline"
diff --git a/kde-apps/kalgebra/metadata.xml b/kde-apps/kalgebra/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kalgebra/metadata.xml
+++ b/kde-apps/kalgebra/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kalzium/metadata.xml b/kde-apps/kalzium/metadata.xml
index 5d86ddcd4ed5..399b30e8b1ca 100644
--- a/kde-apps/kalzium/metadata.xml
+++ b/kde-apps/kalzium/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="editor">Enable the embedded molecule editor/viewer</flag>
-		<flag name="solver">Enable the equation solver</flag>
-	</use>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="editor">Enable the embedded molecule editor/viewer</flag>
+  <flag name="solver">Enable the equation solver</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kamera/metadata.xml b/kde-apps/kamera/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kamera/metadata.xml
+++ b/kde-apps/kamera/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kamoso/metadata.xml b/kde-apps/kamoso/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kamoso/metadata.xml
+++ b/kde-apps/kamoso/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kanagram/metadata.xml b/kde-apps/kanagram/metadata.xml
index b337e66e249b..ab4b007f0605 100644
--- a/kde-apps/kanagram/metadata.xml
+++ b/kde-apps/kanagram/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="speech">Enable text-to-speech support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="speech">Enable text-to-speech support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kapman/metadata.xml b/kde-apps/kapman/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kapman/metadata.xml
+++ b/kde-apps/kapman/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kapptemplate/metadata.xml b/kde-apps/kapptemplate/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kapptemplate/metadata.xml
+++ b/kde-apps/kapptemplate/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kate/metadata.xml b/kde-apps/kate/metadata.xml
index 1c4379fbac89..a535c298552d 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
-		<flag name="filebrowser">Enable File System browser tool view</flag>
-		<flag name="lspclient">Enable LSP (Language Server Protocol) client plugin</flag>
-		<flag name="plasma">Enable Session Applet addon for KDE Plasma</flag>
-		<flag name="projects">Enable Project plugin for executing queries on SQL DBs</flag>
-		<flag name="snippets">Enable Snippets Tool View plugin to manage or download code snippets</flag>
-		<flag name="sql">Enable SQL plugin for executing queries on SQL DBs</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
+  <flag name="filebrowser">Enable File System browser tool view</flag>
+  <flag name="lspclient">Enable LSP (Language Server Protocol) client plugin</flag>
+  <flag name="plasma">Enable Session Applet addon for KDE Plasma</flag>
+  <flag name="projects">Enable Project plugin for executing queries on SQL DBs</flag>
+  <flag name="snippets">Enable Snippets Tool View plugin to manage or download code snippets</flag>
+  <flag name="sql">Enable SQL plugin for executing queries on SQL DBs</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/katomic/katomic-20.08.3.ebuild b/kde-apps/katomic/katomic-20.08.3.ebuild
index 842099fe0bc2..edf411d9e612 100644
--- a/kde-apps/katomic/katomic-20.08.3.ebuild
+++ b/kde-apps/katomic/katomic-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE Atomic Entertainment Game"
 HOMEPAGE="https://apps.kde.org/en/katomic
-https://games.kde.org/game.php?game=katomic"
+https://games.kde.org/games/katomic"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/katomic/katomic-20.12.2.ebuild b/kde-apps/katomic/katomic-20.12.2.ebuild
index 167d69321c30..c92897755d0f 100644
--- a/kde-apps/katomic/katomic-20.12.2.ebuild
+++ b/kde-apps/katomic/katomic-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE Atomic Entertainment Game"
 HOMEPAGE="https://apps.kde.org/en/katomic
-https://games.kde.org/game.php?game=katomic"
+https://games.kde.org/games/katomic"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/katomic/metadata.xml b/kde-apps/katomic/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/katomic/metadata.xml
+++ b/kde-apps/katomic/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kbackup/metadata.xml b/kde-apps/kbackup/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kbackup/metadata.xml
+++ b/kde-apps/kbackup/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kblackbox/metadata.xml b/kde-apps/kblackbox/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kblackbox/metadata.xml
+++ b/kde-apps/kblackbox/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kblocks/metadata.xml b/kde-apps/kblocks/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kblocks/metadata.xml
+++ b/kde-apps/kblocks/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kbounce/kbounce-20.08.3.ebuild b/kde-apps/kbounce/kbounce-20.08.3.ebuild
index 47c53bfeb155..f2628bacc051 100644
--- a/kde-apps/kbounce/kbounce-20.08.3.ebuild
+++ b/kde-apps/kbounce/kbounce-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE Bounce Ball Game"
 HOMEPAGE="https://apps.kde.org/en/kbounce
-https://games.kde.org/game.php?game=kbounce"
+https://games.kde.org/games/kbounce"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kbounce/kbounce-20.12.2.ebuild b/kde-apps/kbounce/kbounce-20.12.2.ebuild
index c02068d560d3..91effd4f2828 100644
--- a/kde-apps/kbounce/kbounce-20.12.2.ebuild
+++ b/kde-apps/kbounce/kbounce-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE Bounce Ball Game"
 HOMEPAGE="https://apps.kde.org/en/kbounce
-https://games.kde.org/game.php?game=kbounce"
+https://games.kde.org/games/kbounce"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kbounce/metadata.xml b/kde-apps/kbounce/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kbounce/metadata.xml
+++ b/kde-apps/kbounce/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kbreakout/kbreakout-20.08.3.ebuild b/kde-apps/kbreakout/kbreakout-20.08.3.ebuild
index 5f2d8908cf25..780b8ee8dc49 100644
--- a/kde-apps/kbreakout/kbreakout-20.08.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Breakout-like game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kbreakout
-https://games.kde.org/game.php?game=kbreakout"
+https://games.kde.org/games/kbreakout"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kbreakout/kbreakout-20.12.2.ebuild b/kde-apps/kbreakout/kbreakout-20.12.2.ebuild
index 57e4224362eb..1b0fa27dd1b6 100644
--- a/kde-apps/kbreakout/kbreakout-20.12.2.ebuild
+++ b/kde-apps/kbreakout/kbreakout-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Breakout-like game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kbreakout
-https://games.kde.org/game.php?game=kbreakout"
+https://games.kde.org/games/kbreakout"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kbreakout/metadata.xml b/kde-apps/kbreakout/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kbreakout/metadata.xml
+++ b/kde-apps/kbreakout/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kbruch/metadata.xml b/kde-apps/kbruch/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kbruch/metadata.xml
+++ b/kde-apps/kbruch/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kcachegrind/metadata.xml b/kde-apps/kcachegrind/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kcachegrind/metadata.xml
+++ b/kde-apps/kcachegrind/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kcalc/metadata.xml b/kde-apps/kcalc/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kcalc/metadata.xml
+++ b/kde-apps/kcalc/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 47e0066c6951..449e25e6dcbc 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,2 +1 @@
-DIST kcalutils-20.08.3.tar.xz 324796 BLAKE2B f7d140d9fc4a28ffd71e5ddb7ee480d1b4a02af2b423cbee1dc3212984d3ef8c119325d231cd28da838bd721ecb18ece8f627839d01f1f09cd9d5e0bfd97d282 SHA512 6dbfde1ee9b245514ed09fc4e64d590c405bc7690087099600e8eedf6e9160eaa2b4e74e640b5bf51bca7ea354652446dfd9685277ace194d4ea65572eeb224a
 DIST kcalutils-20.12.2.tar.xz 324624 BLAKE2B 180837b6f461b41a9915f96ee202d84681340091e2f2093a4f6d46757f67a04d8f2adf9252fe7cf10652d8b61d6ebdac0119f153015f3b201f17cad3727843d1 SHA512 ed4a2dbd9dc866809c5c2ee7befe9070d1b94b02d5066e1bd0e460ec2f633bb7040328bf0f6a0df128788b203eac0866f129a34f27ad391d279ed99ce9c7e8b9
diff --git a/kde-apps/kcalutils/kcalutils-20.08.3.ebuild b/kde-apps/kcalutils/kcalutils-20.08.3.ebuild
deleted file mode 100644
index 96ef8ecedd06..000000000000
--- a/kde-apps/kcalutils/kcalutils-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm 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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bugs 653616, 711666
diff --git a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild b/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
index bb4bb6a682db..607945f11100 100644
--- a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
+++ b/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalutils/metadata.xml b/kde-apps/kcalutils/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kcalutils/metadata.xml
+++ b/kde-apps/kcalutils/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kcharselect/metadata.xml b/kde-apps/kcharselect/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kcharselect/metadata.xml
+++ b/kde-apps/kcharselect/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kcolorchooser/metadata.xml b/kde-apps/kcolorchooser/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kcolorchooser/metadata.xml
+++ b/kde-apps/kcolorchooser/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kcron/metadata.xml b/kde-apps/kcron/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kcron/metadata.xml
+++ b/kde-apps/kcron/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kde-apps-meta/metadata.xml b/kde-apps/kde-apps-meta/metadata.xml
index 4a40e9568e79..99fc355cc351 100644
--- a/kde-apps/kde-apps-meta/metadata.xml
+++ b/kde-apps/kde-apps-meta/metadata.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="accessibility">Pull in <pkg>kde-apps/kdeaccessibility-meta</pkg> packages</flag>
-		<flag name="admin">Pull in <pkg>kde-apps/kdeadmin-meta</pkg> packages</flag>
-		<flag name="education">Pull in <pkg>kde-apps/kdeedu-meta</pkg> packages</flag>
-		<flag name="games">Pull in <pkg>kde-apps/kdegames-meta</pkg> packages</flag>
-		<flag name="graphics">Pull in <pkg>kde-apps/kdegraphics-meta</pkg> packages</flag>
-		<flag name="multimedia">Pull in <pkg>kde-apps/kdemultimedia-meta</pkg> packages</flag>
-		<flag name="network">Pull in <pkg>kde-apps/kdenetwork-meta</pkg> packages</flag>
-		<flag name="pim">Pull in KDE PIM suite</flag>
-		<flag name="sdk">Pull in developer-specific meta-packages</flag>
-		<flag name="utils">Pull in <pkg>kde-apps/kdeutils-meta</pkg> packages</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="accessibility">Pull in <pkg>kde-apps/kdeaccessibility-meta</pkg> packages</flag>
+  <flag name="admin">Pull in <pkg>kde-apps/kdeadmin-meta</pkg> packages</flag>
+  <flag name="education">Pull in <pkg>kde-apps/kdeedu-meta</pkg> packages</flag>
+  <flag name="games">Pull in <pkg>kde-apps/kdegames-meta</pkg> packages</flag>
+  <flag name="graphics">Pull in <pkg>kde-apps/kdegraphics-meta</pkg> packages</flag>
+  <flag name="multimedia">Pull in <pkg>kde-apps/kdemultimedia-meta</pkg> packages</flag>
+  <flag name="network">Pull in <pkg>kde-apps/kdenetwork-meta</pkg> packages</flag>
+  <flag name="pim">Pull in KDE PIM suite</flag>
+  <flag name="sdk">Pull in developer-specific meta-packages</flag>
+  <flag name="utils">Pull in <pkg>kde-apps/kdeutils-meta</pkg> packages</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kde-dev-scripts/metadata.xml b/kde-apps/kde-dev-scripts/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kde-dev-scripts/metadata.xml
+++ b/kde-apps/kde-dev-scripts/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kde-dev-utils/metadata.xml b/kde-apps/kde-dev-utils/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kde-dev-utils/metadata.xml
+++ b/kde-apps/kde-dev-utils/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kde-meta/metadata.xml b/kde-apps/kde-meta/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kde-meta/metadata.xml
+++ b/kde-apps/kde-meta/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdeaccessibility-meta/metadata.xml b/kde-apps/kdeaccessibility-meta/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdeaccessibility-meta/metadata.xml
+++ b/kde-apps/kdeaccessibility-meta/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdeadmin-meta/metadata.xml b/kde-apps/kdeadmin-meta/metadata.xml
index 876887fc529d..01e2a572439e 100644
--- a/kde-apps/kdeadmin-meta/metadata.xml
+++ b/kde-apps/kdeadmin-meta/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="cron">Installs KDE application for <pkg>virtual/cron</pkg> configuration</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="cron">Installs KDE application for <pkg>virtual/cron</pkg> configuration</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdebase-meta/metadata.xml
+++ b/kde-apps/kdebase-meta/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdebugsettings/metadata.xml b/kde-apps/kdebugsettings/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdebugsettings/metadata.xml
+++ b/kde-apps/kdebugsettings/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index ce448ffcffbe..690305f9b2d9 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="share">Install <pkg>kde-frameworks/purpose</pkg> for share file context menu actions in <pkg>kde-apps/dolphin</pkg></flag>
-		<flag name="thumbnail">Install <pkg>kde-apps/ffmpegthumbs</pkg> and <pkg>kde-apps/thumbnailers</pkg> for thumbnail generation in <pkg>kde-apps/dolphin</pkg></flag>
-		<flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="share">Install <pkg>kde-frameworks/purpose</pkg> for share file context menu actions in <pkg>kde-apps/dolphin</pkg></flag>
+  <flag name="thumbnail">Install <pkg>kde-apps/ffmpegthumbs</pkg> and <pkg>kde-apps/thumbnailers</pkg> for thumbnail generation in <pkg>kde-apps/dolphin</pkg></flag>
+  <flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdeedu-data/metadata.xml b/kde-apps/kdeedu-data/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdeedu-data/metadata.xml
+++ b/kde-apps/kdeedu-data/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdeedu-meta/metadata.xml b/kde-apps/kdeedu-meta/metadata.xml
index fca8547c4132..ef9d715e198f 100644
--- a/kde-apps/kdeedu-meta/metadata.xml
+++ b/kde-apps/kdeedu-meta/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="webengine">Enable <pkg>kde-apps/kalzium</pkg> and <pkg>kde-apps/parley</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="webengine">Enable <pkg>kde-apps/kalzium</pkg> and <pkg>kde-apps/parley</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdegames-meta/metadata.xml b/kde-apps/kdegames-meta/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdegames-meta/metadata.xml
+++ b/kde-apps/kdegames-meta/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdegraphics-meta/metadata.xml b/kde-apps/kdegraphics-meta/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdegraphics-meta/metadata.xml
+++ b/kde-apps/kdegraphics-meta/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdegraphics-mobipocket/metadata.xml b/kde-apps/kdegraphics-mobipocket/metadata.xml
index 26ad4fab382a..82791d838261 100644
--- a/kde-apps/kdegraphics-mobipocket/metadata.xml
+++ b/kde-apps/kdegraphics-mobipocket/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="thumbnail">Enables thumbnail generation</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="thumbnail">Enables thumbnail generation</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdemultimedia-meta/metadata.xml b/kde-apps/kdemultimedia-meta/metadata.xml
index 38e7c61082a0..d27da729e917 100644
--- a/kde-apps/kdemultimedia-meta/metadata.xml
+++ b/kde-apps/kdemultimedia-meta/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="cdrom">Include packages for optical discs</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="cdrom">Include packages for optical discs</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdenetwork-filesharing/metadata.xml b/kde-apps/kdenetwork-filesharing/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdenetwork-filesharing/metadata.xml
+++ b/kde-apps/kdenetwork-filesharing/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index a87ce4de0014..d0968bfa8380 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="bittorrent">Pull in <pkg>net-p2p/ktorrent</pkg> for BitTorrent protocol support</flag>
-		<flag name="dropbox">Enable support for Dropbox in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-dropbox</pkg></flag>
-		<flag name="webengine">Enable Google Drive support via <pkg>kde-misc/kio-gdrive</pkg> and instant messaging integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="bittorrent">Pull in <pkg>net-p2p/ktorrent</pkg> for BitTorrent protocol support</flag>
+  <flag name="dropbox">Enable support for Dropbox in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-dropbox</pkg></flag>
+  <flag name="webengine">Enable Google Drive support via <pkg>kde-misc/kio-gdrive</pkg> and instant messaging integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdenlive/metadata.xml b/kde-apps/kdenlive/metadata.xml
index c656c56e78df..82d4447ef849 100644
--- a/kde-apps/kdenlive/metadata.xml
+++ b/kde-apps/kdenlive/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
-		<flag name="webengine">Enable freesound.org credentials support via <pkg>dev-qt/qtwebengine</pkg> to download files</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+  <flag name="webengine">Enable freesound.org credentials support via <pkg>dev-qt/qtwebengine</pkg> to download files</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 76852713b828..7c39c3e3c777 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,2 +1 @@
-DIST kdepim-addons-20.08.3.tar.xz 2071996 BLAKE2B f66800962d6f42d7205ee718b639b22f2865f6e0f1b36a7c5caac7074affbf83bb5540e9ac6e3cb5587b6b129eb69e8d156f5b6f2f8bf90e11c00f08bb9adf01 SHA512 c788f3aa204486491747ca976268347b8b916c84670e58087a009d0cd153be9a199c09434f2e884d26d39f92728210e97ac4e9c74f20ba6fcf37c6e83276980d
 DIST kdepim-addons-20.12.2.tar.xz 2145492 BLAKE2B 6c143977f8e645c9fde13fb5453c292cc8b4068721cb82beac942dfa571906648b03e49e0aa69e37c8042d4a3c0cea4b5befe48716adc736b7bdbf03b0c6b4c9 SHA512 33ed5c0e6444c292f78767c32778ac11a4d1e567c7fde2c85ab10016ddaa7adef7d29e2c75635b1538abf0e6f59eaeae0810b3b122c9aeadc0de407e476c7797
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
deleted file mode 100644
index bc9c082334d4..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="importwizard markdown"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kitinerary-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
-"
-DEPEND="${RDEPEND}
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package importwizard KPimImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
index 16a173a9f36e..9acc125594ec 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="importwizard markdown"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-addons/metadata.xml b/kde-apps/kdepim-addons/metadata.xml
index 669894bdedf1..50558d4d603a 100644
--- a/kde-apps/kdepim-addons/metadata.xml
+++ b/kde-apps/kdepim-addons/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="importwizard">Enable additional import plugins for <pkg>kde-apps/akonadi-import-wizard</pkg></flag>
-		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="importwizard">Enable additional import plugins for <pkg>kde-apps/akonadi-import-wizard</pkg></flag>
+  <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdepim-apps-libs/metadata.xml b/kde-apps/kdepim-apps-libs/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdepim-apps-libs/metadata.xml
+++ b/kde-apps/kdepim-apps-libs/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild
deleted file mode 100644
index 73ae704c0919..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=kde-apps/akonadi-${PV}:${SLOT}
-	>=kde-apps/akonadiconsole-${PV}:${SLOT}
-	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
-	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
-	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
-	>=kde-apps/akonadi-mime-${PV}:${SLOT}
-	>=kde-apps/akonadi-notes-${PV}:${SLOT}
-	>=kde-apps/akonadi-search-${PV}:${SLOT}
-	>=kde-apps/akregator-${PV}:${SLOT}
-	>=kde-apps/calendarjanitor-${PV}:${SLOT}
-	>=kde-apps/calendarsupport-${PV}:${SLOT}
-	>=kde-apps/eventviews-${PV}:${SLOT}
-	>=kde-apps/grantlee-editor-${PV}:${SLOT}
-	>=kde-apps/grantleetheme-${PV}:${SLOT}
-	>=kde-apps/incidenceeditor-${PV}:${SLOT}
-	>=kde-apps/kaddressbook-${PV}:${SLOT}
-	>=kde-apps/kalarm-${PV}:${SLOT}
-	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kdepim-addons-${PV}:${SLOT}
-	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
-	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
-	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
-	>=kde-apps/kimap-${PV}:${SLOT}
-	>=kde-apps/kitinerary-${PV}:${SLOT}
-	>=kde-apps/kldap-${PV}:${SLOT}
-	>=kde-apps/kleopatra-${PV}:${SLOT}
-	>=kde-apps/kmail-${PV}:${SLOT}
-	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
-	>=kde-apps/kmailtransport-${PV}:${SLOT}
-	>=kde-apps/kmbox-${PV}:${SLOT}
-	>=kde-apps/kmime-${PV}:${SLOT}
-	>=kde-apps/knotes-${PV}:${SLOT}
-	>=kde-apps/konsolekalendar-${PV}:${SLOT}
-	>=kde-apps/kontact-${PV}:${SLOT}
-	>=kde-apps/kontactinterface-${PV}:${SLOT}
-	>=kde-apps/korganizer-${PV}:${SLOT}
-	>=kde-apps/kpimtextedit-${PV}:${SLOT}
-	>=kde-apps/kpkpass-${PV}:${SLOT}
-	>=kde-apps/ksmtp-${PV}:${SLOT}
-	>=kde-apps/libgravatar-${PV}:${SLOT}
-	>=kde-apps/libkdepim-${PV}:${SLOT}
-	>=kde-apps/libkgapi-${PV}:${SLOT}
-	>=kde-apps/libkleo-${PV}:${SLOT}
-	>=kde-apps/libksieve-${PV}:${SLOT}
-	>=kde-apps/libktnef-${PV}:${SLOT}
-	>=kde-apps/mailcommon-${PV}:${SLOT}
-	>=kde-apps/mailimporter-${PV}:${SLOT}
-	>=kde-apps/mbox-importer-${PV}:${SLOT}
-	>=kde-apps/messagelib-${PV}:${SLOT}
-	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
-	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
-	>=kde-apps/pimcommon-${PV}:${SLOT}
-"
-# 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-20.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
index 96540f8bfea5..6f04a2b45178 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index 42d0035b36bc..633311743b89 100644
--- a/kde-apps/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="bogofilter">Install <pkg>mail-filter/bogofilter</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
-		<flag name="clamav">Install <pkg>app-antivirus/clamav</pkg> for virus detection support in <pkg>kde-apps/kmail</pkg></flag>
-		<flag name="spamassassin">Install <pkg>mail-filter/spamassassin</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="bogofilter">Install <pkg>mail-filter/bogofilter</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
+  <flag name="clamav">Install <pkg>app-antivirus/clamav</pkg> for virus detection support in <pkg>kde-apps/kmail</pkg></flag>
+  <flag name="spamassassin">Install <pkg>mail-filter/spamassassin</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index f3cc67de9a4e..2349370f7f15 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,2 +1 @@
-DIST kdepim-runtime-20.08.3.tar.xz 1754672 BLAKE2B 6cfba7756489bbf86025637fa0943342359f081771843b73394c822f62ed7b5aef70546acef200544ac5037d603836c718ca7e81e8ef25808767fb4462cfc386 SHA512 98a3623b3973e7b7c194ef1ef986012e0dfddb4c74c3fddba23cac928a73e6f6b634883407ec56ec6f613f8830112389f3c9eb19c89a2164178f2063be72d623
 DIST kdepim-runtime-20.12.2.tar.xz 1801616 BLAKE2B d1db1893a3f87392ecd345976735545a90188aa6b0156b3728c16e08dd3ffd35648345509cb8bce65f7a939708b45be6b8849a8df2ec48f0ae6275efd8982b07 SHA512 234751643730d2ef2f7e4988ca1cf364c30c23997f5e611ef24b09745ee497742210af21096fe2301bca1bdadfda2e7cf47f7ace1627b79ee8d9f8cdd2ebac4e
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
deleted file mode 100644
index 3512281b89c8..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# TODO kolab
-BDEPEND="
-	dev-libs/libxslt
-"
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdav-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
index 51e789f92ae4..78109648bc76 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdesdk-kioslaves/metadata.xml b/kde-apps/kdesdk-kioslaves/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdesdk-kioslaves/metadata.xml
+++ b/kde-apps/kdesdk-kioslaves/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
index 6d6985c428b1..b326d28bf19c 100644
--- a/kde-apps/kdesdk-meta/metadata.xml
+++ b/kde-apps/kdesdk-meta/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="git">Enable support for Git VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-git</pkg></flag>
-		<flag name="mercurial">Enable support for Mercurial VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-mercurial</pkg></flag>
-		<flag name="subversion">Enable support for Apache Subversion VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-subversion</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="git">Enable support for Git VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-git</pkg></flag>
+  <flag name="mercurial">Enable support for Mercurial VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-mercurial</pkg></flag>
+  <flag name="subversion">Enable support for Apache Subversion VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-subversion</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdesdk-thumbnailers/metadata.xml b/kde-apps/kdesdk-thumbnailers/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdesdk-thumbnailers/metadata.xml
+++ b/kde-apps/kdesdk-thumbnailers/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml
index 7262a11e01b6..3138cff6c44f 100644
--- a/kde-apps/kdeutils-meta/metadata.xml
+++ b/kde-apps/kdeutils-meta/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="7zip">Install <pkg>app-arch/p7zip</pkg> for 7zip archive support in <pkg>kde-apps/ark</pkg></flag>
-		<flag name="floppy">Install <pkg>kde-apps/kfloppy</pkg> to format and create DOS or ext2fs filesystems in a floppy.</flag>
-		<flag name="gpg">Install <pkg>kde-apps/kgpg</pkg> which depends on <pkg>kde-apps/akonadi</pkg></flag>
-		<flag name="lrz">Install <pkg>app-arch/lrzip</pkg> for LRZ archive support in <pkg>kde-apps/ark</pkg></flag>
-		<flag name="rar">Install one of <pkg>app-arch/rar</pkg>, <pkg>app-arch/unrar</pkg> or <pkg>app-arch/unar</pkg> for RAR archive support in <pkg>kde-apps/ark</pkg></flag>
-		<flag name="webengine">Enable <pkg>kde-apps/kimagemapeditor</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="7zip">Install <pkg>app-arch/p7zip</pkg> for 7zip archive support in <pkg>kde-apps/ark</pkg></flag>
+  <flag name="floppy">Install <pkg>kde-apps/kfloppy</pkg> to format and create DOS or ext2fs filesystems in a floppy.</flag>
+  <flag name="gpg">Install <pkg>kde-apps/kgpg</pkg> which depends on <pkg>kde-apps/akonadi</pkg></flag>
+  <flag name="lrz">Install <pkg>app-arch/lrzip</pkg> for LRZ archive support in <pkg>kde-apps/ark</pkg></flag>
+  <flag name="rar">Install one of <pkg>app-arch/rar</pkg>, <pkg>app-arch/unrar</pkg> or <pkg>app-arch/unar</pkg> for RAR archive support in <pkg>kde-apps/ark</pkg></flag>
+  <flag name="webengine">Enable <pkg>kde-apps/kimagemapeditor</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdf/metadata.xml b/kde-apps/kdf/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdf/metadata.xml
+++ b/kde-apps/kdf/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdialog/metadata.xml b/kde-apps/kdialog/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdialog/metadata.xml
+++ b/kde-apps/kdialog/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kdiamond/kdiamond-20.08.3.ebuild b/kde-apps/kdiamond/kdiamond-20.08.3.ebuild
index c445f943f51a..8ef9f71f7e49 100644
--- a/kde-apps/kdiamond/kdiamond-20.08.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Single player three-in-a-row game"
 HOMEPAGE="https://apps.kde.org/en/kdiamond
-https://games.kde.org/game.php?game=kdiamond"
+https://games.kde.org/games/kdiamond"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kdiamond/kdiamond-20.12.2.ebuild b/kde-apps/kdiamond/kdiamond-20.12.2.ebuild
index 033701a9b604..a482715bcdb7 100644
--- a/kde-apps/kdiamond/kdiamond-20.12.2.ebuild
+++ b/kde-apps/kdiamond/kdiamond-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Single player three-in-a-row game"
 HOMEPAGE="https://apps.kde.org/en/kdiamond
-https://games.kde.org/game.php?game=kdiamond"
+https://games.kde.org/games/kdiamond"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kdiamond/metadata.xml b/kde-apps/kdiamond/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kdiamond/metadata.xml
+++ b/kde-apps/kdiamond/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/keditbookmarks/metadata.xml b/kde-apps/keditbookmarks/metadata.xml
index ac7f14a78a1d..96ccf0300196 100644
--- a/kde-apps/keditbookmarks/metadata.xml
+++ b/kde-apps/keditbookmarks/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="man">Build and install man pages</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kfind/metadata.xml b/kde-apps/kfind/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kfind/metadata.xml
+++ b/kde-apps/kfind/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kfloppy/metadata.xml b/kde-apps/kfloppy/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kfloppy/metadata.xml
+++ b/kde-apps/kfloppy/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kfourinline/kfourinline-20.08.3.ebuild b/kde-apps/kfourinline/kfourinline-20.08.3.ebuild
index f60153b11cc4..8b1e3ae0957a 100644
--- a/kde-apps/kfourinline/kfourinline-20.08.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE four-in-a-row game"
 HOMEPAGE="https://apps.kde.org/en/kfourinline
-https://games.kde.org/game.php?game=kfourinline"
+https://games.kde.org/games/kfourinline"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kfourinline/kfourinline-20.12.2.ebuild b/kde-apps/kfourinline/kfourinline-20.12.2.ebuild
index 25281670ed40..4db9df714747 100644
--- a/kde-apps/kfourinline/kfourinline-20.12.2.ebuild
+++ b/kde-apps/kfourinline/kfourinline-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE four-in-a-row game"
 HOMEPAGE="https://apps.kde.org/en/kfourinline
-https://games.kde.org/game.php?game=kfourinline"
+https://games.kde.org/games/kfourinline"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kfourinline/metadata.xml b/kde-apps/kfourinline/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kfourinline/metadata.xml
+++ b/kde-apps/kfourinline/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kgeography/metadata.xml b/kde-apps/kgeography/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kgeography/metadata.xml
+++ b/kde-apps/kgeography/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kget/metadata.xml b/kde-apps/kget/metadata.xml
index 1836352e7d9a..14d6b58a0211 100644
--- a/kde-apps/kget/metadata.xml
+++ b/kde-apps/kget/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="bittorrent">Enable bittorrent transfer plugin through <pkg>net-libs/libktorrent</pkg></flag>
-		<flag name="gpg">Enable signature verification by GpgME++ via <pkg>app-crypt/gpgme</pkg></flag>
-		<flag name="mms">Enable MMS (Microsoft Media Server) plugin through <pkg>media-libs/libmms</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="bittorrent">Enable bittorrent transfer plugin through <pkg>net-libs/libktorrent</pkg></flag>
+  <flag name="gpg">Enable signature verification by GpgME++ via <pkg>app-crypt/gpgme</pkg></flag>
+  <flag name="mms">Enable MMS (Microsoft Media Server) plugin through <pkg>media-libs/libmms</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.08.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-20.08.3.ebuild
index 05ad88318460..f2586a9bc698 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-20.08.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Game of action and puzzle solving by KDE"
 HOMEPAGE="https://apps.kde.org/en/kgoldrunner
-https://games.kde.org/game.php?game=kgoldrunner"
+https://games.kde.org/games/kgoldrunner"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.12.2.ebuild b/kde-apps/kgoldrunner/kgoldrunner-20.12.2.ebuild
index e3693b55e87e..9ac14b7f174e 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-20.12.2.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Game of action and puzzle solving by KDE"
 HOMEPAGE="https://apps.kde.org/en/kgoldrunner
-https://games.kde.org/game.php?game=kgoldrunner"
+https://games.kde.org/games/kgoldrunner"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kgoldrunner/metadata.xml b/kde-apps/kgoldrunner/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kgoldrunner/metadata.xml
+++ b/kde-apps/kgoldrunner/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kgpg/metadata.xml b/kde-apps/kgpg/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kgpg/metadata.xml
+++ b/kde-apps/kgpg/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/khangman/metadata.xml b/kde-apps/khangman/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/khangman/metadata.xml
+++ b/kde-apps/khangman/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/khelpcenter/metadata.xml b/kde-apps/khelpcenter/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/khelpcenter/metadata.xml
+++ b/kde-apps/khelpcenter/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index f327fa8ecd87..64baf318a5a1 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,2 +1 @@
-DIST kidentitymanagement-20.08.3.tar.xz 151216 BLAKE2B f82931f29e9e18e8e6d5da112a27bac31ef8e846483381f56ef21dd61f0e2e371161b4ac3d3d6319f1ce7ac407948023e37d182aaa7872b739dfa5a02aa9c36e SHA512 ad7ffbf8d948f052ba24dc887ab7f6d259be277e13452451b09c2fb79358650bf91cee714358c4bcae00d5c6787d5ac95028e114823c6b4557b0b8d984322b93
 DIST kidentitymanagement-20.12.2.tar.xz 152092 BLAKE2B c23b6d9eb32f7c85d742a323166acad5b544cb5920130536a1df0ae44a87df9f78fc7c7348557cfa1ae6d60d771417fd4d47ebbb75fef06c66f0b0ca4eca9d5c SHA512 8a7544376b475b533d618c40fa3acad42a817f147492dc31dfb1622a727db9912dbedd8222c46c05bd11cfe4dc09b53dbb47f6252cd3965f2e52cee62a532ac2
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild
deleted file mode 100644
index 9a91376f4ee1..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
index 055f58f6caf0..ddfde1583b45 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kidentitymanagement/metadata.xml b/kde-apps/kidentitymanagement/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kidentitymanagement/metadata.xml
+++ b/kde-apps/kidentitymanagement/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml
index d6455ebcf839..008f83713b3f 100644
--- a/kde-apps/kig/metadata.xml
+++ b/kde-apps/kig/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra-bin</pkg></flag>
-		<flag name="scripting">Support Python scripting</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra-bin</pkg></flag>
+  <flag name="scripting">Support Python scripting</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kigo/metadata.xml b/kde-apps/kigo/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kigo/metadata.xml
+++ b/kde-apps/kigo/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/killbots/metadata.xml b/kde-apps/killbots/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/killbots/metadata.xml
+++ b/kde-apps/killbots/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kimagemapeditor/metadata.xml b/kde-apps/kimagemapeditor/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kimagemapeditor/metadata.xml
+++ b/kde-apps/kimagemapeditor/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 0f527cc091f7..8e0ba2dc26a9 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,2 +1 @@
-DIST kimap-20.08.3.tar.xz 120264 BLAKE2B f26910d0a599fad9509debac0a11c2cdf4b8733a3b50f89bdfe9ce2dae8004fa916a428fe73a911ca6e157e4571522901183913614f32dd4124bd4a2897e711c SHA512 c4213042b2b6ceb11986a7af962fe8e7c6de488e06456118527bfcab2b63f68ebc1e66583c8bdb0614156122fcba21d0ec24bd6e9965b689f0451d2f1016b9c8
 DIST kimap-20.12.2.tar.xz 124672 BLAKE2B f03ac4355a6c34af2a249e83d726c0120c12d1a7344e9232aef78adbd3f0f9aa11ffa4610d063fb17c724d7ba335bfec3ead08227994a5796c4ed17a108c5066 SHA512 8017720c029aad508b0f32aee0a338785e72566e20eba03a07ec0644c77b929c90049247988e684e52d34f00025c88b41e36e1acbd83c625a1769fa651fa5317
diff --git a/kde-apps/kimap/kimap-20.08.3.ebuild b/kde-apps/kimap/kimap-20.08.3.ebuild
deleted file mode 100644
index a30252b125c6..000000000000
--- a/kde-apps/kimap/kimap-20.08.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kimap/kimap-20.12.2.ebuild b/kde-apps/kimap/kimap-20.12.2.ebuild
index 6553e8cae07f..fe7782838823 100644
--- a/kde-apps/kimap/kimap-20.12.2.ebuild
+++ b/kde-apps/kimap/kimap-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kimap/metadata.xml b/kde-apps/kimap/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kimap/metadata.xml
+++ b/kde-apps/kimap/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index a938f1e44e6d..957ccabed08b 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="activities">Enable activities kioslave and fileitem plugin</flag>
-		<flag name="man">Enable manpages kioslave</flag>
-		<flag name="nfs">Enable NFS support using <pkg>net-libs/libtirpc</pkg></flag>
-		<flag name="phonon">Enable file audio preview plugin using <pkg>media-libs/phonon</pkg></flag>
-		<flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
-		<flag name="taglib">Enable audio thumbnails via <pkg>media-libs/taglib</pkg></flag>
-		<flag name="X">Enable support for XCursor thumbnails via <pkg>x11-libs/libX11</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="activities">Enable activities kioslave and fileitem plugin</flag>
+  <flag name="man">Enable manpages kioslave</flag>
+  <flag name="nfs">Enable NFS support using <pkg>net-libs/libtirpc</pkg></flag>
+  <flag name="phonon">Enable file audio preview plugin using <pkg>media-libs/phonon</pkg></flag>
+  <flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
+  <flag name="taglib">Enable audio thumbnails via <pkg>media-libs/taglib</pkg></flag>
+  <flag name="X">Enable support for XCursor thumbnails via <pkg>x11-libs/libX11</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kipi-plugins/metadata.xml b/kde-apps/kipi-plugins/metadata.xml
index 0315d40cae15..af06d5b89921 100644
--- a/kde-apps/kipi-plugins/metadata.xml
+++ b/kde-apps/kipi-plugins/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="flashexport">Build the flash export plugin</flag>
-		<flag name="mediawiki">Build the mediawiki export plugin</flag>
-		<flag name="remotestorage">Build plugin for remote storage using network protocols such as FTP, SSH, SAMBA via <pkg>kde-frameworks/kio</pkg></flag>
-		<flag name="vkontakte">Build plugin for vkontakte.ru</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="flashexport">Build the flash export plugin</flag>
+  <flag name="mediawiki">Build the mediawiki export plugin</flag>
+  <flag name="remotestorage">Build plugin for remote storage using network protocols such as FTP, SSH, SAMBA via <pkg>kde-frameworks/kio</pkg></flag>
+  <flag name="vkontakte">Build plugin for vkontakte.ru</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kiriki/kiriki-20.08.3.ebuild b/kde-apps/kiriki/kiriki-20.08.3.ebuild
index 192f19afd779..1c01df4f039e 100644
--- a/kde-apps/kiriki/kiriki-20.08.3.ebuild
+++ b/kde-apps/kiriki/kiriki-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An addictive and fun dice game"
 HOMEPAGE="https://apps.kde.org/en/kiriki
-https://games.kde.org/game.php?game=kiriki"
+https://games.kde.org/games/kiriki"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kiriki/kiriki-20.12.2.ebuild b/kde-apps/kiriki/kiriki-20.12.2.ebuild
index c2fcdc24cbe1..0a74dc918845 100644
--- a/kde-apps/kiriki/kiriki-20.12.2.ebuild
+++ b/kde-apps/kiriki/kiriki-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An addictive and fun dice game"
 HOMEPAGE="https://apps.kde.org/en/kiriki
-https://games.kde.org/game.php?game=kiriki"
+https://games.kde.org/games/kiriki"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kiriki/metadata.xml b/kde-apps/kiriki/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kiriki/metadata.xml
+++ b/kde-apps/kiriki/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kiten/metadata.xml b/kde-apps/kiten/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kiten/metadata.xml
+++ b/kde-apps/kiten/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index e28a82693d29..dae43ab6cf54 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,2 +1 @@
-DIST kitinerary-20.08.3.tar.xz 1756240 BLAKE2B 2c25e6befd0f3924fb80c7ec5de6526b1f45e663104fc8e3637456354f25984a2bc3d4d00c94f163781aa9e55f365887774d586f01ef1c5e9d27bc3cdbfd2e8a SHA512 d48dbb2153662352f7abb0a615f4a88b5f55c783e9aaab92b38c65b15dd22c4f7ab328e3d372ba8a23620711676785f7aaf69b50aa3c73d46adf15045f53f4ea
 DIST kitinerary-20.12.2.tar.xz 1814612 BLAKE2B 68401199d3415b02a087f24e20e2c6772a8c66ebef0122788c189de8c4084337e31af42b8e842605d5062b59cd2303921d20680636ae4f4a407ff03e6426949a SHA512 58b0d3832cb04c024d6e9f41b60d0f7679aaa5aca96c21a6dfca6309d1e1e24f7d5156ee04938b0ac5d5dda463483f96e272abfcb3b6566a9f64238759c1d228
diff --git a/kde-apps/kitinerary/kitinerary-20.08.3.ebuild b/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
deleted file mode 100644
index 4cea276fca34..000000000000
--- a/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+barcode pdf"
-
-REQUIRED_USE="test? ( pdf )"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-20.12.2.ebuild b/kde-apps/kitinerary/kitinerary-20.12.2.ebuild
index 7281ebfe73be..40bf4c7fcb6b 100644
--- a/kde-apps/kitinerary/kitinerary-20.12.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+barcode pdf"
 
 REQUIRED_USE="test? ( pdf )"
diff --git a/kde-apps/kitinerary/metadata.xml b/kde-apps/kitinerary/metadata.xml
index 7476175a04a6..b74cfe173616 100644
--- a/kde-apps/kitinerary/metadata.xml
+++ b/kde-apps/kitinerary/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="barcode">Enable support for PDF417 and Aztec barcode decoding using <pkg>media-libs/zxing-cpp</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="barcode">Enable support for PDF417 and Aztec barcode decoding using <pkg>media-libs/zxing-cpp</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.08.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-20.08.3.ebuild
index 500124810be2..09fe1a7f145f 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-20.08.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Tactical one or two player game"
 HOMEPAGE="https://apps.kde.org/en/kjumpingcube
-https://games.kde.org/game.php?game=kjumpingcube"
+https://games.kde.org/games/kjumpingcube"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.12.2.ebuild b/kde-apps/kjumpingcube/kjumpingcube-20.12.2.ebuild
index 83669018bb2f..872f3ecd9359 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-20.12.2.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Tactical one or two player game"
 HOMEPAGE="https://apps.kde.org/en/kjumpingcube
-https://games.kde.org/game.php?game=kjumpingcube"
+https://games.kde.org/games/kjumpingcube"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kjumpingcube/metadata.xml b/kde-apps/kjumpingcube/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kjumpingcube/metadata.xml
+++ b/kde-apps/kjumpingcube/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 42e8cbb12ef1..62e214e6b304 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,2 +1 @@
-DIST kldap-20.08.3.tar.xz 164496 BLAKE2B 4698c187b194243786608b0dec15155a2477ef040eb225297287965c4f0c3f4a20c1dfb322fbeeabedd3f78044c7accb17c170b142d6b5242a3ff7cc589b4f1e SHA512 7572ea28d415d184950c1d358e420c7ef22030b0aee8e423b5e21349b7a8ac97c22143e706b0f167f3a7ce5e7dcce37b1309d6570b22e0581055bfdb63f26917
 DIST kldap-20.12.2.tar.xz 164608 BLAKE2B 1bb7e65eea8be94abb4d1506208730204265abc6a572be87e5146b578b17679b4afa70a3ebd1b6d948680df37a2f8c6211690ebbb7fa8bd71cb332b109433e61 SHA512 8576fed449efcbe1a49b3d473807d4ab64d0a64a490ea60dfa8019e69a94ce3dbc555c302b8310714febe9c3bac0ed1d8bd0b1a4eaf3ae41d42505deb47bf099
diff --git a/kde-apps/kldap/kldap-20.08.3.ebuild b/kde-apps/kldap/kldap-20.08.3.ebuild
deleted file mode 100644
index 260c8f207999..000000000000
--- a/kde-apps/kldap/kldap-20.08.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/kldap-20.12.2.ebuild b/kde-apps/kldap/kldap-20.12.2.ebuild
index 95541b7cf054..88048114b272 100644
--- a/kde-apps/kldap/kldap-20.12.2.ebuild
+++ b/kde-apps/kldap/kldap-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/metadata.xml b/kde-apps/kldap/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kldap/metadata.xml
+++ b/kde-apps/kldap/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index bb4dcf2b161a..653ae92f3cbb 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,2 +1 @@
-DIST kleopatra-20.08.3.tar.xz 1944160 BLAKE2B 1c610913a330a04420a04e89b6760d55ed47f911f7b5830d793a8723b702eddb6748475ab44487cf7a978c1465db868251ecdee9e177e88dc7637827aa4fc67a SHA512 c3c2de5073eee0a21114d9b3b4ed335e6fd7589b28bb82494c840eb53ffe347e4bef15ec54353cac0149bbd08297d05c2c1bac3bb5279260e66131b2249f1bba
 DIST kleopatra-20.12.2.tar.xz 2000248 BLAKE2B 08fd582025a8a467dfc178e6f03f03be640e51a592efe7de3b35b51a5a5c234678a2344135c0475cc1359ee3ea4946d798233e6de112bb3ce52e7ea25e0c31d1 SHA512 23216e413993e61bb1ddb86df4dfb96e2d2b7b2beb27615bf4d55082fdbcb94c61cb3501d5678a30e99d3a414ad1fe3776a08800333a9576098d4ad41f03f797
diff --git a/kde-apps/kleopatra/kleopatra-20.08.3.ebuild b/kde-apps/kleopatra/kleopatra-20.08.3.ebuild
deleted file mode 100644
index 803886d95041..000000000000
--- a/kde-apps/kleopatra/kleopatra-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://apps.kde.org/en/kleopatra"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-20.12.2.ebuild b/kde-apps/kleopatra/kleopatra-20.12.2.ebuild
index b68c917e49b1..caa291dca796 100644
--- a/kde-apps/kleopatra/kleopatra-20.12.2.ebuild
+++ b/kde-apps/kleopatra/kleopatra-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kleopatra"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kleopatra/metadata.xml b/kde-apps/kleopatra/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kleopatra/metadata.xml
+++ b/kde-apps/kleopatra/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/klettres/metadata.xml b/kde-apps/klettres/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/klettres/metadata.xml
+++ b/kde-apps/klettres/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/klickety/klickety-20.08.3.ebuild b/kde-apps/klickety/klickety-20.08.3.ebuild
index 019efaee4948..cda694794496 100644
--- a/kde-apps/klickety/klickety-20.08.3.ebuild
+++ b/kde-apps/klickety/klickety-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An adaptation of the Clickomania game"
 HOMEPAGE="https://apps.kde.org/en/klickety
-https://games.kde.org/game.php?game=klickety"
+https://games.kde.org/games/klickety"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/klickety/klickety-20.12.2.ebuild b/kde-apps/klickety/klickety-20.12.2.ebuild
index a26f922c8cbd..2f1518e5671e 100644
--- a/kde-apps/klickety/klickety-20.12.2.ebuild
+++ b/kde-apps/klickety/klickety-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An adaptation of the Clickomania game"
 HOMEPAGE="https://apps.kde.org/en/klickety
-https://games.kde.org/game.php?game=klickety"
+https://games.kde.org/games/klickety"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/klickety/metadata.xml b/kde-apps/klickety/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/klickety/metadata.xml
+++ b/kde-apps/klickety/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/klines/klines-20.08.3.ebuild b/kde-apps/klines/klines-20.08.3.ebuild
index af1c278f8f84..9cf0b83b9b17 100644
--- a/kde-apps/klines/klines-20.08.3.ebuild
+++ b/kde-apps/klines/klines-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="A little KDE game about balls and how to get rid of them"
 HOMEPAGE="https://apps.kde.org/en/klines
-https://games.kde.org/game.php?game=klines"
+https://games.kde.org/games/klines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/klines/klines-20.12.2.ebuild b/kde-apps/klines/klines-20.12.2.ebuild
index e080445359bb..178591fd0dc0 100644
--- a/kde-apps/klines/klines-20.12.2.ebuild
+++ b/kde-apps/klines/klines-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="A little KDE game about balls and how to get rid of them"
 HOMEPAGE="https://apps.kde.org/en/klines
-https://games.kde.org/game.php?game=klines"
+https://games.kde.org/games/klines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/klines/metadata.xml b/kde-apps/klines/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/klines/metadata.xml
+++ b/kde-apps/klines/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmag/metadata.xml b/kde-apps/kmag/metadata.xml
index f0985e7dbb34..fd765352602b 100644
--- a/kde-apps/kmag/metadata.xml
+++ b/kde-apps/kmag/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="keyboardfocus">Enable keyboard focus tracking</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="keyboardfocus">Enable keyboard focus tracking</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmahjongg/kmahjongg-20.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-20.08.3.ebuild
index 8a052edb8055..d72b42e75238 100644
--- a/kde-apps/kmahjongg/kmahjongg-20.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="A tile matching game for one or two players"
 HOMEPAGE="https://apps.kde.org/en/kmahjongg
-https://games.kde.org/game.php?game=kmahjongg"
+https://games.kde.org/games/kmahjongg"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kmahjongg/kmahjongg-20.12.2.ebuild b/kde-apps/kmahjongg/kmahjongg-20.12.2.ebuild
index 70124522f975..0ce964b7d896 100644
--- a/kde-apps/kmahjongg/kmahjongg-20.12.2.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="A tile matching game for one or two players"
 HOMEPAGE="https://apps.kde.org/en/kmahjongg
-https://games.kde.org/game.php?game=kmahjongg"
+https://games.kde.org/games/kmahjongg"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kmahjongg/metadata.xml b/kde-apps/kmahjongg/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmahjongg/metadata.xml
+++ b/kde-apps/kmahjongg/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 9a666d58c0af..4c37ec265e32 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,2 +1 @@
-DIST kmail-account-wizard-20.08.3.tar.xz 161832 BLAKE2B 01e23924f4728e8a24a83a17a49ef556f125fadeae5da01df57eb0bc3446d387cded535946b33051fc814be06ae46ab240c811c07cad2c238efc71f789bbc38b SHA512 5526e55c8ec49473f41245cf5ebf18997ff4db20637d92fa6db8e20f353a95f255ec69ae03b6eeb9b0ff09180e78260af7392806f931f10bc105dc2dd5f102e4
 DIST kmail-account-wizard-20.12.2.tar.xz 160272 BLAKE2B 543e46692097b0c0737551c025141a14ab046edcdddfa5ea0d626d16a45c1f8c4b49f20b5aa6803473e272cf454802fcca9bc71e28478f7ef2fc0da4c68307d1 SHA512 621e45cfdf7d59a1a1008214baa84af9d09c8bacbc2ed3952d2cf735809e5eaa87fec4781060007eab4087a9aaf1e5c095b369316dbdab59c914190f472345cd
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild
deleted file mode 100644
index f321712f3835..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
index b7e7f5654963..8c34ab9cade9 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/metadata.xml b/kde-apps/kmail-account-wizard/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmail-account-wizard/metadata.xml
+++ b/kde-apps/kmail-account-wizard/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 8a7684bbfcf0..d206126b1802 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,2 +1 @@
-DIST kmail-20.08.3.tar.xz 5157880 BLAKE2B 58c3ef185f08c18a514fb281746c4148d0cef56fec7dc85234ef3ea217c4eca04da5cb044cbf1455478ec84d5ae4a3854e2a7ea061f30e0d700abeb4e3afc626 SHA512 88b3bf94702a61d3082106ca1fea08df6a2231493f62adc92138e2beebb896668aafd1271f20cea5ca0b45e545400fcbcbd42804eaa5727d192e6908f310b3f7
 DIST kmail-20.12.2.tar.xz 4671468 BLAKE2B b95329724286f690a990a100bf88b5c743ac9e06688fe1e8c7208fffb0fe3a600b68a61215d2761a1edabfb56d95264765e790db1156b2c49349fcbfd93077ee SHA512 f6b2b217c95b844b8a4ed3c254a798310da411b6a9bc911378e087c6a150f83d76ab0c7d27bb337b5d5713f62852c3c646f2f8d5a1ef4cd44f7250be38a71945
diff --git a/kde-apps/kmail/kmail-20.08.3.ebuild b/kde-apps/kmail/kmail-20.08.3.ebuild
deleted file mode 100644
index d0884ed171cf..000000000000
--- a/kde-apps/kmail/kmail-20.08.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://apps.kde.org/en/kmail2
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		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}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kmail/kmail-20.12.2.ebuild b/kde-apps/kmail/kmail-20.12.2.ebuild
index 453b9dbcdede..5b1a935b2e84 100644
--- a/kde-apps/kmail/kmail-20.12.2.ebuild
+++ b/kde-apps/kmail/kmail-20.12.2.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 BDEPEND="
diff --git a/kde-apps/kmail/metadata.xml b/kde-apps/kmail/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmail/metadata.xml
+++ b/kde-apps/kmail/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 924826b30e54..0b15a34899f4 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,2 +1 @@
-DIST kmailtransport-20.08.3.tar.xz 168268 BLAKE2B fb5b72cbd25ba3bb4baf4cb9cec15c92ce681a699def0ac299aeb8d92dbd66c0bc10dc23574d36279dbfa2a404eaa718d678561ffceb136c454b936e5cca8b24 SHA512 48613c60a270f61bdbea57107f419bdb1530776e0321d2f41dba2dc8dd70b52946bd1ea84dc957dd06e8091d16f08b0bb3de1f58cfcae17ed486c5abf2c56173
 DIST kmailtransport-20.12.2.tar.xz 168128 BLAKE2B bb98fd98b0e3bac7bd77e754e36ddac0b0f47c5785e45f8b244f1c54bb50816f92e38cc8d777ac55addfa4cc94b21a9f0409b8e94f8dc18461d1565a3e610843 SHA512 3697c2b3a9025ba0df9d6fa608bf2a634f95702c0188fe2a6625f13ae536a16f7b8c4347ea682d85259bf6fc92aa46054d245a822b8577282242fb02f6b2b1fa
diff --git a/kde-apps/kmailtransport/kmailtransport-20.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-20.08.3.ebuild
deleted file mode 100644
index 7fb197215f62..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild b/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
index 4b9075c7fcd1..8a980c8c20ee 100644
--- a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmailtransport/metadata.xml b/kde-apps/kmailtransport/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmailtransport/metadata.xml
+++ b/kde-apps/kmailtransport/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index a6cec10fb8cc..1b71b3d42c9f 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,2 +1 @@
-DIST kmbox-20.08.3.tar.xz 24800 BLAKE2B 27a025ae9493f03cf47c0117e9a44b3ee951bcaa2ca5f57053b50fd3ab4a7baf9e518e4922eaa9697444a933a6ff004f1d58865f39e3ed021eefb367e6676102 SHA512 58edacb2ef03efb1d51a143793839a5fbdec293a97867edd95b481e6b7bfb22f729db6ad156064ebbdb30a45be99ba9524bdace707b5a69d6fad06a2d702b629
 DIST kmbox-20.12.2.tar.xz 24788 BLAKE2B 388433f58ae3742af5792e4a0b758b77a60d5b4daeb61ab713a09b4c145265617659df1f7f566db00d7774cd2bb28cabac4920581f9ea90971ffe67b3c450a98 SHA512 02838f06d9866e77de79463622b9cd464ae2847362cb63ab8510b4fd8a5033fa49322dd554b8b8b5fe6fdea4b6fdb0aa3f4e8374a00e7c5c74d36e0571f420df
diff --git a/kde-apps/kmbox/kmbox-20.08.3.ebuild b/kde-apps/kmbox/kmbox-20.08.3.ebuild
deleted file mode 100644
index 8aadc8cf217c..000000000000
--- a/kde-apps/kmbox/kmbox-20.08.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:5"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-20.12.2.ebuild b/kde-apps/kmbox/kmbox-20.12.2.ebuild
index 60d5ff84f72b..9fed4aa0ecb7 100644
--- a/kde-apps/kmbox/kmbox-20.12.2.ebuild
+++ b/kde-apps/kmbox/kmbox-20.12.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for accessing MBox format mail storages"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=kde-apps/kmime-${PVCUT}:5"
diff --git a/kde-apps/kmbox/metadata.xml b/kde-apps/kmbox/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmbox/metadata.xml
+++ b/kde-apps/kmbox/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 41e93a3d4910..00b72f689396 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,2 +1 @@
-DIST kmime-20.08.3.tar.xz 151700 BLAKE2B 5321b88142bb45f76fee52c6f583dc4ed491b20715c7fa8e4b0b9db8b1608c9ad5654e48970bfd461786f3d66b92f120a816de5601cb7922903a7834a7415c06 SHA512 3dd4314960d5dceed08206a8d997f38b294de0244fcf3a7f4859f913401ae86f5bc8cc598d9b7cf132373704e499c1eccc13e9dd11bfda0b8a5b04a66421b65e
 DIST kmime-20.12.2.tar.xz 150928 BLAKE2B 6ad3783a43af23d1e3fb288622e123bfaf45d90e38830544d1fdc869951acb12a402e49110f69bf704215e993725361178abcb7deaa70b2aef2528c730d8cdf6 SHA512 9166604af411e92a863d29c362bc1e2efd98a4388c4f20e20ad2244a363832a6012a77ef2e57f58ded0276e38e9a8afa43f9db00b676b54eb8c4dc3b3ce17e41
diff --git a/kde-apps/kmime/kmime-20.08.3.ebuild b/kde-apps/kmime/kmime-20.08.3.ebuild
deleted file mode 100644
index 5af999cf1431..000000000000
--- a/kde-apps/kmime/kmime-20.08.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-inherit ecm kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/kmime-20.12.2.ebuild b/kde-apps/kmime/kmime-20.12.2.ebuild
index 4ca7bf9ad8a4..16f273ca1b5b 100644
--- a/kde-apps/kmime/kmime-20.12.2.ebuild
+++ b/kde-apps/kmime/kmime-20.12.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmime/metadata.xml b/kde-apps/kmime/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmime/metadata.xml
+++ b/kde-apps/kmime/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmines/kmines-20.08.3.ebuild b/kde-apps/kmines/kmines-20.08.3.ebuild
index 1bf7a4ee8b35..4c4475a43c35 100644
--- a/kde-apps/kmines/kmines-20.08.3.ebuild
+++ b/kde-apps/kmines/kmines-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Classic mine sweeper game"
 HOMEPAGE="https://apps.kde.org/en/kmines
-https://games.kde.org/game.php?game=kmines"
+https://games.kde.org/games/kmines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kmines/kmines-20.12.2.ebuild b/kde-apps/kmines/kmines-20.12.2.ebuild
index 6e7fa5558d7f..a4ee6c674deb 100644
--- a/kde-apps/kmines/kmines-20.12.2.ebuild
+++ b/kde-apps/kmines/kmines-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Classic mine sweeper game"
 HOMEPAGE="https://apps.kde.org/en/kmines
-https://games.kde.org/game.php?game=kmines"
+https://games.kde.org/games/kmines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kmines/metadata.xml b/kde-apps/kmines/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmines/metadata.xml
+++ b/kde-apps/kmines/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmix/metadata.xml b/kde-apps/kmix/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmix/metadata.xml
+++ b/kde-apps/kmix/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmousetool/metadata.xml b/kde-apps/kmousetool/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmousetool/metadata.xml
+++ b/kde-apps/kmousetool/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmouth/metadata.xml b/kde-apps/kmouth/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmouth/metadata.xml
+++ b/kde-apps/kmouth/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kmplot/metadata.xml b/kde-apps/kmplot/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kmplot/metadata.xml
+++ b/kde-apps/kmplot/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/knavalbattle/knavalbattle-20.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-20.08.3.ebuild
index 579f88156629..bb520a949510 100644
--- a/kde-apps/knavalbattle/knavalbattle-20.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Battleship clone by KDE"
 HOMEPAGE="https://apps.kde.org/en/knavalbattle
-https://games.kde.org/game.php?game=kbattleship"
+https://games.kde.org/games/kbattleship"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/knavalbattle/knavalbattle-20.12.2.ebuild b/kde-apps/knavalbattle/knavalbattle-20.12.2.ebuild
index 8636470dc41f..ba784c352793 100644
--- a/kde-apps/knavalbattle/knavalbattle-20.12.2.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Battleship clone by KDE"
 HOMEPAGE="https://apps.kde.org/en/knavalbattle
-https://games.kde.org/game.php?game=kbattleship"
+https://games.kde.org/games/kbattleship"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/knavalbattle/metadata.xml b/kde-apps/knavalbattle/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/knavalbattle/metadata.xml
+++ b/kde-apps/knavalbattle/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/knetwalk/knetwalk-20.08.3.ebuild b/kde-apps/knetwalk/knetwalk-20.08.3.ebuild
index d7cd7fc72cc3..b51aaa1c6728 100644
--- a/kde-apps/knetwalk/knetwalk-20.08.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
 HOMEPAGE="https://apps.kde.org/en/knetwalk
-https://games.kde.org/game.php?game=knetwalk"
+https://games.kde.org/games/knetwalk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/knetwalk/knetwalk-20.12.2.ebuild b/kde-apps/knetwalk/knetwalk-20.12.2.ebuild
index 5fef0dd43950..237d9fe6f27b 100644
--- a/kde-apps/knetwalk/knetwalk-20.12.2.ebuild
+++ b/kde-apps/knetwalk/knetwalk-20.12.2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
 HOMEPAGE="https://apps.kde.org/en/knetwalk
-https://games.kde.org/game.php?game=knetwalk"
+https://games.kde.org/games/knetwalk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/knetwalk/metadata.xml b/kde-apps/knetwalk/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/knetwalk/metadata.xml
+++ b/kde-apps/knetwalk/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/knights/metadata.xml b/kde-apps/knights/metadata.xml
index cd28b35c5cad..4df8a1f0d523 100644
--- a/kde-apps/knights/metadata.xml
+++ b/kde-apps/knights/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="speech">Enable text-to-speech support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="speech">Enable text-to-speech support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 8c0321182f92..5dd0e19fc9b7 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,2 +1 @@
-DIST knotes-20.08.3.tar.xz 322452 BLAKE2B cb07719d7623549d63c0af6232923a7b522db933920af0f24208acf3500412386a73b755d42ba3195ffdf1ec1ca278cb9dfb01fe70c237b6cdc0c2ec2007d8ea SHA512 79babf26d257775fb150e3c424f876e29461257780204605cb5c8af8fade803fb112217489ea69a90923fb8a2b7a08cbebc75a9d1836bfc3b3cab9fe8f8fcfdb
 DIST knotes-20.12.2.tar.xz 329504 BLAKE2B 7ec1c2fc977c44c71a5e8fa9fe85c505e04f0982a511c5cd31de018d3f6886861dcf2ea1387a17f5e9d7be843f0538714d09403437e7974184756f05cd2ef2a9 SHA512 f6aaa00da95e77055729f4fd74b207cba96bb2a99f7a21f3c6eb14eeb3b1bff44206839ebb1a18fda92079b45324a6597b5e248a96078b80b3c85bb1c9102ec5
diff --git a/kde-apps/knotes/knotes-20.08.3.ebuild b/kde-apps/knotes/knotes-20.08.3.ebuild
deleted file mode 100644
index fcfb0c2c981d..000000000000
--- a/kde-apps/knotes/knotes-20.08.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://apps.kde.org/en/knotes
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake_use_find_package X Qt5X11Extras)
-# 		$(cmake_use_find_package X X11)
-# 	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/knotes/knotes-20.12.2.ebuild b/kde-apps/knotes/knotes-20.12.2.ebuild
index c739590c9af1..172faf6bb269 100644
--- a/kde-apps/knotes/knotes-20.12.2.ebuild
+++ b/kde-apps/knotes/knotes-20.12.2.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/knotes.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knotes/metadata.xml b/kde-apps/knotes/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/knotes/metadata.xml
+++ b/kde-apps/knotes/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kolf/kolf-20.08.3.ebuild b/kde-apps/kolf/kolf-20.08.3.ebuild
index c7eb323626c9..7975490a3f34 100644
--- a/kde-apps/kolf/kolf-20.08.3.ebuild
+++ b/kde-apps/kolf/kolf-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Minigolf game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kolf
-https://games.kde.org/game.php?game=kolf"
+https://games.kde.org/games/kolf"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kolf/kolf-20.12.2.ebuild b/kde-apps/kolf/kolf-20.12.2.ebuild
index 1b02ca627d44..e77f169a3f33 100644
--- a/kde-apps/kolf/kolf-20.12.2.ebuild
+++ b/kde-apps/kolf/kolf-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Minigolf game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kolf
-https://games.kde.org/game.php?game=kolf"
+https://games.kde.org/games/kolf"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kolf/metadata.xml b/kde-apps/kolf/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kolf/metadata.xml
+++ b/kde-apps/kolf/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kollision/kollision-20.08.3.ebuild b/kde-apps/kollision/kollision-20.08.3.ebuild
index da207e0ab0e7..a130428fe765 100644
--- a/kde-apps/kollision/kollision-20.08.3.ebuild
+++ b/kde-apps/kollision/kollision-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Simple ball dodging game"
 HOMEPAGE="https://apps.kde.org/en/kollision
-https://games.kde.org/game.php?game=kollision"
+https://games.kde.org/games/kollision"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kollision/kollision-20.12.2.ebuild b/kde-apps/kollision/kollision-20.12.2.ebuild
index 87c0551c40ea..caeb4f49dc59 100644
--- a/kde-apps/kollision/kollision-20.12.2.ebuild
+++ b/kde-apps/kollision/kollision-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Simple ball dodging game"
 HOMEPAGE="https://apps.kde.org/en/kollision
-https://games.kde.org/game.php?game=kollision"
+https://games.kde.org/games/kollision"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kollision/metadata.xml b/kde-apps/kollision/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kollision/metadata.xml
+++ b/kde-apps/kollision/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kolourpaint/metadata.xml b/kde-apps/kolourpaint/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kolourpaint/metadata.xml
+++ b/kde-apps/kolourpaint/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kompare/metadata.xml b/kde-apps/kompare/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kompare/metadata.xml
+++ b/kde-apps/kompare/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index a198affb5420..403caf99ec8b 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="activities">Enable kactivities support</flag>
-		<flag name="speech">Build text-to-speech plugin</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="activities">Enable kactivities support</flag>
+  <flag name="speech">Build text-to-speech plugin</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/konquest/konquest-20.08.3.ebuild b/kde-apps/konquest/konquest-20.08.3.ebuild
index 19fda8b0913e..5ed2894d344b 100644
--- a/kde-apps/konquest/konquest-20.08.3.ebuild
+++ b/kde-apps/konquest/konquest-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Galactic Strategy KDE Game"
 HOMEPAGE="https://apps.kde.org/en/konquest
-https://games.kde.org/game.php?game=konquest"
+https://games.kde.org/games/konquest"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/konquest/konquest-20.12.2.ebuild b/kde-apps/konquest/konquest-20.12.2.ebuild
index f8ddb9247cc5..ac0537fcb1e1 100644
--- a/kde-apps/konquest/konquest-20.12.2.ebuild
+++ b/kde-apps/konquest/konquest-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Galactic Strategy KDE Game"
 HOMEPAGE="https://apps.kde.org/en/konquest
-https://games.kde.org/game.php?game=konquest"
+https://games.kde.org/games/konquest"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/konquest/metadata.xml b/kde-apps/konquest/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/konquest/metadata.xml
+++ b/kde-apps/konquest/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/konsole/metadata.xml b/kde-apps/konsole/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/konsole/metadata.xml
+++ b/kde-apps/konsole/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 3e429bca6f88..36783e8c4152 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-tools-20.08.3.tar.xz 228576 BLAKE2B 53d3beb42c766f0ac47ea54b5294b61680a6e712ed624489b7df2c182f014ec07fbcb81bd47ab6a2b045515a7d85f7efd1616b9aa672338e84b80258d98298b0 SHA512 d8dc7fbd74cce1081f2398d1d5478e08cd0b7e9c4aed5dc89b3a54b43e0427526c9a47f7304667b796bec2cb53d0f17d4541345f647165f50edfff44c7ee91a3
 DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.08.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.08.3.ebuild
deleted file mode 100644
index 91a7022834bc..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-20.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-inherit ecm kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
index 64a6a8c373dd..712823cc8e75 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsolekalendar/metadata.xml b/kde-apps/konsolekalendar/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/konsolekalendar/metadata.xml
+++ b/kde-apps/konsolekalendar/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index f0422d3bf3b8..f746d3c5c370 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,2 +1 @@
-DIST kontact-20.08.3.tar.xz 794980 BLAKE2B 9d4b324360345ecfadc3e3163436086379abdc27c3477ed37300e42754b35269fd1765669d4a243cf36701b7e784bd423e60d3f122b4f5e436f3b7710744a16f SHA512 b90207279a2f344731c5c9caae45bcf5a4c0eab1cb13c364f9bdbb2e76127c016b0a422f3730e10cd15345a3241345e535f39e88a46e946b87130e856978b857
 DIST kontact-20.12.2.tar.xz 790952 BLAKE2B 8d5a126d62e1d1cc151705bc2ac843625d866b1aa70d63d012341343dedcf0664b0c3e40cb99561f27e71ed4120357c2d9dbf0705673e74ea8dd9161d31c4d83 SHA512 52adbf4f201eafa819b17a88be5e409de5a06bb34e755f57c638b2cc315936fb7c8214d3242f2cdcc62924f44c416215acb1bb4da1a43641d996d3eb4ce44e19
diff --git a/kde-apps/kontact/kontact-20.08.3.ebuild b/kde-apps/kontact/kontact-20.08.3.ebuild
deleted file mode 100644
index 08b6a682b088..000000000000
--- a/kde-apps/kontact/kontact-20.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/en/en/kontact"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontact/kontact-20.12.2.ebuild b/kde-apps/kontact/kontact-20.12.2.ebuild
index dbc00e1e0fa4..77e83bad0295 100644
--- a/kde-apps/kontact/kontact-20.12.2.ebuild
+++ b/kde-apps/kontact/kontact-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/en/en/kontact"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/metadata.xml b/kde-apps/kontact/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kontact/metadata.xml
+++ b/kde-apps/kontact/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 0f9b30f6a5f7..f87aa1961060 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,2 +1 @@
-DIST kontactinterface-20.08.3.tar.xz 36032 BLAKE2B caede603ec9179f0116da9f4a8648e66e72ea76dfd5dde0a0a9790b232b69cdb5147fe3fd14dee6d8be639c29fea662464b05841fc2942437854c3c2eddd74c1 SHA512 e7d53e1dc5623c0adcf8761f004447956dae79e66a9ef43e63aa9cf936b64c63257a1d5a1ae34403f5bec969e3f6387d2be2e0c24f1f02cfecddc47141707b55
 DIST kontactinterface-20.12.2.tar.xz 36072 BLAKE2B 4281849413b64fb3e62048b0a8089453071c617ded3dbbe97d055d4eaeecd5346a36538e2c2d14bfd74ecfd1f051278d203ad008c92f4ecb84c6571f00e58ae3 SHA512 dd0ca6de301206e661ef217209fd4bc2b9c925eb2d191487931a3a187d6d511e661cc76767ad102a1fca6c6e0d73e87291beae99e165552447bb578c19c4eac2
diff --git a/kde-apps/kontactinterface/kontactinterface-20.08.3.ebuild b/kde-apps/kontactinterface/kontactinterface-20.08.3.ebuild
deleted file mode 100644
index e082be74fecb..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-20.08.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm 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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild b/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild
index 13294a8e276b..779d7c25edcb 100644
--- a/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/metadata.xml b/kde-apps/kontactinterface/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kontactinterface/metadata.xml
+++ b/kde-apps/kontactinterface/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 414ef28fffea..fca37b054dc7 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<!-- PLUGINS -->
-		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
-		<flag name="autoreplace">Automatically replace selected text</flag>
-		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
-		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
-		<flag name="history">Enables saving chat history.</flag>
-		<flag name="latex">Embed latex formatted text into messages.</flag>
-		<flag name="nowlistening">Shows song you currently listen to in your status/etc. Bindings for many players.</flag>
-		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
-		<flag name="otr">Allows crypting your chat (drugs and talking nonsense are considered as good alternatives ;]).</flag>
-		<flag name="pipes">Send messages to external pipe.</flag>
-		<flag name="privacy">Filter for incoming messages</flag>
-		<flag name="statistics">Everybody loves statistic graphs, especially cake ones. ;]</flag>
-		<flag name="texteffect">Various fancy text effects for your messages (don't ever consider writing us with this enabled ;]).</flag>
-		<flag name="translator">Translate incoming and outgoing messages.</flag>
-		<flag name="urlpicpreview">Enables in conversation pictures preview.</flag>
-		<flag name="webpresence">Show your status and some more information on web.</flag>
-		<!-- PROTOCOLS -->
-		<flag name="gadu">Enable the Gadu protocol handler.</flag>
-		<flag name="groupwise">Enable the Groupwise protocol handler.</flag>
-		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-		<flag name="testbed">Enable the testbed protocol.</flag>
-		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
-		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
+  <flag name="autoreplace">Automatically replace selected text</flag>
+  <flag name="contactnotes">Enables writing personal notes for contacts.</flag>
+  <flag name="highlight">Allows you to specify highlights on specific events.</flag>
+  <flag name="history">Enables saving chat history.</flag>
+  <flag name="latex">Embed latex formatted text into messages.</flag>
+  <flag name="nowlistening">Shows song you currently listen to in your status/etc. Bindings for many players.</flag>
+  <flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
+  <flag name="otr">Allows crypting your chat (drugs and talking nonsense are considered as good alternatives ;]).</flag>
+  <flag name="pipes">Send messages to external pipe.</flag>
+  <flag name="privacy">Filter for incoming messages</flag>
+  <flag name="statistics">Everybody loves statistic graphs, especially cake ones. ;]</flag>
+  <flag name="texteffect">Various fancy text effects for your messages (don't ever consider writing us with this enabled ;]).</flag>
+  <flag name="translator">Translate incoming and outgoing messages.</flag>
+  <flag name="urlpicpreview">Enables in conversation pictures preview.</flag>
+  <flag name="webpresence">Show your status and some more information on web.</flag>
+  <flag name="gadu">Enable the Gadu protocol handler.</flag>
+  <flag name="groupwise">Enable the Groupwise protocol handler.</flag>
+  <flag name="meanwhile">Enable the Sametime protocol handler.</flag>
+  <flag name="testbed">Enable the testbed protocol.</flag>
+  <flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
+  <flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 4f28ff98850b..9246eda42ffd 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,2 +1 @@
-DIST korganizer-20.08.3.tar.xz 2251956 BLAKE2B 689f10e6fb94e507c1622984145f816392a0986e7475b7da92676db05a498bb9095598ce13be9f219fce69c63b81ad061664a564c8e5b76cf7252cb0b5c2eec0 SHA512 6b53da5d7ac2614e82c19f78b788eba92ba9e77bcd2bc7384e0d558fb9ec87ec09fb6a2033b1f70fd81c1f1e646249d64308a5cc02157939cfaac517354c1723
 DIST korganizer-20.12.2.tar.xz 2246456 BLAKE2B f4126345fc0cdaf44f31cea13621a821677f45710803fa34bc818b6b5aa086b2776cc6a67118f8948f09c05c06e0132e99d42b9ffe2ce64f2d3c8451d98730ef SHA512 0170efde8e906ccf9f68bf18a08b44ba49a04bc75211ba8c328b6960b7bbe2e33f58eb614825bf318685e4f5aeb579c214da5b60b7fe478a989f56c4fb31beab
diff --git a/kde-apps/korganizer/korganizer-20.08.3.ebuild b/kde-apps/korganizer/korganizer-20.08.3.ebuild
deleted file mode 100644
index a52e09b5d66b..000000000000
--- a/kde-apps/korganizer/korganizer-20.08.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/en/korganizer"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry X"
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	telemetry? ( dev-libs/kuserfeedback:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-20.12.2.ebuild b/kde-apps/korganizer/korganizer-20.12.2.ebuild
index 3bfc463a4e46..50d67663f6a9 100644
--- a/kde-apps/korganizer/korganizer-20.12.2.ebuild
+++ b/kde-apps/korganizer/korganizer-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/korganizer"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry X"
 
 BDEPEND="
diff --git a/kde-apps/korganizer/metadata.xml b/kde-apps/korganizer/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/korganizer/metadata.xml
+++ b/kde-apps/korganizer/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kpat/kpat-20.08.3.ebuild b/kde-apps/kpat/kpat-20.08.3.ebuild
index 070069c7ec22..0092ff1c91f1 100644
--- a/kde-apps/kpat/kpat-20.08.3.ebuild
+++ b/kde-apps/kpat/kpat-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE patience game"
 HOMEPAGE="https://apps.kde.org/en/kpat
-https://games.kde.org/game.php?game=kpat"
+https://games.kde.org/games/kpat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kpat/kpat-20.12.2.ebuild b/kde-apps/kpat/kpat-20.12.2.ebuild
index ed44b0c04a31..71dcd0feae83 100644
--- a/kde-apps/kpat/kpat-20.12.2.ebuild
+++ b/kde-apps/kpat/kpat-20.12.2.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE patience game"
 HOMEPAGE="https://apps.kde.org/en/kpat
-https://games.kde.org/game.php?game=kpat"
+https://games.kde.org/games/kpat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kpat/metadata.xml b/kde-apps/kpat/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kpat/metadata.xml
+++ b/kde-apps/kpat/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index ba82a149d294..7527e7d1dd07 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,2 +1 @@
-DIST kpimtextedit-20.08.3.tar.xz 188856 BLAKE2B cf99ad277df9d9f1c3de1d5147fe3bd90df6a126c06f2d078fcb99e57ebc597bbbccae4eecdd2ec469939debde45c663676c4bda7b5704e31e9625d27c741d6b SHA512 8a893740e27ffe7c77df454a1355d384f5d257bedd5db0929b51acae4cf64d7793cb46e156be0aac95d2733170089a3060388a8237e17040fd3ba7d38cdf8d6a
 DIST kpimtextedit-20.12.2.tar.xz 201248 BLAKE2B 8ef6a248f86ff4003a28e6992b19545d75f5be33c134d6fee75cbd5bf5f048a7a2d6902c61627342ec856df07d994f93c22b9ec697a0d487320463e84f77d4dd SHA512 680ceb87a508d25b34f2c20651e44381e3d631797cfbec30646497e2a1fec93eb600f10509a35815931faaac8305d73b18aa9cba68065e1a79dee0d10654e52d
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.08.3.ebuild
deleted file mode 100644
index abc9e0f0d6b7..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-20.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Extended text editor for PIM applications"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild
index 1f515663b190..f3df5b26a4a6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kpimtextedit/metadata.xml b/kde-apps/kpimtextedit/metadata.xml
index a50ada50ef0e..033687a6cbdc 100644
--- a/kde-apps/kpimtextedit/metadata.xml
+++ b/kde-apps/kpimtextedit/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 372639343290..d7643d2208b0 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,2 +1 @@
-DIST kpkpass-20.08.3.tar.xz 23364 BLAKE2B 94e43c7b70b41a812424236fd17d6a7630df2d854e114e49244b9b23f4d99cd05fba43629673a8122ed44c7072810c7a93f15b075a9492f0c91012d84a86a77c SHA512 f32e8a0ad16dc0e271203c86da2902c90352ef436cfb4dbad88e4abd3a5fc60ad873bf0798a678c0d3d793b723ff2006d667c4ce6750d4760d7e55b9f9b2dcce
 DIST kpkpass-20.12.2.tar.xz 23448 BLAKE2B fc39aeabdb73118aad1fa7222e726f24fed743da5b27fe94b2e178c53e7fab20e04d3373015160e0ae73d0c6a51fc5231a97860d2ace55e42caf1bb91a45b6dd SHA512 a5b858f802131b84632fc1c898a76d414b12ccf341a0a0f7a0850555b91a2e1a26528e6833c084fea49dc1b4054735311a318184afe580e87979335cc2690267
diff --git a/kde-apps/kpkpass/kpkpass-20.08.3.ebuild b/kde-apps/kpkpass/kpkpass-20.08.3.ebuild
deleted file mode 100644
index 8e6ad53295f2..000000000000
--- a/kde-apps/kpkpass/kpkpass-20.08.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
diff --git a/kde-apps/kpkpass/kpkpass-20.12.2.ebuild b/kde-apps/kpkpass/kpkpass-20.12.2.ebuild
index c6997dcfa7d8..b7b5eea883ad 100644
--- a/kde-apps/kpkpass/kpkpass-20.12.2.ebuild
+++ b/kde-apps/kpkpass/kpkpass-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpkpass/metadata.xml b/kde-apps/kpkpass/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kpkpass/metadata.xml
+++ b/kde-apps/kpkpass/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kqtquickcharts/metadata.xml b/kde-apps/kqtquickcharts/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kqtquickcharts/metadata.xml
+++ b/kde-apps/kqtquickcharts/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/krdc/metadata.xml b/kde-apps/krdc/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/krdc/metadata.xml
+++ b/kde-apps/krdc/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kreversi/kreversi-20.08.3.ebuild b/kde-apps/kreversi/kreversi-20.08.3.ebuild
index c884cac28b90..fb4fb561a793 100644
--- a/kde-apps/kreversi/kreversi-20.08.3.ebuild
+++ b/kde-apps/kreversi/kreversi-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Board game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kreversi
-https://games.kde.org/game.php?game=kreversi"
+https://games.kde.org/games/kreversi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kreversi/kreversi-20.12.2.ebuild b/kde-apps/kreversi/kreversi-20.12.2.ebuild
index d03e9d8f046b..bf536cc56774 100644
--- a/kde-apps/kreversi/kreversi-20.12.2.ebuild
+++ b/kde-apps/kreversi/kreversi-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Board game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kreversi
-https://games.kde.org/game.php?game=kreversi"
+https://games.kde.org/games/kreversi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kreversi/metadata.xml b/kde-apps/kreversi/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kreversi/metadata.xml
+++ b/kde-apps/kreversi/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/krfb/metadata.xml b/kde-apps/krfb/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/krfb/metadata.xml
+++ b/kde-apps/krfb/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kross-interpreters/metadata.xml b/kde-apps/kross-interpreters/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kross-interpreters/metadata.xml
+++ b/kde-apps/kross-interpreters/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kruler/metadata.xml b/kde-apps/kruler/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kruler/metadata.xml
+++ b/kde-apps/kruler/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kshisen/kshisen-20.08.3.ebuild b/kde-apps/kshisen/kshisen-20.08.3.ebuild
index d14ccd8f9a47..72060a74ef34 100644
--- a/kde-apps/kshisen/kshisen-20.08.3.ebuild
+++ b/kde-apps/kshisen/kshisen-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
 HOMEPAGE="https://apps.kde.org/en/kshisen
-https://games.kde.org/game.php?game=kshisen"
+https://games.kde.org/games/kshisen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kshisen/kshisen-20.12.2.ebuild b/kde-apps/kshisen/kshisen-20.12.2.ebuild
index 0c000f5e4e9a..52dffad32ab3 100644
--- a/kde-apps/kshisen/kshisen-20.12.2.ebuild
+++ b/kde-apps/kshisen/kshisen-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
 HOMEPAGE="https://apps.kde.org/en/kshisen
-https://games.kde.org/game.php?game=kshisen"
+https://games.kde.org/games/kshisen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kshisen/metadata.xml b/kde-apps/kshisen/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kshisen/metadata.xml
+++ b/kde-apps/kshisen/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ksirk/ksirk-20.08.3.ebuild b/kde-apps/ksirk/ksirk-20.08.3.ebuild
index c32730f01e29..c0ccc4c739c3 100644
--- a/kde-apps/ksirk/ksirk-20.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Port of the board game risk"
 HOMEPAGE="https://apps.kde.org/en/ksirk
-https://games.kde.org/game.php?game=ksirk"
+https://games.kde.org/games/ksirk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ksirk/ksirk-20.12.2.ebuild b/kde-apps/ksirk/ksirk-20.12.2.ebuild
index 7e37945a246d..6d2a7a5b7fe3 100644
--- a/kde-apps/ksirk/ksirk-20.12.2.ebuild
+++ b/kde-apps/ksirk/ksirk-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Port of the board game risk"
 HOMEPAGE="https://apps.kde.org/en/ksirk
-https://games.kde.org/game.php?game=ksirk"
+https://games.kde.org/games/ksirk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ksirk/metadata.xml b/kde-apps/ksirk/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ksirk/metadata.xml
+++ b/kde-apps/ksirk/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 963ee01fcf6c..016e1b71507b 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,2 +1 @@
-DIST ksmtp-20.08.3.tar.xz 42436 BLAKE2B c203c4be99b25ec3dd29c17d772da381d5a24efcb54b524fdb4fd69dc5d572076d95db331734a2b1d5409ff35d3570f2263666ec4395b44db481535704059d5f SHA512 57f549f1e37f09d656ea338688aec663fe56b08384f57d1cea5c5418c073f1ada90941462bbc279619ebda7243a961c7017e686ccc89f076e0d68c20307d4eee
 DIST ksmtp-20.12.2.tar.xz 43092 BLAKE2B 74a757a58687d4c76d6a6c6c9c5931ff01938c206d482bc9a02d00bd46fef942ad5fe785b6e2c300dee889509cda1ed489355c3ab2f00e65efd039dd53856a84 SHA512 d336777948705f4d79ba6ac2c428caa467da8d6b0853defd8fb42a150c10dd25ef0258f41ce2549212e27dabca58e17eddb0d6425d2159e3d21eafaa29e369a5
diff --git a/kde-apps/ksmtp/ksmtp-20.08.3.ebuild b/kde-apps/ksmtp/ksmtp-20.08.3.ebuild
deleted file mode 100644
index d9ff616b8cea..000000000000
--- a/kde-apps/ksmtp/ksmtp-20.08.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm 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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-20.12.2.ebuild b/kde-apps/ksmtp/ksmtp-20.12.2.ebuild
index df2365e79226..804cb09bc357 100644
--- a/kde-apps/ksmtp/ksmtp-20.12.2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-20.12.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/metadata.xml b/kde-apps/ksmtp/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ksmtp/metadata.xml
+++ b/kde-apps/ksmtp/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ksnakeduel/metadata.xml b/kde-apps/ksnakeduel/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ksnakeduel/metadata.xml
+++ b/kde-apps/ksnakeduel/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kspaceduel/kspaceduel-20.08.3.ebuild b/kde-apps/kspaceduel/kspaceduel-20.08.3.ebuild
index 1ee42a67a3c2..b38c273bfee3 100644
--- a/kde-apps/kspaceduel/kspaceduel-20.08.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Space Game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kspaceduel
-https://games.kde.org/game.php?game=kspaceduel"
+https://games.kde.org/games/kspaceduel"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kspaceduel/kspaceduel-20.12.2.ebuild b/kde-apps/kspaceduel/kspaceduel-20.12.2.ebuild
index 511900ec8a79..9a2dddec8923 100644
--- a/kde-apps/kspaceduel/kspaceduel-20.12.2.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Space Game by KDE"
 HOMEPAGE="https://apps.kde.org/en/kspaceduel
-https://games.kde.org/game.php?game=kspaceduel"
+https://games.kde.org/games/kspaceduel"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/kspaceduel/metadata.xml b/kde-apps/kspaceduel/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kspaceduel/metadata.xml
+++ b/kde-apps/kspaceduel/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ksquares/ksquares-20.08.3.ebuild b/kde-apps/ksquares/ksquares-20.08.3.ebuild
index 4c76ffd9fa45..b562ba8d2328 100644
--- a/kde-apps/ksquares/ksquares-20.08.3.ebuild
+++ b/kde-apps/ksquares/ksquares-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE clone of the game squares"
 HOMEPAGE="https://apps.kde.org/en/ksquares
-https://games.kde.org/game.php?game=ksquares"
+https://games.kde.org/games/ksquares"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ksquares/ksquares-20.12.2.ebuild b/kde-apps/ksquares/ksquares-20.12.2.ebuild
index b38cd7bc003d..e81945184fd7 100644
--- a/kde-apps/ksquares/ksquares-20.12.2.ebuild
+++ b/kde-apps/ksquares/ksquares-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE clone of the game squares"
 HOMEPAGE="https://apps.kde.org/en/ksquares
-https://games.kde.org/game.php?game=ksquares"
+https://games.kde.org/games/ksquares"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ksquares/metadata.xml b/kde-apps/ksquares/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ksquares/metadata.xml
+++ b/kde-apps/ksquares/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ksudoku/ksudoku-20.08.3.ebuild b/kde-apps/ksudoku/ksudoku-20.08.3.ebuild
index f4b9a8082045..8e792acc434f 100644
--- a/kde-apps/ksudoku/ksudoku-20.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Logic-based symbol placement puzzle by KDE"
 HOMEPAGE="https://apps.kde.org/en/ksudoku
-https://games.kde.org/game.php?game=ksudoku"
+https://games.kde.org/games/ksudoku"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ksudoku/ksudoku-20.12.2.ebuild b/kde-apps/ksudoku/ksudoku-20.12.2.ebuild
index 196338897d58..2f5c02c9a9da 100644
--- a/kde-apps/ksudoku/ksudoku-20.12.2.ebuild
+++ b/kde-apps/ksudoku/ksudoku-20.12.2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Logic-based symbol placement puzzle by KDE"
 HOMEPAGE="https://apps.kde.org/en/ksudoku
-https://games.kde.org/game.php?game=ksudoku"
+https://games.kde.org/games/ksudoku"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ksudoku/metadata.xml b/kde-apps/ksudoku/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ksudoku/metadata.xml
+++ b/kde-apps/ksudoku/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ksystemlog/metadata.xml b/kde-apps/ksystemlog/metadata.xml
index c86984db68b9..a63e8383e35f 100644
--- a/kde-apps/ksystemlog/metadata.xml
+++ b/kde-apps/ksystemlog/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="kdesu">Run as root using kdesu from <pkg>kde-plasma/kde-cli-tools</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="kdesu">Run as root using kdesu from <pkg>kde-plasma/kde-cli-tools</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kteatime/metadata.xml b/kde-apps/kteatime/metadata.xml
index 2706a4222a63..4e0a3b454ad6 100644
--- a/kde-apps/kteatime/metadata.xml
+++ b/kde-apps/kteatime/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<longdescription>Kteatime alerts when the given time is over.
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <longdescription>Kteatime alerts when the given time is over.
 	Different times for black tea, green tea, pizza and more.</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktimer/metadata.xml b/kde-apps/ktimer/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktimer/metadata.xml
+++ b/kde-apps/ktimer/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktouch/metadata.xml b/kde-apps/ktouch/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktouch/metadata.xml
+++ b/kde-apps/ktouch/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-accounts-kcm/metadata.xml b/kde-apps/ktp-accounts-kcm/metadata.xml
index 98aa6aeeaf8e..f7e211fb899a 100644
--- a/kde-apps/ktp-accounts-kcm/metadata.xml
+++ b/kde-apps/ktp-accounts-kcm/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="experimental">Enables disabled telepathy services (currently only steam)</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="experimental">Enables disabled telepathy services (currently only steam)</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-approver/metadata.xml b/kde-apps/ktp-approver/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-approver/metadata.xml
+++ b/kde-apps/ktp-approver/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-auth-handler/metadata.xml b/kde-apps/ktp-auth-handler/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-auth-handler/metadata.xml
+++ b/kde-apps/ktp-auth-handler/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-common-internals/metadata.xml b/kde-apps/ktp-common-internals/metadata.xml
index 6b4abc5e89ef..99b8c6e3553f 100644
--- a/kde-apps/ktp-common-internals/metadata.xml
+++ b/kde-apps/ktp-common-internals/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="sso">Enable support for Single sign-on through KAccounts</flag>
-		<flag name="otr">Enable support for encrypted conversations using Off-The-Records messaging</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="sso">Enable support for Single sign-on through KAccounts</flag>
+  <flag name="otr">Enable support for encrypted conversations using Off-The-Records messaging</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-contact-list/metadata.xml b/kde-apps/ktp-contact-list/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-contact-list/metadata.xml
+++ b/kde-apps/ktp-contact-list/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-contact-runner/metadata.xml b/kde-apps/ktp-contact-runner/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-contact-runner/metadata.xml
+++ b/kde-apps/ktp-contact-runner/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-desktop-applets/metadata.xml b/kde-apps/ktp-desktop-applets/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-desktop-applets/metadata.xml
+++ b/kde-apps/ktp-desktop-applets/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-filetransfer-handler/metadata.xml b/kde-apps/ktp-filetransfer-handler/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-filetransfer-handler/metadata.xml
+++ b/kde-apps/ktp-filetransfer-handler/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-kded-module/metadata.xml b/kde-apps/ktp-kded-module/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-kded-module/metadata.xml
+++ b/kde-apps/ktp-kded-module/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-send-file/metadata.xml b/kde-apps/ktp-send-file/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktp-send-file/metadata.xml
+++ b/kde-apps/ktp-send-file/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktp-text-ui/metadata.xml b/kde-apps/ktp-text-ui/metadata.xml
index 33bd3090f924..7096c4fecf58 100644
--- a/kde-apps/ktp-text-ui/metadata.xml
+++ b/kde-apps/ktp-text-ui/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="speech">Enable incoming messages to be read out using text-to-speech</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="speech">Enable incoming messages to be read out using text-to-speech</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/ktuberling/ktuberling-20.08.3.ebuild b/kde-apps/ktuberling/ktuberling-20.08.3.ebuild
index 47b343595c54..ea140a0f7870 100644
--- a/kde-apps/ktuberling/ktuberling-20.08.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Potato game for kids by KDE"
 HOMEPAGE="https://apps.kde.org/en/ktuberling
-https://games.kde.org/game.php?game=ktuberling"
+https://games.kde.org/games/ktuberling"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ktuberling/ktuberling-20.12.2.ebuild b/kde-apps/ktuberling/ktuberling-20.12.2.ebuild
index d2e7734d5c71..17b2ad2ac0fa 100644
--- a/kde-apps/ktuberling/ktuberling-20.12.2.ebuild
+++ b/kde-apps/ktuberling/ktuberling-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Potato game for kids by KDE"
 HOMEPAGE="https://apps.kde.org/en/ktuberling
-https://games.kde.org/game.php?game=ktuberling"
+https://games.kde.org/games/ktuberling"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/ktuberling/metadata.xml b/kde-apps/ktuberling/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/ktuberling/metadata.xml
+++ b/kde-apps/ktuberling/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kturtle/metadata.xml b/kde-apps/kturtle/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kturtle/metadata.xml
+++ b/kde-apps/kturtle/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kubrick/metadata.xml b/kde-apps/kubrick/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kubrick/metadata.xml
+++ b/kde-apps/kubrick/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kwalletmanager/metadata.xml b/kde-apps/kwalletmanager/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kwalletmanager/metadata.xml
+++ b/kde-apps/kwalletmanager/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kwave/metadata.xml b/kde-apps/kwave/metadata.xml
index e53b8a3ea814..8b0021b11a37 100644
--- a/kde-apps/kwave/metadata.xml
+++ b/kde-apps/kwave/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
-	<use>
-		<flag name="qtmedia">Enable playback via Qt5Multimedia</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
+ 
+ <use>
+  <flag name="qtmedia">Enable playback via Qt5Multimedia</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kwordquiz/metadata.xml b/kde-apps/kwordquiz/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/kwordquiz/metadata.xml
+++ b/kde-apps/kwordquiz/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/kwrite/metadata.xml b/kde-apps/kwrite/metadata.xml
index e86df5ddbf6b..e4ff089fcd9e 100644
--- a/kde-apps/kwrite/metadata.xml
+++ b/kde-apps/kwrite/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 8e1a7877fd00..fb64ced4ed61 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,2 +1 @@
-DIST libgravatar-20.08.3.tar.xz 33564 BLAKE2B 1add9453d5e685d2d370c7fe79138a0cc00f66ae5e89e0f7eb77d4c9e72b9978819ee6541b037ae033ee494d497f17bc5f07b949cde88c90df3e6adc93af87b0 SHA512 f17d6f78bcf51bc9d9f00745e430845fc7ed3540e92560db40583cfbbfc74fa7310e68a6694cb49f60c731315411b5784e338a9d079ff13d4706889e3464b871
 DIST libgravatar-20.12.2.tar.xz 31124 BLAKE2B 86912421ba998f8a151c730e32b2b95de61d43d26c34b675fc079cd01ea74fee273638d00558fd121d33a977c4019112e1b96e1f8a36f455e910b5cc1c136522 SHA512 4c5d9706d7f4530fd6ba27134855e1c033af245f72aedfa87045939bf92e6c4e35a87ebbc0fff0d4982f1295c23e65fdeadc13a1530343a213cb4ffed0693a7c
diff --git a/kde-apps/libgravatar/libgravatar-20.08.3.ebuild b/kde-apps/libgravatar/libgravatar-20.08.3.ebuild
deleted file mode 100644
index f026bded1eae..000000000000
--- a/kde-apps/libgravatar/libgravatar-20.08.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-20.12.2.ebuild b/kde-apps/libgravatar/libgravatar-20.12.2.ebuild
index 7cf6687095a1..41f1649bdb99 100644
--- a/kde-apps/libgravatar/libgravatar-20.12.2.ebuild
+++ b/kde-apps/libgravatar/libgravatar-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for gravatar integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libgravatar/metadata.xml b/kde-apps/libgravatar/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libgravatar/metadata.xml
+++ b/kde-apps/libgravatar/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkcddb/metadata.xml b/kde-apps/libkcddb/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkcompactdisc/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkcompactdisc/metadata.xml
+++ b/kde-apps/libkcompactdisc/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkdcraw/metadata.xml b/kde-apps/libkdcraw/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkdcraw/metadata.xml
+++ b/kde-apps/libkdcraw/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkdegames/metadata.xml b/kde-apps/libkdegames/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkdegames/metadata.xml
+++ b/kde-apps/libkdegames/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index dae861db432b..bb60fe672ebc 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,2 +1 @@
-DIST libkdepim-20.08.3.tar.xz 249656 BLAKE2B 0ccd3d3620dace60a18424f268861e8053ff148e96137f61327d854c5c6144fdfeec7debcd16eb7ace3e97e184d2a37712ece53dda3137ed3869b43077b004b1 SHA512 d9e9d90bde82fa7c5692ee4c67318b580983932aecf1efa30edeed01aa83718be7f40c278c5a6197156f3d71ada9a376f5aa07a32dd8cf7eeb1608f54b37645a
 DIST libkdepim-20.12.2.tar.xz 238548 BLAKE2B 0f859d3e081b4b26f96e0d66844ac68301ba4c3b4f59e22f8648f575cc4048fe682cf82233fa75a7d1c80c5c756ff1efaf6ca2a947d1d71616af48a315c037ba SHA512 fef76bd6b086ffe7bf232d6d742583a4d146c3dda31c15799708b86d23f29fa175dfce86ac084ced2cd107968dd21116a8f5e776e0ab67347ca6a62c35e4d877
diff --git a/kde-apps/libkdepim/libkdepim-20.08.3.ebuild b/kde-apps/libkdepim/libkdepim-20.08.3.ebuild
deleted file mode 100644
index 8678d670b046..000000000000
--- a/kde-apps/libkdepim/libkdepim-20.08.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-20.12.2.ebuild b/kde-apps/libkdepim/libkdepim-20.12.2.ebuild
index f815ada55283..88400a729a8a 100644
--- a/kde-apps/libkdepim/libkdepim-20.12.2.ebuild
+++ b/kde-apps/libkdepim/libkdepim-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/metadata.xml b/kde-apps/libkdepim/metadata.xml
index a50ada50ef0e..033687a6cbdc 100644
--- a/kde-apps/libkdepim/metadata.xml
+++ b/kde-apps/libkdepim/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkeduvocdocument/metadata.xml b/kde-apps/libkeduvocdocument/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkeduvocdocument/metadata.xml
+++ b/kde-apps/libkeduvocdocument/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkexiv2/metadata.xml b/kde-apps/libkexiv2/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkexiv2/metadata.xml
+++ b/kde-apps/libkexiv2/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 4d783edbb5d7..ecf59a497926 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,2 +1 @@
-DIST libkgapi-20.08.3.tar.xz 242676 BLAKE2B 86b04cea376eb46081632fb571bdb3a67f4f44f3dd6c8a3af0144598634417ee39defb445324f33969420718daa999f43c5ea5d9c01634a0ec944bf457219fd7 SHA512 de7062632660777074f4d0d8b754b072c7f2b0550260e994d1db3e99d8f258f2507ad605d91cb6c465794ced92b740a742ab99947737edea73fd928c087d4388
 DIST libkgapi-20.12.2.tar.xz 246020 BLAKE2B c934898d8832c0264919a313d25d6a74a7a377dbd5575926ea6bc6ebbe8870e37691b307b058b67a5ff09d9bbf2db759b4d98d93d347a239315500e7f95d5bdc SHA512 0350eaff72b192219553047781e1ae79bc794b9519095f812a1c8efe3e9d33c3dbb5d9db07bd28a39132adc4543627e2c46a866aec9f8710ef2d35cfb0a1f697
diff --git a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch b/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
deleted file mode 100644
index 42cd78136ad1..000000000000
--- a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 570c0fd731af9ca4cead249d1db6133acc21f7c1 Mon Sep 17 00:00:00 2001
-From: David Barchiesi <david@barchie.si>
-Date: Mon, 24 Aug 2020 12:04:17 +0200
-Subject: [PATCH] Remove duplicate "gContact$groupMembershipInfo" value in mock
- fetch response.
-
-BUG: 419629
----
- autotests/contacts/data/contact1_fetch_response.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/autotests/contacts/data/contact1_fetch_response.txt b/autotests/contacts/data/contact1_fetch_response.txt
-index 7b22c91..89fc0e1 100644
---- a/autotests/contacts/data/contact1_fetch_response.txt
-+++ b/autotests/contacts/data/contact1_fetch_response.txt
-@@ -44,12 +44,6 @@ Content-type: application/json; charset=UTF-8
-       "$t": "2018-03-25T16:37:29.565Z"
-     }, 
-     "xmlns$gd": "http://schemas.google.com/g/2005", 
--    "gContact$groupMembershipInfo": [
--      {
--        "deleted": "false", 
--        "href": "http://www.google.com/m8/feeds/groups/MockAccount/base/6"
--      }
--    ], 
-     "gd$structuredPostalAddress": [
-       {
-         "gd$country": {
--- 
-GitLab
-
diff --git a/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild b/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
deleted file mode 100644
index 99b60fac04bf..000000000000
--- a/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm 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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-contactfetchjobtest-w-qt-5.15.patch" # bug 754159
-)
diff --git a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild b/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
index 9f09231fc49a..1f8552178b95 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/libkgapi/metadata.xml b/kde-apps/libkgapi/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkgapi/metadata.xml
+++ b/kde-apps/libkgapi/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkipi/metadata.xml b/kde-apps/libkipi/metadata.xml
index acef20363a48..8330739b4758 100644
--- a/kde-apps/libkipi/metadata.xml
+++ b/kde-apps/libkipi/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<slots>
-		<subslots>Reflects ABI compatibility of libKF5Kipi.so</subslots>
-	</slots>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <slots>
+  <subslots>Reflects ABI compatibility of libKF5Kipi.so</subslots>
+ </slots>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index caf3916be225..114095557841 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,2 +1 @@
-DIST libkleo-20.08.3.tar.xz 355120 BLAKE2B 3c5f14498e98e7efb8b6da302979294a0fc8ff9e13fe3409072063557ae6a9bc57f7aa9df03ef3e979aabcb63a47032291001c8aaae3e0b234cbcbfe14977e8b SHA512 9c8c7d5784f47a8edc411853ca8fc0922b494c1a3036c9d354514468589fa28e8a2b7cc6e1726955ccdc4074588f859d3ea70b258f7c198c09cd1fe3e689477b
 DIST libkleo-20.12.2.tar.xz 358600 BLAKE2B 1b1802adf16605d6c8e3ce8fbf4e56a353cea5e3cc07a060dd78d8fe4f5adf2e1ce74c12942e803283a07fb9db237fc049a3bf1adf64f59337dc79e71bc31bb6 SHA512 38b6bbbecf37327ef8ce55f9d14750c4fbfa8ca9712d73906f13e42ca3e199e6fbe2b9dd28afdeaa239aca73cf6608a12246472238e235eee099305d9c48be50
diff --git a/kde-apps/libkleo/libkleo-20.08.3.ebuild b/kde-apps/libkleo/libkleo-20.08.3.ebuild
deleted file mode 100644
index 7a5887dade04..000000000000
--- a/kde-apps/libkleo/libkleo-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+fancyviewer"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkleo/libkleo-20.12.2.ebuild b/kde-apps/libkleo/libkleo-20.12.2.ebuild
index 55a6164c2090..7405150e5372 100644
--- a/kde-apps/libkleo/libkleo-20.12.2.ebuild
+++ b/kde-apps/libkleo/libkleo-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
diff --git a/kde-apps/libkleo/metadata.xml b/kde-apps/libkleo/metadata.xml
index 6bd976f27cbf..38bbcd9dbff7 100644
--- a/kde-apps/libkleo/metadata.xml
+++ b/kde-apps/libkleo/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="fancyviewer">Use <pkg>kde-apps/kpimtextedit</pkg> for an improved audit log viewer</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="fancyviewer">Use <pkg>kde-apps/kpimtextedit</pkg> for an improved audit log viewer</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkmahjongg/metadata.xml b/kde-apps/libkmahjongg/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkmahjongg/metadata.xml
+++ b/kde-apps/libkmahjongg/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libkomparediff2/metadata.xml b/kde-apps/libkomparediff2/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libkomparediff2/metadata.xml
+++ b/kde-apps/libkomparediff2/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libksane/metadata.xml b/kde-apps/libksane/metadata.xml
index 080de1ce90f6..a9e48da21d60 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 4d4e41e5d18f..64a1791c5ff3 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,2 +1 @@
-DIST libksieve-20.08.3.tar.xz 560144 BLAKE2B c2b03d38045909a3adb2ed65650d593cabf66734993eb1757cbbf8954e4c587fd720cc53e3f3821b10d147bf2f6c0608c9d9c10d1a0fbcc606dee582103bf81b SHA512 419d142bedc36b3cf21b3808cb95dedd17e3ffa859327b45ee5b5808c8907c08e164f0d5e9ef9bbe617a331352275a7d6d3b375689377e26962e22cf558f7505
 DIST libksieve-20.12.2.tar.xz 558380 BLAKE2B 50efee16805c4d9acf4f9760c4e9c5adee2f7d9041bb9755c91395240519c71eabe7eb28bb8962d9fb68233672754f9183edd89296320cb23f1fd6e3c182308a SHA512 18a44446a390cc5f682e36fa282ca34637e6c245fea32bd23f1aca9bdbdde1301d666b6576b88b37f665bafedbd85cf62a9c87f569548a1e2b85be25f989d6b5
diff --git a/kde-apps/libksieve/libksieve-20.08.3.ebuild b/kde-apps/libksieve/libksieve-20.08.3.ebuild
deleted file mode 100644
index 04f2f1697224..000000000000
--- a/kde-apps/libksieve/libksieve-20.08.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_run_in kioslave cmake_comment_add_subdirectory doc
-}
diff --git a/kde-apps/libksieve/libksieve-20.12.2.ebuild b/kde-apps/libksieve/libksieve-20.12.2.ebuild
index 108a92c7ab14..0f3ae90ee9ab 100644
--- a/kde-apps/libksieve/libksieve-20.12.2.ebuild
+++ b/kde-apps/libksieve/libksieve-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/libksieve/metadata.xml b/kde-apps/libksieve/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libksieve/metadata.xml
+++ b/kde-apps/libksieve/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 339e34e75b48..f1b761440b49 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,2 +1 @@
-DIST ktnef-20.08.3.tar.xz 299888 BLAKE2B b4ef35c3b9d4ac3548f981527a073f8fcc735414af8a81efe3996862868f2087638cbe771e9dd0d975bf7880728bdde9a54842ef9c225728c2fa598dad035268 SHA512 9838061585a177d7487f5ffc022e99420b8d429eef7df660397dd5792beead18fd301a3ca1e1faf85fd3a4ed01508d99cd5fcf5ab6babf85f475239ff3e8dfef
 DIST ktnef-20.12.2.tar.xz 299868 BLAKE2B a6b8c67bdce00e4a392f80fd666af6aaca0d5ca85fab28681d2bb323c68d7755e576467eb9243c6ae383f1ffafc3f657ec6338d995a5aed023c7a1d130b4f40d SHA512 d59701455f7f9fcec54d2698fa3f16e508766e098f0b14e96c5cad8921428f2f43ef4cf627330dc3b1809b91ffadd5481feed645d4f1e29f7c16225a73c315e7
diff --git a/kde-apps/libktnef/libktnef-20.08.3.ebuild b/kde-apps/libktnef/libktnef-20.08.3.ebuild
deleted file mode 100644
index 0dddb6ef8eac..000000000000
--- a/kde-apps/libktnef/libktnef-20.08.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-20.12.2.ebuild b/kde-apps/libktnef/libktnef-20.12.2.ebuild
index 9630e971e3d7..0c2ac2980a32 100644
--- a/kde-apps/libktnef/libktnef-20.12.2.ebuild
+++ b/kde-apps/libktnef/libktnef-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libktnef/metadata.xml b/kde-apps/libktnef/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/libktnef/metadata.xml
+++ b/kde-apps/libktnef/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/lokalize/metadata.xml b/kde-apps/lokalize/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/lokalize/metadata.xml
+++ b/kde-apps/lokalize/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/lskat/lskat-20.08.3.ebuild b/kde-apps/lskat/lskat-20.08.3.ebuild
index 4ed5a90bc09e..6f0b91f291ba 100644
--- a/kde-apps/lskat/lskat-20.08.3.ebuild
+++ b/kde-apps/lskat/lskat-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Skat game by KDE"
 HOMEPAGE="https://apps.kde.org/en/lskat
-https://games.kde.org/game.php?game=lskat"
+https://games.kde.org/games/lskat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/lskat/lskat-20.12.2.ebuild b/kde-apps/lskat/lskat-20.12.2.ebuild
index a100c85fa479..6f14205e0d48 100644
--- a/kde-apps/lskat/lskat-20.12.2.ebuild
+++ b/kde-apps/lskat/lskat-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Skat game by KDE"
 HOMEPAGE="https://apps.kde.org/en/lskat
-https://games.kde.org/game.php?game=lskat"
+https://games.kde.org/games/lskat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/lskat/metadata.xml b/kde-apps/lskat/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/lskat/metadata.xml
+++ b/kde-apps/lskat/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 3555f357472f..edee3312ddb0 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,2 +1 @@
-DIST mailcommon-20.08.3.tar.xz 708792 BLAKE2B 19e1d512e0264b212d85f34d911193d8f0f455f18a51b90cac3fddb7b373283ba42598e2012b3a585298bb00bc907ab09ed94087e5114da3384b8a55fc7ec609 SHA512 b7f21ff44fb2a9735fc870217fdfe947adefe08228dcab16caefe25d429ba19d431c0774b73860fbd9a45e591e749c49e6bc6db479327ce21bb95ed505919056
 DIST mailcommon-20.12.2.tar.xz 723900 BLAKE2B 010a1e65b53c45dc0f91b51efb337f8a2c0450186e87b2c017470d7887c74a32eda1a834b9ee8a8df54786d058861c3fe29c75a9cb54912565a963f49e84de21 SHA512 22d161ea3d7330b02b5b21ab71864e3be7b067fac5518317471c7b1342b2a5115d5a5cae273bd5783788de4fd61ff82a1ee41c802900978b7cb38b14b8e78743
diff --git a/kde-apps/mailcommon/mailcommon-20.08.3.ebuild b/kde-apps/mailcommon/mailcommon-20.08.3.ebuild
deleted file mode 100644
index 9089aab1a701..000000000000
--- a/kde-apps/mailcommon/mailcommon-20.08.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-20.12.2.ebuild b/kde-apps/mailcommon/mailcommon-20.12.2.ebuild
index 9cffbdbc33ba..6f8422e1f752 100644
--- a/kde-apps/mailcommon/mailcommon-20.12.2.ebuild
+++ b/kde-apps/mailcommon/mailcommon-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/mailcommon/metadata.xml b/kde-apps/mailcommon/metadata.xml
index a50ada50ef0e..033687a6cbdc 100644
--- a/kde-apps/mailcommon/metadata.xml
+++ b/kde-apps/mailcommon/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index edd62b15025c..482783276dfb 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,2 +1 @@
-DIST mailimporter-20.08.3.tar.xz 541548 BLAKE2B 901b641c2cc77181d0a6de9eda52901fb06d2b69ca4d114225035a8ff2508cfabb9121a32679b28a40e4a77ff02cb9e4ffa714e5a2c35ca16c96d6a4c2b56a86 SHA512 0aa095a4304bd20c928f79ad0e8d7edf2fce7b750244bae4f7ec4b4aebc31f81b1010e910fe3619355639f731b2026610023509e4406d8439c1259df331c6db4
 DIST mailimporter-20.12.2.tar.xz 548636 BLAKE2B 39080c6a8cf829e0a4f4e72b09d3fb309abd7013a8cf4ae3f26b0be8040e855a3e56ce3ae9bbf492e1342073d687615961b0b686f6afcb21839a62e32d3e53da SHA512 a7ed6b2d6acd322c1fbfac5a6bc0d370715a1cdcaf615647fd908e06bb058f9226f20c04e101f01d520f31c98c0ddb5b05404119fa1db9b8e474e049a0056de8
diff --git a/kde-apps/mailimporter/mailimporter-20.08.3.ebuild b/kde-apps/mailimporter/mailimporter-20.08.3.ebuild
deleted file mode 100644
index 2fb184ad3f87..000000000000
--- a/kde-apps/mailimporter/mailimporter-20.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-20.12.2.ebuild b/kde-apps/mailimporter/mailimporter-20.12.2.ebuild
index b8153ecb3344..5253b4f09d64 100644
--- a/kde-apps/mailimporter/mailimporter-20.12.2.ebuild
+++ b/kde-apps/mailimporter/mailimporter-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library to import mail from various sources"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailimporter/metadata.xml b/kde-apps/mailimporter/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/mailimporter/metadata.xml
+++ b/kde-apps/mailimporter/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index f57f36e23efb..bc0dcee36911 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="aprs">Enable support for APRS data sources</flag>
-		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="geolocation">Enable position information via <pkg>dev-qt/qtpositioning</pkg></flag>
-		<flag name="pbf">Enable OpenStreetMap PBF file support via <pkg>dev-libs/protobuf</pkg></flag>
-		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
-		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
-		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="aprs">Enable support for APRS data sources</flag>
+  <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+  <flag name="geolocation">Enable position information via <pkg>dev-qt/qtpositioning</pkg></flag>
+  <flag name="pbf">Enable OpenStreetMap PBF file support via <pkg>dev-libs/protobuf</pkg></flag>
+  <flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
+  <flag name="shapefile">Enable support for ESRI shapefiles</flag>
+  <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index bd12391e542b..5180ac9d7fa5 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,2 +1 @@
-DIST mbox-importer-20.08.3.tar.xz 34756 BLAKE2B fb5dcec096e28910789d059eb7e6e5db27844087386aea05bb4211a876c71b18a5a303bbd87fa73bbf9b9f6bc1b9ad79582c0aab52b9fbf4484e34952d7a8872 SHA512 1b5c2c413037137a69c05855bb31927c6c64ae2ece0e68bb585e719b3cfa1c660a8bbf7c664f242ed21e1e88d1977388c5ccd4b0c370b6b9b2108360780f5ce9
 DIST mbox-importer-20.12.2.tar.xz 24772 BLAKE2B d90529baf92a2ea78f026cf03cbdc27390c1044c774df2e8d2d8bd0201eecd7786d328fa7412b34a04b89886e61ebcd3b7b4136d02bd293fd56937a5cd2ca49a SHA512 e751606ecb47692d27ffc5b0c08b1550dc6eb769d42051ed4c05f43a07e21701bb7387078239c4c201aa21169eee26309b64f1fac53f0943cb529136e4195313
diff --git a/kde-apps/mbox-importer/mbox-importer-20.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-20.08.3.ebuild
deleted file mode 100644
index 88d2ab350d5d..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-20.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild b/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild
index 7267d862251d..baff0019624e 100644
--- a/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mbox-importer/metadata.xml b/kde-apps/mbox-importer/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/mbox-importer/metadata.xml
+++ b/kde-apps/mbox-importer/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index e0b3a65d8dba..55aca05752ab 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,2 +1 @@
-DIST messagelib-20.08.3.tar.xz 10531248 BLAKE2B 2a612a839fcee9c663ee8cca07e45b1d7f4ad2e268af91033862d4372ebaf0340ecc2d4f18919feaf8fb83ab2e319729ae4ade7deeeda75b8aa777ff8a3281e7 SHA512 6a66838f1810fc19ee862f7d67d69667fd5ea1c081da325b7ced20c7a19ae8bdd0354c1a0dc482bb0ee68f9d55d4505ebfb0bee95b74d7406b4ebc2cdcd29c6b
 DIST messagelib-20.12.2.tar.xz 10542352 BLAKE2B 5aba18dff341f18dd30af8fd0f76434319496f5e4d7edc047e24e865ed325f33b6651b7329c592183f641dab107bf7a9f6a4ed344cfae07d63167caf414a661b SHA512 bc75d49ea1411dd75d35150757b9f1993e4e1b4ca1347bebbdcebc8c029dc18ccd43e83abcb375622a2638997c0346e15d08a9131b232c1032430d27bc71ff89
diff --git a/kde-apps/messagelib/messagelib-20.08.3.ebuild b/kde-apps/messagelib/messagelib-20.08.3.ebuild
deleted file mode 100644
index 32954751d3f1..000000000000
--- a/kde-apps/messagelib/messagelib-20.08.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=app-crypt/qca-2.3.0:2
-	>=dev-libs/grantlee-5.1.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-20.12.2.ebuild b/kde-apps/messagelib/messagelib-20.12.2.ebuild
index 6bd4ccf59a35..55c8a8ec4d74 100644
--- a/kde-apps/messagelib/messagelib-20.12.2.ebuild
+++ b/kde-apps/messagelib/messagelib-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries for messaging functions"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/messagelib/metadata.xml b/kde-apps/messagelib/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/messagelib/metadata.xml
+++ b/kde-apps/messagelib/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/minuet/metadata.xml b/kde-apps/minuet/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/minuet/metadata.xml
+++ b/kde-apps/minuet/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index f07864be71d3..4101c0099b8c 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
-		<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
-		<flag name="image-backend">Enable image viewing support</flag>
-		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
-		<flag name="mobi">Enable mobipocket support</flag>
-		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
-		<flag name="qml">Install Okular Qml components</flag>
-		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
-		<flag name="speech">Enable text-to-speech support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
+  <flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
+  <flag name="image-backend">Enable image viewing support</flag>
+  <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
+  <flag name="mobi">Enable mobipocket support</flag>
+  <flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
+  <flag name="qml">Install Okular Qml components</flag>
+  <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+  <flag name="speech">Enable text-to-speech support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/palapeli/metadata.xml b/kde-apps/palapeli/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/palapeli/metadata.xml
+++ b/kde-apps/palapeli/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/parley/metadata.xml b/kde-apps/parley/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/parley/metadata.xml
+++ b/kde-apps/parley/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/picmi/metadata.xml b/kde-apps/picmi/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/picmi/metadata.xml
+++ b/kde-apps/picmi/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/picmi/picmi-20.08.3.ebuild b/kde-apps/picmi/picmi-20.08.3.ebuild
index 8eaea342e064..89f51ccac4b9 100644
--- a/kde-apps/picmi/picmi-20.08.3.ebuild
+++ b/kde-apps/picmi/picmi-20.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Nonogram logic game by KDE"
 HOMEPAGE="https://apps.kde.org/en/picmi
-https://games.kde.org/game.php?game=picmi"
+https://games.kde.org/games/picmi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/picmi/picmi-20.12.2.ebuild b/kde-apps/picmi/picmi-20.12.2.ebuild
index 005fabcfa181..3678d9dbb098 100644
--- a/kde-apps/picmi/picmi-20.12.2.ebuild
+++ b/kde-apps/picmi/picmi-20.12.2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Nonogram logic game by KDE"
 HOMEPAGE="https://apps.kde.org/en/picmi
-https://games.kde.org/game.php?game=picmi"
+https://games.kde.org/games/picmi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 279545027850..b15d9a88649d 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,2 +1 @@
-DIST pim-data-exporter-20.08.3.tar.xz 399520 BLAKE2B 770af04d616d3c4c397074ebf3702c98b9ab1566428a0dadf7ac416c2167a465b06be0d4047f3a6acfa4e97d5fb46039e2efa0fe3dec43e5011d5484ebc39bb8 SHA512 70459c941204cafb60c1c77c107208f32b41b3d50902c8ee9d10d40f126265c8ad4745ddbaa2b3e50537248acd6883d71a568105f5a90d94bcc7b5fa9004339a
 DIST pim-data-exporter-20.12.2.tar.xz 400376 BLAKE2B ed88c2292c3a5cc70a0382cac11c77a891fe71755e2a2ab962cf2d8aa7244a6222b30759be572a58682de50f3d50a05591141e8f1147373ef6947e27fe8c4598 SHA512 a213183e6f7e6086de511c3f8171de52b705c7097c85dd149ff912959b420df20c3ac5fd96c61687dfca20e1fe6745e48e0884deba914c3cda1274db36d7d153
diff --git a/kde-apps/pim-data-exporter/metadata.xml b/kde-apps/pim-data-exporter/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/pim-data-exporter/metadata.xml
+++ b/kde-apps/pim-data-exporter/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild
deleted file mode 100644
index dd9808d39d5d..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://apps.kde.org/en/pimdataexporter
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # 11 out of 21 tests fail...
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild
index 81a8615d4826..30091bea2315 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/KMail/Backup_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 7629015ca5df..33b364d231c1 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,2 +1 @@
-DIST pim-sieve-editor-20.08.3.tar.xz 454436 BLAKE2B 7143e72dbec7d60564acbcf7e7599e5c2825e2f524c8e8226db9990555e8dd467bd06e73a06c7ef5559e403fe3b52e6ba40b3a6590d02f6d79d9efe286ec6c71 SHA512 2a16d2f91cfc4f5fff25f7b787c6e89dd20e8a77bc4acb409fafc2ffaeab98b2b6df638cc88a42f5823b0f77ddc6f7cf0a9719d08cbd599e1f9bd490efa9225e
 DIST pim-sieve-editor-20.12.2.tar.xz 455092 BLAKE2B f39d1436f9121d0a0e1e78ce49db91fe3dafde6f09303bdf6a58c22ff480f5c160b655ac7d24f572202ddf291e29f454873b70f943a582a5daf8977fe1a8b42c SHA512 466bf9e5411ac33737a416108583c8e6cd3497f740457d8dfbaafd1ce57a45184337a894bbb0bb5a52496a0ce93104596c3835376be11f94d78382da7a41b24f
diff --git a/kde-apps/pim-sieve-editor/metadata.xml b/kde-apps/pim-sieve-editor/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/pim-sieve-editor/metadata.xml
+++ b/kde-apps/pim-sieve-editor/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.3.ebuild
deleted file mode 100644
index c338b3362f1a..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild
index 09f58bd5a5c3..5c0c92fed6bc 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 86eb9500f804..cb0ebf8fc58d 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,2 +1 @@
-DIST pimcommon-20.08.3.tar.xz 357152 BLAKE2B 9a0dd228d9997bd891b2247fdf2fc6feeefa3606234ba69d1e335234f40a7b9031285882d95cc62b3b4a380a29dbed58647aafd5e93dddbeb79d8ffd8cc4e945 SHA512 873fa273dd06eff2d488926c3d359f7fd0b56276eb6fcbb3bffb83207631902479b3751dbeae1525c07d24a2f284a05e9054f71a9497867a461040363cd75a2d
 DIST pimcommon-20.12.2.tar.xz 364268 BLAKE2B e979c3b72cc37c443d7bd29323c4277be1625e9635f20f16e90d8ebc0a5bcfcf343f91d6d88a26f25337583d270309aa66707cff141073e278b87faced43281a SHA512 268ad53f8cf44171be339e6ab4a6608581f79e7c4c08fd22f4d8ce698c20281580ed4f25a956d6b0449753273bda7b6c6d40d44189eeb5cd7c479266c706c960
diff --git a/kde-apps/pimcommon/metadata.xml b/kde-apps/pimcommon/metadata.xml
index a50ada50ef0e..033687a6cbdc 100644
--- a/kde-apps/pimcommon/metadata.xml
+++ b/kde-apps/pimcommon/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/pimcommon/pimcommon-20.08.3.ebuild b/kde-apps/pimcommon/pimcommon-20.08.3.ebuild
deleted file mode 100644
index 2c3d15efb3fc..000000000000
--- a/kde-apps/pimcommon/pimcommon-20.08.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/libkdepim-20.07.80:5
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-20.12.2.ebuild b/kde-apps/pimcommon/pimcommon-20.12.2.ebuild
index bf95871a0c8e..d282c2997b4d 100644
--- a/kde-apps/pimcommon/pimcommon-20.12.2.ebuild
+++ b/kde-apps/pimcommon/pimcommon-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/metadata.xml b/kde-apps/plasma-telepathy-meta/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/plasma-telepathy-meta/metadata.xml
+++ b/kde-apps/plasma-telepathy-meta/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/poxml/metadata.xml b/kde-apps/poxml/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/poxml/metadata.xml
+++ b/kde-apps/poxml/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/print-manager/metadata.xml b/kde-apps/print-manager/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/print-manager/metadata.xml
+++ b/kde-apps/print-manager/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/rocs/metadata.xml b/kde-apps/rocs/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/rocs/metadata.xml
+++ b/kde-apps/rocs/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/signon-kwallet-extension/metadata.xml b/kde-apps/signon-kwallet-extension/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/signon-kwallet-extension/metadata.xml
+++ b/kde-apps/signon-kwallet-extension/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml
index bc2d96259f57..11951ade4a23 100644
--- a/kde-apps/spectacle/metadata.xml
+++ b/kde-apps/spectacle/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag>
-		<flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
-		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag>
+  <flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
+  <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/spectacle/spectacle-20.12.2.ebuild b/kde-apps/spectacle/spectacle-20.12.2-r1.ebuild
index 6c5c1429821e..7fb30afe4ae4 100644
--- a/kde-apps/spectacle/spectacle-20.12.2.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.2-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
-	annotate? ( media-libs/kimageannotator )
+	annotate? ( >=media-libs/kimageannotator-0.4.1 )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
diff --git a/kde-apps/step/metadata.xml b/kde-apps/step/metadata.xml
index f6287bcadeb7..3ef0b3f23352 100644
--- a/kde-apps/step/metadata.xml
+++ b/kde-apps/step/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/svgpart/metadata.xml b/kde-apps/svgpart/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/svgpart/metadata.xml
+++ b/kde-apps/svgpart/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/sweeper/metadata.xml b/kde-apps/sweeper/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/sweeper/metadata.xml
+++ b/kde-apps/sweeper/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/thumbnailers/metadata.xml b/kde-apps/thumbnailers/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/thumbnailers/metadata.xml
+++ b/kde-apps/thumbnailers/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/umbrello/metadata.xml b/kde-apps/umbrello/metadata.xml
index c81c6f761d85..97e21f26ac01 100644
--- a/kde-apps/umbrello/metadata.xml
+++ b/kde-apps/umbrello/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="php">Enable PHP import support using <pkg>dev-util/kdevelop</pkg> and <pkg>dev-util/kdevelop-pg-qt</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="php">Enable PHP import support using <pkg>dev-util/kdevelop</pkg> and <pkg>dev-util/kdevelop-pg-qt</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/yakuake/metadata.xml b/kde-apps/yakuake/metadata.xml
index af7db56fcb83..7e4b3335cbd6 100644
--- a/kde-apps/yakuake/metadata.xml
+++ b/kde-apps/yakuake/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <longdescription>
 		YaKuake is Yet Another Kuake terminal emulator. It drops down on a configurable
 		key press (defaults to F12) with a konsole window, supports multiple tabs,
 		tabs, multiple screens and mouse wheel tab navigation amongst other features.
 	</longdescription>
-	<use>
-		<flag name="absolute-position">Use <pkg>kde-frameworks/kwayland</pkg> for absolute window positioning in KWin</flag>
-	</use>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="absolute-position">Use <pkg>kde-frameworks/kwayland</pkg> for absolute window positioning in KWin</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/kde-apps/zeroconf-ioslave/metadata.xml b/kde-apps/zeroconf-ioslave/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/kde-apps/zeroconf-ioslave/metadata.xml
+++ b/kde-apps/zeroconf-ioslave/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-03-01 00:37:58 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-03-01 00:37:58 +0000
commit	8ddb1a3d1229412a438971f82d37d518a0223726 (patch)
tree	83438b5ddb9d23a390f1a3fc505303d3d2223bf2 /kde-apps
parent	9acab46e1a820daece7b2e631485c157ce2210ad (diff)
download	baldeagleos-repo-21.1.5.tar.gz baldeagleos-repo-21.1.5.tar.xz baldeagleos-repo-21.1.5.zip