gentoo resync : 15.12.2019

4 files changed, 73 insertions, 61 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 820c6fddb64a..94983f0e5011 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
-DIST kaddressbook-19.04.3.tar.xz 473480 BLAKE2B 263d4b20967e428fbeae77ea96cedcdce0cdb95c065871abc18318fdadd6f06754f4c0385f522bf5f9ded61e507609e49558f91770064e1b33ca8109eb44caea SHA512 8428ac9ca70a855c49a029073a36855d6b4604b9d1dbd386b22e096e6d76a815033767209c0f0afd9d728fa0f3117adb09cac021a3506afa2375973fa441d005
 DIST kaddressbook-19.08.3.tar.xz 473792 BLAKE2B 3e91dc694f1161efbee03545646cfcf50da42d659fdb15104bc3a348aa37f3390baedca5b74433477b2b1333eabc46434bfc57d299919cf9db8d4fcefda8908f SHA512 82d0f41bf722a24df8db9d040256d69e8818fa5cd52bf42a310e503772b27ee0745476c2ece607bb5acc81dd4f44f85e2a6b5d26e9b4b061772c361520053022
-EBUILD kaddressbook-19.04.3.ebuild 1601 BLAKE2B a67022c100d95c276afef5f2a4c200c6a1a38b3dc597945ca29b406c2f605a8d8c06ab2e71099dab28706d3776d823215d57b8f0423652ae022fc7291ce695d4 SHA512 6adad14bb54b7f8a91a55ffe160aeba74ac7edf9ef9403fea1208afd79fee447e1c7c0a0340f2533e04889e243e94bd35ffa1c119447357d81d1d69ff7df5dc8
-EBUILD kaddressbook-19.08.3.ebuild 2046 BLAKE2B e8e350386a36884f1c59573f9cabe37b36ee2571f44af50db07876888c5f078539e2034d09ef1c44b12c0bcdea5e55fd98bf365b3d93005d4a0bc7d863a29644 SHA512 b35b127f6d7dd8a23d51977e2744130ac33b58ae8d0df9295755e76c33e960a7be1c20429b22c49847de99acc01276ae2c9393246f4297c8baa68bb0be9835db
+DIST kaddressbook-19.12.0.tar.xz 2379408 BLAKE2B 4c1fdd7f99cea3d1848eca653eeb22dd2aa814e9f9a90a506a791a38a123aff288301c8ac0d41271fc67ca711958f9ac34fb5e99d6aae987d87e7865bea03fc6 SHA512 fb326204d7a9b939655652d3c1316ee3d0f96413f6b75b80f4fc7810cf1d96b09cf60f1f4ed9fc871effc03644a49d1bff938fc2b123d9ee4f82ac20930675e0
+EBUILD kaddressbook-19.08.3.ebuild 2043 BLAKE2B 6b0e2719ab23872ca0198c7a69a9c08508678530583916335cb04cb74dd0e7dc4d0d7cc80b356298347622b9b28517622d725b8eec2436c32cbd020fa431bea2 SHA512 fe8dcf2b941126f90435655eaa168ee7cfbf3321f2d04998ae4734e7b47cb058783b7ec11869a13b7413e23d53f8e72a54e1bdbc63608979209b605b4540ebfc
+EBUILD kaddressbook-19.12.0.ebuild 1973 BLAKE2B e91dab8a6cbc223eaeb7390f967455955db360f93cb6d28b8f798b7c8c22e446e7d25984a815316cd712abdefbba06e0e9b11583210ffa975c5d378055d6dfcd SHA512 8ebdd2989f46c88ed51b0fa7b246df6572f95ba1214bd8220180505ce77c5223566ff53454279cb6b6b0f9ab3b5e7105e3293c1cb0ae248cf6c46a6e52742f7b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-19.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.04.3.ebuild
deleted file mode 100644
index 192ce9d6cfc9..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-19.04.3.ebuild
+++ /dev/null
@@ -1,57 +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="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
index 0a9d58ea406c..032d872aeb4e 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.0.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.0.ebuild
new file mode 100644
index 000000000000..9ae86355aafc
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-19.12.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/office/org.kde.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/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
+}