From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2CCE4138252 for ; Wed, 11 May 2016 13:14:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48B19E0810; Wed, 11 May 2016 13:14:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C58E0E0810 for ; Wed, 11 May 2016 13:14:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AEC0340A6A for ; Wed, 11 May 2016 13:14:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50A3533A for ; Wed, 11 May 2016 13:14:45 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1462972451.56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwallet-pam/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwallet-pam/kwallet-pam-5.6.4-r1.ebuild kde-plasma/kwallet-pam/kwallet-pam-5.6.4.ebuild X-VCS-Directories: kde-plasma/kwallet-pam/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a X-VCS-Branch: master Date: Wed, 11 May 2016 13:14:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dd6111f7-cf74-4671-bd46-b3d46aefa6f9 X-Archives-Hash: fac489110f0b595083617c74c7c7bc1a commit: 56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a Author: Michael Palimaka gentoo org> AuthorDate: Wed May 11 13:13:51 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed May 11 13:14:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cf1b58 kde-plasma/kwallet-pam: restore oldwallet USE flag that was accidentally removed Package-Manager: portage-2.2.28 kde-plasma/kwallet-pam/kwallet-pam-5.6.4-r1.ebuild | 91 ++++++++++++++++++++++ kde-plasma/kwallet-pam/kwallet-pam-5.6.4.ebuild | 58 -------------- 2 files changed, 91 insertions(+), 58 deletions(-) diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.4-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.4-r1.ebuild new file mode 100644 index 0000000..0713014 --- /dev/null +++ b/kde-plasma/kwallet-pam/kwallet-pam-5.6.4-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_AUTODEPS="false" +inherit kde5 multibuild multilib + +DESCRIPTION="KWallet PAM module to not enter password again" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+oldwallet" + +COMMON_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 + 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_install() { + multibuild_foreach_variant kde5_src_install +} + +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 + 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" + 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" + 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" + has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde" + elog +} diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.4.ebuild deleted file mode 100644 index 7bb19fb..0000000 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.6.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_AUTODEPS="false" -inherit kde5 multilib - -DESCRIPTION="KWallet PAM module to not enter password again" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -COMMON_DEPEND=" - dev-libs/libgcrypt:0= - virtual/pam -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep extra-cmake-modules) -" -RDEPEND="${COMMON_DEPEND} - net-misc/socat -" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" - ) - - kde5_src_configure -} - -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" - fi - } - elog - 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" - has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde" - elog -}