Clean some versions, EAPI2, fix Gnome start command for bug #292480

(Portage version: 2.2_rc59/cvs/Linux x86_64)

11 files changed, 68 insertions, 570 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index b72b6ea16599..8f2fc5ae6348 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.68 2009/11/25 14:00:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.69 2009/12/15 20:35:41 voyageur Exp $
+
+*nxserver-freenx-0.7.3_p104-r3 (15 Dec 2009)
+
+  15 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nxserver-freenx-0.7.2-exitstatus.patch,
+  -files/nxserver-freenx-0.7.2-nolistentcp.patch,
+  -files/nxserver-freenx-0.7.2-nxloadconfig.patch,
+  -nxserver-freenx-0.7.3-r2.ebuild, -nxserver-freenx-0.7.3-r3.ebuild,
+  -nxserver-freenx-0.7.3_p104-r1.ebuild,
+  +nxserver-freenx-0.7.3_p104-r3.ebuild,
+  -files/nxserver-freenx-0.7.3-cflags.patch,
+  -files/nxserver-freenx-0.7.3-nxloadconfig.patch,
+  -files/nxserver-freenx-0.7.3-roundrobin.patch,
+  +files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch:
+  Clean some versions, EAPI2, fix Gnome start command for bug #292480
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org>
   nxserver-freenx-0.7.3_p104-r2.ebuild:
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-exitstatus.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-exitstatus.patch
deleted file mode 100644
index cbc768455692..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-exitstatus.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- nxserver.orig	2008-04-09 17:40:33.000000000 +0200
-+++ nxserver	2008-04-09 17:43:10.000000000 +0200
-@@ -1594,6 +1594,13 @@
- 	exit 1
- }
- 
-+cmd_abort_success()
-+{
-+	echo "NX> 500" "$@" 1>&2
-+	echo "NX> 999 Bye" 1>&2
-+	exit 0
-+}
-+
- cmd_user_passwd()
- {
- 	echo "NX> 100 NXSERVER - Version $NX_VERSION $NX_LICENSE"
-@@ -1653,14 +1660,14 @@
- cmd_start()
- {
- 	
--	[ -f $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS ] && cmd_abort "ERROR: Service already running"
-+	[ -f $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS ] && cmd_abort_success "ERROR: Service already running"
- 	mv $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS.disabled $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS
- 	echo "NX> 122 Service started"
- }
- 
- cmd_stop()
- {
--	[ -f $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS ] || cmd_abort "Service was already stopped"
-+	[ -f $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS ] || cmd_abort_success "Service was already stopped"
- 	mv $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS $NX_HOME_DIR/.ssh/$SSH_AUTHORIZED_KEYS.disabled
- 	echo "NX> 123 Service stopped"
- }
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nolistentcp.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nolistentcp.patch
deleted file mode 100644
index 35311c3f16ed..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nolistentcp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nxnode.orig	2008-03-31 14:08:56.000000000 +0200
-+++ nxnode	2008-03-31 14:08:58.000000000 +0200
-@@ -525,7 +525,7 @@
- 		
- 		# Start the agent
- 		
--		PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 &
-+		PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -nolisten tcp -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 &
- 	fi
- 	
- 	#
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nxloadconfig.patch
deleted file mode 100644
index fa8b60e3f9aa..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nxloadconfig.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur freenx-server-0.7.2.orig/nxloadconfig freenx-server-0.7.2/nxloadconfig
---- freenx-server-0.7.2.orig/nxloadconfig	2008-03-19 00:26:08.000000000 +0100
-+++ freenx-server-0.7.2/nxloadconfig	2008-03-19 00:27:44.000000000 +0100
-@@ -58,7 +58,8 @@
- # Where can different nx components be found
- NX_DIR=/usr
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
--PATH_LIB=$NX_DIR/lib
-+REAL_PATH_BIN=$NX_DIR/lib/NX/bin
-+PATH_LIB=$NX_DIR/lib/NX/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
- NX_HOME_DIR=/var/lib/nxserver/home
-@@ -179,7 +180,7 @@
- DEFAULT_X_WM=""
- KILL_DEFAULT_X_WM="1"
- USER_X_STARTUP_SCRIPT=.Xclients
--DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
- COMMAND_START_KDE=startkde
- COMMAND_START_GNOME=gnome-session
- COMMAND_START_CDE=cdwm
-@@ -307,9 +308,9 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
--[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- 
--NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
-+NX_BACKEND_VERSION=$(strings $REAL_PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
- 
- [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend
- 
-@@ -346,7 +347,7 @@
- 		ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
- 	# Check for NX agents ...
- 	
--	[ ! -x "$PATH_BIN/nxagent" ] && \
-+	[ ! -x "$REAL_PATH_BIN/nxagent" ] && \
- 		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
- 	
- 	if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ]
-@@ -598,8 +599,8 @@
- 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
- 
--	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \
--		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[01].0 backend is needed for this version of FreeNX."
-+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \
-+		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[012].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX."
- 		
- 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
- 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-cflags.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-cflags.patch
deleted file mode 100644
index cfb71f139439..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- nx-session-launcher/Makefile.orig	2008-12-19 16:34:02.000000000 +0100
-+++ nx-session-launcher/Makefile	2008-12-19 16:34:55.000000000 +0100
-@@ -1,7 +1,6 @@
- .PHONY: all install
- 
--CC=gcc
--CFLAGS=-g -O2 -Wall -fPIC
-+CFLAGS+=-fPIC
- 
- SOURCES = nx-session-launcher-suid.c
- PROGRAMS = nx-session-launcher-suid
---- nxredir/Makefile.orig	2008-12-19 16:33:53.000000000 +0100
-+++ nxredir/Makefile	2008-12-19 16:34:48.000000000 +0100
-@@ -1,7 +1,6 @@
- all: libnxredir.so.0
- 
--CC=gcc
--CFLAGS=-g -O2 -Wall -fPIC
-+CFLAGS+=-fPIC
- LIBNAME=libnxredir.so.0
- 
- libnxredir.so.0: nxredir.o
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch
deleted file mode 100644
index 6bb57bf777a8..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- nxloadconfig.orig	2008-08-22 02:44:43.000000000 +0200
-+++ nxloadconfig	2008-08-22 14:29:30.000000000 +0200
-@@ -58,7 +58,8 @@
- # Where can different nx components be found
- NX_DIR=/usr
- PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
--PATH_LIB=$NX_DIR/lib
-+REAL_PATH_BIN=$NX_DIR/lib/NX/bin
-+PATH_LIB=$NX_DIR/lib/NX/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
- NX_HOME_DIR=/var/lib/nxserver/home
-@@ -185,7 +186,7 @@
- DEFAULT_X_WM=""
- KILL_DEFAULT_X_WM="1"
- USER_X_STARTUP_SCRIPT=.Xclients
--DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
- COMMAND_START_KDE=startkde
- COMMAND_START_GNOME=gnome-session
- COMMAND_START_CDE=cdwm
-@@ -315,9 +316,9 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
--[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- 
--NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
-+NX_BACKEND_VERSION=$(strings $REAL_PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
- 
- [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend
- 
-@@ -354,7 +355,7 @@
- 		ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
- 	# Check for NX agents ...
- 	
--	[ ! -x "$PATH_BIN/nxagent" ] && \
-+	[ ! -x "$REAL_PATH_BIN/nxagent" ] && \
- 		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
- 	
- 	if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ]
-@@ -606,7 +607,7 @@
- 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
- 
--	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \
-+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \
- 		WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX."
- 		
- 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-roundrobin.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-roundrobin.patch
deleted file mode 100644
index b584f33df0ed..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-roundrobin.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- trunk/freenx-server/nxserver	2008/08/22 00:44:43	580
-+++ trunk/freenx-server/nxserver	2008/08/25 03:28:15	612
-@@ -1192,7 +1192,7 @@
- 	# Lock held
- 
- 	SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null)
--	let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS
-+	let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS
- 	echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin
- 
- 	# Exit critical section
-@@ -1961,71 +1961,71 @@
- 	session_history "$user" "$sessid"
- }
- 
--cmd_terminate()
-+cmd_execute()
- {
--	CMD_PARAMS=$(cmd_parse_3_params "$2")
--	[ -z "$CMD_PARAMS" ] && exit 1
--	for i in $CMD_PARAMS;
-+	cmd_host="$1"
-+	cmd_user="$2"
-+	cmd_cmd="$3"
-+
-+	if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ]
-+	then
-+		sh -c "$cmd_cmd"
-+	elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ]
-+	then
-+		su - "$cmd_user" -c "$cmd_cmd"
-+	else
-+		ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'"
-+	fi
-+}
-+
-+cmd_terminate_or_send()
-+{
-+	CMD="$1"
-+
-+	if [ "$CMD" = "--broadcast" ]
-+	then
-+		CMD_PARAMS=$(session_find_all)
-+		[ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found."
-+	else
-+		CMD_PARAMS=$(cmd_parse_3_params "$2")
-+		[ -z "$CMD_PARAMS" ] && exit 1
-+		shift
-+	fi
-+	shift
-+
-+	for i in $CMD_PARAMS
- 	do
- 			CMDLINE=$(session_get_cmdline $i)
- 			cmd_sessionid=$(getparam sessionId)
-+			cmd_display=$(getparam display)
- 			cmd_user=$(getparam userName)
- 			cmd_type=$(getparam type)
- 			cmd_status=$(getparam status)
-+			cmd_host=$(getparam host)
- 
- 			# is it a "good" session?
--			case "$1" in 
-+			case "$CMD" in 
- 			--suspend)
- 				if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
- 				then
--					echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend"
-+					echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend"
- 				fi
- 			;;
- 			--terminate)
--				echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate"
-+				echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate"
- 			;;
- 			--force-terminate)
--				echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate"
-+				echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate"
- 				session_close $cmd_sessionid
- 			;;
--			esac
--	done
--
--}
--
--cmd_send()
--{
--	if [ "$1" = "--broadcast" ]
--	then
--	  CMD_PARAMS=$(session_find_all)
--	  [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found."
--	else
--	  CMD_PARAMS=$(cmd_parse_3_params "$2")
--	  [ -z "$CMD_PARAMS" ] && exit 1
--	  shift
--	fi
--	shift
--	for i in $CMD_PARAMS;
--	do
--			CMDLINE=$(session_get_cmdline $i)
--			cmd_display=$(getparam display)
--			cmd_user=$(getparam userName)
--			cmd_type=$(getparam type)
--			cmd_status=$(getparam status)
--			cmd_host=$(getparam host)
--
--			# is it a "good" session?
--			if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
--			then
--				if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ]
-+			--send|--broadcast)
-+				# is it a "good" session?
-+				if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
- 				then
--					su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &"
--				else
--					ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'"
-+					cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &"
- 				fi
--			fi
-+			esac
- 	done
--	#nxnode_start --send "$CMD_PARAMS"
- }
- 
- #
-@@ -2099,13 +2099,13 @@
- 		cmd_history "$@"
- 	;;
- 	--terminate|--suspend|--force-terminate)
--		cmd_terminate "$@"
-+		cmd_terminate_or_send "$@"
- 	;;
- 	--cleanup)
--		cmd_terminate "--force-terminate" "*"
-+		cmd_terminate_or_send "--force-terminate" "*"
- 	;;
- 	--send|--broadcast)
--		cmd_send "$@"
-+		cmd_terminate_or_send "$@"
- 	;;
- 	*)
- 		cmd_abort "Error: Function $CMD not implemented yet."
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch
new file mode 100644
index 000000000000..56c025572867
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch
@@ -0,0 +1,47 @@
+--- nxloadconfig.orig	2009-12-15 21:31:45.000000000 +0100
++++ nxloadconfig	2009-12-15 21:32:21.000000000 +0100
+@@ -58,7 +58,7 @@
+ # Where can different nx components be found
+ NX_DIR=/usr
+ PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
+-PATH_LIB=$NX_DIR/lib
++PATH_LIB=$NX_DIR/lib/NX/lib
+ NX_ETC_DIR=/etc/nxserver
+ NX_SESS_DIR=/var/lib/nxserver/db
+ NX_HOME_DIR=/var/lib/nxserver/home
+@@ -194,14 +194,14 @@
+ KILL_DEFAULT_X_WM="1"
+ BOOTSTRAP_X_SESSION="0"
+ USER_X_STARTUP_SCRIPT=.Xclients
+-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
++DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
+ COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom"
+ if [ ! -x "$COMMAND_GDM_X_SESSION" ]
+ then
+-	COMMAND_GDM_X_SESSION="/etc/X11/Xsession"
++	COMMAND_GDM_X_SESSION="/etc/X11/Sessions/Xsession"
+ fi
+ COMMAND_START_KDE=startkde
+-COMMAND_START_GNOME=gnome-session
++COMMAND_START_GNOME=/etc/X11/Sessions/Gnome
+ COMMAND_START_CDE=cdwm
+ COMMAND_XTERM=xterm
+ COMMAND_XAUTH=/usr/bin/xauth
+@@ -224,7 +224,7 @@
+ COMMAND_NXSHADOWACL="$PATH_BIN/nxshadowacl"
+ COMMAND_NXACL="$PATH_BIN/nxacl"
+ COMMAND_NXCHECKLOAD="$PATH_BIN/nxcheckload"
+-COMMAND_NXAGENT="$PATH_BIN/nxagent"
++COMMAND_NXAGENT="REAL_PATH_LIB/nxagent"
+ 
+ # Guest directives
+ ENABLE_GUEST_LOGIN="0"
+@@ -357,7 +357,7 @@
+ [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
+ [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
+ [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
+-[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
++[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
+ 
+ NX_BACKEND_VERSION=$(strings $COMMAND_NXAGENT 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
+ 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild
deleted file mode 100644
index 3d06a889d265..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r2.ebuild,v 1.3 2009/11/10 23:17:34 cla Exp $
-
-inherit multilib eutils toolchain-funcs
-
-MY_PN="freenx-server"
-DESCRIPTION="Free Software Implementation of the NX Server"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="mirror://berlios/freenx/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="strip"
-IUSE="cups esd nxclient"
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND="dev-tcltk/expect
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	net-analyzer/gnu-netcat
-	>=net-misc/nx-2.1.0
-	sys-apps/gawk
-	virtual/ssh
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	!net-misc/nxserver-freeedition
-	!net-misc/nxserver-2xterminalserver"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-export NX_HOME_DIR=/var/lib/nxserver/home
-
-pkg_setup () {
-	enewuser nx -1 -1 ${NX_HOME_DIR}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-	epatch "${FILESDIR}"/${P}-roundrobin.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
-
-	sed -e "s/3\.\[012\]/3.[0123]/g" \
-		-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
-		-e "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" \
-		-i nxloadconfig || die "nxloadconfig sed failed"
-
-	# Change the defaults in nxloadconfig to meet the users needs.
-	if use esd ; then
-		einfo "Enabling esd support."
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
-	fi
-	if use cups ; then
-		einfo "Enabling cups support."
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample || die
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
-}
-
-src_install() {
-	export NX_ETC_DIR=/etc/nxserver
-	export NX_SESS_DIR=/var/lib/nxserver/db
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient && rm "${D}"/usr/bin/nxprint
-
-	mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf ||
-		die "cannot find default configuration file"
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch "${D}"${NX_ETC_DIR}/$x
-		chmod 600 "${D}"${NX_ETC_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	newinitd "${FILESDIR}"/nxserver.init nxserver
-}
-
-pkg_postinst () {
-	# Other NX servers ebuilds may have already created the nx account
-	# However they use different login shell/home directory paths
-	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:"
-	elog " nxsetup --install --setup-nomachine-key --clean --purge"
-	elog "This will use the default Nomachine SSH key"
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild
deleted file mode 100644
index dc23a11297b0..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild,v 1.2 2009/11/10 23:17:34 cla Exp $
-
-EAPI=1
-
-inherit multilib eutils toolchain-funcs
-
-MY_PN="freenx-server"
-DESCRIPTION="Free Software Implementation of the NX Server"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="mirror://berlios/freenx/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-IUSE="cups esd +nxclient"
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND="dev-tcltk/expect
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	net-analyzer/gnu-netcat
-	>=net-misc/nx-2.1.0
-	sys-apps/gawk
-	virtual/ssh
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	!net-misc/nxserver-freeedition
-	!net-misc/nxserver-2xterminalserver"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-export NX_HOME_DIR=/var/lib/nxserver/home
-
-pkg_setup () {
-	enewuser nx -1 -1 ${NX_HOME_DIR}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-	epatch "${FILESDIR}"/${P}-roundrobin.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
-
-	sed -e "s/3\.\[012\]/3.[0123]/g" \
-		-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
-		-e "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" \
-		-i nxloadconfig || die "nxloadconfig sed failed"
-
-	# Change the defaults in nxloadconfig to meet the users needs.
-	if use esd ; then
-		einfo "Enabling esd support."
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
-	fi
-	if use cups ; then
-		einfo "Enabling cups support."
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample || die
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
-}
-
-src_install() {
-	export NX_ETC_DIR=/etc/nxserver
-	export NX_SESS_DIR=/var/lib/nxserver/db
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient && rm "${D}"/usr/bin/nxprint
-
-	mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf ||
-		die "cannot find default configuration file"
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch "${D}"${NX_ETC_DIR}/$x
-		chmod 600 "${D}"${NX_ETC_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	newinitd "${FILESDIR}"/nxserver.init nxserver
-}
-
-pkg_postinst () {
-	# Other NX servers ebuilds may have already created the nx account
-	# However they use different login shell/home directory paths
-	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:"
-	elog " nxsetup --install --setup-nomachine-key --clean --purge"
-	elog "This will use the default Nomachine SSH key"
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
index 3a817d8e3ef3..b070a9a8bb03 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r1.ebuild,v 1.2 2009/09/17 09:23:19 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild,v 1.1 2009/12/15 20:35:41 voyageur Exp $
 
-EAPI=1
+EAPI=2
 
 inherit multilib eutils toolchain-funcs versionator
 
@@ -46,12 +46,10 @@ pkg_setup () {
 	enewuser nx -1 -1 ${NX_HOME_DIR}
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-pam_ssh.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3_p102-nxloadconfig.patch
+	epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch
+	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
 	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch