gentoo resync : 15.12.2019

4 files changed, 50 insertions, 44 deletions

diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index dfe9ea340bb0..c45c56901474 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
-DIST khangman-19.04.3.tar.xz 7120720 BLAKE2B 57ca23fe276186d692268e9100abe70a26afd25f637e784cc878033fe5ee959783dd62f484ec4f68df9ca70dc2f4aefde6ecea2be16a023371101d7d5d9b525a SHA512 986f2628ca9c5c6393ad0b563ee422375f7b888a9f3549ce32ebca61b831fdc124b48afcd293ba1308c2f8242199ccdbebe04ca934f5f1395e55761cef0d5198
 DIST khangman-19.08.3.tar.xz 7116224 BLAKE2B 60d777b920139a40674a53c0c8c8bc368bb600d7a5b005d38e8c35e5087592013dac0e4bcbe71c0221c3671a0a8c194be3e5ce55e9213cd3092e19d094913841 SHA512 c2b389caf6858205de6a30f77c7423e9cc7da59bac20ae0dbc8efe267363ba9e522ed3f985ac78e818d68e18f19a9920419bfdb059acc77de93fa7139777ec1e
-EBUILD khangman-19.04.3.ebuild 1039 BLAKE2B 3db83d82f51748b4c37c4823988409b7dd32902ce5bdc322a55647a1c7875c72ca1a37cee7dd3841d467e3919d23ba05650e1f593a899984a9116ecdb02c37ee SHA512 74f9230108e25d3efdf0ab7046e6e8ef1c1b749a0dd052af71851cd34b174f613a263eba5fd4167eb572d5fcbdbdbd00da4cc371cd2b8bb9125716faa6a7a8c0
-EBUILD khangman-19.08.3.ebuild 1255 BLAKE2B d49f9f863cd1b3259759becdb4685f367e6de85b7008e9d87f1af41fa529c1d2c499c7058606368da96316f13fbc9ae520e5da8d47a9b0ce4a0968df3f665263 SHA512 ed5e16b35d577f5a5050d26555b3dbaf180c4c368d07d06c6518ce2c446bf49cd404a35d7f6c735c88c7fa60a94274a7a944e67347035efb288d1a60ef9b3fe6
+DIST khangman-19.12.0.tar.xz 7118956 BLAKE2B 9194c7cee12f9a36b0f144868bba97e8e44a8c0b6eda4ce5d18943d1eb01fc2fc9562a3f0253839d8c033423f78a33a9a21c5c097be6b6d5e11fa73256d85f30 SHA512 888a0bab58ce28c1a1542b30c48a6767f0f92dba61b30682bdb6b3918c78af0dd528ffd836e818c49fb204608db6ebb750474b4d3edafbbef00b84068d9ad496
+EBUILD khangman-19.08.3.ebuild 1252 BLAKE2B 42965df5a89a25df3ce7c4fff2039d90056c3474d11fc673962f34b1d21951f27596189fdc62712dbee960604bf044aabc93d7e45ce5e55e9959885b2c52a9ca SHA512 65c1d07db7de47042ab9a38de06b36e1d1c9dd389b2c41317f945e974524065a3364f2cc1147b274170b647314bb2f2151c232a7456e6d927826aae704623b0c
+EBUILD khangman-19.12.0.ebuild 1264 BLAKE2B aa2f520417a0b3da04ad5e3fa63635d5f5c017d260351a39c6dc3f1c5a8a54a068fca6216b900265026e76b51d1f9a6698ec14f35458a859ad15febbd02dc570 SHA512 a7e03dab2a6c478a95ce7dbbef1f15121cf0716694c3d59c8e96004a3b35155f51c2a15c4fd02dd43f754419ba2a06b690730d86a235a7fe28bee9b45d40ac3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-19.04.3.ebuild b/kde-apps/khangman/khangman-19.04.3.ebuild
deleted file mode 100644
index 68a18301215b..000000000000
--- a/kde-apps/khangman/khangman-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +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="Classical hangman game by KDE"
-HOMEPAGE="https://kde.org/applications/education/khangman
-https://edu.kde.org/khangman/"
-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 kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtquickcontrols)
-"
diff --git a/kde-apps/khangman/khangman-19.08.3.ebuild b/kde-apps/khangman/khangman-19.08.3.ebuild
index 44f7bccd45ee..5e6d4d6185fa 100644
--- a/kde-apps/khangman/khangman-19.08.3.ebuild
+++ b/kde-apps/khangman/khangman-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/education/khangman
 https://edu.kde.org/khangman/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-19.12.0.ebuild b/kde-apps/khangman/khangman-19.12.0.ebuild
new file mode 100644
index 000000000000..a5b715353551
--- /dev/null
+++ b/kde-apps/khangman/khangman-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# 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="Classical hangman game by KDE"
+HOMEPAGE="https://kde.org/applications/education/org.kde.khangman
+https://edu.kde.org/khangman/"
+
+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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkeduvocdocument-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdeedu-data-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"