gentoo resync : 15.12.2019

4 files changed, 47 insertions, 40 deletions

diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 03c9387157aa..086dcbde9ae2 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
-DIST kwordquiz-19.04.3.tar.xz 4167304 BLAKE2B de31519763ee5516706803a74d2e203332a6faa3357ca39f9a18fd911f640524c74da07104b01b8cb53a0ef3f3d0e56135fc26207339790281f1e7ebf00a9b57 SHA512 83ae3b4e34de6d0491203f008dab358c23f34301e7d10904f1bb2230a01541102d554c9aa4204160a372ef96e404285dbcb2d9f8a1c25ea7a6ae6fa5007afbc3
 DIST kwordquiz-19.08.3.tar.xz 4174684 BLAKE2B 12c0fce9044be7dea6b06322faaa6974236149c1901ad1d14a46c0bbd5afd32f330a9deaf36a56190b6520a016ac4323b095482bb9e1931ae47dddaaaace9d84 SHA512 2eace5904211f44d6ace73122a52f7b970e16e68e25921087560322989823ef0c518d5e8a0d07c06f59ca87959f92a35a836486ccd20d82d1b5225ca479e5404
-EBUILD kwordquiz-19.04.3.ebuild 1021 BLAKE2B e18848ea0318a589971aab4528653e447af8589256cb871bc433c8888b553d74daa5572de2bf99335f3fe6f85897a78e80385c99eb4ee3383a92851ec2b316fd SHA512 686d142b81515afaa1c5ce8b8444abfe68fa4c15218cb9cbec902e3616d81c7df1fcaded53be4de3e7e128a78e51381b57b43f4b07d2e67db08f369b45e18725
-EBUILD kwordquiz-19.08.3.ebuild 1228 BLAKE2B 6f9c9a2437f246e4d1cecc16ab4bd0e363df944a72d4948dc7b3efe39e452afc4c4d0611228d20273f72251b510b928f074433d7a5e1d54e8dd83a6a8639b513 SHA512 3e6b88b4265d4fd4083b62daedff6148fa961d018702ef4ce386b467b3634598c548d8f638246092dffc22353a4c1510d33eed19bf21407909188bdf77705d21
+DIST kwordquiz-19.12.0.tar.xz 4170736 BLAKE2B c95fcdc3b9835fde7bb0f892f560e3818fbe2beff4b47ed45286bbe87ed0b29ee239a383efa7054905f6253998a36c3b5d343a69918e0ada9828a7e1e288b839 SHA512 55780f68344a0dad9def31d042973601c587292c58b75389ca2d5fafc72eda58cc5668a34dc5069bbb576b19148eae98458ad92b50eba546a9a3c0cfc8f94dd0
+EBUILD kwordquiz-19.08.3.ebuild 1225 BLAKE2B b0947d55e6b6bc80d5e066b066cdb1dc4d24381125307d6e86b4cb2d32c80ed81d0a68a3ca35df35a85cb44a6f21284fef91a05316407b1b2091fce4b72ffd80 SHA512 869789b852d1a18ab10682361bea9b8d2ceffd957dcaf2298ff26bd1da1c097d85406d315dd9091de0ad5b5e7090c595af0d7ad123fa90b8207218ea8d9ca549
+EBUILD kwordquiz-19.12.0.ebuild 1237 BLAKE2B 58b248f57a5230175275a40079b05957eb72082ed5055e682101f56ecf6e0cd073b39a64c7cbefca5f62f07d28ad6701d1b7731e9d84c8194591330ffbd6f702 SHA512 27f24f5272686ea0a41f0d62feec23ce4ee9e9879380b873e1c901857b2154bf7db740de88dd573e0e17b3742954356d4082a2328d18ee09b49e9d740f74904e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-19.04.3.ebuild b/kde-apps/kwordquiz/kwordquiz-19.04.3.ebuild
deleted file mode 100644
index fa440ab84598..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +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="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild b/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild
index 42f2d271ea06..ffa8a7dc3b2e 100644
--- a/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Powerful flashcard and vocabulary learning program"
 HOMEPAGE="https://kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-19.12.0.ebuild b/kde-apps/kwordquiz/kwordquiz-19.12.0.ebuild
new file mode 100644
index 000000000000..aefbdebe77b8
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kwordquiz
+https://edu.kde.org/kwordquiz/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkeduvocdocument-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND=${DEPEND}