Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kaddressbook/
Date: Mon, 07 Sep 2020 15:07:51
Message-Id: 1599491149.72ed393a959c8b66800edae7f8db63c21aeb8030.asturm@gentoo
1 commit: 72ed393a959c8b66800edae7f8db63c21aeb8030
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 14:55:44 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 15:05:49 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=72ed393a
7
8 kde-apps/kaddressbook: Use optfeature
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild | 9 ++++-----
14 kde-apps/kaddressbook/kaddressbook-9999.ebuild | 9 ++++-----
15 2 files changed, 8 insertions(+), 10 deletions(-)
16
17 diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild
18 index 3a32313bea..8cdc7c0d74 100644
19 --- a/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild
20 +++ b/kde-apps/kaddressbook/kaddressbook-20.08.49.9999.ebuild
21 @@ -9,7 +9,7 @@ PVCUT=$(ver_cut 1-3)
22 KFMIN=5.72.0
23 QTMIN=5.14.2
24 VIRTUALX_REQUIRED="test"
25 -inherit ecm kde.org
26 +inherit ecm kde.org optfeature
27
28 DESCRIPTION="Address book application based on KDE Frameworks"
29 HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
30 @@ -68,10 +68,9 @@ src_configure() {
31 }
32
33 pkg_postinst() {
34 - ecm_pkg_postinst
35 -
36 if [[ -z "${REPLACING_VERSIONS}" ]]; then
37 - has_version "kde-apps/kdepim-addons:${SLOT}" || \
38 - elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
39 + elog "Optional dependencies:"
40 + optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
41 fi
42 + ecm_pkg_postinst
43 }
44
45 diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
46 index 52aa0838d6..cf167b1403 100644
47 --- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
48 +++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
49 @@ -9,7 +9,7 @@ PVCUT=$(ver_cut 1-3)
50 KFMIN=5.73.0
51 QTMIN=5.14.2
52 VIRTUALX_REQUIRED="test"
53 -inherit ecm kde.org
54 +inherit ecm kde.org optfeature
55
56 DESCRIPTION="Address book application based on KDE Frameworks"
57 HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
58 @@ -68,10 +68,9 @@ src_configure() {
59 }
60
61 pkg_postinst() {
62 - ecm_pkg_postinst
63 -
64 if [[ -z "${REPLACING_VERSIONS}" ]]; then
65 - has_version "kde-apps/kdepim-addons:${SLOT}" || \
66 - elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
67 + elog "Optional dependencies:"
68 + optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
69 fi
70 + ecm_pkg_postinst
71 }