--- nx-x11-1.4.0-r4.ebuild	2005-05-01 13:35:53.000000000 -0500
+++ nx-x11-1.5.0-r3.ebuild	2005-10-08 09:03:01.892790464 -0500
@@ -4,21 +4,22 @@
 
 inherit eutils
 
-MY_PN="${PN//x11/X11}"
-MY_PV="${PV}-10"
 DESCRIPTION="A special version of the X11 libraries supporting NX compression technology"
 HOMEPAGE="http://www.nomachine.com/developers.php"
-URI_BASE="http://www.nomachine.com/download/nxsources/"
-URI_BASE2="http://www.nomachine.com/download/nxsources/"
-SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
-SRC_NXAGENT="nxagent-1.4.0-65.tar.gz"
-SRC_NXAUTH="nxauth-1.4.0-2.tar.gz"
-SRC_NXCOMP="nxcomp-1.4.0-31.tar.gz"
-SRC_NXCOMPEXT="nxcompext-1.4.0-3.tar.gz"
-SRC_NXVIEWER="nxviewer-1.4.0-4.tar.gz"
-SRC_NXDESKTOP="nxdesktop-1.4.0-61.tar.gz"
-SRC_NXESD="nxesd-1.4.0-1.tar.gz"
-SRC_URI="$URI_BASE/nx-X11/${SRC_NX_X11} $URI_BASE/nxagent/${SRC_NXAGENT} $URI_BASE/nxauth/${SRC_NXAUTH} $URI_BASE/nxcomp/${SRC_NXCOMP} $URI_BASE/nxcompext/${SRC_NXCOMPEXT} $URI_BASE/nxviewer/${SRC_NXVIEWER} $URI_BASE/nxdesktop/${SRC_NXDESKTOP} $URI_BASE/nxesd/${SRC_NXESD}"
+URI_BASE="http://www.nomachine.com/download/1.5.0/sources"
+SRC_NX_X11="nx-X11-$PV-15.tar.gz"
+SRC_NXAGENT="nxagent-$PV-93.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-65.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-16.tar.gz"
+SRC_NXVIEWER="nxviewer-$PV-14.tar.gz"
+SRC_NXDESKTOP="nxdesktop-$PV-75.tar.gz"
+SRC_NXESD="nxesd-$PV-3.tar.gz"
+
+SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXAUTH
+	 $URI_BASE/$SRC_NXCOMP $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXVIEWER
+	 $URI_BASE/$SRC_NXDESKTOP $URI_BASE/$SRC_NXESD"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
@@ -27,7 +28,7 @@ IUSE=""
 DEPEND="virtual/x11
 	media-libs/jpeg"
 #RDEPEND=""
-S=${WORKDIR}/${MY_PN}
+S=${WORKDIR}/${PN//x11/X11}
 
 src_unpack() {
 	# we can't use ${A} because of bug #61977
@@ -41,7 +42,7 @@ src_unpack() {
 	unpack ${SRC_NXESD}
 
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-${PV}.xprint.patch
+	epatch ${FILESDIR}/nx-x11-windows-linux-resume.patch
 }
 
 src_compile() {
@@ -89,12 +90,12 @@ src_install() {
 	popd
 
 	pushd ../nxcomp/
-	dolib libXcomp.so.1.4.0
+	dolib libXcomp.so.1.5.0
 	dolib libXcomp.so
 	popd
 
 	pushd ../nxcompext/
-	dolib libXcompext.so.1.4.0
+	dolib libXcompext.so.1.5.0
 	dolib libXcompext.so
 	popd
 
@@ -103,12 +104,13 @@ src_install() {
 	insinto /usr/X11R6/include
 	doins ../nxcomp/NX.h
 
+	insinto /etc/env.d
+	doins ${FILESDIR}/1.5.0/50nxx11
+
 	dodir /var/lib/nxserver
 
 	return
 
-	# nxesd support will have to wait for a later release
-
 	cd ../nxesd
 	emake DESTDIR=${D} install || die "unable to install nxesd"
 }