1 |
dilfridge 11/07/12 20:49:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdm-4.6.5-r1.ebuild |
5 |
Log: |
6 |
Use the session files from kdm, bug 364861 |
7 |
|
8 |
(Portage version: 2.1.10.4/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.255 kde-base/kdm/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.255&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.255&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?r1=1.254&r2=1.255 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v |
20 |
retrieving revision 1.254 |
21 |
retrieving revision 1.255 |
22 |
diff -u -r1.254 -r1.255 |
23 |
--- ChangeLog 9 Jul 2011 15:14:28 -0000 1.254 |
24 |
+++ ChangeLog 12 Jul 2011 20:49:17 -0000 1.255 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for kde-base/kdm |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.254 2011/07/09 15:14:28 alexxy Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.255 2011/07/12 20:49:17 dilfridge Exp $ |
30 |
+ |
31 |
+*kdm-4.6.5-r1 (12 Jul 2011) |
32 |
+ |
33 |
+ 12 Jul 2011; Andreas K. Huettel <dilfridge@g.o> +kdm-4.6.5-r1.ebuild: |
34 |
+ Use the session files from kdm, bug 364861 |
35 |
|
36 |
*kdm-4.6.5 (09 Jul 2011) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 kde-base/kdm/kdm-4.6.5-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.6.5-r1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.6.5-r1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: kdm-4.6.5-r1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2011 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.5-r1.ebuild,v 1.1 2011/07/12 20:49:17 dilfridge Exp $ |
51 |
|
52 |
EAPI=4 |
53 |
|
54 |
KDE_HANDBOOK="optional" |
55 |
KMNAME="kdebase-workspace" |
56 |
inherit kde4-meta flag-o-matic |
57 |
|
58 |
DESCRIPTION="KDE login manager, similar to xdm and gdm" |
59 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
60 |
IUSE="+consolekit debug kerberos pam" |
61 |
|
62 |
DEPEND=" |
63 |
$(add_kdebase_dep libkworkspace) |
64 |
x11-libs/libXau |
65 |
x11-libs/libXdmcp |
66 |
x11-libs/libXtst |
67 |
consolekit? ( |
68 |
>=sys-apps/dbus-1.0.2 |
69 |
sys-auth/consolekit |
70 |
) |
71 |
kerberos? ( virtual/krb5 ) |
72 |
pam? ( |
73 |
$(add_kdebase_dep kcheckpass) |
74 |
virtual/pam |
75 |
) |
76 |
" |
77 |
RDEPEND="${DEPEND} |
78 |
$(add_kdebase_dep kdepasswd) |
79 |
>=x11-apps/xinit-1.0.5-r2 |
80 |
x11-apps/xmessage |
81 |
" |
82 |
|
83 |
add_blocker systemsettings '<4.5.80' |
84 |
|
85 |
KMEXTRA=" |
86 |
libs/kdm/ |
87 |
" |
88 |
|
89 |
PATCHES=( |
90 |
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
91 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
92 |
) |
93 |
|
94 |
pkg_setup() { |
95 |
kde4-meta_pkg_setup |
96 |
|
97 |
# Create kdm:kdm user |
98 |
KDM_HOME=/var/lib/kdm |
99 |
enewgroup kdm |
100 |
enewuser kdm -1 -1 "${KDM_HOME}" kdm |
101 |
} |
102 |
|
103 |
src_configure() { |
104 |
# genkdmconf breaks with -O3 |
105 |
# last checked in 4.2.95 |
106 |
replace-flags -O3 -O2 |
107 |
|
108 |
mycmakeargs=( |
109 |
$(cmake-utils_use kerberos KDE4_KRB5AUTH) |
110 |
$(cmake-utils_use_with pam) |
111 |
$(cmake-utils_use_with consolekit CkConnector) |
112 |
) |
113 |
|
114 |
kde4-meta_src_configure |
115 |
} |
116 |
|
117 |
src_install() { |
118 |
export GENKDMCONF_FLAGS="--no-old --no-backup" |
119 |
|
120 |
kde4-meta_src_install |
121 |
|
122 |
# Customize the kdmrc configuration: |
123 |
# - SessionDirs set to /usr/share/xsessions |
124 |
# - increase server timeout to 30s |
125 |
# - TerminateServer=true to workaround X server regen bug, bug 278473 |
126 |
# - DataDir set to /var/lib/kdm |
127 |
# - FaceDir set to /var/lib/kdm/faces |
128 |
sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \ |
129 |
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \ |
130 |
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ |
131 |
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ |
132 |
-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ |
133 |
-i "${ED}"/usr/share/config/kdm/kdmrc \ |
134 |
|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." |
135 |
|
136 |
# Don't install empty dir |
137 |
rmdir "${ED}"/usr/share/config/kdm/sessions |
138 |
|
139 |
# Set up permissions to kdm work directory |
140 |
keepdir "${KDM_HOME}" |
141 |
fowners root:kdm "${KDM_HOME}" |
142 |
fperms 1770 "${KDM_HOME}" |
143 |
|
144 |
# install logrotate file |
145 |
insinto /etc/logrotate.d |
146 |
newins "${FILESDIR}"/kdm-logrotate kdm |
147 |
} |
148 |
|
149 |
pkg_postinst() { |
150 |
kde4-meta_pkg_postinst |
151 |
|
152 |
local file src dest dir old_dirs=( |
153 |
/var/lib/kdm-live |
154 |
/var/lib/kdm-4.6 |
155 |
/var/lib/kdm-4.5 |
156 |
/var/lib/kdm-4.4 |
157 |
/usr/share/apps/kdm |
158 |
/usr/kde/4.4/share/apps/kdm |
159 |
/usr/kde/4.3/share/apps/kdm |
160 |
/usr/kde/4.2/share/apps/kdm |
161 |
) |
162 |
|
163 |
mkdir -p "${EROOT}${KDM_HOME}/faces" |
164 |
# Set the default kdm face icon if it's not already set by the system admin |
165 |
# because this is user-overrideable in that way, it's not in src_install |
166 |
for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do |
167 |
src=${file#*:} |
168 |
dest=${file%:*} |
169 |
if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then |
170 |
for dir in "${old_dirs[@]}"; do |
171 |
if [[ -e ${EROOT}${dir}/${dest} ]]; then |
172 |
cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" |
173 |
break 2 |
174 |
fi |
175 |
done |
176 |
if [[ -n ${src} ]]; then |
177 |
cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \ |
178 |
"${EROOT}${KDM_HOME}/${dest}" |
179 |
fi |
180 |
fi |
181 |
done |
182 |
for dir in "${old_dirs[@]}"; do |
183 |
if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then |
184 |
echo |
185 |
elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE." |
186 |
elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}." |
187 |
echo |
188 |
elog "After doing so, you may delete the directory." |
189 |
echo |
190 |
fi |
191 |
done |
192 |
|
193 |
# Make sure permissions are correct -- old installations may have |
194 |
# gotten this wrong |
195 |
use prefix || chown root:kdm "${EROOT}${KDM_HOME}" |
196 |
chmod 1770 "${EROOT}${KDM_HOME}" |
197 |
|
198 |
if use consolekit; then |
199 |
echo |
200 |
elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," |
201 |
elog "make sure consolekit daemon is running and started at login time" |
202 |
elog |
203 |
elog "rc-update add consolekit default && /etc/init.d/consolekit start" |
204 |
echo |
205 |
fi |
206 |
} |