gentoo resync : 15.12.2019

4 files changed, 44 insertions, 39 deletions

diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index f161a88034fa..f59a455b8006 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
-DIST kmag-19.04.3.tar.xz 671144 BLAKE2B 215b7a893a0dd531a0a420e619446c71fc17841ca32fdd27a53b474f77bf4297bd4121a5f2389e2dfc2cc930ad76f249d5a76b6c61884e8b73dfeffbe3daa12b SHA512 d246e747601719934fcb217e111a9672f77dbfc51e965e6943cb2451524ffeb425c422f15ea67fa35ebf218a0085e0e61a4551546af73c623889afba333158b2
 DIST kmag-19.08.3.tar.xz 673556 BLAKE2B 1a43c25c807d9044275923b21b95526d6596de33c8105644384157c03efdaf45fa460851361a4f6e8efa5b830cacda73461867127ff865281b95050c00d3ab14 SHA512 d9ee8e1a12d0b1eb9e20923301094eb65bfd680676e57b4e75fe07448d5490bb0836694eed807b6b555ae119576367d15ef8bd6b4b9db011268ce4f2d2a3771b
-EBUILD kmag-19.04.3.ebuild 830 BLAKE2B 7c6c870baa3578391b9e6fdcc2306fd4223fc2cb081371ca3a65d66393f1721fd665fb9c545a37e1434cd27de6a77035f51e4644ba9edaf56679593c5eab2fad SHA512 e50832b0ae9c976d9616af2fa803f52153162980dbea8bf8ffd5a2d60e3488c04e81ccf046d30779258181f8b9924a95e514c66c07f0b1a95839d1e3a5da525f
-EBUILD kmag-19.08.3.ebuild 964 BLAKE2B f1d82417e0ad50ffe2f39848c033fccd13f4f2b55134390288a57d5558b0343f30a43abe0c316dc6ce64ea662dab52e46ec2e5ca83c89a3dbccf4570e44ae0a6 SHA512 8304be922025c2ea5b2f03670b4a8053862a5813309bed0ba939ef2a58af96ea3f1cce1661d6519073df41434373257410d8889423d89d9695e3666a6c93a1d3
+DIST kmag-19.12.0.tar.xz 674396 BLAKE2B 7100c8a9d72ecd2fbe6d7729e7363cb83031533af998c0ee5bd060bbd50ecd9bbbe7e3db4303d0edaf1b1069bd2e533d052796a30119b5944de5c086a89b0c89 SHA512 991b376115abcb30c766d4821b83fdcac41087ce7b6c9cc27d864a3aa4690f39057654524ae33a1dbd1070054716e1429d65d2d21706ea81fa27a1633b30e411
+EBUILD kmag-19.08.3.ebuild 961 BLAKE2B 92e33bfef87324ca413025788a65d0fe79882b9815e26951b3887c545b82bfd481d2fd4d73de1f277b74f57acc110e269b4c53307c4df54bdc0f6d7947895925 SHA512 c6c011de0a360e294fb5de172e21d1c89ab91d98d438306741139adbf3f9a5b21b4e99cb6d23834aa43d902fd41962340660340e9c4630d4e8c404e367bd4ff2
+EBUILD kmag-19.12.0.ebuild 966 BLAKE2B 49f79ec967c22511aecd0289bdf7bc8a57a208e44a5fd99891cfdb9b35ec1be2fb97a0a21211d2cf48d975f1078c03b1b2a4ad4d8d4eec3f01b2786b5b79a961 SHA512 883451b851b431bc07b9d2244d5b0e82d167870bec4b8cf794d95b59798a438d521875996a5a62e860c910ac80b736c1cb71153d6426663e328d6197c73d0f3f
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-19.04.3.ebuild b/kde-apps/kmag/kmag-19.04.3.ebuild
deleted file mode 100644
index a49a38e249ba..000000000000
--- a/kde-apps/kmag/kmag-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +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="KDE screen magnifier"
-HOMEPAGE="https://kde.org/applications/utilities/kmag/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmag/kmag-19.08.3.ebuild b/kde-apps/kmag/kmag-19.08.3.ebuild
index 806d9f504854..d0416181a0db 100644
--- a/kde-apps/kmag/kmag-19.08.3.ebuild
+++ b/kde-apps/kmag/kmag-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://kde.org/applications/utilities/kmag/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-19.12.0.ebuild b/kde-apps/kmag/kmag-19.12.0.ebuild
new file mode 100644
index 000000000000..b1a403e4f1ba
--- /dev/null
+++ b/kde-apps/kmag/kmag-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# 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="KDE screen magnifier"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kmag"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="keyboardfocus"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package keyboardfocus QAccessibilityClient)
+	)
+
+	ecm_src_configure
+}