diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-05-11 23:13:51 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-05-11 23:14:11 +1000 |
commit | 56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a (patch) | |
tree | d80abed0f5ec7fae868c23e17907b029d14c36c2 /kde-plasma | |
parent | media-sound/podget: remove old (diff) | |
download | gentoo-56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a.tar.gz gentoo-56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a.tar.bz2 gentoo-56cf1b58ee126b35ae1d73047bf9a2bbbf1d0c8a.zip |
kde-plasma/kwallet-pam: restore oldwallet USE flag that was accidentally removed
Package-Manager: portage-2.2.28
Diffstat (limited to 'kde-plasma')
-rw-r--r-- | kde-plasma/kwallet-pam/kwallet-pam-5.6.4-r1.ebuild | 91 | ||||
-rw-r--r-- | 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 000000000000..071301435607 --- /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 7bb19fb2b1b5..000000000000 --- 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 -} |