gentoo resync : 15.12.2019

4 files changed, 37 insertions, 35 deletions

diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 8c550627aa65..6fe5667526c3 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
-DIST kfloppy-19.04.3.tar.xz 198868 BLAKE2B 66a667b512c2528ec0220012ebd0e8d8d02f5d55c4873ebc88b72ca31a4ddfe36963dcb2e4d772dc16fb19d19526ef08acfe58c33395649747fe4d677afbfef6 SHA512 59a466b82321d021343446c8a7e8c2e6479c1fe74644dd008cf65c44cd0ab7ce414a6d377c73299949b7f32d2341895a8b8c62fa5a1aeff707d44995284e26bc
 DIST kfloppy-19.08.3.tar.xz 198760 BLAKE2B 42f547306ff27bdfa57825812a9a286cdbe786451b7703bcf275ce0827240e3aea5ad734b44cab4d5bcbbd415299cdcec31afe660926182ef0ac53db08d1c1fe SHA512 533542c053b3128059188599cd024ed328a72286919efc7786d4c95fb08c602a966a7497788d046d4daa92473c06c001af6740fd1c00ed7aa10860ac1083c335
-EBUILD kfloppy-19.04.3.ebuild 748 BLAKE2B c47cf6e315a95106f6f4fe15a9fbe1fc70c48b0d5327269a82936c1fba16a6f89ae0834197108dfbe87f958ce7430df34ecb9c5d28363066c068ccffee11f41d SHA512 3e835275f2c4767d2c39b98ba47143cc2a928ff873c88800224ae7f11dc720cfd8938ad7c01ca5404c139f2e68e856364f31ed3e3c930dc5171e4f41b6f40e11
-EBUILD kfloppy-19.08.3.ebuild 889 BLAKE2B 608d7dd83da28b4a508b5a08c0b8c165fbe83076c7a49c408d475e3ac66064185126ebb2e3435b32f5d4a15ab8b78c665312298ad201929ba895c56433fe0efe SHA512 2a484f9429e0306d037fc83cad4a875179e2f92a98acc371fcfec68280575e8f41faf32d6bbe7766862425763a92e8e7e79bfdca32efac741c1c054a888718c1
+DIST kfloppy-19.12.0.tar.xz 199308 BLAKE2B da1741d4c9de25825ae2f9aae280f73c79939fb6ad06363313d3e7d4953d4cc7cecbfe8b46dbea981f3f3cc19d125776ed0b9f7b708a64a93154db32e983ff56 SHA512 c252fdd33e58c621f2cf63c54b5f81451603c301841b1498aadba6fee205a164d4a647a73fd199a0877f6408a0a4445bf36e0b32a557d953ce06b206660c486c
+EBUILD kfloppy-19.08.3.ebuild 886 BLAKE2B fa19dcfe18c6470ac26fd6a06dfdd6341b2643aa35a66625bc0e4a9628306e04cae57952912a3a4ae86eba69560c78f66780d477697524a42e5901537e16c4b4 SHA512 242a8a923c673d89521d8a1a4b2c50f1f780726fbdbad1042c41b8251c7c52438dfd23044e1a4ba32ceba4bf828779e21634c6c6c6ccfbbda3b7696204129215
+EBUILD kfloppy-19.12.0.ebuild 892 BLAKE2B 65591ad55bbf3c908f2e4520655c704a29919ae90fd0d2f9236b6c5bd9dbe75bcc474fe61ce26d08741fdf4d8394540f15e803d1d70946848f5ee06174e47eb9 SHA512 f8d260dbf0f4f4d90a5fe50f74c6772921f192ddb0167e5df01044fa6c7dca3b2c91fbab76af45d41477d8c163853eda85d647cda896f0c04c27235a2f31b6a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-19.04.3.ebuild b/kde-apps/kfloppy/kfloppy-19.04.3.ebuild
deleted file mode 100644
index 4474b1825f0b..000000000000
--- a/kde-apps/kfloppy/kfloppy-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="
-	https://kde.org/applications/utilities/kfloppy/
-	https://utils.kde.org/projects/kfloppy/
-"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/kfloppy-19.08.3.ebuild b/kde-apps/kfloppy/kfloppy-19.08.3.ebuild
index f533ca8c7e10..00bc8f5354d2 100644
--- a/kde-apps/kfloppy/kfloppy-19.08.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-19.12.0.ebuild b/kde-apps/kfloppy/kfloppy-19.12.0.ebuild
new file mode 100644
index 000000000000..940b6a23bc07
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kfloppy
+https://utils.kde.org/projects/kfloppy/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"