gentoo Easter resync : 12.04.2020

4 files changed, 39 insertions, 41 deletions

diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 64d643244f82..85424a4ebb0d 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,6 +1,6 @@
 AUX baloo-5.67.0-sync-IndexerConfig-on-exit.patch 843 BLAKE2B 471e15932172e6cbfe7d3d7e85b51f0e4cf24dfa0e26dc54af493e6b5c7ccde57fc5f43f37955202c8faaf9eef1d1dbaba02af2a23d9b325358f806e1b9537dd SHA512 6cec3aa43a5c46baee3899787b11019952ee3590a94f760ed31670fee23097aff4c38bd611a7bfa8547d37c97dd1b4969c1e906d355cdb49cd6c4657de36c60e
-DIST baloo-5.64.0.tar.xz 277132 BLAKE2B d37a14721053f3396834d76e3855d9606af0bba042dd8b01933d1e004f659c9b739852c7e33eb2ca0abadf6ec99c4369a26d3c61047ac06f5d7d8d05079fb210 SHA512 c01fec2e01ed3b979a9309a5745822e8632e5034882fd62d0a16c2ff61b88351724d078257a2b7faf7ce306a658e9df6780cd18ceeda3e2c70cd7e4523f3d5f1
 DIST baloo-5.67.0.tar.xz 273900 BLAKE2B 059ae680e887b5fcdbeb6d68c6760f035660919d727f2d46cf838e6426b0f83625faecbc754518e6968262ef3efb2fb9ea9852ab652e0d80629de9dc59db781f SHA512 065fb29c86e29a848c0bcac68851eb6b02b46e9f32269175a6d8cae80325dc619e020ac1c1f564998381a678d8918c1d7ddb81697e475663816eecb127831d5c
-EBUILD baloo-5.64.0.ebuild 922 BLAKE2B 6cd1fa052ae3467db962b687d3712c05691700c36cb2e294f61c3df2f1ba6a53d398bdd427f31ec427b6053c635a1bc269d2edbfa2f806e8632250f9466d47f3 SHA512 e2b6cfb1c8f3a65e00478c15dc2c3dade2295e80b4753cd3429f983302c53d9c65b153b2016d45e6839c999075154c58a95623840b05c937533d9bdbac14fdd8
-EBUILD baloo-5.67.0-r1.ebuild 958 BLAKE2B ade8a0f7fa2bedf2225b0eca78f3a3eebf98112fe036528034ad3416f67f6ea782e76542392a14dc8567c12215aeb9e61b8f60b0d346ee699784859e2e569549 SHA512 8dfffe756cc709481cfd6d3cfa9d7c740b5d26d7774036ba2878228e7686f16cfb796345f65f4b11d5f5cb37815b7c1b816e79581399b2c4612e69b64d790c22
+DIST baloo-5.69.0.tar.xz 278212 BLAKE2B 39492dc8094b718f864971146d6e332f7f04e3890a1518870095fb3a92eaff45a08c099cb4bea68405ad490fea3aa3941d85d3b7ed0bbeb939cc5be6933e326d SHA512 0716208265b141c9e4cf4920c310b73f26e3abb56bddd60d8ea426f2e26b0cfe66c8b93cab09707ef7b94444d43b8336a1274e862a811e20c0437faf65cccc66
+EBUILD baloo-5.67.0-r1.ebuild 955 BLAKE2B 864de0f57b5f84a49571a8a49d2eff68fa31a72b5b0919f634ab116da5d46952cf77541060ded68367f007c089d393c6d0282be8f3e90d3235fbeaa2252709d7 SHA512 16c0e065b5c0b6e378703076e21242c04bbdb17cafc7cf0905fe424673030aebb0e3df48eda3998a03f969e71b9ef4e6138a3d8fa4b91f60e0fb2750c9abb4e3
+EBUILD baloo-5.69.0.ebuild 893 BLAKE2B 9ae3e14cea0e79e92f6aea5bd04dcfd00068b866351f0aa09cb1ae64f8359e67341935e6dc330385df0338073ac6e84072187dbd2675ca85c2c3a1fcc664d475 SHA512 9bf12a1bf1b7ed19795e401633443cb77a9376b534cceb022441d11956e92e56b32e52f8f7a6904b7a6d8af4cc47deb25f37289ec8b8dbbbfe87e84d1bb9be19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.64.0.ebuild b/kde-frameworks/baloo/baloo-5.64.0.ebuild
deleted file mode 100644
index f66a05dd55f0..000000000000
--- a/kde-frameworks/baloo/baloo-5.64.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${PVCUT}:5
-	>=kde-frameworks/kcrash-${PVCUT}:5
-	>=kde-frameworks/kdbusaddons-${PVCUT}:5
-	>=kde-frameworks/kfilemetadata-${PVCUT}:5
-	>=kde-frameworks/ki18n-${PVCUT}:5
-	>=kde-frameworks/kidletime-${PVCUT}:5
-	>=kde-frameworks/kio-${PVCUT}:5
-	>=kde-frameworks/solid-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-db/lmdb-0.9.17
-"
-RDEPEND="${DEPEND}
-	!kde-frameworks/baloo:4[-minimal(+)]
-"
-
-RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
index c7b655229de9..1e140d9e7e35 100644
--- a/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
+++ b/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for searching and managing metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/baloo/baloo-5.69.0.ebuild b/kde-frameworks/baloo/baloo-5.69.0.ebuild
new file mode 100644
index 000000000000..ba93e6eb57ef
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.69.0.ebuild
@@ -0,0 +1,35 @@
+# 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-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 624250