gentoo resync : 20.01.2020

3 files changed, 3 insertions, 93 deletions

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index ac089798d1da..986b8de3798b 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,5 +1,3 @@
-DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
 DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B b02248ac51c4593434f234b574c23c68fe6777787451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d SHA512 9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915
-EBUILD calligraplan-3.2.1.ebuild 2451 BLAKE2B 0dffdccaafec994cdeab70b41accd6586ec848869a574e79aeee7a1a62d9fae8342d3411c4de2ed9ab3363638f51333fc8d8280e7b288cf738e187cae9e882b6 SHA512 131372915c9a45d45519840ad8c3227ee774910494ff632724f26b7bb12050ef06a6807cc0a00b9eb1ba41854c255cf72589dc4249d80c12d3068a1414eba39e
-EBUILD calligraplan-3.2.2.ebuild 2453 BLAKE2B f8326c8f691db08c9c7045e4f37f6680086c2a5bdbbff5e633173a0936d827e03656ab8485038de4dec65dd0c45d8ff3c7cd7298d3e22d00b0a95d41f775ff2e SHA512 f3160ed5c5c05190d84bd5c4d9f09b9d23ebba17f13ec339d68220c752c81d8d7cd3bbcaf949231b27be3e7f78b3f89d19bdc88c4e4db4152edaec8f8e9fd23c
+EBUILD calligraplan-3.2.2.ebuild 2451 BLAKE2B 6bf7d239e8d1955a4a33af9d6eb1256f5d1a3d9e3d4cfadf30e653b0179cbac0cd33eb6f09b6aa363c0eaed8e57bb52a2e3baecd5dc0225190c830684bd07e0c SHA512 fb291924401c6af560693f7992610abc731b3ea6eb812786f6e11ec836b9844b43ee7949eb4db4077f32bb2179db03120ce1f687f4885ec7a473706f5a3eba4a
 MISC metadata.xml 649 BLAKE2B 24dd20d4a19187e71952aad0d157b7b66adbbd8de24344e2de7aabe714cffd1db1f69f88b34aed13dfadaa62c51b3be7bc057f651d6388a0e98595688db3dc1b SHA512 44d54e0b08e4422a504a0107c73c7cbd2186698f60bc40b2c523d302150de877a86c482edb6b59ac613ef1a4ea2f04f1124ab7ab6e00c42a097a51e55a0a1dcc
diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild b/app-office/calligraplan/calligraplan-3.2.1.ebuild
deleted file mode 100644
index c610d97f9c28..000000000000
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	dev-lang/perl
-	dev-libs/kdiagram:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	kwallet? (
-		app-crypt/qca:2[qt5(+)]
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/calligra[calligra_features_plan(-)]
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package holidays KF5Holidays)
-		$(cmake_use_find_package kwallet Qca-qt5)
-		$(cmake_use_find_package kwallet KF5Wallet)
-	)
-	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-	ecm_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index 45620a30fd04..a8dc309bb5c0 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"