Gentoo Archives: gentoo-commits

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