gentoo resync : 15.12.2019

4 files changed, 47 insertions, 44 deletions

diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 637e0f2fb1f2..67ff3c5f71d9 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,6 +1,6 @@
 AUX kruler-19.08.3-qt-5.14.patch 1395 BLAKE2B e46ce5ca3e4540a8776e5df5ef478abfd6a12d22551d3180c7ee6efe29fb3036020ffb6d512d26651c92aa8b7f3667480903ad81d053c005fd4acf665b29f1d0 SHA512 bd88002f2f5d40861cb8b63bed31a1f541fd11c214c116b1b8a4ef2fa93fe997f8be672c5af5718ffcbd0222d449b898ddf64c3523accd186006cffc9a65d9f5
-DIST kruler-19.04.3.tar.xz 249128 BLAKE2B edd73d76e299defb832631fb5052bdfb1a748d09d310ceb1b74fdfc91e1fe02b967cfb3773a4a26c817293bad9805d29a9d4775f1982288ecad7ae431905e0e4 SHA512 fc4d2b621f8e4aafb742848a3a58da77c3fa5a00ea91d347df588cb8f9da69a0c92028133e5f87243b2fa148318a47b213d392f8fe8da5a0ce876e4146502511
 DIST kruler-19.08.3.tar.xz 249500 BLAKE2B 49e857bee9076f6f4abde7c719b9c4e7a55d50d70d9beef76ad6e31826aed44c0f66accd5b4ea80afc9543459e27f793973d82930dd0f400ca507b69f9ed51a3 SHA512 25e146e941f6eaf04e4f93cffad0fae777345800f1b80127e39f3701660d4c0f2839d152a82c15b8e5ebe9351a41974e139223984fd6cd99f49b7de36789d139
-EBUILD kruler-19.04.3.ebuild 843 BLAKE2B 868cedc5939f99946af58058f5406d4c1ce9a29c0b43d0dea91413835562ca8ad2a1572c1c67602f610fc89415006718ceb8913cb5ce92b02e3f1baf1ac925db SHA512 4a87985bce986263d821ae5c0b94f1e0152c18f420501d17d6213d8a7b1de6ab3f9c439405cd6f9018d86c70c605a37b08e696fe96e49e7b21146cd93cc967bb
-EBUILD kruler-19.08.3.ebuild 999 BLAKE2B 8e1080aab6ef1b3f8dbd3dfcc2b70b16ea34cbe25c62889666f08a461497d61629e4a34dbd9fddc85992808bbf36b606368877414d7c9aec4682ea4beab3b26c SHA512 1910220dc29e97e447bf31346b41f1537e35428b8257f68bf1cbc3e1d45aa4f1d08070df50e94868d665a4c249a9ca57c53a4e0420c0c33e41dcb38d9dc1a448
+DIST kruler-19.12.0.tar.xz 250480 BLAKE2B 0a091d06f272d044fc8c9be7c2a697c1d8ce4bf9efaed871e2a4ce5a9da2c85ffa70572982467ed0a99ff1e9b1c686dcf94330ae2d8485e1fb345cca120101d2 SHA512 696019c062c17b3f9e3d152dc0ccc63afd2a0fd9b4f578eed4a8d5f01e4d4d9f23f2fb7e849068ec360f43dba9586be83efc2c4d479c19c561a50d0d8b8dcb59
+EBUILD kruler-19.08.3.ebuild 996 BLAKE2B 61f9f1114acbb7466a72b1d96cc199971e4b3594832313b6404b99afd673a75eec5b3fc8203d7f9137b99aea47218a468f77b6ab48c42cfb6867c5cae23b99aa SHA512 98732a4cacafd535b720874ffee9b5079073b61debc4c5c421897aa50570f37ec1e31588bb11e4fb08f0a51f60fc832a6984be967369c924941c3a232788773b
+EBUILD kruler-19.12.0.ebuild 954 BLAKE2B 0e2c7c0df4e169ca518c88fb6e3421826651c9a996f7f08535daf18e9f983a8deaaf14173e62563f1b40b3bf8bbfe150fa21558afb3b73d9ef34db54f5324b5e SHA512 59bdfeabe4e85e4e519421cd7569d8548b450c5492f4d595452d9b1819e970353acb32ac8b32b800d589133136e59886ec7a790b8f3dc3522b3df8a3dc07bcc4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-19.04.3.ebuild b/kde-apps/kruler/kruler-19.04.3.ebuild
deleted file mode 100644
index 3b47572626c0..000000000000
--- a/kde-apps/kruler/kruler-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="Screen ruler for Plasma"
-HOMEPAGE="https://kde.org/applications/graphics/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kruler/kruler-19.08.3.ebuild b/kde-apps/kruler/kruler-19.08.3.ebuild
index ae9cd336b7d1..3af08979d5f1 100644
--- a/kde-apps/kruler/kruler-19.08.3.ebuild
+++ b/kde-apps/kruler/kruler-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/graphics/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kruler/kruler-19.12.0.ebuild b/kde-apps/kruler/kruler-19.12.0.ebuild
new file mode 100644
index 000000000000..2b6cc09da8c6
--- /dev/null
+++ b/kde-apps/kruler/kruler-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"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.kruler"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}