| 1 |
johu 12/02/03 16:10:42 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: kdm-4.7.4-r1.ebuild kdm-4.8.0-r1.ebuild |
| 5 |
Removed: kdm-4.8.0.ebuild |
| 6 |
Log: |
| 7 |
Revision bump. Removes pam patch which has no effect. Is fixed in kde-base/libkworkspace bug #398333. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.279 kde-base/kdm/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.279&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.279&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?r1=1.278&r2=1.279 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v |
| 21 |
retrieving revision 1.278 |
| 22 |
retrieving revision 1.279 |
| 23 |
diff -u -r1.278 -r1.279 |
| 24 |
--- ChangeLog 25 Jan 2012 18:16:50 -0000 1.278 |
| 25 |
+++ ChangeLog 3 Feb 2012 16:10:42 -0000 1.279 |
| 26 |
@@ -1,6 +1,14 @@ |
| 27 |
# ChangeLog for kde-base/kdm |
| 28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.278 2012/01/25 18:16:50 johu Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.279 2012/02/03 16:10:42 johu Exp $ |
| 31 |
+ |
| 32 |
+*kdm-4.8.0-r1 (03 Feb 2012) |
| 33 |
+*kdm-4.7.4-r1 (03 Feb 2012) |
| 34 |
+ |
| 35 |
+ 03 Feb 2012; Johannes Huber <johu@g.o> +kdm-4.7.4-r1.ebuild, |
| 36 |
+ +kdm-4.8.0-r1.ebuild, -kdm-4.8.0.ebuild: |
| 37 |
+ Revision bump. Removes pam patch which has no effect. Is fixed in kde- |
| 38 |
+ base/libkworkspace bug #398333. |
| 39 |
|
| 40 |
*kdm-4.8.0 (25 Jan 2012) |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 kde-base/kdm/kdm-4.7.4-r1.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.7.4-r1.ebuild?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: kdm-4.7.4-r1.ebuild |
| 51 |
=================================================================== |
| 52 |
# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.4-r1.ebuild,v 1.1 2012/02/03 16:10:42 johu Exp $ |
| 55 |
|
| 56 |
EAPI=4 |
| 57 |
|
| 58 |
KDE_HANDBOOK="optional" |
| 59 |
KMNAME="kde-workspace" |
| 60 |
inherit kde4-meta flag-o-matic |
| 61 |
|
| 62 |
DESCRIPTION="KDE login manager, similar to xdm and gdm" |
| 63 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
| 64 |
IUSE="+consolekit debug kerberos pam" |
| 65 |
|
| 66 |
DEPEND=" |
| 67 |
$(add_kdebase_dep libkworkspace) |
| 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 |
" |
| 81 |
RDEPEND="${DEPEND} |
| 82 |
$(add_kdebase_dep kdepasswd) |
| 83 |
>=x11-apps/xinit-1.0.5-r2 |
| 84 |
x11-apps/xmessage |
| 85 |
" |
| 86 |
|
| 87 |
KMEXTRA=" |
| 88 |
libs/kdm/ |
| 89 |
" |
| 90 |
|
| 91 |
PATCHES=( |
| 92 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
| 93 |
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
| 94 |
) |
| 95 |
|
| 96 |
pkg_setup() { |
| 97 |
kde4-meta_pkg_setup |
| 98 |
|
| 99 |
# Create kdm:kdm user |
| 100 |
KDM_HOME=/var/lib/kdm |
| 101 |
enewgroup kdm |
| 102 |
enewuser kdm -1 -1 "${KDM_HOME}" kdm |
| 103 |
} |
| 104 |
|
| 105 |
src_configure() { |
| 106 |
# genkdmconf breaks with -O3 |
| 107 |
# last checked in 4.2.95 |
| 108 |
replace-flags -O3 -O2 |
| 109 |
|
| 110 |
mycmakeargs=( |
| 111 |
$(cmake-utils_use kerberos KDE4_KRB5AUTH) |
| 112 |
$(cmake-utils_use_with pam) |
| 113 |
$(cmake-utils_use_with consolekit CkConnector) |
| 114 |
) |
| 115 |
|
| 116 |
kde4-meta_src_configure |
| 117 |
} |
| 118 |
|
| 119 |
src_install() { |
| 120 |
export GENKDMCONF_FLAGS="--no-old --no-backup" |
| 121 |
|
| 122 |
kde4-meta_src_install |
| 123 |
|
| 124 |
# an equivalent file is already installed by kde-base/startkde, bug 377151 |
| 125 |
rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die |
| 126 |
|
| 127 |
# Customize the kdmrc configuration: |
| 128 |
# - SessionDirs set to /usr/share/xsessions |
| 129 |
# - increase server timeout to 30s |
| 130 |
# - TerminateServer=true to workaround X server regen bug, bug 278473 |
| 131 |
# - DataDir set to /var/lib/kdm |
| 132 |
# - FaceDir set to /var/lib/kdm/faces |
| 133 |
sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \ |
| 134 |
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \ |
| 135 |
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ |
| 136 |
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ |
| 137 |
-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ |
| 138 |
-i "${ED}"/usr/share/config/kdm/kdmrc \ |
| 139 |
|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." |
| 140 |
|
| 141 |
# Don't install empty dir |
| 142 |
rmdir "${ED}"/usr/share/config/kdm/sessions |
| 143 |
|
| 144 |
# Set up permissions to kdm work directory |
| 145 |
keepdir "${KDM_HOME}" |
| 146 |
fowners root:kdm "${KDM_HOME}" |
| 147 |
fperms 1770 "${KDM_HOME}" |
| 148 |
|
| 149 |
# install logrotate file |
| 150 |
insinto /etc/logrotate.d |
| 151 |
newins "${FILESDIR}"/kdm-logrotate kdm |
| 152 |
} |
| 153 |
|
| 154 |
pkg_postinst() { |
| 155 |
kde4-meta_pkg_postinst |
| 156 |
|
| 157 |
local file src dest dir old_dirs=( |
| 158 |
/var/lib/kdm-live |
| 159 |
/var/lib/kdm-4.6 |
| 160 |
/var/lib/kdm-4.5 |
| 161 |
/var/lib/kdm-4.4 |
| 162 |
/usr/share/apps/kdm |
| 163 |
/usr/kde/4.4/share/apps/kdm |
| 164 |
/usr/kde/4.3/share/apps/kdm |
| 165 |
/usr/kde/4.2/share/apps/kdm |
| 166 |
) |
| 167 |
|
| 168 |
mkdir -p "${EROOT}${KDM_HOME}/faces" |
| 169 |
# Set the default kdm face icon if it's not already set by the system admin |
| 170 |
# because this is user-overrideable in that way, it's not in src_install |
| 171 |
for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do |
| 172 |
src=${file#*:} |
| 173 |
dest=${file%:*} |
| 174 |
if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then |
| 175 |
for dir in "${old_dirs[@]}"; do |
| 176 |
if [[ -e ${EROOT}${dir}/${dest} ]]; then |
| 177 |
cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" |
| 178 |
break 2 |
| 179 |
fi |
| 180 |
done |
| 181 |
if [[ -n ${src} ]]; then |
| 182 |
cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \ |
| 183 |
"${EROOT}${KDM_HOME}/${dest}" |
| 184 |
fi |
| 185 |
fi |
| 186 |
done |
| 187 |
for dir in "${old_dirs[@]}"; do |
| 188 |
if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then |
| 189 |
echo |
| 190 |
elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE." |
| 191 |
elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}." |
| 192 |
echo |
| 193 |
elog "After doing so, you may delete the directory." |
| 194 |
echo |
| 195 |
fi |
| 196 |
done |
| 197 |
|
| 198 |
# Make sure permissions are correct -- old installations may have |
| 199 |
# gotten this wrong |
| 200 |
use prefix || chown root:kdm "${EROOT}${KDM_HOME}" |
| 201 |
chmod 1770 "${EROOT}${KDM_HOME}" |
| 202 |
|
| 203 |
if use consolekit; then |
| 204 |
echo |
| 205 |
elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," |
| 206 |
elog "make sure consolekit daemon is running and started at login time" |
| 207 |
elog |
| 208 |
elog "rc-update add consolekit default && /etc/init.d/consolekit start" |
| 209 |
echo |
| 210 |
fi |
| 211 |
} |
| 212 |
|
| 213 |
|
| 214 |
|
| 215 |
1.1 kde-base/kdm/kdm-4.8.0-r1.ebuild |
| 216 |
|
| 217 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.8.0-r1.ebuild?rev=1.1&view=markup |
| 218 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.8.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 219 |
|
| 220 |
Index: kdm-4.8.0-r1.ebuild |
| 221 |
=================================================================== |
| 222 |
# Copyright 1999-2012 Gentoo Foundation |
| 223 |
# Distributed under the terms of the GNU General Public License v2 |
| 224 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.0-r1.ebuild,v 1.1 2012/02/03 16:10:42 johu Exp $ |
| 225 |
|
| 226 |
EAPI=4 |
| 227 |
|
| 228 |
KDE_HANDBOOK="optional" |
| 229 |
KMNAME="kde-workspace" |
| 230 |
inherit kde4-meta flag-o-matic |
| 231 |
|
| 232 |
DESCRIPTION="KDE login manager, similar to xdm and gdm" |
| 233 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 234 |
IUSE="+consolekit debug kerberos pam" |
| 235 |
|
| 236 |
DEPEND=" |
| 237 |
$(add_kdebase_dep libkworkspace) |
| 238 |
x11-libs/libXau |
| 239 |
x11-libs/libXdmcp |
| 240 |
x11-libs/libXtst |
| 241 |
consolekit? ( |
| 242 |
>=sys-apps/dbus-1.0.2 |
| 243 |
sys-auth/consolekit |
| 244 |
) |
| 245 |
kerberos? ( virtual/krb5 ) |
| 246 |
pam? ( |
| 247 |
$(add_kdebase_dep kcheckpass) |
| 248 |
virtual/pam |
| 249 |
) |
| 250 |
" |
| 251 |
RDEPEND="${DEPEND} |
| 252 |
$(add_kdebase_dep kdepasswd) |
| 253 |
>=x11-apps/xinit-1.0.5-r2 |
| 254 |
x11-apps/xmessage |
| 255 |
" |
| 256 |
|
| 257 |
KMEXTRA=" |
| 258 |
libs/kdm/ |
| 259 |
" |
| 260 |
|
| 261 |
PATCHES=( |
| 262 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
| 263 |
"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" |
| 264 |
) |
| 265 |
|
| 266 |
pkg_setup() { |
| 267 |
kde4-meta_pkg_setup |
| 268 |
|
| 269 |
# Create kdm:kdm user |
| 270 |
KDM_HOME=/var/lib/kdm |
| 271 |
enewgroup kdm |
| 272 |
enewuser kdm -1 -1 "${KDM_HOME}" kdm |
| 273 |
} |
| 274 |
|
| 275 |
src_configure() { |
| 276 |
# genkdmconf breaks with -O3 |
| 277 |
# last checked in 4.2.95 |
| 278 |
replace-flags -O3 -O2 |
| 279 |
|
| 280 |
mycmakeargs=( |
| 281 |
$(cmake-utils_use kerberos KDE4_KRB5AUTH) |
| 282 |
$(cmake-utils_use_with pam) |
| 283 |
$(cmake-utils_use_with consolekit CkConnector) |
| 284 |
) |
| 285 |
|
| 286 |
kde4-meta_src_configure |
| 287 |
} |
| 288 |
|
| 289 |
src_install() { |
| 290 |
export GENKDMCONF_FLAGS="--no-old --no-backup" |
| 291 |
|
| 292 |
kde4-meta_src_install |
| 293 |
|
| 294 |
# an equivalent file is already installed by kde-base/startkde, bug 377151 |
| 295 |
rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die |
| 296 |
|
| 297 |
# Customize the kdmrc configuration: |
| 298 |
# - SessionDirs set to /usr/share/xsessions |
| 299 |
# - increase server timeout to 30s |
| 300 |
# - TerminateServer=true to workaround X server regen bug, bug 278473 |
| 301 |
# - DataDir set to /var/lib/kdm |
| 302 |
# - FaceDir set to /var/lib/kdm/faces |
| 303 |
sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \ |
| 304 |
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \ |
| 305 |
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ |
| 306 |
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ |
| 307 |
-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ |
| 308 |
-i "${ED}"/usr/share/config/kdm/kdmrc \ |
| 309 |
|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." |
| 310 |
|
| 311 |
# Don't install empty dir |
| 312 |
rmdir "${ED}"/usr/share/config/kdm/sessions |
| 313 |
|
| 314 |
# Set up permissions to kdm work directory |
| 315 |
keepdir "${KDM_HOME}" |
| 316 |
fowners root:kdm "${KDM_HOME}" |
| 317 |
fperms 1770 "${KDM_HOME}" |
| 318 |
|
| 319 |
# install logrotate file |
| 320 |
insinto /etc/logrotate.d |
| 321 |
newins "${FILESDIR}"/kdm-logrotate kdm |
| 322 |
} |
| 323 |
|
| 324 |
pkg_postinst() { |
| 325 |
kde4-meta_pkg_postinst |
| 326 |
|
| 327 |
local file src dest dir old_dirs=( |
| 328 |
/var/lib/kdm-live |
| 329 |
/var/lib/kdm-4.6 |
| 330 |
/var/lib/kdm-4.5 |
| 331 |
/var/lib/kdm-4.4 |
| 332 |
/usr/share/apps/kdm |
| 333 |
/usr/kde/4.4/share/apps/kdm |
| 334 |
/usr/kde/4.3/share/apps/kdm |
| 335 |
/usr/kde/4.2/share/apps/kdm |
| 336 |
) |
| 337 |
|
| 338 |
mkdir -p "${EROOT}${KDM_HOME}/faces" |
| 339 |
# Set the default kdm face icon if it's not already set by the system admin |
| 340 |
# because this is user-overrideable in that way, it's not in src_install |
| 341 |
for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do |
| 342 |
src=${file#*:} |
| 343 |
dest=${file%:*} |
| 344 |
if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then |
| 345 |
for dir in "${old_dirs[@]}"; do |
| 346 |
if [[ -e ${EROOT}${dir}/${dest} ]]; then |
| 347 |
cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" |
| 348 |
break 2 |
| 349 |
fi |
| 350 |
done |
| 351 |
if [[ -n ${src} ]]; then |
| 352 |
cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \ |
| 353 |
"${EROOT}${KDM_HOME}/${dest}" |
| 354 |
fi |
| 355 |
fi |
| 356 |
done |
| 357 |
for dir in "${old_dirs[@]}"; do |
| 358 |
if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then |
| 359 |
echo |
| 360 |
elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE." |
| 361 |
elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}." |
| 362 |
echo |
| 363 |
elog "After doing so, you may delete the directory." |
| 364 |
echo |
| 365 |
fi |
| 366 |
done |
| 367 |
|
| 368 |
# Make sure permissions are correct -- old installations may have |
| 369 |
# gotten this wrong |
| 370 |
use prefix || chown root:kdm "${EROOT}${KDM_HOME}" |
| 371 |
chmod 1770 "${EROOT}${KDM_HOME}" |
| 372 |
|
| 373 |
if use consolekit; then |
| 374 |
echo |
| 375 |
elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," |
| 376 |
elog "make sure consolekit daemon is running and started at login time" |
| 377 |
elog |
| 378 |
elog "rc-update add consolekit default && /etc/init.d/consolekit start" |
| 379 |
echo |
| 380 |
fi |
| 381 |
} |
Archives