1 |
commit: d353f4c1104ce336e22a22cf34c376d689144270 |
2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Sun Nov 20 22:53:49 2011 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 20 22:53:49 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d353f4c1 |
7 |
|
8 |
[kde-base/kdm] Moved 4.7.3 to tree, added patch in newer |
9 |
|
10 |
(Portage version: 2.1.10.36/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
kde-base/kdm/kdm-4.7.3-r1.ebuild | 161 ----------------------------------- |
14 |
kde-base/kdm/kdm-4.7.49.9999.ebuild | 3 +- |
15 |
kde-base/kdm/kdm-4.7.80.ebuild | 3 +- |
16 |
kde-base/kdm/kdm-9999.ebuild | 3 +- |
17 |
4 files changed, 6 insertions(+), 164 deletions(-) |
18 |
|
19 |
diff --git a/kde-base/kdm/kdm-4.7.3-r1.ebuild b/kde-base/kdm/kdm-4.7.3-r1.ebuild |
20 |
deleted file mode 100644 |
21 |
index 7e04b3f..0000000 |
22 |
--- a/kde-base/kdm/kdm-4.7.3-r1.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,161 +0,0 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $ |
28 |
- |
29 |
-EAPI=4 |
30 |
- |
31 |
-KDE_HANDBOOK="optional" |
32 |
-KMNAME="kde-workspace" |
33 |
-inherit kde4-meta flag-o-matic |
34 |
- |
35 |
-DESCRIPTION="KDE login manager, similar to xdm and gdm" |
36 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
37 |
-IUSE="+consolekit debug kerberos pam" |
38 |
- |
39 |
-DEPEND=" |
40 |
- $(add_kdebase_dep libkworkspace) |
41 |
- x11-libs/libXau |
42 |
- x11-libs/libXdmcp |
43 |
- x11-libs/libXtst |
44 |
- consolekit? ( |
45 |
- >=sys-apps/dbus-1.0.2 |
46 |
- sys-auth/consolekit |
47 |
- ) |
48 |
- kerberos? ( virtual/krb5 ) |
49 |
- pam? ( |
50 |
- $(add_kdebase_dep kcheckpass) |
51 |
- virtual/pam |
52 |
- ) |
53 |
-" |
54 |
-RDEPEND="${DEPEND} |
55 |
- $(add_kdebase_dep kdepasswd) |
56 |
- >=x11-apps/xinit-1.0.5-r2 |
57 |
- x11-apps/xmessage |
58 |
-" |
59 |
- |
60 |
-KMEXTRA=" |
61 |
- libs/kdm/ |
62 |
-" |
63 |
- |
64 |
-PATCHES=( |
65 |
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
66 |
- "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
67 |
- "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
68 |
-) |
69 |
- |
70 |
-pkg_setup() { |
71 |
- kde4-meta_pkg_setup |
72 |
- |
73 |
- # Create kdm:kdm user |
74 |
- KDM_HOME=/var/lib/kdm |
75 |
- enewgroup kdm |
76 |
- enewuser kdm -1 -1 "${KDM_HOME}" kdm |
77 |
-} |
78 |
- |
79 |
-src_configure() { |
80 |
- # genkdmconf breaks with -O3 |
81 |
- # last checked in 4.2.95 |
82 |
- replace-flags -O3 -O2 |
83 |
- |
84 |
- mycmakeargs=( |
85 |
- $(cmake-utils_use kerberos KDE4_KRB5AUTH) |
86 |
- $(cmake-utils_use_with pam) |
87 |
- $(cmake-utils_use_with consolekit CkConnector) |
88 |
- ) |
89 |
- |
90 |
- kde4-meta_src_configure |
91 |
-} |
92 |
- |
93 |
-src_install() { |
94 |
- export GENKDMCONF_FLAGS="--no-old --no-backup" |
95 |
- |
96 |
- kde4-meta_src_install |
97 |
- |
98 |
- # an equivalent file is already installed by kde-base/startkde, bug 377151 |
99 |
- rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die |
100 |
- |
101 |
- # Customize the kdmrc configuration: |
102 |
- # - SessionDirs set to /usr/share/xsessions |
103 |
- # - increase server timeout to 30s |
104 |
- # - TerminateServer=true to workaround X server regen bug, bug 278473 |
105 |
- # - DataDir set to /var/lib/kdm |
106 |
- # - FaceDir set to /var/lib/kdm/faces |
107 |
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \ |
108 |
- -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \ |
109 |
- -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ |
110 |
- -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ |
111 |
- -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ |
112 |
- -i "${ED}"/usr/share/config/kdm/kdmrc \ |
113 |
- || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." |
114 |
- |
115 |
- # Don't install empty dir |
116 |
- rmdir "${ED}"/usr/share/config/kdm/sessions |
117 |
- |
118 |
- # Set up permissions to kdm work directory |
119 |
- keepdir "${KDM_HOME}" |
120 |
- fowners root:kdm "${KDM_HOME}" |
121 |
- fperms 1770 "${KDM_HOME}" |
122 |
- |
123 |
- # install logrotate file |
124 |
- insinto /etc/logrotate.d |
125 |
- newins "${FILESDIR}"/kdm-logrotate kdm |
126 |
-} |
127 |
- |
128 |
-pkg_postinst() { |
129 |
- kde4-meta_pkg_postinst |
130 |
- |
131 |
- local file src dest dir old_dirs=( |
132 |
- /var/lib/kdm-live |
133 |
- /var/lib/kdm-4.6 |
134 |
- /var/lib/kdm-4.5 |
135 |
- /var/lib/kdm-4.4 |
136 |
- /usr/share/apps/kdm |
137 |
- /usr/kde/4.4/share/apps/kdm |
138 |
- /usr/kde/4.3/share/apps/kdm |
139 |
- /usr/kde/4.2/share/apps/kdm |
140 |
- ) |
141 |
- |
142 |
- mkdir -p "${EROOT}${KDM_HOME}/faces" |
143 |
- # Set the default kdm face icon if it's not already set by the system admin |
144 |
- # because this is user-overrideable in that way, it's not in src_install |
145 |
- for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do |
146 |
- src=${file#*:} |
147 |
- dest=${file%:*} |
148 |
- if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then |
149 |
- for dir in "${old_dirs[@]}"; do |
150 |
- if [[ -e ${EROOT}${dir}/${dest} ]]; then |
151 |
- cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" |
152 |
- break 2 |
153 |
- fi |
154 |
- done |
155 |
- if [[ -n ${src} ]]; then |
156 |
- cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \ |
157 |
- "${EROOT}${KDM_HOME}/${dest}" |
158 |
- fi |
159 |
- fi |
160 |
- done |
161 |
- for dir in "${old_dirs[@]}"; do |
162 |
- if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then |
163 |
- echo |
164 |
- elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE." |
165 |
- elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}." |
166 |
- echo |
167 |
- elog "After doing so, you may delete the directory." |
168 |
- echo |
169 |
- fi |
170 |
- done |
171 |
- |
172 |
- # Make sure permissions are correct -- old installations may have |
173 |
- # gotten this wrong |
174 |
- use prefix || chown root:kdm "${EROOT}${KDM_HOME}" |
175 |
- chmod 1770 "${EROOT}${KDM_HOME}" |
176 |
- |
177 |
- if use consolekit; then |
178 |
- echo |
179 |
- elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," |
180 |
- elog "make sure consolekit daemon is running and started at login time" |
181 |
- elog |
182 |
- elog "rc-update add consolekit default && /etc/init.d/consolekit start" |
183 |
- echo |
184 |
- fi |
185 |
-} |
186 |
|
187 |
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild |
188 |
index a63e162..ce9a6a7 100644 |
189 |
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild |
190 |
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild |
191 |
@@ -1,6 +1,6 @@ |
192 |
# Copyright 1999-2011 Gentoo Foundation |
193 |
# Distributed under the terms of the GNU General Public License v2 |
194 |
-# $Header: $ |
195 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $ |
196 |
|
197 |
EAPI=4 |
198 |
|
199 |
@@ -40,6 +40,7 @@ KMEXTRA=" |
200 |
PATCHES=( |
201 |
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
202 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
203 |
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
204 |
) |
205 |
|
206 |
pkg_setup() { |
207 |
|
208 |
diff --git a/kde-base/kdm/kdm-4.7.80.ebuild b/kde-base/kdm/kdm-4.7.80.ebuild |
209 |
index 19ea40e..d3a5af4 100644 |
210 |
--- a/kde-base/kdm/kdm-4.7.80.ebuild |
211 |
+++ b/kde-base/kdm/kdm-4.7.80.ebuild |
212 |
@@ -1,6 +1,6 @@ |
213 |
# Copyright 1999-2011 Gentoo Foundation |
214 |
# Distributed under the terms of the GNU General Public License v2 |
215 |
-# $Header: $ |
216 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $ |
217 |
|
218 |
EAPI=4 |
219 |
|
220 |
@@ -40,6 +40,7 @@ KMEXTRA=" |
221 |
PATCHES=( |
222 |
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
223 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
224 |
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
225 |
) |
226 |
|
227 |
pkg_setup() { |
228 |
|
229 |
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild |
230 |
index a63e162..ce9a6a7 100644 |
231 |
--- a/kde-base/kdm/kdm-9999.ebuild |
232 |
+++ b/kde-base/kdm/kdm-9999.ebuild |
233 |
@@ -1,6 +1,6 @@ |
234 |
# Copyright 1999-2011 Gentoo Foundation |
235 |
# Distributed under the terms of the GNU General Public License v2 |
236 |
-# $Header: $ |
237 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $ |
238 |
|
239 |
EAPI=4 |
240 |
|
241 |
@@ -40,6 +40,7 @@ KMEXTRA=" |
242 |
PATCHES=( |
243 |
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
244 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
245 |
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
246 |
) |
247 |
|
248 |
pkg_setup() { |