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