public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2015-08-06 20:30 Johannes Huber
  0 siblings, 0 replies; 18+ messages in thread
From: Johannes Huber @ 2015-08-06 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     c6fc1c33fe89d95db16d6626b56685599568d0a2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 20:02:38 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 20:02:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6fc1c33

[kde-plasma/kwallet-pam] New package

Will be part of KDE Plasma 5.4

Package-Manager: portage-2.2.20

 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 23 +++++++++++++++++++++++
 kde-plasma/kwallet-pam/metadata.xml            |  5 +++++
 2 files changed, 28 insertions(+)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
new file mode 100644
index 0000000..031612c
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_AUTODEPS=false
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+KEYWORDS=""
+IUSE=""
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DKWALLET5=1 )
+
+	kde5_src_configure
+}

diff --git a/kde-plasma/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-plasma/kwallet-pam/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2015-08-06 20:46 Johannes Huber
  0 siblings, 0 replies; 18+ messages in thread
From: Johannes Huber @ 2015-08-06 20:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e61e0c3457bb6c81241ed33cace5ce7404af23e1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 20:48:08 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 20:48:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e61e0c34

[kde-plasma/kwallet-pam] Fix LICENSE

Drop custom src_configure as license builds the newer version by default now.
Upstream commit 3abf505717170085d9c3c05b6e21e882911d5201

Package-Manager: portage-2.2.20

 kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild      | 9 +++------
 kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild | 9 +++------
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild        | 8 ++------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild
index 97a857c..e349f0d 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild
@@ -8,16 +8,13 @@ KDE_AUTODEPS=false
 inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
+
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64"
 IUSE=""
+
 DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DKWALLET5=1 )
-
-	kde5_src_configure
-}

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild
index 031612c..47bb849 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild
@@ -8,16 +8,13 @@ KDE_AUTODEPS=false
 inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
+
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
+
 DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DKWALLET5=1 )
-
-	kde5_src_configure
-}

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 031612c..06cfb86 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -8,16 +8,12 @@ KDE_AUTODEPS=false
 inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
+
 DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DKWALLET5=1 )
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2015-08-12 13:59 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2015-08-12 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     9c18f2a2c7e0740468417c9e94169623ca88826a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 13:59:01 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 13:59:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c18f2a2

kde-plasma/kwallet-pam: quotes

Package-Manager: portage-2.2.20.1

 kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild      | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild
index 56faa97..6e1b4f0 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.3.95.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-KDE_AUTODEPS=false
+KDE_AUTODEPS="false"
 inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild
index ffe0358..babb9dc 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.49.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-KDE_AUTODEPS=false
+KDE_AUTODEPS="false"
 inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index deb5821..84ef01c 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-KDE_AUTODEPS=false
+KDE_AUTODEPS="false"
 inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2015-11-25 16:45 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2015-11-25 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     0d48b59abf1689174da2cabebdc5dccd52029d14
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 16:45:12 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 16:45:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d48b59a

kde-plasma/kwallet-pam: install modules to correct location

Due to an upstream change, it ended up in /usr/lib64/security instead of /lib64/security where it could not be found.

Upstream-commit: 105cd18dbfe644e510e772a7e8226d8e965477f9

Package-Manager: portage-2.2.25

 ...{kwallet-pam-5.4.95.ebuild => kwallet-pam-5.4.95-r1.ebuild} | 10 +++++++++-
 kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild          | 10 +++++++++-
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild                 | 10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.95.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.95-r1.ebuild
similarity index 71%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.4.95.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.4.95-r1.ebuild
index 95a4b5b..2cd69e0 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.4.95.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.95-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_AUTODEPS="false"
-inherit kde5
+inherit kde5 multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
@@ -17,3 +17,11 @@ DEPEND="
 	virtual/pam
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+
+	kde5_src_configure
+}

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 84ef01c..b166d70 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
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_AUTODEPS="false"
-inherit kde5
+inherit kde5 multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
@@ -17,3 +17,11 @@ DEPEND="
 	virtual/pam
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 84ef01c..b166d70 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_AUTODEPS="false"
-inherit kde5
+inherit kde5 multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
@@ -17,3 +17,11 @@ DEPEND="
 	virtual/pam
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+
+	kde5_src_configure
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2015-12-02 11:10 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2015-12-02 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a5216664de0767250003acc420317c67dc5b0041
Author:     Fabian Köster <fabian.koester <AT> bringnow <DOT> com>
AuthorDate: Mon Nov 30 14:18:37 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 11:10:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5216664

kde-plasma/kwallet-pam: Fix bug #561470 by adding missing runtime dependency on net-misc/socat

 ...{kwallet-pam-5.5.49.9999.ebuild => kwallet-pam-5.4.95-r2.ebuild} | 6 ++++--
 kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild               | 4 +++-
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild                      | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.95-r2.ebuild
similarity index 87%
copy from kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild
copy to kde-plasma/kwallet-pam/kwallet-pam-5.4.95-r2.ebuild
index b166d70..4aeb4a7 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.5.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.95-r2.ebuild
@@ -9,14 +9,16 @@ inherit kde5 multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
 
 src_configure() {
 	local mycmakeargs=(

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 b166d70..2a1bd02 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
@@ -16,7 +16,9 @@ DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index b166d70..2a1bd02 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -16,7 +16,9 @@ DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-03-01 11:52 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2016-03-01 11:52 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-04-14 19:55 Johannes Huber
  0 siblings, 0 replies; 18+ messages in thread
From: Johannes Huber @ 2016-04-14 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e877002bc0a1c024db39242aa8ff2efe527b545e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 19:55:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 19:55:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e877002b

kde-plasma/kwallet-pam: Sync with tree

Package-Manager: portage-2.2.28

 kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild | 13 +++++++------
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild        | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
index 8b857d9..ce480aa 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
@@ -34,8 +34,8 @@ 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
+			grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+			grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
 			elog "    ${1} - ${2} ...GOOD"
 		else
 			ewarn "    ${1} - ${2} ...BAD"
@@ -44,12 +44,13 @@ pkg_postinst() {
 	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 "1.  Use standard blowfish encryption instead of GPG"
+	elog "2.  Use same password for login and kwallet"
+	elog "3.  A display manager with support for PAM"
+	elog "4.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..."
+	elog "4.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"

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 8b857d9..ce480aa 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -34,8 +34,8 @@ 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
+			grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+			grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
 			elog "    ${1} - ${2} ...GOOD"
 		else
 			ewarn "    ${1} - ${2} ...BAD"
@@ -44,12 +44,13 @@ pkg_postinst() {
 	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 "1.  Use standard blowfish encryption instead of GPG"
+	elog "2.  Use same password for login and kwallet"
+	elog "3.  A display manager with support for PAM"
+	elog "4.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..."
+	elog "4.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"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-04-20  9:28 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2016-04-20  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     3fa15127a0fa194035847fca2ef56c2553204870
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Apr 20 09:16:24 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 09:28:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3fa15127

kde-plasma/kwallet-pam: Add USE=oldwallet, block kde-apps/kwalletd-pam

Improvements to pkg_postinst thx to Arfrever.

 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 57 ++++++++++++++++++++------
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index ce480aa..6c48b49 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -5,12 +5,12 @@
 EAPI=6
 
 KDE_AUTODEPS="false"
-inherit kde5 multilib
+inherit kde5 multibuild multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
-IUSE=""
+IUSE="+oldwallet"
 
 COMMON_DEPEND="
 	dev-libs/libgcrypt:0=
@@ -18,31 +18,60 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kwalletd-pam
 	net-misc/socat
 "
 
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
+}
+
 src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
+	myconfigure() {
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		)
+		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
+
+		kde5_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
 
-	kde5_src_configure
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
 }
 
 pkg_postinst() {
 	check_dm() {
-		if [[ -e "${ROOT}${2}" ]] && \
-			grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-			grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-			elog "    ${1} - ${2} ...GOOD"
-		else
-			ewarn "    ${1} - ${2} ...BAD"
+		local good
+		if [[ -e "${ROOT}${2}" ]] ; then
+			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
+				good=true
+			fi
+			if use oldwallet ; then
+				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
+					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
+					good=false
+				fi
+			fi
 		fi
+		[[ "${good}" = true ]] && \
+			elog "    ${1} - ${2} ...GOOD" || \
+			ewarn "    ${1} - ${2} ...BAD"
 	}
 	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -50,6 +79,10 @@ pkg_postinst() {
 	elog "4.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"
+	if use oldwallet ; then
+		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
+		elog "    -session     optional        pam_kwallet.so"
+	fi
 	elog "4.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"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-04-20  9:42 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2016-04-20  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e99f86c5ddc823b564a0fda87837edb48a977477
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 09:42:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 09:42:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e99f86c5

kde-plasma/kwallet-pam: add missing local USE flag description from main tree

Package-Manager: portage-2.2.28

 kde-plasma/kwallet-pam/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kde-plasma/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml
index 2fdbf33..033c611 100644
--- a/kde-plasma/kwallet-pam/metadata.xml
+++ b/kde-plasma/kwallet-pam/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="oldwallet">Enable legacy support for <pkg>kde-apps/kwalletd</pkg></flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-05-11 13:17 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2016-05-11 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6e9f9a2f0f2630e08c5be03c1fee2e7db2497ebe
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 13:17:17 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 11 13:17:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e9f9a2f

kde-plasma/kwallet-pam: restore oldwallet USE flag

This applies changes from 3fa15127a0fa194035847fca2ef56c2553204870 to 5.6.
These changes were already in the main tree in the previous 5.6 version.

Package-Manager: portage-2.2.28

 .../kwallet-pam/kwallet-pam-5.6.49.9999.ebuild     | 57 +++++++++++++++++-----
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
index ce480aa..6c48b49 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.6.49.9999.ebuild
@@ -5,12 +5,12 @@
 EAPI=6
 
 KDE_AUTODEPS="false"
-inherit kde5 multilib
+inherit kde5 multibuild multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
-IUSE=""
+IUSE="+oldwallet"
 
 COMMON_DEPEND="
 	dev-libs/libgcrypt:0=
@@ -18,31 +18,60 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kwalletd-pam
 	net-misc/socat
 "
 
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
+}
+
 src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
+	myconfigure() {
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		)
+		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
+
+		kde5_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
 
-	kde5_src_configure
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
 }
 
 pkg_postinst() {
 	check_dm() {
-		if [[ -e "${ROOT}${2}" ]] && \
-			grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-			grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-			elog "    ${1} - ${2} ...GOOD"
-		else
-			ewarn "    ${1} - ${2} ...BAD"
+		local good
+		if [[ -e "${ROOT}${2}" ]] ; then
+			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
+				good=true
+			fi
+			if use oldwallet ; then
+				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
+					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
+					good=false
+				fi
+			fi
 		fi
+		[[ "${good}" = true ]] && \
+			elog "    ${1} - ${2} ...GOOD" || \
+			ewarn "    ${1} - ${2} ...BAD"
 	}
 	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -50,6 +79,10 @@ pkg_postinst() {
 	elog "4.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"
+	if use oldwallet ; then
+		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
+		elog "    -session     optional        pam_kwallet.so"
+	fi
 	elog "4.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"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-07-06 13:15 Michael Palimaka
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Palimaka @ 2016-07-06 13:15 UTC (permalink / raw
  To: gentoo-commits

commit:     4f6da488cc6744b2c82fe61f265ed1c8b513bf78
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 13:08:16 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 13:15:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f6da488

kde-plasma/kwallet-pam: export custom src_test

The default phase causes BUILD_DIR to be overwritten with an incorrect value,
breaking the multibuild configuration causing one build to not be installed.

Gentoo-bug: 588136

Package-Manager: portage-2.3.0

 kde-plasma/kwallet-pam/kwallet-pam-5.7.49.9999.ebuild | 4 ++++
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.7.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.7.49.9999.ebuild
index 6c48b49..bad6aae 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.7.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.7.49.9999.ebuild
@@ -46,6 +46,10 @@ src_compile() {
 	multibuild_foreach_variant kde5_src_compile
 }
 
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
 src_install() {
 	multibuild_foreach_variant kde5_src_install
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 6c48b49..bad6aae 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -46,6 +46,10 @@ src_compile() {
 	multibuild_foreach_variant kde5_src_compile
 }
 
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
 src_install() {
 	multibuild_foreach_variant kde5_src_install
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2016-12-10 11:43 Johannes Huber
  0 siblings, 0 replies; 18+ messages in thread
From: Johannes Huber @ 2016-12-10 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     14e982f4a74135c5ce22db6b757e4c01174f9b36
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 11:41:25 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 11:41:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14e982f4

kde-plasma/kwallet-pam: Drop check on deprecated kdm

Package-Manager: portage-2.3.3

 kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild | 1 -
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild
index bad6aae..e7efcc6 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild
@@ -90,6 +90,5 @@ pkg_postinst() {
 	elog "4.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 bad6aae..e7efcc6 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -90,6 +90,5 @@ pkg_postinst() {
 	elog "4.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
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2017-05-27 15:48 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2017-05-27 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     3776fe01715756ae6a7441a2eb34b9dc9c8d5588
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 15:46:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:46:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3776fe01

kde-plasma/kwallet-pam: Drop USE=oldwallet, cleanup

Gentoo-bug: 597610

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild   | 66 +++++-----------------
 .../kwallet-pam/kwallet-pam-5.10.49.9999.ebuild    | 66 +++++-----------------
 .../kwallet-pam/kwallet-pam-5.8.49.9999.ebuild     | 66 +++++-----------------
 kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild   | 66 +++++-----------------
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild     | 66 +++++-----------------
 kde-plasma/kwallet-pam/metadata.xml                |  3 -
 6 files changed, 65 insertions(+), 268 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild
index 04d60238de..c91205f155 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild
@@ -3,78 +3,41 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
+inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+oldwallet"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
+RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
 }
 
 pkg_postinst() {
 	check_dm() {
-		local good
 		if [[ -e "${ROOT}${2}" ]] ; then
 			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
 				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
+				elog "    ${1} - ${2} ...GOOD"
+			else
+				ewarn "    ${1} - ${2} ...BAD"
 			fi
 		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
 	}
-	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -82,12 +45,9 @@ pkg_postinst() {
 	elog "4.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"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
 	elog "4.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"
 	elog
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.10.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.10.49.9999.ebuild
index f322759080..7025612609 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.10.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.10.49.9999.ebuild
@@ -3,78 +3,41 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
+inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
-IUSE="+oldwallet"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
+RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
 }
 
 pkg_postinst() {
 	check_dm() {
-		local good
 		if [[ -e "${ROOT}${2}" ]] ; then
 			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
 				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
+				elog "    ${1} - ${2} ...GOOD"
+			else
+				ewarn "    ${1} - ${2} ...BAD"
 			fi
 		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
 	}
-	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -82,12 +45,9 @@ pkg_postinst() {
 	elog "4.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"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
 	elog "4.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"
 	elog
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild
index f322759080..7025612609 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild
@@ -3,78 +3,41 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
+inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
-IUSE="+oldwallet"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
+RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
 }
 
 pkg_postinst() {
 	check_dm() {
-		local good
 		if [[ -e "${ROOT}${2}" ]] ; then
 			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
 				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
+				elog "    ${1} - ${2} ...GOOD"
+			else
+				ewarn "    ${1} - ${2} ...BAD"
 			fi
 		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
 	}
-	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -82,12 +45,9 @@ pkg_postinst() {
 	elog "4.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"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
 	elog "4.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"
 	elog
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild
index 04d60238de..c91205f155 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild
@@ -3,78 +3,41 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
+inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+oldwallet"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
+RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
 }
 
 pkg_postinst() {
 	check_dm() {
-		local good
 		if [[ -e "${ROOT}${2}" ]] ; then
 			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
 				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
+				elog "    ${1} - ${2} ...GOOD"
+			else
+				ewarn "    ${1} - ${2} ...BAD"
 			fi
 		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
 	}
-	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -82,12 +45,9 @@ pkg_postinst() {
 	elog "4.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"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
 	elog "4.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"
 	elog
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index f322759080..7025612609 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -3,78 +3,41 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
+inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
-IUSE="+oldwallet"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
+RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
 }
 
 pkg_postinst() {
 	check_dm() {
-		local good
 		if [[ -e "${ROOT}${2}" ]] ; then
 			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
 				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
+				elog "    ${1} - ${2} ...GOOD"
+			else
+				ewarn "    ${1} - ${2} ...BAD"
 			fi
 		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
 	}
-	elog
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
 	elog "List of things to make it work:"
 	elog "1.  Use standard blowfish encryption instead of GPG"
 	elog "2.  Use same password for login and kwallet"
@@ -82,12 +45,9 @@ pkg_postinst() {
 	elog "4.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"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
 	elog "4.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"
 	elog
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }

diff --git a/kde-plasma/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml
index 033c6118ee..2fdbf33d96 100644
--- a/kde-plasma/kwallet-pam/metadata.xml
+++ b/kde-plasma/kwallet-pam/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="oldwallet">Enable legacy support for <pkg>kde-apps/kwalletd</pkg></flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2017-10-21 18:34 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2017-10-21 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a81174869edd49d24b65e6d4f48394318b79cb98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 15:20:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 15:20:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8117486

kde-plasma/kwallet-pam: Simplify pkg_postinst

SDDM needs no manual fiddling these days. Anyone else
can look up the provided KDE Wiki link.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../kwallet-pam/kwallet-pam-5.11.49.9999.ebuild    | 22 +---------------------
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild     | 22 +---------------------
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild
index 7025612609..ac6ac2fa98 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.11.49.9999.ebuild
@@ -27,27 +27,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	check_dm() {
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				elog "    ${1} - ${2} ...GOOD"
-			else
-				ewarn "    ${1} - ${2} ...BAD"
-			fi
-		fi
-	}
+	kde5_pkg_postinst
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.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 "4.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"
-	elog
 	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 7025612609..ac6ac2fa98 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -27,27 +27,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	check_dm() {
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				elog "    ${1} - ${2} ...GOOD"
-			else
-				ewarn "    ${1} - ${2} ...BAD"
-			fi
-		fi
-	}
+	kde5_pkg_postinst
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.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 "4.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"
-	elog
 	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2019-05-18 12:12 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2019-05-18 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     23a9c249aee9e7653d8d006b679166e3850ce710
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 12:10:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 18 12:11:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=23a9c249

kde-plasma/kwallet-pam: Add missing DEPEND, drop unused cmake arg

Upstream commits:
fd556ab25365f953af2e6fc867e43292fd8e4b08
905b00d380408f54da3de0d8dcc2b14e1cb9f6e2

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

 kde-plasma/kwallet-pam/kwallet-pam-5.15.90.ebuild      | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-5.16.49.9999.ebuild | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.15.90.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.15.90.ebuild
index 1aa3a587a8..f3e1c598ec 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.15.90.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.15.90.ebuild
@@ -11,6 +11,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
@@ -21,7 +22,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
 	)
 	kde5_src_configure
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.16.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.16.49.9999.ebuild
index 6c12dc0220..6c7b6bb822 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.16.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.16.49.9999.ebuild
@@ -11,6 +11,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
@@ -21,7 +22,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
 	)
 	kde5_src_configure
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 6c12dc0220..6c7b6bb822 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -11,6 +11,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
@@ -21,7 +22,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
 	)
 	kde5_src_configure
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2019-10-12 19:40 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2019-10-12 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d8996384b4fcec8c489a77a3d87c1113afa5c691
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 19:40:29 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 19:40:29 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8996384

kde-plasma/kwallet-pam: Migrate to sys-libs/pam

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

 kde-plasma/kwallet-pam/kwallet-pam-5.16.90.ebuild      | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-5.17.0.ebuild       | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-5.17.49.9999.ebuild | 2 +-
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.16.90.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.16.90.ebuild
index f3e1c598ec..3b8009a017 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.16.90.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.16.90.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
-	virtual/pam
+	sys-libs/pam
 "
 RDEPEND="${DEPEND}
 	net-misc/socat

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.17.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.0.ebuild
index f3e1c598ec..3b8009a017 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.17.0.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.17.0.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
-	virtual/pam
+	sys-libs/pam
 "
 RDEPEND="${DEPEND}
 	net-misc/socat

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.17.49.9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.49.9999.ebuild
index 6c7b6bb822..5f59742ef3 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.17.49.9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.17.49.9999.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
-	virtual/pam
+	sys-libs/pam
 "
 RDEPEND="${DEPEND}
 	net-misc/socat

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 6c7b6bb822..5f59742ef3 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kwallet)
 	dev-libs/libgcrypt:0=
-	virtual/pam
+	sys-libs/pam
 "
 RDEPEND="${DEPEND}
 	net-misc/socat


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2024-03-16 10:37 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2024-03-16 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     24b42df90f4b7fc1b1354b6920cf9dda25de6ebd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 09:34:59 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 10:36:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=24b42df9

kde-plasma/kwallet-pam: Drop superfluous PVCUT

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 5c1343dc97..3ce7fb2c05 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 KFMIN=9999
-PVCUT=$(ver_cut 1-3)
 inherit ecm plasma.kde.org
 
 DESCRIPTION="PAM module to not enter KWallet password again after login"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/
@ 2024-09-14 15:16 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2024-09-14 15:16 UTC (permalink / raw
  To: gentoo-commits

commit:     0e1891a4bb7f4bdb65bbc494c35c11305e6e2f33
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 14:26:55 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 14:26:55 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e1891a4

kde-plasma/kwallet-pam: Add new BDEPEND

Upstream commit 3c11e10bbb8f30efd8fc95bd0f0ff6487310fd11

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 3ce7fb2c05..25dd93b278 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	net-misc/socat
 "
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2024-09-14 15:16 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-12 19:40 [gentoo-commits] proj/kde:master commit in: kde-plasma/kwallet-pam/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-09-14 15:16 Andreas Sturmlechner
2024-03-16 10:37 Andreas Sturmlechner
2019-05-18 12:12 Andreas Sturmlechner
2017-10-21 18:34 Andreas Sturmlechner
2017-05-27 15:48 Andreas Sturmlechner
2016-12-10 11:43 Johannes Huber
2016-07-06 13:15 Michael Palimaka
2016-05-11 13:17 Michael Palimaka
2016-04-20  9:42 Michael Palimaka
2016-04-20  9:28 Michael Palimaka
2016-04-14 19:55 Johannes Huber
2016-03-01 11:52 Michael Palimaka
2015-12-02 11:10 Michael Palimaka
2015-11-25 16:45 Michael Palimaka
2015-08-12 13:59 Michael Palimaka
2015-08-06 20:46 Johannes Huber
2015-08-06 20:30 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox