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>[email protected]</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <use>
- <flag name="oldwallet">Enable legacy support for
<pkg>kde-apps/kwalletd</pkg></flag>
- </use>
</pkgmetadata>
