Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
Date: Mon, 01 Jun 2015 18:18:51
Message-Id: 1433182689.14b79a7d4e149c0ed23a4480fa4e4ededafbe126.kensington@gentoo
1 commit: 14b79a7d4e149c0ed23a4480fa4e4ededafbe126
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 1 18:18:09 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 1 18:18:09 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14b79a7d
7
8 [kde-plasma/plasma-workspace] Import PAM files from kde-base/kdebase-pam.
9
10 These files are currently only used by kcheckpass for unlocking the screen.
11
12 Package-Manager: portage-2.2.20
13
14 kde-plasma/plasma-workspace/files/kde-np.pam | 10 ++++++++++
15 kde-plasma/plasma-workspace/files/kde.pam | 11 +++++++++++
16 .../plasma-workspace/plasma-workspace-5.3.49.9999.ebuild | 6 ++++--
17 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 6 ++++--
18 4 files changed, 29 insertions(+), 4 deletions(-)
19
20 diff --git a/kde-plasma/plasma-workspace/files/kde-np.pam b/kde-plasma/plasma-workspace/files/kde-np.pam
21 new file mode 100644
22 index 0000000..f5499e6
23 --- /dev/null
24 +++ b/kde-plasma/plasma-workspace/files/kde-np.pam
25 @@ -0,0 +1,10 @@
26 +#%PAM-1.0
27 +
28 +auth required pam_nologin.so
29 +auth required pam_permit.so
30 +
31 +account include system-local-login
32 +
33 +password include system-local-login
34 +
35 +session include system-local-login
36
37 diff --git a/kde-plasma/plasma-workspace/files/kde.pam b/kde-plasma/plasma-workspace/files/kde.pam
38 new file mode 100644
39 index 0000000..24d19de
40 --- /dev/null
41 +++ b/kde-plasma/plasma-workspace/files/kde.pam
42 @@ -0,0 +1,11 @@
43 +#%PAM-1.0
44 +
45 +auth required pam_nologin.so
46 +
47 +auth include system-local-login
48 +
49 +account include system-local-login
50 +
51 +password include system-local-login
52 +
53 +session include system-local-login
54
55 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild
56 index c05b182..a7d7177 100644
57 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild
58 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild
59 @@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
60 KDE_PUNT_BOGUS_DEPS="true"
61 KDE_TEST="true"
62 VIRTUALX_REQUIRED="test"
63 -inherit kde5 multilib
64 +inherit kde5 multilib pam
65
66 DESCRIPTION="KDE Plasma workspace"
67 KEYWORDS=""
68 @@ -102,7 +102,6 @@ RDEPEND="${COMMON_DEPEND}
69 dev-qt/qdbus:5
70 dev-qt/qtpaths:5
71 dev-qt/qtquickcontrols:5[widgets]
72 - kde-base/kdebase-pam
73 x11-apps/mkfontdir
74 x11-apps/xmessage
75 x11-apps/xprop
76 @@ -158,6 +157,9 @@ src_configure() {
77 src_install() {
78 kde5_src_install
79
80 + newpamd "${FILESDIR}/kde.pam" kde
81 + newpamd "${FILESDIR}/kde-np.pam" kde-np
82 +
83 # startup and shutdown scripts
84 insinto /etc/plasma/startup
85 doins "${FILESDIR}/agent-startup.sh"
86
87 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
88 index 329e224..6c2b55a 100644
89 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
90 +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
91 @@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
92 KDE_PUNT_BOGUS_DEPS="true"
93 KDE_TEST="true"
94 VIRTUALX_REQUIRED="test"
95 -inherit kde5 multilib
96 +inherit kde5 multilib pam
97
98 DESCRIPTION="KDE Plasma workspace"
99 KEYWORDS=""
100 @@ -101,7 +101,6 @@ RDEPEND="${COMMON_DEPEND}
101 dev-qt/qdbus:5
102 dev-qt/qtpaths:5
103 dev-qt/qtquickcontrols:5[widgets]
104 - kde-base/kdebase-pam
105 x11-apps/mkfontdir
106 x11-apps/xmessage
107 x11-apps/xprop
108 @@ -157,6 +156,9 @@ src_configure() {
109 src_install() {
110 kde5_src_install
111
112 + newpamd "${FILESDIR}/kde.pam" kde
113 + newpamd "${FILESDIR}/kde-np.pam" kde-np
114 +
115 # startup and shutdown scripts
116 insinto /etc/plasma/startup
117 doins "${FILESDIR}/agent-startup.sh"