gentoo resync : 15.12.2019

4 files changed, 69 insertions, 59 deletions

diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 40d08eedd3fb..e0b9f59b31c7 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
-DIST ktouch-19.04.3.tar.xz 4947000 BLAKE2B 6148566525f9839dc93fd5365c426007568bda2bc0a76c86639ebdb27d62778d843b5cdfae65880f9f55114389add213077c15e87714e29d0a2644ed353034ca SHA512 499caa202f3e08d85240c0cb2b0099495d37c8c285701d5ac0834fd6a30a78b3988677577c5d21e24bf68a3ee22735b145f340794e5860fdb193c964ded49a34
 DIST ktouch-19.08.3.tar.xz 4937064 BLAKE2B 5098fb24c08e4343320deef501cbd579b575f81797f22bcbce914112d1e4ba1e83e924c8ddb58aa6066aa1a23dbfb8f9b2f451c7a83c960d54335cc950551823 SHA512 934680eb3f43f31ca04058a50b181a1cd6bcc5a9657bc5203c947e05a35706722aa023ce717b6ab4a4b5dd388e91682aee06b2cc1de9ab2030e9437e00ea1176
-EBUILD ktouch-19.04.3.ebuild 1350 BLAKE2B 21eac1d880d87bf0710157c266f305d2a2f6c2058a3fc55c841eff4b904edbf426fe1b3d5815ba7d42dbe705c965d5fc5cc18fb93930c90afced7e60a7d9003e SHA512 b424e35f1bf4d70e56109d3845b7b8b53a3fe3cfcaf71cd1b6fcd0629a62faae800d8122b5a1aa8b55b81d1a21da3f8638800441a3f2101879e9778e59d0f26b
-EBUILD ktouch-19.08.3.ebuild 1663 BLAKE2B 974060cb46c8554ac6cfc72b16fea7d88e437a29be0274bc82d8dcc4c3a63677b3e640a1bd907bf1cf6b1f67dcbc178c9001eb94f7e9c84e6f2120e2d2927906 SHA512 965368e6f6f1f5ca78e83f147432050358329a7d64f34039e9a8741c445214d532f3441b03fba16395b45eaf9c13cc38542bf9748f3fdb0d921753481a2161d5
+DIST ktouch-19.12.0.tar.xz 4935588 BLAKE2B 9cc9cc140347e059f3a217fb43502f68b9028e0ea1829a338db79f76512af3a5441a6a44788ae8e800bc51512c3efcc2e13902fb16e0a88bbdddc05f4c031cfe SHA512 19fcd2987547b8383ddfee4681c57ba402e5e7e5be2d3e97bbfdf7cb2ec5bcd55e2dfee3ba9a2f5602cf9d37f90f970b036db5597bdbe9e5b1b969e3cf2e21e4
+EBUILD ktouch-19.08.3.ebuild 1660 BLAKE2B ce8f4a4d3a38b150a9f36e7cdd39f8149a22f0bcf11a1dc35decdcb1fcd969454bf2322f033daa158be0ec3eba78040ccd5f12b919d80ba29ca0256d0174cf66 SHA512 d65e6b5d335c5a1f17ff9bed709ee8502c9328a2c7c5ec2a41d899a41251cdc4e8fbd60b4d3e2dab3f05b2197a2680d3b53a8f88e003c05320d737afb2a2a7f4
+EBUILD ktouch-19.12.0.ebuild 1659 BLAKE2B 8d1cc0519eb9e14f38e5adf667ecdecf9b01ab3825e356d2f19d25e67268db1e81dec4847a74f0b976a524cef61148afea87ceac485031f93c88d042b22f7b02 SHA512 8c6d36ee03d0acdde7c8e14c3aa388dfa5d8c5ff101a0bfcb4b3f8f5f94fbe6bd6210800c06fef39b8710e8234646f1699dd3addd8bdd63933062bba4aa53f0c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-19.04.3.ebuild b/kde-apps/ktouch/ktouch-19.04.3.ebuild
deleted file mode 100644
index 6fe816fc0ed2..000000000000
--- a/kde-apps/ktouch/ktouch-19.04.3.ebuild
+++ /dev/null
@@ -1,55 +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="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://kde.org/applications/education/ktouch/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-# USE !X is broken, https://bugs.kde.org/show_bug.cgi?id=402902
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kqtquickcharts)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ktouch/ktouch-19.08.3.ebuild b/kde-apps/ktouch/ktouch-19.08.3.ebuild
index a1a0c243f967..3b388fd9ed01 100644
--- a/kde-apps/ktouch/ktouch-19.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Program that helps to learn and practice touch typing"
 HOMEPAGE="https://kde.org/applications/education/ktouch/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktouch/ktouch-19.12.0.ebuild b/kde-apps/ktouch/ktouch-19.12.0.ebuild
new file mode 100644
index 000000000000..ae683a137663
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-19.12.0.ebuild
@@ -0,0 +1,65 @@
+# 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="Program that helps to learn and practice touch typing"
+HOMEPAGE="https://kde.org/applications/education/org.kde.ktouch"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb[xkb]
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kqtquickcharts-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCOMPILE_QML=OFF
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}