gentoo resync : 15.01.2020

4 files changed, 79 insertions, 74 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index c1d5d069321f..dd7632ac5fcc 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
-DIST discover-5.16.5.tar.xz 10453308 BLAKE2B 03d497f9dd1685a356081bf43228c5859d80c40f3b45616e9919f6b3a50e193ca608a14e3175168c77d9b5e234e34ab4eb97c2294a366e47328044bdea98b231 SHA512 69fcfc9f8576dc5933f4e0c36ac25c518e2cd41158c5c171f760a4cd883018a6dd01ffa8984c80e5002830d6b9d706abbb7cedf3d2144317e482404bb821055e
 DIST discover-5.17.4.tar.xz 10449080 BLAKE2B 3e1163316f24bc3943d599c7e7f52537d54f5a1df252de5bffba0f709626c78025dd3dd56885c885a910ea7f7689de98e597e41a7d84b3cc600ff6ac57390b73 SHA512 a31df976ce053c898e22c9f3b9c8f06e461a785c6fa6048cbca51ee0d08597f7e300dfde8132c5d1d326d32476abe09d5637ae9b0e358c03d310d939bae19736
-EBUILD discover-5.16.5.ebuild 1651 BLAKE2B 4c219c7744eb168fe5579252b91e6fe93cc34baadb5380d0e5c208e32dfa72988b200b6742bc991b880ff9d7c5d71d4e2f62d78b536d8ccfd8fe288e18035f60 SHA512 dfb64f708a743d666754be397b2f682716b4e4c95b70db2cb78749d4370ae75d0e9c9dab034461a14430b507d948a2367f38421275c9429fa5ceebee909cb71f
-EBUILD discover-5.17.4.ebuild 1886 BLAKE2B e2d7be8a9177131e2b15f6df88eed3be68e17be3fe20aebf9f299bfe77fdb386db6aea054635f5dfa39d75007a17e0552e8455b22ae2733002d6cc3d497887a8 SHA512 24a4a85620cfde0cede8d92f0b2d1d26b7da4dfea7d4a73d1dcceefc13fcd0f92e4ca5a5cd6b2f57b0d2b16e33f7ed4ab1e8664e6bc19e53885ec5db906774fe
+DIST discover-5.17.5.tar.xz 10449596 BLAKE2B 473a93fb66183253c814932e86be7d5a5f454a6146cd202cb2b43d60223f8e15370622b3eb572c27ce041c8fbd9f095ce9733ffa5464d386bdd419cd80db2e75 SHA512 8d8d6675a894f1f50094021f93d38b7bc6d2927fb8434c002e816c1c322ca25134cd73a1b9fce22bb07ae091ccfb156c22399896f47ef1223b8233febb45f866
+EBUILD discover-5.17.4.ebuild 1883 BLAKE2B dd3f66ad19a5c9a7650953fcde74cadbffec46769e18f229e136e3600188db26ea1fa422e0857f0ae6d6fd0eeb737c95964b4a478f0a393f0da1ea6381f6d229 SHA512 92bb09c3ccbb43497c6736b8ebc202c8af8b6c4e9146ae3defb1e7c6a8ba87a8d69a8ff09217b6c3ba5860bda2febf4d05a82f5f061f8319ca1dfb4cc2031020
+EBUILD discover-5.17.5.ebuild 1886 BLAKE2B b9fc9249564b858d8bdcb120022393d90bbd9985598c43cb6d43631b01fcc7bdb548ad7ca3be8fc98df657ee557eef3daa5156d8bac582010b8e391a5ec845fe SHA512 f21f7cd0db8d8528785f6d2f528a389f211e28428901af16558f70ceb77a0510c137876478831349b3d1c94203c3b873d75d3fb945b858998e946830d7825308
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.16.5.ebuild b/kde-plasma/discover/discover-5.16.5.ebuild
deleted file mode 100644
index 5cc9732e0482..000000000000
--- a/kde-plasma/discover/discover-5.16.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="+firmware"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kirigami)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	firmware? ( sys-apps/fwupd )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# we don't need it with PackageKitBackend off
-	punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/discover/discover-5.17.4.ebuild b/kde-plasma/discover/discover-5.17.4.ebuild
index 4e6efe95f7d5..ad9b9eebf7b2 100644
--- a/kde-plasma/discover/discover-5.17.4.ebuild
+++ b/kde-plasma/discover/discover-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma resources management GUI"
 HOMEPAGE="https://userbase.kde.org/Discover"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+firmware"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/discover-5.17.5.ebuild b/kde-plasma/discover/discover-5.17.5.ebuild
new file mode 100644
index 000000000000..3e920f4241e1
--- /dev/null
+++ b/kde-plasma/discover/discover-5.17.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+firmware"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=kde-frameworks/attica-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	firmware? ( sys-apps/fwupd )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_bogus_dep KF5 Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DBUILD_FlatpakBackend=OFF
+		-DBUILD_FwupdBackend=$(usex firmware)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}