gentoo Easter resync : 12.04.2020

4 files changed, 48 insertions, 60 deletions

diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 6bcfbdf44025..dce21eb23b0a 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
-DIST frameworkintegration-5.64.0.tar.xz 1754716 BLAKE2B a9812b62c8973b5286b06388a5a9bb2f65bed49684b72c56696ab8e5ea7a03b24ba9d8b58b210cfbd06d46a695106d81f22b5fbd6440bc68dc639c5385dbce62 SHA512 7288578fcec9c1fe1d768692380acff00267513e0092361b0c0739e669a86ffde1df96f20e0ce91685df440ae7fcd7786d96fc18c1faa00e5e82d7fc9b8d60df
 DIST frameworkintegration-5.67.0.tar.xz 1753624 BLAKE2B cf70bed5acf65240568aafe7b025db339550abc0226d1f560d24636e4368955028148d9dbdf47afbe2e0f98850c9112aaf7ffc02966ffb48e27814adfc7cb65c SHA512 47ec7ebc2b1067074620a5a9e39f5aa664595569fc2d4a1c591e34e9ac52502fffd51f7707a522bf4028f50064f82dfafe2c6b46faa3b0f212b766e6f2ac2186
-EBUILD frameworkintegration-5.64.0.ebuild 1287 BLAKE2B 8d1d3a1103da52c9d8e8d4e503651e0d82ad338886ee096c68e1965ec3f2ad26b17372b1fd8b20f461ff8327696fc6689c7b3ed405d17e6f9572e31efe4432dd SHA512 822d0ec74e2bd6dbebc5974353648b17f48f8516211b4f63c764ef931286610591a239092ac3dc31c53f614014718567493758127325235f777cf55324d2ec24
-EBUILD frameworkintegration-5.67.0.ebuild 1138 BLAKE2B 7651f1dd6bf7bcf7a92f8ace738388ab47df61e0645fb17d19b3fc93fc879ce2408341d835dec96d38632c2e434596359097da7dc8714f440950ac4cdd27c349 SHA512 8bd3791c5e75a8412b24618852f9b0226d20bcda8f05f1e1d4cffc9a4da9b1b341e3d02fa0fdfda5745c33c6928ed14f6a1382ec512daf3ead49e4334d0c9ebf
+DIST frameworkintegration-5.69.0.tar.xz 1754048 BLAKE2B 8809b3cdf5f2c61d4370266b12c50bb0673ea4a83c8677d44a9d510392e5ddc5b8f2e77e4bd70d5b2de62753dc8661d3f4dd5995bea73f77f59198349715f0e4 SHA512 2c217182a083cc7adde2460716e4ee8cb02a1583d002b5fdbd1e3a570e92ee8faf8fc6520f8debccf3dc8fc143352379054b7a15fad05c21cd658969c5bfdf17
+EBUILD frameworkintegration-5.67.0.ebuild 1135 BLAKE2B 14e7ccb31fa7b2a346e880cf6920b68e3a08a64f1c4d34d831acaa438ea6f7858e3b65b8a1490cf167024af68cde419d19135c9db5a689be28b57e6c19958da4 SHA512 96a570a65dec243e42487ff2727e141f9db54e15935007136c0e4bfa9e9f2c747ae6ed90a64a144c685470bd3d3516c97e0d94446f3e8026ccdd581531321c03
+EBUILD frameworkintegration-5.69.0.ebuild 1055 BLAKE2B 8ef3c662c7a3849e07b9fcab74077b48c03c4e7b29121299246cd9274e45263098668fdcaaaa3421ad71fc353dcdc0c7f532853df3a713c2f1317df07018e283 SHA512 3b86f911a492d71a8ba860b53b7e4278d06fd2461e582d062d017ad59c07b6148aadc8a4e17497c88b202e35994962ae591cd1cd0697f3c91b3d57e325be7057
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
deleted file mode 100644
index d12e52dd57fc..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="appstream X"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
-	>=kde-frameworks/kconfig-${PVCUT}:5
-	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
-	>=kde-frameworks/ki18n-${PVCUT}:5
-	>=kde-frameworks/kiconthemes-${PVCUT}:5
-	>=kde-frameworks/knewstuff-${PVCUT}:5
-	>=kde-frameworks/knotifications-${PVCUT}:5
-	>=kde-frameworks/kpackage-${PVCUT}:5
-	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	appstream? (
-		app-admin/packagekit-qt
-		dev-libs/appstream[qt5]
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_punt_bogus_dep Qt5 DBus
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package appstream packagekitqt5)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild
index b142ab4aa42e..9368388712c0 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream"
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.69.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.69.0.ebuild
new file mode 100644
index 000000000000..a4bb90f9557a
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.69.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/knewstuff-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+	)
+
+	ecm_src_configure
+}