Fix for library overwrite problems w/ nxserver

1 files changed, 19 insertions, 6 deletions

diff --git a/eclass/nxserver-1.4.eclass b/eclass/nxserver-1.4.eclass
index 9dbc78f75bbf..c2ab23e103e9 100644
--- a/eclass/nxserver-1.4.eclass
+++ b/eclass/nxserver-1.4.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.3 2005/01/02 09:53:22 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.4 2005/05/23 18:37:30 stuart Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -21,11 +21,12 @@ RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
 DEPEND="$DEPEND
-		 >=net-misc/nxclient-1.4.0
         >=sys-apps/shadow-4.0.3-r6
 		>=net-misc/openssh-3.6.1_p2
-		>=net-misc/nxssh-1.4.0
-		net-misc/nx-x11"
+		=net-misc/nxssh-1.4*
+		=net-misc/nxproxy-1.4*
+		=net-misc/nxclient-1.4*
+		=net-misc/nx-x11-1.4*"
 
 RDEPEND="$RDEPEND
 	     >=media-libs/jpeg-6b-r3
@@ -43,7 +44,7 @@ EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst
 
 nxserver_pkg_setup() {
 	einfo "Adding user 'nx' for the NX server"
-	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/home/nx
+	enewuser nx -1 /bin/false /usr/NX/home/nx
 }
 
 nxserver_src_compile() {
@@ -69,6 +70,13 @@ nxserver_src_install() {
 		fi
 	done
 
+	# remove libraries installed by other packages
+	for x in usr/NX/lib/*.so.* ; do 
+		if [ -f $x ]; then
+			rm -f $x
+		fi
+	done
+
 	tar -cf - * | ( cd ${D} ; tar -xf - )
 
 	dodir /usr/NX/var
@@ -99,7 +107,12 @@ nxserver_pkg_postinst() {
 
 	# end of upgrade support
 
-	
+	# now that nxserver has been installed, we can change the shell
+	# of the nx user to be the correct one
+
+	echo "Setting nx's homedir to /usr/NX/bin/nxserver"
+	chsh -s /usr/NX/bin/nxserver nx
+
 	# we do this to move the home directory of older installs
 
 	einfo "Setting home directory of user 'nx' to /usr/NX/home/nx"