commit:     72ed393a959c8b66800edae7f8db63c21aeb8030
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 14:55:44 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 15:05:49 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=72ed393a

kde-apps/kaddressbook: Use optfeature

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild | 9 ++++-----
 kde-apps/kaddressbook/kaddressbook-9999.ebuild          | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild 
b/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild
index 3a32313bea..8cdc7c0d74 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild
@@ -9,7 +9,7 @@ PVCUT=$(ver_cut 1-3)
 KFMIN=5.72.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Address book application based on KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook";
@@ -68,10 +68,9 @@ src_configure() {
 }
 
 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}!"
+               elog "Optional dependencies:"
+               optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
        fi
+       ecm_pkg_postinst
 }

diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild 
b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index 52aa0838d6..cf167b1403 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -9,7 +9,7 @@ PVCUT=$(ver_cut 1-3)
 KFMIN=5.73.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Address book application based on KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook";
@@ -68,10 +68,9 @@ src_configure() {
 }
 
 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}!"
+               elog "Optional dependencies:"
+               optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
        fi
+       ecm_pkg_postinst
 }

Reply via email to