gentoo resync : 18.11.2019

3 files changed, 77 insertions, 72 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 5a36f2597233..ecf38a2175c8 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.2.tar.xz 10448116 BLAKE2B 884e37dd77a8b275817edceac5f2eb22b9243c1d836997ca1088c4407123c2bd2359f096096d55ee706f321abb07fcf3932e3557d03f2de67f0a00bee51e9265 SHA512 4526ad1bf17bd24dada6c4f5a9cfc88fcf33fecd1009d1cfd77a281a5c6f132e7b41e464f170a3e1a92a164d9e9027cbe0072966ccf07d637796aa524964af82
+DIST discover-5.17.3.tar.xz 10447620 BLAKE2B 2d9357e40a2ef3a2c5e18c2989502accc4689591c947e15d3dcf4c7c4a1936708fd57b190f3fa02e30d43da7e45c352870294a9f7a8cedcac7fdbf3563d6aa5f SHA512 9a8b59c42d14647cf14ff7a4ec83f719a6122f937f190e32916ae8b89e5d934fb8b4d21dbb3b4d1763718e1d0329d051ccbed529f5e6f61958290ce1ac567833
 EBUILD discover-5.16.5.ebuild 1651 BLAKE2B 4c219c7744eb168fe5579252b91e6fe93cc34baadb5380d0e5c208e32dfa72988b200b6742bc991b880ff9d7c5d71d4e2f62d78b536d8ccfd8fe288e18035f60 SHA512 dfb64f708a743d666754be397b2f682716b4e4c95b70db2cb78749d4370ae75d0e9c9dab034461a14430b507d948a2367f38421275c9429fa5ceebee909cb71f
-EBUILD discover-5.17.2.ebuild 1654 BLAKE2B a654cecba7799c95c1c447863ead8cf6cd3e470bd6a928857252adb71e5e837acf6935e29eaa5aec789ccc3e5af60c5aacaeb8d16a7eb0b3c8391adadc307016 SHA512 1d8c74b715eee55f7e9653e5625bc106a164991c9496b99bf2333299573e3950513619a74a38ab62ca3f00add2b689709d901ce9f90e19fa84724a4ac9d6fd04
+EBUILD discover-5.17.3.ebuild 1886 BLAKE2B e2d7be8a9177131e2b15f6df88eed3be68e17be3fe20aebf9f299bfe77fdb386db6aea054635f5dfa39d75007a17e0552e8455b22ae2733002d6cc3d497887a8 SHA512 24a4a85620cfde0cede8d92f0b2d1d26b7da4dfea7d4a73d1dcceefc13fcd0f92e4ca5a5cd6b2f57b0d2b16e33f7ed4ab1e8664e6bc19e53885ec5db906774fe
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.17.2.ebuild b/kde-plasma/discover/discover-5.17.2.ebuild
deleted file mode 100644
index 3de7eec2f778..000000000000
--- a/kde-plasma/discover/discover-5.17.2.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.3.ebuild b/kde-plasma/discover/discover-5.17.3.ebuild
new file mode 100644
index 000000000000..4e6efe95f7d5
--- /dev/null
+++ b/kde-plasma/discover/discover-5.17.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 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
+}