diff -u eclass/nxserver-1.4.eclass eclass/nxserver-1.4.eclass
--- eclass/nxserver-1.4.eclass	2006-04-02 10:29:37.000000000 +0200
+++ eclass/nxserver-1.4.eclass	2006-04-02 10:46:48.000000000 +0200
@@ -4,8 +4,6 @@
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
-#
-# now handles freenx as well
 
 inherit rpm eutils
 
@@ -19,16 +17,9 @@
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
 DEPEND=">=sys-apps/shadow-4.0.3-r6
 	>=net-misc/openssh-3.6.1_p2
-	=net-misc/nxssh-1.4*
-	=net-misc/nxproxy-1.4*
-	=net-misc/nxclient-1.4*
-	=net-misc/nx-x11-1.4*"
-
-RDEPEND=">=media-libs/jpeg-6b-r3
-	>=sys-libs/glibc-2.3.2-r1
-	>=sys-libs/zlib-1.1.4-r1
-	virtual/x11
-	>=net-misc/openssh-3.6.1_p2
+	>=net-misc/nxclient-1.4.0
+	>=net-misc/nxproxy-1.4.0
+	>=net-misc/nx-x11-1.4.0
 	>=dev-lang/perl-5.8.0-r12"
 
 S="${WORKDIR}"
diff -u net-misc/nxclient/nxclient-1.4.0-r5.ebuild net-misc/nxclient/nxclient-1.4.0-r5.ebuild
--- net-misc/nxclient/nxclient-1.4.0-r5.ebuild	2006-04-02 10:17:56.000000000 +0200
+++ net-misc/nxclient/nxclient-1.4.0-r5.ebuild	2006-04-02 10:49:41.000000000 +0200
@@ -16,23 +16,15 @@
 MY_PV="${PV}-91"
 SRC_URI="http://www.nomachine.com/download/nxclient/1.4.0/RedHat-9.0/${PN}-${MY_PV}.i386.rpm"
 
-DEPEND=">=media-libs/jpeg-6b-r3
-	>=sys-libs/glibc-2.3.2-r1
-	>=sys-libs/zlib-1.1.4-r1
+DEPEND="
+	>=net-misc/nxproxy-1.4.0
+	>=net-misc/nxssh-1.4.0
 	>=dev-libs/expat-1.95.6-r1
 	>=media-libs/fontconfig-2.2.0-r2
 	>=media-libs/freetype-2.1.4
-	>=media-libs/jpeg-6b-r3
 	>=x11-libs/qt-3.3.2
-	=net-misc/nx-x11-1.4*
-	=net-misc/nxproxy-1.4*
 	net-analyzer/gnu-netcat
-	=net-misc/nxssh-1.4*
-	|| ( (	x11-libs/libX11
-			x11-libs/libXext
-		)
-		virtual/x11
-	)"
+	sys-libs/lib-compat"
 
 S="${WORKDIR}"
 
diff -u net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild
--- net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild	2006-04-02 10:17:57.000000000 +0200
+++ net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild	2006-04-02 10:36:25.000000000 +0200
@@ -12,14 +12,7 @@
 SLOT="0"
 KEYWORDS="~ppc ~sparc x86"
 IUSE=""
-DEPEND="=net-misc/nx-x11-1.4*
-	sys-devel/patch
-	>=media-libs/jpeg-6b-r3
-	>=sys-libs/glibc-2.3.2-r1
-	>=sys-libs/zlib-1.1.4-r1"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
+DEPEND="~net-misc/nx-x11-1.4.0"
 
 S=${WORKDIR}/${PN}
 
diff -u net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild
--- net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild	2006-04-02 10:17:57.000000000 +0200
+++ net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild	2006-04-02 10:38:38.000000000 +0200
@@ -15,11 +15,11 @@
 DEPEND="virtual/ssh
 	dev-tcltk/expect
 	net-analyzer/gnu-netcat
-	x86? ( commercial? ( =net-misc/nxclient-1.4* )
+	x86? ( commercial? ( ~net-misc/nxclient-1.4.0 )
 	      !commercial? ( !net-misc/nxclient ) )
 	!x86? ( !net-misc/nxclient )
-	>=net-misc/nxproxy-1.4.0
-	=net-misc/nx-x11-1.4*
+	~net-misc/nxproxy-1.4.0
+	~net-misc/nx-x11-1.4.0
 	!net-misc/nxserver-personal
 	!net-misc/nxserver-business
 	!net-misc/nxserver-enterprise"
diff -u net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild
--- net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild	2006-04-02 10:17:57.000000000 +0200
+++ net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild	2006-04-02 10:42:12.000000000 +0200
@@ -25,8 +25,11 @@
 IUSE=""
 #RESTRICT="nostrip"
 DEPEND="virtual/x11
-	media-libs/jpeg"
-#RDEPEND=""
+	>=media-libs/jpeg-6b-r3
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.1.4-r1
+	>=sys-libs/glibc-2.3.2-r1"
+
 S=${WORKDIR}/${MY_PN}
 
 src_unpack() {