gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 123 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index f995ad69b4c5..155b40bbde1a 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-19.08.3.tar.xz 4728620 BLAKE2B d487a62df13b49b1d7d054a005481854f8636e72d13be882586f1ebabf0fe02b3c27d47b172da7e0785a905b39cd5ba7e8a9a03d2cefc6be1e542ce354812f20 SHA512 ba8804a47144b62d35a5fa777616426465d5da5d98aaf34d30c7863c12198139e34249315533752a897d48619eb5546810363d5f2bd50622f513e78eb6367001
-DIST kmail-19.12.2.tar.xz 4707516 BLAKE2B 61870fef4a142d01d3be448b599aa961b74ac563cdd866c9ab51f13e078ffd411e790da9cc02f7e986c9d796331835972f4985b8b863318384b903e5b5b41e0c SHA512 84a9dbea7b84d46366d41efdd5640a740fc8ca0c7d62b35f9bd9406e474a3fc685d16d664e3eea4e5b3a1e1896b7ac6bc5d99f1e524f463b71e434ec72a82611
-EBUILD kmail-19.08.3.ebuild 3592 BLAKE2B 818294a2319408edea5c7e908d589d726b03aba6987702af830ce30c2538bfbdb06e9bb8ec20d7603d8ebbbaf02928d3c6bd700ce6034e77cdaf87a0d9badf38 SHA512 b1d9125a1fcc120746263c5e93fcbad105008a6662f038ab117f7376470e5ca6c444adee5dce5c92bdb1a9184f353a31944be82c4dfea682196ea534d7e815d3
-EBUILD kmail-19.12.2.ebuild 3679 BLAKE2B 2146e7e537e917b1fc0f5952fe6d48e9d329324d2fd5e7516131bbd5a6a3deae26d64efa40d35f9a509693d6ce9fa86b20da84bed08a7baec1bd302431d86ea8 SHA512 23d934f92ae005d1949da76cae28190e06758babec964d60ce5516266e87054473fcda0163c384b0945c92e5492df7834baeb32bfb32c71ad475117c6cf57734
+DIST kmail-19.12.3.tar.xz 4711336 BLAKE2B 781c12d9f6e3ef975aad9915e006b0a9bed465c3da26d48c733636179b12c062d9446660bb3fe3283a31632d67b4841626c2b7d046b8ba50309fc3466d40f874 SHA512 274c2675da6ddf97732dfe0c2b7f9daff1df88735711291f52ee3d359c07ad349686b498909a358c4a091aa70bd7dc77d239536f9757093979bebc9328dc7601
+EBUILD kmail-19.12.3.ebuild 3676 BLAKE2B ca9e7b65f095436a7a92bf3e0e9e8235e9042ecb77f2276f730f87df1e1df90454abb67e753d7b5c42c01460e2823a4a08850f2c45f9d154cd7a5440f530abb3 SHA512 26b15eb2198db1ee133046f392c680e372fb2c005bc3dbac4b28d1980f110af86d5574fe983529785ae0704e725a62435ce972e9b721d39a55f00b6e150d6642
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-19.08.3.ebuild b/kde-apps/kmail/kmail-19.08.3.ebuild
deleted file mode 100644
index 76f90647ff53..000000000000
--- a/kde-apps/kmail/kmail-19.08.3.ebuild
+++ /dev/null
@@ -1,118 +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"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${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
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "KMail supports the following runtime dependencies:"
-		elog "  Virus detection:"
-		elog "    $(pkg_is_installed app-antivirus/clamav)"
-		elog "  Spam filtering:"
-		elog "    $(pkg_is_installed mail-filter/bogofilter)"
-		elog "    $(pkg_is_installed mail-filter/spamassassin)"
-		elog "  Fancy e-mail headers and various useful plugins:"
-		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-		elog "  Crypto config and certificate details GUI:"
-		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-	fi
-}
diff --git a/kde-apps/kmail/kmail-19.12.2.ebuild b/kde-apps/kmail/kmail-19.12.3.ebuild
index 22712ef46f8e..20614edb0c5c 100644
--- a/kde-apps/kmail/kmail-19.12.2.ebuild
+++ b/kde-apps/kmail/kmail-19.12.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # drop qtcore subslot operator when QT_MINIMAL >= 5.14.0