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-frameworks/kwallet/
Date: Mon, 07 Sep 2020 15:07:53
Message-Id: 1599491149.72835ae9865c7bd8c8f5d7420d612de3de53c8e8.asturm@gentoo
1 commit: 72835ae9865c7bd8c8f5d7420d612de3de53c8e8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 14:33:18 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=72835ae9
7
8 kde-frameworks/kwallet: 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-frameworks/kwallet/kwallet-5.74.0.ebuild | 14 +++++++-------
14 kde-frameworks/kwallet/kwallet-9999.ebuild | 14 +++++++-------
15 2 files changed, 14 insertions(+), 14 deletions(-)
16
17 diff --git a/kde-frameworks/kwallet/kwallet-5.74.0.ebuild b/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
18 index b4c11415bb..d757b246fb 100644
19 --- a/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
20 +++ b/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
21 @@ -5,7 +5,7 @@ EAPI=7
22
23 PVCUT=$(ver_cut 1-2)
24 QTMIN=5.14.2
25 -inherit ecm kde.org
26 +inherit ecm kde.org optfeature
27
28 DESCRIPTION="Framework providing desktop-wide storage for passwords"
29
30 @@ -44,11 +44,11 @@ src_configure() {
31 }
32
33 pkg_postinst() {
34 - if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
35 - elog
36 - elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
37 - elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
38 - elog
39 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
40 + elog "Optional dependencies:"
41 + optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
42 + optfeature "KWallet management" kde-apps/kwalletmanager:5
43 + elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
44 fi
45 - elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
46 + ecm_pkg_postinst
47 }
48
49 diff --git a/kde-frameworks/kwallet/kwallet-9999.ebuild b/kde-frameworks/kwallet/kwallet-9999.ebuild
50 index 1a25c912d2..ecc991323c 100644
51 --- a/kde-frameworks/kwallet/kwallet-9999.ebuild
52 +++ b/kde-frameworks/kwallet/kwallet-9999.ebuild
53 @@ -5,7 +5,7 @@ EAPI=7
54
55 PVCUT=$(ver_cut 1-2)
56 QTMIN=5.14.2
57 -inherit ecm kde.org
58 +inherit ecm kde.org optfeature
59
60 DESCRIPTION="Framework providing desktop-wide storage for passwords"
61
62 @@ -44,11 +44,11 @@ src_configure() {
63 }
64
65 pkg_postinst() {
66 - if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
67 - elog
68 - elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
69 - elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
70 - elog
71 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
72 + elog "Optional dependencies:"
73 + optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
74 + optfeature "KWallet management" kde-apps/kwalletmanager:5
75 + elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
76 fi
77 - elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
78 + ecm_pkg_postinst
79 }