gentoo resync : 15.12.2019

3 files changed, 15 insertions, 13 deletions

diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 1a0473e5a1f3..d8a9558da181 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
-DIST sonnet-5.60.0.tar.xz 287516 BLAKE2B 1500c4e978205a70b68a0f59a4767980544c9f380a3286f2c6072d98cd61f0e986a996df602680e782b46b791e3e2feaf3b6076b56219a3f15ee0d137124a674 SHA512 2dbb3bec5f0999b82a09c9ff9a826cb390dfae55d91f4ae91ed494a41d498ec18a5bfb53ecd95f6b086bd2f0b72f6ffbcc690aefe8de1e2e6694ec8750230441
 DIST sonnet-5.64.0.tar.xz 286768 BLAKE2B 299f69e69415c75c64f38b9114611b2fc7b58d23bccbade2d062a5ce348da9bf1f169d16b7dae2748d86974151f2496bb8cb86a9113f7516d4de549abc0dd594 SHA512 37a2f17de5d47a9966452d95d2a2c82816467a6ec0c6a3318c40847b641310c568d84c6acb99f1f4a54d02e8e4b7f17e76eee36410ad194b0a33170557f1282e
-EBUILD sonnet-5.60.0.ebuild 830 BLAKE2B e59a518fd5e59d4fcf2baaa256e5cf34dd1b5317d4b11fc8c3a66a65d2454a57e49c790d988511d7a17d953a73c786ee547250ce02774ee97ace83749dd0b972 SHA512 3c40c40e077ba2e2310b80c0a602491b1dbc0c5b0441825a49d4a85ea42af43663e274fad7a25a1658846c5796ed2553e130cf6e98a08d9c9a1135efb48c0646
-EBUILD sonnet-5.64.0.ebuild 895 BLAKE2B 88eb940a8db2f28bce56dbc349f60f1078bbb731cd5984a61239835e1c8d1479dadc5972d2cd889b2d16cd6b6ab90163b90699420535dd064b4423ca5770cd9e SHA512 08f083606dc962a87d5a694830de5ea5baebae4905357eb25e60e79b64320d01a387677ac020c2a7ab1864281c89ab1c010c858a1192a0c135d564f9b0e54882
+DIST sonnet-5.65.0.tar.xz 288960 BLAKE2B b4d43095628308b05d452d0561cb14815274897b1710622d989e5d181c3086919c2cd32aa73cf727cc0d6e63be44c34a207e104a3aa13afed465c479ba0d9991 SHA512 37c459d6de59d974fc8a0812d3ce55661a1c85eefa551f8c7a7d2a4b2c37f55b163f7bcea4334f6467cca65cdd7a4dd67b6217c8f167eefc56d9dbac2223e2fa
+EBUILD sonnet-5.64.0.ebuild 892 BLAKE2B 8ac2c881a3b73ea962bb177118414c51b573a73c9ad6b9151dbee16fc0cb6cc14c6097557c4da243c1bab70088b4a9448b55a367071a64ba41b84def35370235 SHA512 14c9a53052808f5a47fb5ff2bdf3d5c95ecafced195de19f771bdf58c0b0fab4a8fe4f401b2b8641743ff3c5f45f81de2881e8a596930cbe3c38ee086502e3fb
+EBUILD sonnet-5.65.0.ebuild 883 BLAKE2B 335a1c3785844bc444c2d0efd0058d3cb79078736d8f3a1d71a9c89da4a14f48becf22d6817c6d53c63931f4d381b47a57bb5f8a4b5e166b6ba6ea0fcc9811e5 SHA512 a43a3c9c25fca5acff93cfe64e14d693d50c234d0eeda0706680102bac4cf4ae64a1fd06b01cdc2ad4a2dce885b68b9608b4fe4cb4f43325e401c0ac656cc05e
 MISC metadata.xml 502 BLAKE2B d76f720d075b51e7bfba2fbf3edf8715f158ff62585596233be3b6d3afb52212e15be4d3cfc4e83e68a52dfe3ac233af1cf82894ce3197016d163f3d2688e673 SHA512 5ffd2a07ba9206a3d6a88970687c3baa068af228e6025cbc662a466eafc0afb3598e390f907b8c334a418394e60f58db07431cd0a85440148f9959be6ea6e0af
diff --git a/kde-frameworks/sonnet/sonnet-5.64.0.ebuild b/kde-frameworks/sonnet/sonnet-5.64.0.ebuild
index bd90ae56be56..4d8eb524eed0 100644
--- a/kde-frameworks/sonnet/sonnet-5.64.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.64.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="aspell +hunspell nls"
 
 BDEPEND="
diff --git a/kde-frameworks/sonnet/sonnet-5.60.0.ebuild b/kde-frameworks/sonnet/sonnet-5.65.0.ebuild
index 512e1e914fdd..6a8424472c39 100644
--- a/kde-frameworks/sonnet/sonnet-5.60.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.65.0.ebuild
@@ -3,20 +3,22 @@
 
 EAPI=7
 
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="aspell +hunspell nls"
 
 BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 DEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell:= )
 "
@@ -24,11 +26,11 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package aspell ASPELL)
-		$(cmake-utils_use_find_package hunspell HUNSPELL)
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
@@ -37,5 +39,5 @@ src_test() {
 		-E "(sonnet-test_settings|sonnet-test_highlighter)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }