* [gentoo-commits] gentoo-x86 commit in kde-base/kdm: ChangeLog kdm-4.6.5-r2.ebuild kdm-4.6.5.ebuild kdm-4.6.5-r1.ebuild
@ 2011-07-17 11:23 Andreas HAttel (dilfridge)
0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2011-07-17 11:23 UTC (permalink / raw
To: gentoo-commits
dilfridge 11/07/17 11:23:51
Modified: ChangeLog
Added: kdm-4.6.5-r2.ebuild
Removed: kdm-4.6.5.ebuild kdm-4.6.5-r1.ebuild
Log:
Re-add support for window managers using make_session_desktop from
eutils.eclass (which installs to /usr/share/xsessions)
(Portage version: 2.1.10.5/cvs/Linux x86_64)
Revision Changes Path
1.256 kde-base/kdm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.256&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.256&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?r1=1.255&r2=1.256
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- ChangeLog 12 Jul 2011 20:49:17 -0000 1.255
+++ ChangeLog 17 Jul 2011 11:23:51 -0000 1.256
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/kdm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.255 2011/07/12 20:49:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.256 2011/07/17 11:23:51 dilfridge Exp $
+
+*kdm-4.6.5-r2 (17 Jul 2011)
+
+ 17 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdm-4.6.5.ebuild,
+ -kdm-4.6.5-r1.ebuild, +kdm-4.6.5-r2.ebuild:
+ Re-add support for window managers using make_session_desktop from
+ eutils.eclass (which installs to /usr/share/xsessions)
*kdm-4.6.5-r1 (12 Jul 2011)
1.1 kde-base/kdm/kdm-4.6.5-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.6.5-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.6.5-r2.ebuild?rev=1.1&content-type=text/plain
Index: kdm-4.6.5-r2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.5-r2.ebuild,v 1.1 2011/07/17 11:23:51 dilfridge Exp $
EAPI=4
KDE_HANDBOOK="optional"
KMNAME="kdebase-workspace"
inherit kde4-meta flag-o-matic
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="+consolekit debug kerberos pam"
DEPEND="
$(add_kdebase_dep libkworkspace)
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
consolekit? (
>=sys-apps/dbus-1.0.2
sys-auth/consolekit
)
kerberos? ( virtual/krb5 )
pam? (
$(add_kdebase_dep kcheckpass)
virtual/pam
)
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
>=x11-apps/xinit-1.0.5-r2
x11-apps/xmessage
"
add_blocker systemsettings '<4.5.80'
KMEXTRA="
libs/kdm/
"
PATCHES=(
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
)
pkg_setup() {
kde4-meta_pkg_setup
# Create kdm:kdm user
KDM_HOME=/var/lib/kdm
enewgroup kdm
enewuser kdm -1 -1 "${KDM_HOME}" kdm
}
src_configure() {
# genkdmconf breaks with -O3
# last checked in 4.2.95
replace-flags -O3 -O2
mycmakeargs=(
$(cmake-utils_use kerberos KDE4_KRB5AUTH)
$(cmake-utils_use_with pam)
$(cmake-utils_use_with consolekit CkConnector)
)
kde4-meta_src_configure
}
src_install() {
export GENKDMCONF_FLAGS="--no-old --no-backup"
kde4-meta_src_install
# Customize the kdmrc configuration:
# - SessionDirs set to /usr/share/xsessions
# - increase server timeout to 30s
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
-i "${ED}"/usr/share/config/kdm/kdmrc \
|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
# Don't install empty dir
rmdir "${ED}"/usr/share/config/kdm/sessions
# Set up permissions to kdm work directory
keepdir "${KDM_HOME}"
fowners root:kdm "${KDM_HOME}"
fperms 1770 "${KDM_HOME}"
# install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
}
pkg_postinst() {
kde4-meta_pkg_postinst
local file src dest dir old_dirs=(
/var/lib/kdm-live
/var/lib/kdm-4.6
/var/lib/kdm-4.5
/var/lib/kdm-4.4
/usr/share/apps/kdm
/usr/kde/4.4/share/apps/kdm
/usr/kde/4.3/share/apps/kdm
/usr/kde/4.2/share/apps/kdm
)
mkdir -p "${EROOT}${KDM_HOME}/faces"
# Set the default kdm face icon if it's not already set by the system admin
# because this is user-overrideable in that way, it's not in src_install
for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
src=${file#*:}
dest=${file%:*}
if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
for dir in "${old_dirs[@]}"; do
if [[ -e ${EROOT}${dir}/${dest} ]]; then
cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
break 2
fi
done
if [[ -n ${src} ]]; then
cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
"${EROOT}${KDM_HOME}/${dest}"
fi
fi
done
for dir in "${old_dirs[@]}"; do
if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
echo
elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
echo
elog "After doing so, you may delete the directory."
echo
fi
done
# Make sure permissions are correct -- old installations may have
# gotten this wrong
use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
chmod 1770 "${EROOT}${KDM_HOME}"
if use consolekit; then
echo
elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
elog "make sure consolekit daemon is running and started at login time"
elog
elog "rc-update add consolekit default && /etc/init.d/consolekit start"
echo
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-17 11:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-17 11:23 [gentoo-commits] gentoo-x86 commit in kde-base/kdm: ChangeLog kdm-4.6.5-r2.ebuild kdm-4.6.5.ebuild kdm-4.6.5-r1.ebuild Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox