gentoo resync : 18.11.2019

3 files changed, 57 insertions, 55 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index bb4593025605..6e78b90189c5 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.60.0.tar.xz 870708 BLAKE2B 06ffccf8a36e461a2b63ea587e4dc46af45fc9261bd6e037a258395b64f43535118b1dd182f4817261a2af9bebe49baf48eebbe75b9d1545949bd8fcdcd6c35d SHA512 89238c3f58ce39f79aefbf89b7a7336c6bf71cbbc29fbd2fbe98a9c9c2dcd47135a61c50459b90c81c043bd40063b124b57e66cc74347fb491b62ff96992b92b
-DIST kxmlgui-5.63.0.tar.xz 874636 BLAKE2B 377c8d7df63913ebe139d4d8d45783beae6c80518c5896d05bb7a91e937801c7c622137d5f1080758ee6fd4994b64c27bf02756597008cc17aba96082b7d5cb8 SHA512 ef11ad3a1a2b7adf4065d43260277273b5fa0b574e7d1e960a24524e96aa8c5812bd570f2d0b23a9571e018ae53b618c047d3e7947744c8ba0d7fb32d5aa7406
+DIST kxmlgui-5.64.0.tar.xz 875332 BLAKE2B 08b67d60d504538d3591dc4e9236873008cf8d158344eb567fb5d0f1484514ebed73f2e02fb92685518ae7b34136fe9b27035ac2d3a5b652e0b7b93892c28747 SHA512 07d7991c32c028fe8720630c51e8cfde9917279d02af3ae0ce3f05c55767dc461efe1d4d63bc968fa829f04f00f004a4f8f11d5c71de653fdb001ea4fc84e0ac
 EBUILD kxmlgui-5.60.0.ebuild 1219 BLAKE2B 916b1ee2b500ed53505ac09c0b02be57ff594066854a11d3a8c9bc90b5e65ad78d24be71e0b19061ed8a0dd3f8a2dc4ced8f2d8e63f57919cabac78b60f493d4 SHA512 1bfc26b1993d171fb107c91615b586c31009db34649753962f2b86ad3a354edbbb06e07da82af0feb4911a94ae2b36c73baa7df6e1a5e4fbc3bc26c58152be7e
-EBUILD kxmlgui-5.63.0.ebuild 1248 BLAKE2B 886b26acbfc8dc257553a86e4656ea3044093aeabc0c8a620759506ca40181c726f2b4db9684ed2a87fe434b9bbf808978464a477689c85e64748bd149d360fa SHA512 beceb702914e8daedfa492c275997fcf8d0e7ea27a8f2ce976b4e5682e637234211becaf3a129b30b83c886565922c7d004c3a22e3f2489c147def5bd49aee5a
+EBUILD kxmlgui-5.64.0.ebuild 1384 BLAKE2B 7a82d9370bde7515ed340740206bca8b9673fdeb9c91cf4df64acb9b4a52d663aae43b549045cf3d11eefd430c76f7155005a0d6ce0fc870548ec5bc2689e97b SHA512 39be6731079c60254af2e536a9065238a131e9a2d965b1209bf2b4e0ed6327fb70b90342bdf06ec37c9f746f006e15514128068b0ba02f1b6d364b4e020bb22b
 MISC metadata.xml 421 BLAKE2B cfb7fbf74b000e0307c956a3ceea0aeca9d772bd660b6891c92cc8dc58d569be446764967ccfdf36752b5b8acb8a1f6b31417a625360133bb517f6072a715a12 SHA512 173d218f5def1b968d5224bbc63213a40468848e5c0ca70cb924d1298e2d1b510edf60e43ce7292d83b7bcf8baa89112cd602520a91bca8670a771a56fa4531c
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.63.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.63.0.ebuild
deleted file mode 100644
index a1c06dea1027..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.63.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-LICENSE="LGPL-2+"
-IUSE="attica"
-
-# slot op: includes QtCore/private/qlocale_p.h
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore '' '' '5=')
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	attica? ( $(add_frameworks_dep attica) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# Files are missing; whatever. Bugs 650290, 668198
-	local myctestargs=(
-		-E "(ktoolbar_unittest|kxmlgui_unittest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild
new file mode 100644
index 000000000000..637e759d0263
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kglobalaccel-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kiconthemes-${PVCUT}:5
+	>=kde-frameworks/kitemviews-${PVCUT}:5
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kwindowsystem-${PVCUT}:5
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	attica? ( >=kde-frameworks/attica-${PVCUT}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	ecm_src_test
+}