Use mirror:// for SRC_URI, bug #218657. Also remove 0.7.1 versions

(Portage version: 2.1.5_rc6)

12 files changed, 17 insertions, 549 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index ed0d2d78d4d3..f2c8ed681e37 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,18 @@
 # 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.48 2008/04/10 09:58:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.49 2008/05/02 16:54:37 voyageur Exp $
+
+  02 May 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nxserver-freenx-0.7.1-cups.patch,
+  -files/nxserver-freenx-0.7.1-nscd.patch,
+  -files/nxserver-freenx-0.7.1-nxdialog.patch,
+  -files/nxserver-freenx-0.7.1-nxloadconfig.patch,
+  -files/nxserver-freenx-0.7.1-nxserver_fixes.patch,
+  -files/nxserver-freenx-0.7.1-samba.patch,
+  -files/nxserver-freenx-0.7.1-usession_fixes.patch,
+  nxserver-freenx-0.7.0-r1.ebuild, -nxserver-freenx-0.7.1-r1.ebuild,
+  -nxserver-freenx-0.7.1-r2.ebuild, nxserver-freenx-0.7.2-r2.ebuild:
+  Use mirror:// for SRC_URI, bug #218657. Also remove 0.7.1 versions
 
   10 Apr 2008; Bernard Cafarelli <voyageur@gentoo.org>
   files/nxserver-freenx-0.7.2-nxloadconfig.patch,
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-cups.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-cups.patch
deleted file mode 100644
index 40a1aeb90003..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-cups.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur freenx-0.7.1.orig/node.conf freenx-0.7.1/node.conf
---- freenx-0.7.1.orig/node.conf	2007-10-31 13:47:45.000000000 +0100
-+++ freenx-0.7.1/node.conf	2007-10-31 13:48:35.000000000 +0100
-@@ -319,12 +319,12 @@
- # of available ppd drivers via the $COMMAND_FOOMATIC command.
- 
- #ENABLE_FOOMATIC="1"
--#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
-+#COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile"
- 
- # 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.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig
---- freenx-0.7.1.orig/nxloadconfig	2007-10-31 13:47:45.000000000 +0100
-+++ freenx-0.7.1/nxloadconfig	2007-10-31 13:48:43.000000000 +0100
-@@ -155,9 +155,9 @@
- ENABLE_CUPS_SEAMLESS="0"
- CUPS_SEAMLESS_DELAY="10"
- ENABLE_FOOMATIC="1"
--COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
-+COMMAND_FOOMATIC="/usr/bin/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/"
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nscd.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nscd.patch
deleted file mode 100644
index 97fb2db073ae..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nscd.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- nxsetup~	2007-10-15 00:25:14.000000000 +0200
-+++ nxsetup	2007-10-19 18:36:45.000000000 +0200
-@@ -164,11 +164,15 @@
- 
- 		# adduser needs a valid group to add the user to
- 		! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx
--		[ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+		if [ -f /var/run/nscd/nscd.pid ]; then
-+			[ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+		fi
- 
- 		adduser $USERADD_OPTIONS nx
--		[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
--		
-+		if [ -f /var/run/nscd/nscd.pid ]; then
-+			[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+		fi
-+
- 	# no, its a "normal" useradd
- 	else
- 		USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver"
-@@ -187,17 +191,25 @@
- 		
- 		if [ "$SETUP_LOCAL_USER" = "yes" ]
- 		then
--			! nx_group_exists && lgroupadd $GROUPADD_OPTIONS nx 
--			[ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+			! nx_group_exists && lgroupadd $GROUPADD_OPTIONS nx
-+			if [ -f /var/run/nscd/nscd.pid ]; then
-+				[ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+			fi
- 
- 			luseradd $USERADD_OPTIONS nx
--			[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+			if [ -f /var/run/nscd/nscd.pid ]; then
-+				[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+			fi
- 		else
- 			! nx_group_exists && groupadd $GROUPADD_OPTIONS nx
--			[ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+			if [ -f /var/run/nscd/nscd.pid ]; then
-+				[ -f /etc/nscd.conf ] && { nscd --invalidate group; }
-+			fi
- 
- 			useradd $USERADD_OPTIONS nx
--			[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+			if [ -f /var/run/nscd/nscd.pid ]; then
-+				[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; }
-+			fi
- 		fi
- 
- 		
-@@ -457,7 +469,9 @@
- 	#Perform cleanup?
- 	[ "$CLEAN" = "yes" ] && uninstall_nx
- 	
--	[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; nscd --invalidate group; }
-+	if [ -f /var/run/nscd/nscd.pid ]; then
-+		[ -f /etc/nscd.conf ] && { nscd --invalidate passwd; nscd --invalidate group; }
-+	fi
- 	install_nx
- 
- 	[ "$AUTOMATIC" = "no" ] && test_nx
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxdialog.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxdialog.patch
deleted file mode 100644
index a3445aed7341..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxdialog.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: nxdialog
-===================================================================
---- nxdialog	(révision 405)
-+++ nxdialog	(révision 413)
-@@ -26,6 +26,7 @@
- 	done
- }
- 
-+PARAMS=( "$@" )
- INPUTS=$(requote "$@")	#JJK: Save input parameter line...
- 
- TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer:,parent: -n $(basename $0) -- "$@"`
-@@ -71,10 +72,13 @@
- # client does not like large databases like used when ENABLE_FOOMATIC=1.
- #
- # This seems to be because the used sorting algorithm scales in O(n^2).
-+#
-+# This is now fixed in NXClient 3.0.0, but still people sometimes use
-+# older clients.
- 
- NXCLIENT="/usr/NX/bin/nxclient"
- [ -x "$NXCLIENT" -a "$DIALOG_TYPE" != "printer" -a "$(file -bi $NXCLIENT)" != 'application/x-shellscript' ] \
--	&& exec ${NXCLIENT} "$@"
-+	&& exec ${NXCLIENT} "${PARAMS[@]}"
- 
- # FIXME: This should be COMMAND_XDIALOG, ...
- if [ -x /usr/bin/Xdialog ] 
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch
deleted file mode 100644
index 7dd476d62d1a..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- freenx-0.7.1.orig/nxloadconfig	2007-10-31 13:17:10.000000000 +0100
-+++ freenx-0.7.1/nxloadconfig	2007-10-31 13:20:33.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
-@@ -171,7 +172,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
-@@ -297,7 +298,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"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- 	ENABLE_2_0_0_BACKEND="1"
-@@ -301,7 +301,7 @@
- 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|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
-+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi 
- 
- if [ "$ENABLE_KDE_CUPS" = "1" ]
-@@ -326,7 +327,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" ]
-@@ -578,7 +579,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.0.0')" ] && \
-+	[ -z "$(strings $REAL_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.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.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.1-nxserver_fixes.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxserver_fixes.patch
deleted file mode 100644
index c5b985f70c4e..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxserver_fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN freenx-0.7.0.orig/nxserver freenx-0.7.0/nxserver
---- freenx-0.7.0.orig/nxserver	2007-05-29 17:27:07.000000000 +0200
-+++ freenx-0.7.0/nxserver	2007-08-23 15:32:38.387208694 +0200
-@@ -399,7 +399,7 @@
- # Main nxserver <-> nxclient communication module
- #
- 
--if [ $USER = "nxfree" -o "$USER" = "nx" -o "$ENABLE_USERMODE_AUTHENTICATION" = "1" ]
-+if [ "$USER" = "nxfree" -o "$USER" = "nx" -o "$ENABLE_USERMODE_AUTHENTICATION" = "1" ]
- then
- 
- setup_usermode_auth()
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-samba.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-samba.patch
deleted file mode 100644
index 01601dd966f1..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-samba.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- nxnode~	2007-12-05 18:41:09.714867153 +0100
-+++ nxnode	2007-12-10 18:19:20.572614463 +0100
-@@ -56,7 +56,7 @@
- {
- 	stringinstring "&$1=" "$CMDLINE" || return 1
- 	
--	echo "$CMDLINE" |  tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }'
-+	echo "$CMDLINE" |  tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }' | sed 's|%24|$|'
- 	
- 	return 0
- }
-@@ -720,7 +720,7 @@
- 		# Catch NXAGENT SMB Port (sometimes the port differs from what we got from nxserver)
- 		#
- 		
--		if stringinstring "Info: Listening for SMB connections on port" "$line"
-+		if stringinstring "Info: Listening * SMB connections on port" "$line"
- 		then
- 			SMBMOUNT_PORT=$(echo $line | cut -d"'" -f2)
- 			echo "$SMBMOUNT_PORT" >"$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mport"
-@@ -1314,8 +1314,9 @@
- 		sleep 1
- 	done
- 	# sometimes the samba port we get from nxserver is not the right one, so let's get it from nxagent
--	port=$(cat "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport")
--	error=$(PASSWD="$password" $COMMAND_SMBMOUNT "//$computername/$share" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
-+	realport=$(cat "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport")
-+	[ -n "$realport" ] && port=$realport
-+	error=$(PASSWD="$password" $COMMAND_SMBMOUNT "//$computername/$share" "$HOME/$dir" -o username="$username",ip=127.0.0.1,port=$port 2>&1)
- 	if [ $? -eq 0 ]
- 	then
- 		$PATH_BIN/nxdialog -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' mounted on: '$HOME/$dir'" -display :$display &
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-usession_fixes.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-usession_fixes.patch
deleted file mode 100644
index 2daffb9535ca..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-usession_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur freenx-0.7.1.orig/node.conf freenx-0.7.1/node.conf
---- freenx-0.7.1.orig/node.conf	2007-12-03 20:12:36.000000000 +0100
-+++ freenx-0.7.1/node.conf	2007-12-03 20:14:49.000000000 +0100
-@@ -469,7 +469,7 @@
- # Note: You have to make sure that you add the nx user to the
- #       utmp or tty group or how its called on your system
- #       before this directive works.
--#ENABLE_USESSION="0"
-+#ENABLE_USESSION="1"
- #COMMAND_SESSREG="sessreg"
- 
- # Extra options sent to the different nx agents. See !M documentation
-diff -Naur freenx-0.7.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig
---- freenx-0.7.1.orig/nxloadconfig	2007-12-03 20:12:36.000000000 +0100
-+++ freenx-0.7.1/nxloadconfig	2007-12-03 20:14:33.000000000 +0100
-@@ -202,7 +202,7 @@
- EXPORT_SESSIONID="1"
- NODE_AUTOSTART=""
- ENABLE_ROOTLESS_MODE="1"
--ENABLE_USESSION="0"
-+ENABLE_USESSION="1"
- COMMAND_SESSREG="sessreg"
- AGENT_EXTRA_OPTIONS_RFB=""
- AGENT_EXTRA_OPTIONS_RDP=""
-diff -Naur freenx-0.7.1.orig/nxsetup freenx-0.7.1/nxsetup
---- freenx-0.7.1.orig/nxsetup	2007-12-03 20:12:36.000000000 +0100
-+++ freenx-0.7.1/nxsetup	2007-12-03 20:12:50.000000000 +0100
-@@ -263,6 +263,13 @@
- 		echo "done"
- 	fi
- 	
-+	if [ "$ENABLE_USESSION" = "1" ]
-+	then
-+		echo -n "Adding user \"nx\" to group \"utmp\" ..."
-+		usermod -G utmp nx
-+		echo "done"
-+	fi
-+	
- 	if [ "$ENABLE_NOMACHINE_FORWARD_PORT" = "1" -a -x "$NOMACHINE_SERVER" ]
- 	then
- 		echo -n "Setting up NoMachine forwarding ..."
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
index 1f778199c8db..0c9ea7065a90 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.4 2008/03/18 23:49:08 voyageur Exp $
+# $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 $
 
 inherit multilib eutils
 
 MY_PN="freenx"
 DESCRIPTION="Free Software Implementation of the NX Server"
 HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://download.berlios.de/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="mirror://berlios/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r1.ebuild
deleted file mode 100644
index 597363b12980..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.1-r1.ebuild,v 1.2 2008/03/18 23:49:08 voyageur Exp $
-
-inherit multilib eutils
-
-MY_PN="freenx"
-DESCRIPTION="Free Software Implementation of the NX Server"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://download.berlios.de/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-IUSE="arts cups esd nxclient"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	sys-apps/gawk
-	net-analyzer/gnu-netcat
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	>=net-misc/nx-2.1.0
-	arts? ( kde-base/arts )
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	!net-misc/nxserver-freeedition
-	!net-misc/nxserver-2xterminalserver"
-
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg"
-
-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}"
-
-	mv node.conf.sample node.conf || die
-
-	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-	epatch "${FILESDIR}"/${P}-cups.patch
-	epatch "${FILESDIR}"/${P}-nxdialog.patch
-	epatch "${FILESDIR}"/${P}-nscd.patch
-	epatch "${FILESDIR}"/${P}-usession_fixes.patch
-	epatch "${FILESDIR}"/${P}-nxserver_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
-
-	# Change the defaults in nxloadconfig to meet the users needs.
-	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
-	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
-	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
-	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
-	dobin nxdialog
-	dobin nxdesktop_helper
-	dobin nxviewer_helper
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient || dobin nxprint
-
-	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
-
-	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 () {
-	# 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.1-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r2.ebuild
deleted file mode 100644
index b7cbc81cc9ec..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.1-r2.ebuild,v 1.2 2008/03/18 23:49:08 voyageur Exp $
-
-inherit multilib eutils
-
-MY_PN="freenx"
-DESCRIPTION="Free Software Implementation of the NX Server"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://download.berlios.de/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-IUSE="arts cups esd nxclient"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	sys-apps/gawk
-	net-analyzer/gnu-netcat
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	>=net-misc/nx-2.1.0
-	arts? ( kde-base/arts )
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	!net-misc/nxserver-freeedition
-	!net-misc/nxserver-2xterminalserver"
-
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg"
-
-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}"
-
-	mv node.conf.sample node.conf || die
-
-	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-	epatch "${FILESDIR}"/${P}-cups.patch
-	epatch "${FILESDIR}"/${P}-nxdialog.patch
-	epatch "${FILESDIR}"/${P}-nscd.patch
-	epatch "${FILESDIR}"/${P}-usession_fixes.patch
-	epatch "${FILESDIR}"/${P}-nxserver_fixes.patch
-	epatch "${FILESDIR}"/${P}-samba.patch
-
-	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
-	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
-
-	# Change the defaults in nxloadconfig to meet the users needs.
-	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
-	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
-	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
-	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
-	dobin nxdialog
-	dobin nxdesktop_helper
-	dobin nxviewer_helper
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient || dobin nxprint
-
-	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
-
-	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 () {
-	# 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.2-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r2.ebuild
index fd892c62365e..aa2b74c7c034 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r2.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r2.ebuild
@@ -1,13 +1,13 @@
 # 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.2-r2.ebuild,v 1.1 2008/04/09 21:14:21 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r2.ebuild,v 1.2 2008/05/02 16:54:37 voyageur Exp $
 
 inherit multilib eutils
 
 MY_PN="freenx-server"
 DESCRIPTION="Free Software Implementation of the NX Server"
 HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://download.berlios.de/freenx/${MY_PN}-${PV}.tar.gz"
+SRC_URI="mirror://berlios/freenx/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"