[gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/

[Michael Palimaka]

commit:     db8ab7601a5f2dfbb20156cee12148bc79d75893
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 28 02:00:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 11:52:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db8ab760

kde-plasma/kwallet-pam: Add pkg_postinst instructions, ECM to DEPENDs

Package-Manager: portage-2.2.27

 .../kwallet-pam/kwallet-pam-5.5.49.9999.ebuild     | 25 +++++++++++++++++
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild     | 32 ++++++++++++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild
index 6b531b3..8925848 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild
@@ -27,3 +27,28 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	check_dm() {
+		if [[ -e "${ROOT}${2}" ]] && \
+			[[ -n $(egrep "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}") ]] && \
+			[[ -n $(egrep "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}") ]]; then
+			elog "    ${1} - ${2} ...GOOD"
+		else
+			ewarn "    ${1} - ${2} ...BAD"
+		fi
+	}
+	elog
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "List of things to make it work:"
+	elog "1.  Use same password for login and kwallet"
+	elog "2.  A display manager with support for PAM"
+	elog "3.a Have the following lines in the display manager's pam.d file:"
+	elog "    -auth        optional        pam_kwallet5.so"
+	elog "    -session     optional        pam_kwallet5.so auto_start"
+	elog "3.b Checking installed DMs..."
+	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
+	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
+	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+	elog
+}

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 6b531b3..8b857d9 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -12,11 +12,14 @@ LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
+RDEPEND="${COMMON_DEPEND}
 	net-misc/socat
 "
 
@@ -27,3 +30,28 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	check_dm() {
+		if [[ -e "${ROOT}${2}" ]] && \
+			[[ -n $(egrep "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}") ]] && \
+			[[ -n $(egrep "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}") ]]; then
+			elog "    ${1} - ${2} ...GOOD"
+		else
+			ewarn "    ${1} - ${2} ...BAD"
+		fi
+	}
+	elog
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "List of things to make it work:"
+	elog "1.  Use same password for login and kwallet"
+	elog "2.  A display manager with support for PAM"
+	elog "3.a Have the following lines in the display manager's pam.d file:"
+	elog "    -auth        optional        pam_kwallet5.so"
+	elog "    -session     optional        pam_kwallet5.so auto_start"
+	elog "3.b Checking installed DMs..."
+	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
+	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
+	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+	elog
+}