--- /usr/portage/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.8.ebuild	2011-08-24 10:14:19.000000000 +0200
+++ nxserver-freeedition-3.5.0.8.ebuild	2011-08-25 11:47:16.712633386 +0200
@@ -28,12 +28,13 @@
 S="${WORKDIR}"/NX
 
 pkg_preinst() {
-	enewuser nx -1 -1 /usr/NX/home/nx
+	enewuser nx -1 -1 /var/lib/NX
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
 	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
+	epatch "${FILESDIR}"/nxserver-3.4-chown.patch
 }
 
 src_install() {
@@ -43,8 +44,8 @@
 	into /usr/NX
 	dobin bin/nxserver
 
-	dodir /usr/NX/etc/keys
-	insinto /usr/NX/etc
+	dodir /etc/NX/keys
+	insinto /etc/NX
 	doins etc/administrators.db.sample
 	doins etc/guests.db.sample
 	doins etc/passwords.db.sample
@@ -54,11 +55,19 @@
 
 	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
 
-	cp -R home "${D}"/usr/NX || die "Unable to install home folder"
+	dodir /var/lib
+	cp -R home/nx "${D}"/var/lib || die "Unable to install home folder"
+	mv "${D}"/var/lib/{nx,NX}
+
 	cp -R lib "${D}"/usr/NX || die "Unable to install lib folder"
 	cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder"
 	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
-	cp -R var "${D}"/usr/NX || die "Unable to install var folder"
+
+	dodir /var/db/NX
+	cp -R var/db/. "${D}"/var/db/NX || die "Unable to install var/db folder"
+	dodir /var/run/NX
+	cp -R var/run/. "${D}"/var/run/NX || die "Unable to install var/run folder"
+	dodir /var/log/NX
 
 	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
 }
@@ -68,16 +77,16 @@
 	# However they use different login shell/home directory paths
 	if [[ ${ROOT} == "/" ]]; then
 		usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-		usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
+		usermod -d /var/lib/NX nx || die "Unable to set home directory of nx user!!"
 	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/NX/bin/nxserver"
-		elog " * home directory: /usr/NX/home/nx"
+		elog " * home directory: /var/lib/NX"
 	fi
 
 	# only run install when no configuration file is found
-	if [ -f /usr/NX/etc/server.cfg ]; then
+	if [ -f "${ROOT}"/etc/NX/server.cfg ]; then
 		einfo "Running NoMachine's update script"
 		"${ROOT}"/usr/NX/scripts/setup/nxserver --update || die "Update script failed"
 	else