commit: 72835ae9865c7bd8c8f5d7420d612de3de53c8e8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 14:33:18 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=72835ae9
kde-frameworks/kwallet: Use optfeature
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kwallet/kwallet-5.74.0.ebuild | 14 +++++++-------
kde-frameworks/kwallet/kwallet-9999.ebuild | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
b/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
index b4c11415bb..d757b246fb 100644
--- a/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PVCUT=$(ver_cut 1-2)
QTMIN=5.14.2
-inherit ecm kde.org
+inherit ecm kde.org optfeature
DESCRIPTION="Framework providing desktop-wide storage for passwords"
@@ -44,11 +44,11 @@ src_configure() {
}
pkg_postinst() {
- if ! has_version "kde-plasma/kwallet-pam" || ! has_version
"kde-apps/kwalletmanager:5" ; then
- elog
- elog "Install kde-plasma/kwallet-pam for auto-unlocking after
account login."
- elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
- elog
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Optional dependencies:"
+ optfeature "Auto-unlocking after account login"
kde-plasma/kwallet-pam
+ optfeature "KWallet management" kde-apps/kwalletmanager:5
+ elog "For more information, read
https://wiki.gentoo.org/wiki/KDE#KWallet";
fi
- elog "For more information, read
https://wiki.gentoo.org/wiki/KDE#KWallet";
+ ecm_pkg_postinst
}
diff --git a/kde-frameworks/kwallet/kwallet-9999.ebuild
b/kde-frameworks/kwallet/kwallet-9999.ebuild
index 1a25c912d2..ecc991323c 100644
--- a/kde-frameworks/kwallet/kwallet-9999.ebuild
+++ b/kde-frameworks/kwallet/kwallet-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PVCUT=$(ver_cut 1-2)
QTMIN=5.14.2
-inherit ecm kde.org
+inherit ecm kde.org optfeature
DESCRIPTION="Framework providing desktop-wide storage for passwords"
@@ -44,11 +44,11 @@ src_configure() {
}
pkg_postinst() {
- if ! has_version "kde-plasma/kwallet-pam" || ! has_version
"kde-apps/kwalletmanager:5" ; then
- elog
- elog "Install kde-plasma/kwallet-pam for auto-unlocking after
account login."
- elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
- elog
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Optional dependencies:"
+ optfeature "Auto-unlocking after account login"
kde-plasma/kwallet-pam
+ optfeature "KWallet management" kde-apps/kwalletmanager:5
+ elog "For more information, read
https://wiki.gentoo.org/wiki/KDE#KWallet";
fi
- elog "For more information, read
https://wiki.gentoo.org/wiki/KDE#KWallet";
+ ecm_pkg_postinst
}
