Version bump, remove old 0.7.0

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r4 x86_64)

6 files changed, 67 insertions, 258 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index d5e70c381d2a..14cdc95895fd 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.51 2008/06/05 15:26:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.52 2008/08/22 13:04:53 voyageur Exp $
+
+*nxserver-freenx-0.7.3 (22 Aug 2008)
+
+  22 Aug 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nxserver-freenx-0.6.0-nxloadconfig.patch,
+  -files/nxserver-freenx-0.7.0-kdecups.patch,
+  -files/nxserver-freenx-0.7.0-nx3support.patch,
+  -files/nxserver-freenx-0.7.0-xfsfonts.patch,
+  +files/nxserver-freenx-0.7.3-nxloadconfig.patch,
+  -nxserver-freenx-0.7.0-r1.ebuild, +nxserver-freenx-0.7.3.ebuild:
+  Version bump, remove old 0.7.0
 
   05 Jun 2008; Peter Volkov <pva@gentoo.org>
   nxserver-freenx-0.7.2-r2.ebuild:
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
deleted file mode 100644
index c00a6eb8384f..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-kdecups.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
---- freenx-0.7.0.orig/node.conf	2007-08-10 17:42:19.000000000 +0200
-+++ freenx-0.7.0/node.conf	2007-08-10 17:42:41.000000000 +0200
-@@ -289,7 +289,7 @@
- # CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS 
- # installation.
- 
--#CUPS_BACKEND="/usr/lib/cups/backend"
-+#CUPS_BACKEND="/usr/libexec/cups/backend"
- #CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
- #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
- #CUPS_ETC="/etc/cups"
-diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
---- freenx-0.7.0.orig/nxloadconfig	2007-08-10 17:42:19.000000000 +0200
-+++ freenx-0.7.0/nxloadconfig	2007-08-10 17:42:55.000000000 +0200
-@@ -152,7 +152,7 @@
- ENABLE_FOOMATIC="1"
- COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
- 
--CUPS_BACKEND="/usr/lib/cups/backend"
-+CUPS_BACKEND="/usr/libexec/cups/backend"
- CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
- CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
- CUPS_ETC="/etc/cups/"
-@@ -282,7 +282,6 @@
- fi 
- 
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
--[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
- [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
- 
- #########################################################################
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
deleted file mode 100644
index baede8465232..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
---- freenx-0.7.0.orig/node.conf	2007-09-17 15:53:24.000000000 +0200
-+++ freenx-0.7.0/node.conf	2007-09-17 15:53:08.000000000 +0200
-@@ -378,6 +378,9 @@
- # When you installed a 2.0.0 NX Backend, set this to 1.
- #ENABLE_2_0_0_BACKEND="0"
- 
-+# When you installed a 3.0.0 NX Backend, set this to 1.
-+#ENABLE_3_0_0_BACKEND="0"
-+
- # When set to 1 this will automatically resume started sessions
- #ENABLE_AUTORECONNECT="0"
- 
-diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
---- freenx-0.7.0.orig/nxloadconfig	2007-09-17 15:53:24.000000000 +0200
-+++ freenx-0.7.0/nxloadconfig	2007-09-17 15:53:07.000000000 +0200
-@@ -184,6 +184,7 @@
- # Misc directives
- 
- ENABLE_2_0_0_BACKEND=""
-+ENABLE_3_0_0_BACKEND=""
- ENABLE_AUTORECONNECT="0"
- ENABLE_AUTORECONNECT_BEFORE_140="1"
- EXPORT_USERIP="0"
-@@ -275,13 +276,19 @@
- [ -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:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
-+[ -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/libXcompshad.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- 	ENABLE_2_0_0_BACKEND="1"
- 	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi 
- 
-+if [ -z "$ENABLE_3_0_0_BACKEND" ]
-+then
-+	ENABLE_3_0_0_BACKEND="1"
-+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 3.[01].0')" ] && ENABLE_3_0_0_BACKEND="0"
-+fi
-+
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
- [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
- 
-@@ -303,11 +310,11 @@
- 	[ ! -f "$REAL_PATH_BIN/nxagent" ] && \
- 		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
- 		
--	[ ! -f "$PATH_BIN/nxdesktop" ] && \
--		WARNING="yes" && echo "Warning: Could not find nxdesktop in $PATH_BIN. RDP sessions won't work."
-+	[ ! -f "$PATH_BIN/rdesktop" ] && \
-+		WARNING="yes" && echo "Warning: Could not find rdesktop in $PATH_BIN. RDP sessions won't work."
- 		
--	[ ! -f "$PATH_BIN/nxviewer" ] && \
--		WARNING="yes" && echo "Warning: Could not find nxviewer in $PATH_BIN. VNC sessions won't work."
-+	[ ! -f "$PATH_BIN/vncviewer" ] && \
-+		WARNING="yes" && echo "Warning: Could not find vncviewer in $PATH_BIN. VNC sessions won't work."
- 
- 	# Check for paths
- 		
-@@ -535,8 +542,8 @@
- 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
- 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
- 
--	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
--		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[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.0.0')" ] && \
-+		ERROR="yes" && echo "Error: Could not find 1.5.0, 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 to 3.0.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 -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
---- freenx-0.7.0.orig/nxnode	2007-09-17 15:53:24.000000000 +0200
-+++ freenx-0.7.0/nxnode	2007-09-17 15:55:03.000000000 +0200
-@@ -414,7 +414,7 @@
- 	# backingstore
- 	
- 	B=""
--	if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ]
-+	if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" -a "$ENABLE_3_0_0_BACKEND" != "1" ]
- 	then
- 		[ "$backingstore" != 1 ] && B="-bs $backingstore"
- 		[ "$backingstore" = 1 ] && B="+bs"
-@@ -424,6 +424,7 @@
- 	
- 	G=""
- 	[ -n "$geometry" ] && G="-geometry $geometry"
-+	[ -n "$geometry" -a "$type" = "windows" ] && G="-g $geometry"
- 
- 	# type of session
- 	
-@@ -435,7 +436,7 @@
- 	vncfullscreen=""
- 	[ "$geometry" = "fullscreen" -a "$type" = "vnc" ] && vncfullscreen="-fullscreen" && G=""
- 	
--	[ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-geometry `echo $screeninfo | cut -d"x" -f1,2`"
-+	[ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-g`echo $screeninfo | cut -d"x" -f1,2`"
- 
- 	#
- 	# Start the wanted nxagent
-@@ -443,7 +444,7 @@
- 
- 	if [ "$type" = "windows" ]
- 	then
--		# nxdesktop session (Windows RDP)
-+		# rdesktop session (Windows RDP)
- 
- 		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
- 		# Setup optional parameters
-@@ -457,21 +458,21 @@
- 
- 		# Start the agent
- 		
--		echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
-+		echo "$agent_password" | $PATH_BIN/rdesktop $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
- 
- 	elif [ "$type" = "vnc" ]
- 	then
--		# nxviewer session (VNC RFP)
-+		# vncviewer session (VNC RFP)
- 		
- 		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
- 		# Setup password
- 		
- 		mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/"
--		echo "$agent_password" | $PATH_BIN/nxpasswd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" doit
-+		echo "$agent_password" | $PATH_BIN/vncpasswd -f > "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd"
- 		
- 		# Start the agent
- 		
--		$PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
-+		$PATH_BIN/vncviewer -encodings "tight hextile copyrect raw" -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd $vncfullscreen $G $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
- 
- 	elif [ "$R" = "-R" -a "$rootless" != "1" ]
- 	then
-@@ -942,8 +943,8 @@
- 
- node_start_monitor()
- {
--	[ "$ENABLE_2_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
--	[ "$ENABLE_2_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
-+	[ "$ENABLE_2_0_0_BACKEND" = "1" -o "$ENABLE_3_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
-+	[ "$ENABLE_2_0_0_BACKEND" = "1" -o "$ENABLE_3_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
- }
- 
- #
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch
deleted file mode 100644
index 4fe189ab37df..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-xfsfonts.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_xfs_fonts.dpatch by  <diamond@google.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad freenx-0.6.0+svn334~/nxnode freenx-0.6.0+svn334/nxnode
---- freenx-0.6.0+svn334~/nxnode	2007-05-31 16:47:23.000000000 +0100
-+++ freenx-0.6.0+svn334/nxnode	2007-05-31 16:47:50.000000000 +0100
-@@ -304,6 +304,8 @@
- 		NODE_WM_PID=$!
- 	fi
- 
-+	echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1
-+
- 	#
- 	# Startup the application
- 	#
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch
index d0deb200eb49..6bb57bf777a8 100644
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch
@@ -1,5 +1,5 @@
---- nxloadconfig.orig	2007-01-23 04:22:50.000000000 +0100
-+++ nxloadconfig	2007-01-29 17:29:38.000000000 +0100
+--- 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
@@ -10,7 +10,7 @@
  NX_ETC_DIR=/etc/nxserver
  NX_SESS_DIR=/var/lib/nxserver/db
  NX_HOME_DIR=/var/lib/nxserver/home
-@@ -154,7 +155,7 @@
+@@ -185,7 +186,7 @@
  DEFAULT_X_WM=""
  KILL_DEFAULT_X_WM="1"
  USER_X_STARTUP_SCRIPT=.Xclients
@@ -19,35 +19,33 @@
  COMMAND_START_KDE=startkde
  COMMAND_START_GNOME=gnome-session
  COMMAND_START_CDE=cdwm
-@@ -263,11 +264,11 @@
+@@ -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.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
+-[ -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"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- 	ENABLE_2_0_0_BACKEND="1"
--	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
-+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi 
  
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-@@ -288,7 +289,7 @@
+-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 ...
  	
--	[ ! -f "$PATH_BIN/nxagent" ] && \
-+	[ ! -f "$REAL_PATH_BIN/nxagent" ] && \
+-	[ ! -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."
- 		
- 	[ ! -f "$PATH_BIN/nxdesktop" ] && \
-@@ -509,7 +510,7 @@
+ 	
+ 	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')" ] && \
-+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
- 		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
+-	[ -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/nxserver-freenx-0.7.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild
index 0c9ea7065a90..7deec58928ec 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2008 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.0-r1.ebuild,v 1.5 2008/05/02 16:54:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3.ebuild,v 1.1 2008/08/22 13:04:53 voyageur Exp $
 
 inherit multilib eutils
 
-MY_PN="freenx"
+MY_PN="freenx-server"
 DESCRIPTION="Free Software Implementation of the NX Server"
 HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="mirror://berlios/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="mirror://berlios/freenx/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
 IUSE="arts cups esd nxclient"
 DEPEND="virtual/ssh
@@ -32,7 +32,8 @@ RDEPEND="${DEPEND}
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
 	x11-apps/xauth
-	x11-apps/xrdb"
+	x11-apps/xrdb
+	x11-apps/sessreg"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
@@ -46,15 +47,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	mv node.conf.sample node.conf || die
-
-	epatch "${FILESDIR}"/${PN}-0.6.0-nxloadconfig.patch
-	epatch "${FILESDIR}"/${P}-kdecups.patch
-	epatch "${FILESDIR}"/${P}-xfsfonts.patch
-	epatch "${FILESDIR}"/${P}-nx3support.patch
-
-	# Fix DISPLAY for XCB-enabled systems
-	sed -i "s/unix:/:/g" nxnode || die
+	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
 
 	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
 	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
@@ -63,37 +57,31 @@ src_unpack() {
 	if use arts ; then
 		einfo "Enabling arts support."
 		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
-		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf || die
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
 	fi
 	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 || 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 || die
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample || die
 	fi
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	NX_ETC_DIR=/etc/nxserver
-	NX_SESS_DIR=/var/lib/nxserver/db
-
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-	dobin nxloadconfig
-	dobin nxsetup
-	dobin nxcups-gethost
-	use nxclient || dobin nxprint
-	use nxclient || dobin nxclient
+	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
@@ -101,20 +89,30 @@ src_install() {
 		chmod 600 "${D}"${NX_ETC_DIR}/$x
 	done
 
-	insinto ${NX_ETC_DIR}
-	doins node.conf
-
 	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 () {
-	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!!"
+	# 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"