--- /usr/portage/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild	2007-11-07 11:06:18.000000000 +0100
+++ nxserver-freenx-0.7.1.ebuild	2007-11-12 14:47:15.344309270 +0100
@@ -52,6 +52,7 @@
 	epatch "${FILESDIR}"/${P}-cups.patch
 	epatch "${FILESDIR}"/${P}-nxdialog.patch
 	epatch "${FILESDIR}"/${P}-nscd.patch
+	epatch "${FILESDIR}"/${P}-usession_fixes.patch
 
 	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
 	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
@@ -72,6 +73,9 @@
 		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die
 		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf || die
 	fi
+	einfo "Enabling usession support."
+	sed -i '/ENABLE_USESSION=/s/"0"/"1"/' nxloadconfig || die
+	sed -i '/ENABLE_USESSION=/s/"0"/"1"/' node.conf || die
 }
 
 src_compile() {
@@ -119,11 +123,13 @@
 	if [[ ${ROOT} == "/" ]]; then
 		usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
 		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
+		usermod -G utmp nx || die "Unable to add nx user to utmp group!!"
 	else
 		elog "If you had another NX server installed before, please make sure"
 		elog "the nx user account is correctly set to:"
 		elog " * login shell: /usr/bin/nxserver"
 		elog " * home directory: ${NX_HOME_DIR}"
+		elog " * supplementary groups: utmp"
 	fi
 
 	elog "To complete the installation, run:"