gentoo Easter resync : 12.04.2020

4 files changed, 18 insertions, 21 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index fc0544a2da96..2f5d29180798 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
-DIST kxmlgui-5.64.0.tar.xz 875332 BLAKE2B 08b67d60d504538d3591dc4e9236873008cf8d158344eb567fb5d0f1484514ebed73f2e02fb92685518ae7b34136fe9b27035ac2d3a5b652e0b7b93892c28747 SHA512 07d7991c32c028fe8720630c51e8cfde9917279d02af3ae0ce3f05c55767dc461efe1d4d63bc968fa829f04f00f004a4f8f11d5c71de653fdb001ea4fc84e0ac
 DIST kxmlgui-5.67.0.tar.xz 857668 BLAKE2B dd6b40e2bc4e6ca725c910343299057e5c49e739dc4bb6c789b234302279af58cd224aafedb0a1bd5589244392c0780c3919423c4ab90d92313fbc1d02f724d6 SHA512 57e860ae9cb6c82d691b7f463992147f440f5f89cad14ba770a6e16f6d50347a2575a2fa5a0e09decb7e135ad50720f8762d412072d2d2fe868280e07d861e2e
-EBUILD kxmlgui-5.64.0.ebuild 1375 BLAKE2B 788c14c88f1758f942fa0200e16294c6eed0dd0972fbbf5e4d4027fe05d187fd0990801081c8ec952060ff98e86e666d9011b7bec8e48e4ef892486c527c2512 SHA512 9fb53ead67973a916017041426b18c24d7cd20015ff9dcda3d179ad26087b2c5b0deac07b8340bd9e716f632fba56e6b718cb2adc7f324e6129314682b0a2638
-EBUILD kxmlgui-5.67.0.ebuild 1288 BLAKE2B 82b3010144f141c3a259e47b3798a325efb706246554bd2c0f9d1bdfb8561d767d48c8d40ef00c50e536dffe4ff4f6e0303acff0c937d9b3fe9f015cfc6ae3df SHA512 9175fedcda1a4f4cf774b4bcc16d5daac357403587e906395bb4b1dd392dd360afcb295298f6f0bc74ac124d998d962023f0e66f76c55ed2b20c0330cbef83b0
-MISC metadata.xml 421 BLAKE2B cfb7fbf74b000e0307c956a3ceea0aeca9d772bd660b6891c92cc8dc58d569be446764967ccfdf36752b5b8acb8a1f6b31417a625360133bb517f6072a715a12 SHA512 173d218f5def1b968d5224bbc63213a40468848e5c0ca70cb924d1298e2d1b510edf60e43ce7292d83b7bcf8baa89112cd602520a91bca8670a771a56fa4531c
+DIST kxmlgui-5.69.0.tar.xz 857340 BLAKE2B 568e21202b7078ba2bb84e3052d3262364519dc2ca9df751c0d3d20abb1924c030624630606530207559fd1bbd3e2a4f5a1d8c3c75f3de15f955af99598fae3c SHA512 5095cce9832cb492825d5dbb19d7c1f80b9071ec4022333288c7ed0326ae43f26d8f9677e7a53186454876691bbac61706a214359836b2982cb47efbfdb90c6b
+EBUILD kxmlgui-5.67.0.ebuild 1285 BLAKE2B 4017f3fb0eab9abf2d9e049c0b3d3050d37e886f4a6d8a9fc09874dc72c6f30ca9b398be7e120e86e56361eb9bbadaead4e9dc7883ecbc6f026292c98fb2d7bf SHA512 4e363d9b13c5b6f6e80ad26e80c486040ba649da079a3f6e87276a4a7546912e3c06a4f669368d849c1853ae791e869c4c6ccff87715d3d4396762859301bd53
+EBUILD kxmlgui-5.69.0.ebuild 1288 BLAKE2B 82b3010144f141c3a259e47b3798a325efb706246554bd2c0f9d1bdfb8561d767d48c8d40ef00c50e536dffe4ff4f6e0303acff0c937d9b3fe9f015cfc6ae3df SHA512 9175fedcda1a4f4cf774b4bcc16d5daac357403587e906395bb4b1dd392dd360afcb295298f6f0bc74ac124d998d962023f0e66f76c55ed2b20c0330cbef83b0
+MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.67.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.67.0.ebuild
index 0eb5dbb35766..2ede7f69d19e 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.67.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.67.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2+"
 IUSE=""
 
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.69.0.ebuild
index 8fb4be784bbf..0eb5dbb35766 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.69.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,22 +10,12 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 LICENSE="LGPL-2+"
-IUSE="attica"
+IUSE=""
 
 # 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
@@ -33,13 +23,21 @@ DEPEND="
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	attica? ( >=kde-frameworks/attica-${PVCUT}:5 )
+	=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/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package attica KF5Attica)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/kxmlgui/metadata.xml b/kde-frameworks/kxmlgui/metadata.xml
index 961dc3194f86..a50ada50ef0e 100644
--- a/kde-frameworks/kxmlgui/metadata.xml
+++ b/kde-frameworks/kxmlgui/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="attica">Enable support for <pkg>kde-frameworks/attica</pkg></flag>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
 	</use>
 </pkgmetadata>