| 1 |
commit: 3776fe01715756ae6a7441a2eb34b9dc9c8d5588 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 27 15:46:25 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 27 15:46:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3776fe01 |
| 7 |
|
| 8 |
kde-plasma/kwallet-pam: Drop USE=oldwallet, cleanup |
| 9 |
|
| 10 |
Gentoo-bug: 597610 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 13 |
|
| 14 |
kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild | 66 +++++----------------- |
| 15 |
.../kwallet-pam/kwallet-pam-5.10.49.9999.ebuild | 66 +++++----------------- |
| 16 |
.../kwallet-pam/kwallet-pam-5.8.49.9999.ebuild | 66 +++++----------------- |
| 17 |
kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild | 66 +++++----------------- |
| 18 |
kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 66 +++++----------------- |
| 19 |
kde-plasma/kwallet-pam/metadata.xml | 3 - |
| 20 |
6 files changed, 65 insertions(+), 268 deletions(-) |
| 21 |
|
| 22 |
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild |
| 23 |
index 04d60238de..c91205f155 100644 |
| 24 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild |
| 25 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.10.0.ebuild |
| 26 |
@@ -3,78 +3,41 @@ |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
|
| 30 |
-KDE_AUTODEPS="false" |
| 31 |
-inherit kde5 multibuild multilib |
| 32 |
+inherit kde5 |
| 33 |
|
| 34 |
DESCRIPTION="KWallet PAM module to not enter password again" |
| 35 |
LICENSE="LGPL-2.1" |
| 36 |
KEYWORDS="~amd64 ~arm ~x86" |
| 37 |
-IUSE="+oldwallet" |
| 38 |
+IUSE="" |
| 39 |
|
| 40 |
-COMMON_DEPEND=" |
| 41 |
+DEPEND=" |
| 42 |
dev-libs/libgcrypt:0= |
| 43 |
virtual/pam |
| 44 |
" |
| 45 |
-DEPEND="${COMMON_DEPEND} |
| 46 |
- $(add_frameworks_dep extra-cmake-modules) |
| 47 |
- $(add_qt_dep qtcore) |
| 48 |
-" |
| 49 |
-RDEPEND="${COMMON_DEPEND} |
| 50 |
- !kde-apps/kwalletd-pam |
| 51 |
+RDEPEND="${DEPEND} |
| 52 |
net-misc/socat |
| 53 |
" |
| 54 |
|
| 55 |
-pkg_setup() { |
| 56 |
- kde5_pkg_setup |
| 57 |
- MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) ) |
| 58 |
-} |
| 59 |
- |
| 60 |
src_configure() { |
| 61 |
- myconfigure() { |
| 62 |
- local mycmakeargs=( |
| 63 |
- -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 64 |
- ) |
| 65 |
- [[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 ) |
| 66 |
- |
| 67 |
- kde5_src_configure |
| 68 |
- } |
| 69 |
- multibuild_foreach_variant myconfigure |
| 70 |
-} |
| 71 |
- |
| 72 |
-src_compile() { |
| 73 |
- multibuild_foreach_variant kde5_src_compile |
| 74 |
-} |
| 75 |
- |
| 76 |
-src_test() { |
| 77 |
- multibuild_foreach_variant kde5_src_test |
| 78 |
-} |
| 79 |
- |
| 80 |
-src_install() { |
| 81 |
- multibuild_foreach_variant kde5_src_install |
| 82 |
+ local mycmakeargs=( |
| 83 |
+ -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 84 |
+ -DKWALLET4=0 |
| 85 |
+ ) |
| 86 |
+ kde5_src_configure |
| 87 |
} |
| 88 |
|
| 89 |
pkg_postinst() { |
| 90 |
check_dm() { |
| 91 |
- local good |
| 92 |
if [[ -e "${ROOT}${2}" ]] ; then |
| 93 |
if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 94 |
grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 95 |
- good=true |
| 96 |
- fi |
| 97 |
- if use oldwallet ; then |
| 98 |
- if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \ |
| 99 |
- ! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then |
| 100 |
- good=false |
| 101 |
- fi |
| 102 |
+ elog " ${1} - ${2} ...GOOD" |
| 103 |
+ else |
| 104 |
+ ewarn " ${1} - ${2} ...BAD" |
| 105 |
fi |
| 106 |
fi |
| 107 |
- [[ "${good}" = true ]] && \ |
| 108 |
- elog " ${1} - ${2} ...GOOD" || \ |
| 109 |
- ewarn " ${1} - ${2} ...BAD" |
| 110 |
} |
| 111 |
- elog |
| 112 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 113 |
- use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4." |
| 114 |
elog "List of things to make it work:" |
| 115 |
elog "1. Use standard blowfish encryption instead of GPG" |
| 116 |
elog "2. Use same password for login and kwallet" |
| 117 |
@@ -82,12 +45,9 @@ pkg_postinst() { |
| 118 |
elog "4.a Have the following lines in the display manager's pam.d file:" |
| 119 |
elog " -auth optional pam_kwallet5.so" |
| 120 |
elog " -session optional pam_kwallet5.so auto_start" |
| 121 |
- if use oldwallet ; then |
| 122 |
- elog " -auth optional pam_kwallet.so kdehome=.kde4" |
| 123 |
- elog " -session optional pam_kwallet.so" |
| 124 |
- fi |
| 125 |
elog "4.b Checking installed DMs..." |
| 126 |
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 127 |
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 128 |
elog |
| 129 |
+ elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 130 |
} |
| 131 |
|
| 132 |
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 |
| 133 |
index f322759080..7025612609 100644 |
| 134 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.10.49.9999.ebuild |
| 135 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.10.49.9999.ebuild |
| 136 |
@@ -3,78 +3,41 @@ |
| 137 |
|
| 138 |
EAPI=6 |
| 139 |
|
| 140 |
-KDE_AUTODEPS="false" |
| 141 |
-inherit kde5 multibuild multilib |
| 142 |
+inherit kde5 |
| 143 |
|
| 144 |
DESCRIPTION="KWallet PAM module to not enter password again" |
| 145 |
LICENSE="LGPL-2.1" |
| 146 |
KEYWORDS="" |
| 147 |
-IUSE="+oldwallet" |
| 148 |
+IUSE="" |
| 149 |
|
| 150 |
-COMMON_DEPEND=" |
| 151 |
+DEPEND=" |
| 152 |
dev-libs/libgcrypt:0= |
| 153 |
virtual/pam |
| 154 |
" |
| 155 |
-DEPEND="${COMMON_DEPEND} |
| 156 |
- $(add_frameworks_dep extra-cmake-modules) |
| 157 |
- $(add_qt_dep qtcore) |
| 158 |
-" |
| 159 |
-RDEPEND="${COMMON_DEPEND} |
| 160 |
- !kde-apps/kwalletd-pam |
| 161 |
+RDEPEND="${DEPEND} |
| 162 |
net-misc/socat |
| 163 |
" |
| 164 |
|
| 165 |
-pkg_setup() { |
| 166 |
- kde5_pkg_setup |
| 167 |
- MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) ) |
| 168 |
-} |
| 169 |
- |
| 170 |
src_configure() { |
| 171 |
- myconfigure() { |
| 172 |
- local mycmakeargs=( |
| 173 |
- -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 174 |
- ) |
| 175 |
- [[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 ) |
| 176 |
- |
| 177 |
- kde5_src_configure |
| 178 |
- } |
| 179 |
- multibuild_foreach_variant myconfigure |
| 180 |
-} |
| 181 |
- |
| 182 |
-src_compile() { |
| 183 |
- multibuild_foreach_variant kde5_src_compile |
| 184 |
-} |
| 185 |
- |
| 186 |
-src_test() { |
| 187 |
- multibuild_foreach_variant kde5_src_test |
| 188 |
-} |
| 189 |
- |
| 190 |
-src_install() { |
| 191 |
- multibuild_foreach_variant kde5_src_install |
| 192 |
+ local mycmakeargs=( |
| 193 |
+ -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 194 |
+ -DKWALLET4=0 |
| 195 |
+ ) |
| 196 |
+ kde5_src_configure |
| 197 |
} |
| 198 |
|
| 199 |
pkg_postinst() { |
| 200 |
check_dm() { |
| 201 |
- local good |
| 202 |
if [[ -e "${ROOT}${2}" ]] ; then |
| 203 |
if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 204 |
grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 205 |
- good=true |
| 206 |
- fi |
| 207 |
- if use oldwallet ; then |
| 208 |
- if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \ |
| 209 |
- ! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then |
| 210 |
- good=false |
| 211 |
- fi |
| 212 |
+ elog " ${1} - ${2} ...GOOD" |
| 213 |
+ else |
| 214 |
+ ewarn " ${1} - ${2} ...BAD" |
| 215 |
fi |
| 216 |
fi |
| 217 |
- [[ "${good}" = true ]] && \ |
| 218 |
- elog " ${1} - ${2} ...GOOD" || \ |
| 219 |
- ewarn " ${1} - ${2} ...BAD" |
| 220 |
} |
| 221 |
- elog |
| 222 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 223 |
- use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4." |
| 224 |
elog "List of things to make it work:" |
| 225 |
elog "1. Use standard blowfish encryption instead of GPG" |
| 226 |
elog "2. Use same password for login and kwallet" |
| 227 |
@@ -82,12 +45,9 @@ pkg_postinst() { |
| 228 |
elog "4.a Have the following lines in the display manager's pam.d file:" |
| 229 |
elog " -auth optional pam_kwallet5.so" |
| 230 |
elog " -session optional pam_kwallet5.so auto_start" |
| 231 |
- if use oldwallet ; then |
| 232 |
- elog " -auth optional pam_kwallet.so kdehome=.kde4" |
| 233 |
- elog " -session optional pam_kwallet.so" |
| 234 |
- fi |
| 235 |
elog "4.b Checking installed DMs..." |
| 236 |
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 237 |
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 238 |
elog |
| 239 |
+ elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 240 |
} |
| 241 |
|
| 242 |
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 |
| 243 |
index f322759080..7025612609 100644 |
| 244 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild |
| 245 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.49.9999.ebuild |
| 246 |
@@ -3,78 +3,41 @@ |
| 247 |
|
| 248 |
EAPI=6 |
| 249 |
|
| 250 |
-KDE_AUTODEPS="false" |
| 251 |
-inherit kde5 multibuild multilib |
| 252 |
+inherit kde5 |
| 253 |
|
| 254 |
DESCRIPTION="KWallet PAM module to not enter password again" |
| 255 |
LICENSE="LGPL-2.1" |
| 256 |
KEYWORDS="" |
| 257 |
-IUSE="+oldwallet" |
| 258 |
+IUSE="" |
| 259 |
|
| 260 |
-COMMON_DEPEND=" |
| 261 |
+DEPEND=" |
| 262 |
dev-libs/libgcrypt:0= |
| 263 |
virtual/pam |
| 264 |
" |
| 265 |
-DEPEND="${COMMON_DEPEND} |
| 266 |
- $(add_frameworks_dep extra-cmake-modules) |
| 267 |
- $(add_qt_dep qtcore) |
| 268 |
-" |
| 269 |
-RDEPEND="${COMMON_DEPEND} |
| 270 |
- !kde-apps/kwalletd-pam |
| 271 |
+RDEPEND="${DEPEND} |
| 272 |
net-misc/socat |
| 273 |
" |
| 274 |
|
| 275 |
-pkg_setup() { |
| 276 |
- kde5_pkg_setup |
| 277 |
- MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) ) |
| 278 |
-} |
| 279 |
- |
| 280 |
src_configure() { |
| 281 |
- myconfigure() { |
| 282 |
- local mycmakeargs=( |
| 283 |
- -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 284 |
- ) |
| 285 |
- [[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 ) |
| 286 |
- |
| 287 |
- kde5_src_configure |
| 288 |
- } |
| 289 |
- multibuild_foreach_variant myconfigure |
| 290 |
-} |
| 291 |
- |
| 292 |
-src_compile() { |
| 293 |
- multibuild_foreach_variant kde5_src_compile |
| 294 |
-} |
| 295 |
- |
| 296 |
-src_test() { |
| 297 |
- multibuild_foreach_variant kde5_src_test |
| 298 |
-} |
| 299 |
- |
| 300 |
-src_install() { |
| 301 |
- multibuild_foreach_variant kde5_src_install |
| 302 |
+ local mycmakeargs=( |
| 303 |
+ -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 304 |
+ -DKWALLET4=0 |
| 305 |
+ ) |
| 306 |
+ kde5_src_configure |
| 307 |
} |
| 308 |
|
| 309 |
pkg_postinst() { |
| 310 |
check_dm() { |
| 311 |
- local good |
| 312 |
if [[ -e "${ROOT}${2}" ]] ; then |
| 313 |
if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 314 |
grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 315 |
- good=true |
| 316 |
- fi |
| 317 |
- if use oldwallet ; then |
| 318 |
- if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \ |
| 319 |
- ! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then |
| 320 |
- good=false |
| 321 |
- fi |
| 322 |
+ elog " ${1} - ${2} ...GOOD" |
| 323 |
+ else |
| 324 |
+ ewarn " ${1} - ${2} ...BAD" |
| 325 |
fi |
| 326 |
fi |
| 327 |
- [[ "${good}" = true ]] && \ |
| 328 |
- elog " ${1} - ${2} ...GOOD" || \ |
| 329 |
- ewarn " ${1} - ${2} ...BAD" |
| 330 |
} |
| 331 |
- elog |
| 332 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 333 |
- use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4." |
| 334 |
elog "List of things to make it work:" |
| 335 |
elog "1. Use standard blowfish encryption instead of GPG" |
| 336 |
elog "2. Use same password for login and kwallet" |
| 337 |
@@ -82,12 +45,9 @@ pkg_postinst() { |
| 338 |
elog "4.a Have the following lines in the display manager's pam.d file:" |
| 339 |
elog " -auth optional pam_kwallet5.so" |
| 340 |
elog " -session optional pam_kwallet5.so auto_start" |
| 341 |
- if use oldwallet ; then |
| 342 |
- elog " -auth optional pam_kwallet.so kdehome=.kde4" |
| 343 |
- elog " -session optional pam_kwallet.so" |
| 344 |
- fi |
| 345 |
elog "4.b Checking installed DMs..." |
| 346 |
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 347 |
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 348 |
elog |
| 349 |
+ elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 350 |
} |
| 351 |
|
| 352 |
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild |
| 353 |
index 04d60238de..c91205f155 100644 |
| 354 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild |
| 355 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.9.95.ebuild |
| 356 |
@@ -3,78 +3,41 @@ |
| 357 |
|
| 358 |
EAPI=6 |
| 359 |
|
| 360 |
-KDE_AUTODEPS="false" |
| 361 |
-inherit kde5 multibuild multilib |
| 362 |
+inherit kde5 |
| 363 |
|
| 364 |
DESCRIPTION="KWallet PAM module to not enter password again" |
| 365 |
LICENSE="LGPL-2.1" |
| 366 |
KEYWORDS="~amd64 ~arm ~x86" |
| 367 |
-IUSE="+oldwallet" |
| 368 |
+IUSE="" |
| 369 |
|
| 370 |
-COMMON_DEPEND=" |
| 371 |
+DEPEND=" |
| 372 |
dev-libs/libgcrypt:0= |
| 373 |
virtual/pam |
| 374 |
" |
| 375 |
-DEPEND="${COMMON_DEPEND} |
| 376 |
- $(add_frameworks_dep extra-cmake-modules) |
| 377 |
- $(add_qt_dep qtcore) |
| 378 |
-" |
| 379 |
-RDEPEND="${COMMON_DEPEND} |
| 380 |
- !kde-apps/kwalletd-pam |
| 381 |
+RDEPEND="${DEPEND} |
| 382 |
net-misc/socat |
| 383 |
" |
| 384 |
|
| 385 |
-pkg_setup() { |
| 386 |
- kde5_pkg_setup |
| 387 |
- MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) ) |
| 388 |
-} |
| 389 |
- |
| 390 |
src_configure() { |
| 391 |
- myconfigure() { |
| 392 |
- local mycmakeargs=( |
| 393 |
- -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 394 |
- ) |
| 395 |
- [[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 ) |
| 396 |
- |
| 397 |
- kde5_src_configure |
| 398 |
- } |
| 399 |
- multibuild_foreach_variant myconfigure |
| 400 |
-} |
| 401 |
- |
| 402 |
-src_compile() { |
| 403 |
- multibuild_foreach_variant kde5_src_compile |
| 404 |
-} |
| 405 |
- |
| 406 |
-src_test() { |
| 407 |
- multibuild_foreach_variant kde5_src_test |
| 408 |
-} |
| 409 |
- |
| 410 |
-src_install() { |
| 411 |
- multibuild_foreach_variant kde5_src_install |
| 412 |
+ local mycmakeargs=( |
| 413 |
+ -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 414 |
+ -DKWALLET4=0 |
| 415 |
+ ) |
| 416 |
+ kde5_src_configure |
| 417 |
} |
| 418 |
|
| 419 |
pkg_postinst() { |
| 420 |
check_dm() { |
| 421 |
- local good |
| 422 |
if [[ -e "${ROOT}${2}" ]] ; then |
| 423 |
if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 424 |
grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 425 |
- good=true |
| 426 |
- fi |
| 427 |
- if use oldwallet ; then |
| 428 |
- if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \ |
| 429 |
- ! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then |
| 430 |
- good=false |
| 431 |
- fi |
| 432 |
+ elog " ${1} - ${2} ...GOOD" |
| 433 |
+ else |
| 434 |
+ ewarn " ${1} - ${2} ...BAD" |
| 435 |
fi |
| 436 |
fi |
| 437 |
- [[ "${good}" = true ]] && \ |
| 438 |
- elog " ${1} - ${2} ...GOOD" || \ |
| 439 |
- ewarn " ${1} - ${2} ...BAD" |
| 440 |
} |
| 441 |
- elog |
| 442 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 443 |
- use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4." |
| 444 |
elog "List of things to make it work:" |
| 445 |
elog "1. Use standard blowfish encryption instead of GPG" |
| 446 |
elog "2. Use same password for login and kwallet" |
| 447 |
@@ -82,12 +45,9 @@ pkg_postinst() { |
| 448 |
elog "4.a Have the following lines in the display manager's pam.d file:" |
| 449 |
elog " -auth optional pam_kwallet5.so" |
| 450 |
elog " -session optional pam_kwallet5.so auto_start" |
| 451 |
- if use oldwallet ; then |
| 452 |
- elog " -auth optional pam_kwallet.so kdehome=.kde4" |
| 453 |
- elog " -session optional pam_kwallet.so" |
| 454 |
- fi |
| 455 |
elog "4.b Checking installed DMs..." |
| 456 |
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 457 |
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 458 |
elog |
| 459 |
+ elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 460 |
} |
| 461 |
|
| 462 |
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild |
| 463 |
index f322759080..7025612609 100644 |
| 464 |
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild |
| 465 |
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild |
| 466 |
@@ -3,78 +3,41 @@ |
| 467 |
|
| 468 |
EAPI=6 |
| 469 |
|
| 470 |
-KDE_AUTODEPS="false" |
| 471 |
-inherit kde5 multibuild multilib |
| 472 |
+inherit kde5 |
| 473 |
|
| 474 |
DESCRIPTION="KWallet PAM module to not enter password again" |
| 475 |
LICENSE="LGPL-2.1" |
| 476 |
KEYWORDS="" |
| 477 |
-IUSE="+oldwallet" |
| 478 |
+IUSE="" |
| 479 |
|
| 480 |
-COMMON_DEPEND=" |
| 481 |
+DEPEND=" |
| 482 |
dev-libs/libgcrypt:0= |
| 483 |
virtual/pam |
| 484 |
" |
| 485 |
-DEPEND="${COMMON_DEPEND} |
| 486 |
- $(add_frameworks_dep extra-cmake-modules) |
| 487 |
- $(add_qt_dep qtcore) |
| 488 |
-" |
| 489 |
-RDEPEND="${COMMON_DEPEND} |
| 490 |
- !kde-apps/kwalletd-pam |
| 491 |
+RDEPEND="${DEPEND} |
| 492 |
net-misc/socat |
| 493 |
" |
| 494 |
|
| 495 |
-pkg_setup() { |
| 496 |
- kde5_pkg_setup |
| 497 |
- MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) ) |
| 498 |
-} |
| 499 |
- |
| 500 |
src_configure() { |
| 501 |
- myconfigure() { |
| 502 |
- local mycmakeargs=( |
| 503 |
- -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 504 |
- ) |
| 505 |
- [[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 ) |
| 506 |
- |
| 507 |
- kde5_src_configure |
| 508 |
- } |
| 509 |
- multibuild_foreach_variant myconfigure |
| 510 |
-} |
| 511 |
- |
| 512 |
-src_compile() { |
| 513 |
- multibuild_foreach_variant kde5_src_compile |
| 514 |
-} |
| 515 |
- |
| 516 |
-src_test() { |
| 517 |
- multibuild_foreach_variant kde5_src_test |
| 518 |
-} |
| 519 |
- |
| 520 |
-src_install() { |
| 521 |
- multibuild_foreach_variant kde5_src_install |
| 522 |
+ local mycmakeargs=( |
| 523 |
+ -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" |
| 524 |
+ -DKWALLET4=0 |
| 525 |
+ ) |
| 526 |
+ kde5_src_configure |
| 527 |
} |
| 528 |
|
| 529 |
pkg_postinst() { |
| 530 |
check_dm() { |
| 531 |
- local good |
| 532 |
if [[ -e "${ROOT}${2}" ]] ; then |
| 533 |
if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \ |
| 534 |
grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then |
| 535 |
- good=true |
| 536 |
- fi |
| 537 |
- if use oldwallet ; then |
| 538 |
- if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \ |
| 539 |
- ! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then |
| 540 |
- good=false |
| 541 |
- fi |
| 542 |
+ elog " ${1} - ${2} ...GOOD" |
| 543 |
+ else |
| 544 |
+ ewarn " ${1} - ${2} ...BAD" |
| 545 |
fi |
| 546 |
fi |
| 547 |
- [[ "${good}" = true ]] && \ |
| 548 |
- elog " ${1} - ${2} ...GOOD" || \ |
| 549 |
- ewarn " ${1} - ${2} ...BAD" |
| 550 |
} |
| 551 |
- elog |
| 552 |
elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." |
| 553 |
- use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4." |
| 554 |
elog "List of things to make it work:" |
| 555 |
elog "1. Use standard blowfish encryption instead of GPG" |
| 556 |
elog "2. Use same password for login and kwallet" |
| 557 |
@@ -82,12 +45,9 @@ pkg_postinst() { |
| 558 |
elog "4.a Have the following lines in the display manager's pam.d file:" |
| 559 |
elog " -auth optional pam_kwallet5.so" |
| 560 |
elog " -session optional pam_kwallet5.so auto_start" |
| 561 |
- if use oldwallet ; then |
| 562 |
- elog " -auth optional pam_kwallet.so kdehome=.kde4" |
| 563 |
- elog " -session optional pam_kwallet.so" |
| 564 |
- fi |
| 565 |
elog "4.b Checking installed DMs..." |
| 566 |
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm" |
| 567 |
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm" |
| 568 |
elog |
| 569 |
+ elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" |
| 570 |
} |
| 571 |
|
| 572 |
diff --git a/kde-plasma/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml |
| 573 |
index 033c6118ee..2fdbf33d96 100644 |
| 574 |
--- a/kde-plasma/kwallet-pam/metadata.xml |
| 575 |
+++ b/kde-plasma/kwallet-pam/metadata.xml |
| 576 |
@@ -5,7 +5,4 @@ |
| 577 |
<email>kde@g.o</email> |
| 578 |
<name>Gentoo KDE Project</name> |
| 579 |
</maintainer> |
| 580 |
- <use> |
| 581 |
- <flag name="oldwallet">Enable legacy support for <pkg>kde-apps/kwalletd</pkg></flag> |
| 582 |
- </use> |
| 583 |
</pkgmetadata> |
Archives