gentoo resync : 02.08.2019

3 files changed, 2 insertions, 46 deletions

diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index c0cf848675e3..5f9a08640b0c 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-18.12.3.tar.xz 225324 BLAKE2B 04432c5a7b65087ff037ae0b0231445830782fe1f79c77f33c0f25af5509180d00855803f33661af230eacb19be0fdcb33aeda157a12cd1ef659b40cf3bf6088 SHA512 aaeba0398f24389e4371deef583688b9349b5aa248ded914e62ba3a690b99963d7b4fd78c990123fbcc8656e5ac49ba874a4fd81827f3c862f7401c54924e285
 DIST akonadi-calendar-tools-19.04.3.tar.xz 223328 BLAKE2B 47f16a483f49f27d203db3b0627532b7b928f18bead7e22176b340698e7c2e52322139ca92cae9a776b239d9d741656ec3c943eb997c1dd5064da4d818610474 SHA512 d4c61f04861b26fb01b0cd76056fa5107e0257e7b2c118596ed40d87a3cffa8526889bc82b45f9d3cc61d1d4d25518bbeca56edaa028d02f779b7880df2522e5
-EBUILD calendarjanitor-18.12.3-r1.ebuild 1047 BLAKE2B 242b77640991ab3531eb58ee41441f4c0ba8792cb4e733b74a3de8228908ea96eee29129050031b85dd68686f67f868cd763f4fcfbbb6ef0ae14040da5d33c7d SHA512 140eb4d5488d6b9b27657b9b6ceb0003b004604ebc801251a1f8c034005f53ad2c0bdb0858935d72c239c81b5d216c020a1ee1f7ed1de7674d99e8a8c67db0ac
-EBUILD calendarjanitor-19.04.3.ebuild 996 BLAKE2B 41f0567f31710a91d529a69299ce024d9de78c822aa4590d0af8a7ce69527728b9ab0c9fdb0ba7d8fefeb7cc6e5a82b06453f37a43628c020be469970c443341 SHA512 647fe5cc0568fc2eb1b0bdb3de7e5aeaf47dd9e3c706d4aa8ab3f10a9918d8b8315796095a2f9bb1b57f1b9675ade6fbdb0367f8845ef19922a1338bb4fdcaa2
+EBUILD calendarjanitor-19.04.3.ebuild 993 BLAKE2B bccab9d221cf58e5771a0e5f26ddeefd84fa9eb330badaab0886dfba9add5eb137839d9aa596c3ae0552ea1615560017b351126c2c86a3791c2fa52a10acc876 SHA512 039f660706274f490d1ebdf4c761ada31fe03fb215da07c1c757c6d5cb71ad3de5396bdda1d6b6377ceaac1b09a8f45d6dd58b3c190089b6740ce8f262375f0a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
deleted file mode 100644
index b412e508151a..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="false"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.04.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.04.3.ebuild
index 64de5e99bad5..4bfec8f24667 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.04.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE=""