gentoo resync : 15.12.2019

4 files changed, 62 insertions, 60 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index d3a63c7c0163..9ae23c413ecc 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
-DIST ktexteditor-5.60.0.tar.xz 2321556 BLAKE2B 908443a648a402b73cf223e63f70165abf4b5c636a3c2b894ce3f3633383f12be1fb41e195d65a9703ab9d17d9ad6cccc058edbffec139db4934dc714de09d86 SHA512 16741e4f6aab274b856fdff42a578f936bd72d5452d88e52e1cf739d6462e461e330b51360f1583fa9c4c1f51998d2ea27d78f9456118bca2b381dda7e809272
 DIST ktexteditor-5.64.0.tar.xz 2359280 BLAKE2B bef28882fc0f7b525eaaa3d29305c6a884af5030a2f319c3bb085c5fd74f81f14353c6685faa7e7d67fbe292fae5f56eb452dbdd4a86cab9c015b8cd1ae788c7 SHA512 6a8f1f86cf5cdc259673152a26c3feb952fc2e5a9227c7a78ae52a848acbe5b60d30583539363ebd59fa744fb428441acdf89581b2db44d54c1896248eb18e99
-EBUILD ktexteditor-5.60.0.ebuild 1402 BLAKE2B 2b57119583107c1e2293bcfb4dbeab4019b442205863034e0299d0b09cccbb30d6487d2abb4df9f346e5857f39aa73f1f8c637c373c6900fe7bf71b28507d4ea SHA512 5ec514329969cfbfab32a3274f9f2ede46a7807254ec712b63b889c65f55113de7f8b6ac73355736656e6bf9d700a26a2d2b96891954aef6ac4ef27455b31b77
-EBUILD ktexteditor-5.64.0.ebuild 1595 BLAKE2B a4020dd8820f90ad8f5347275aab3e1b292f5294ef1dbcf21147b0ed0c4e84fd6ffe18fb1dd471d9b6f010a44447e0774a3e6739cf2911dcc785bb22132ff013 SHA512 cd816f82dadfcd5a5ce2dbf4c80da47ce75d006c15c84e55b99881ff4abca7a13ca9921959cdf1cafa63955a649e956a7a914a779ae4641817198e2346adce18
+DIST ktexteditor-5.65.0.tar.xz 2353568 BLAKE2B 052ebd66daf95e39d8e21dfb716223a05df160eb6bfac013fd181dc50926bd9ff58bdf2924b57c723765548673c6a0c512cd565ce7a8ec8fc3464eb05dbee9a4 SHA512 78239f49155809fd36ac82ee98c7ddb46d95aa1ed972b88b34757e6ae726f03427ade86441691344934da7fcc2f132035c62e19e960e65a026c1e06fb48345ff
+EBUILD ktexteditor-5.64.0.ebuild 1592 BLAKE2B 95966a7d1ab367aa4d282b088e99473af93317b23d2e5d09c9a1603a91e04f515e921bc46c10815f7af0238c55c462839001fa2cb7b7b09be7194ec78bd5c5a8 SHA512 443c125f16c8c4f76b009e9cf6a34532efdc5f36281b7e003045a7f1d9571e83eee325e6d7cbaf9907d204aa1a1a463e522e57775bb719e4e41dfa7b038322b6
+EBUILD ktexteditor-5.65.0.ebuild 1583 BLAKE2B d077704854036dc46bd19a66f07b85d8e8dc5760838c105d592b295e5dcaad6456197526985a42d357cbb5aabe31c98b8590f2392f76b43e25604eb8d0c9a653 SHA512 23e1145c7fd91d1af81ff4d98f261f7c6c0c32b8b466a0b982684919df18c2f037b584f01986a99a9f0b81389d423ef1cc53871504da41859030c627ce248227
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.60.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.60.0.ebuild
deleted file mode 100644
index b41a090b6971..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.60.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="editorconfig git"
-
-BDEPEND="
-	test? ( $(add_frameworks_dep kservice) )
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
index 6d43f24cc3fd..498e30c6e641 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing a full text editor component"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="editorconfig git"
 
 BDEPEND="
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.65.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.65.0.ebuild
new file mode 100644
index 000000000000..7bd5da9400d9
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.65.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+BDEPEND="
+	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+DEPEND="
+	>=kde-frameworks/karchive-${PVCUT}:5
+	>=kde-frameworks/kauth-${PVCUT}:5
+	>=kde-frameworks/kcodecs-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${PVCUT}:5
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kguiaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kiconthemes-${PVCUT}:5
+	>=kde-frameworks/kio-${PVCUT}:5
+	>=kde-frameworks/kitemviews-${PVCUT}:5
+	>=kde-frameworks/kjobwidgets-${PVCUT}:5
+	>=kde-frameworks/kparts-${PVCUT}:5
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kxmlgui-${PVCUT}:5
+	>=kde-frameworks/sonnet-${PVCUT}:5
+	>=kde-frameworks/syntax-highlighting-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package editorconfig EditorConfig)
+		$(cmake_use_find_package git LibGit2)
+	)
+
+	ecm_src_configure
+}