gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 75 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 29d80074c203..192bc09894ea 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,3 @@
-DIST kaddressbook-19.08.3.tar.xz 473792 BLAKE2B 3e91dc694f1161efbee03545646cfcf50da42d659fdb15104bc3a348aa37f3390baedca5b74433477b2b1333eabc46434bfc57d299919cf9db8d4fcefda8908f SHA512 82d0f41bf722a24df8db9d040256d69e8818fa5cd52bf42a310e503772b27ee0745476c2ece607bb5acc81dd4f44f85e2a6b5d26e9b4b061772c361520053022
-DIST kaddressbook-19.12.2.tar.xz 2419276 BLAKE2B 526e930f9613d34a1b5dec08fd8bee161b6ac44efdac9a17cdc251c48635ae6dbd20aac47980d748de7ce317b796a6a3cf56c08045a99a99d0cb90e5b567ec2c SHA512 f9ff89ebb0151204eeeb5258889f3f015ff45b857b2d56f74b18d9c773ff8c5b81af657ecaeb4abe30d0ab999541f66cc85c3d3a9ed4c7c4d80556334eb38c4f
-EBUILD kaddressbook-19.08.3.ebuild 2043 BLAKE2B 6b0e2719ab23872ca0198c7a69a9c08508678530583916335cb04cb74dd0e7dc4d0d7cc80b356298347622b9b28517622d725b8eec2436c32cbd020fa431bea2 SHA512 fe8dcf2b941126f90435655eaa168ee7cfbf3321f2d04998ae4734e7b47cb058783b7ec11869a13b7413e23d53f8e72a54e1bdbc63608979209b605b4540ebfc
-EBUILD kaddressbook-19.12.2.ebuild 1950 BLAKE2B a7ce9a813ea77107633e433a8053b09f3f913a3702413e92d9b2972e64851b4d70db19af401dda5b4fbdfb3d72454ec30a73500ea9fbb9cb1d85071daab076cb SHA512 e387f365cd69a9eff6e9071884887e52360d0d6c905927f1ea77b19dbea568b48ad19fcbe209e7e610db3318add47cdc990c1b2480fb097177f0694b6f532b61
+DIST kaddressbook-19.12.3.tar.xz 2418004 BLAKE2B 73932d0ae81bc16715a137ebf8d6464d657a623c9bae1ee0d6066478ade39b2c88b80f52994ee4221a545732970f63f6c524cef65c4d368f6640632f97c2ea16 SHA512 e08cd6ce8b1583431ea2ee79818f82183c9d3109852277b80ea6e1ff84b0ed921eef1b443617128bd67e4240834f63722f8b4a60c4195bb9ac96810fc0bb4719
+EBUILD kaddressbook-19.12.3.ebuild 1947 BLAKE2B cb61e4cbf47771d1ee4fdc59d849ed3e1c9ded94d359b97038cca60c54dd281da6f83bb6ec4064dfb46a3698cc7100f835bf5fd9c4c8b190c08d2f48c9219cff SHA512 eec78b70df75fff31700702c8626747c5b10948d26d7cbaefeeaa064f0f7c6a32bc4a396483b4ab4ebfd699338ce26212b65915944aea670c33aaf7dbcee87c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
deleted file mode 100644
index 032d872aeb4e..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/kdepim-addons:${SLOT}" || \
-			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
-	fi
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild
index d8e7181fac78..67527793251a 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.12.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="