Index: nx-x11-1.4.0-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild,v
retrieving revision 1.4
diff -u -b -B -r1.4 nx-x11-1.4.0-r4.ebuild
--- nx-x11-1.4.0-r4.ebuild	11 Jan 2006 04:41:31 -0000	1.4
+++ nx-x11-1.4.0-r4.ebuild	25 Jan 2006 22:42:48 -0000
@@ -24,10 +24,63 @@
 KEYWORDS="ppc ~sparc x86"
 IUSE=""
 #RESTRICT="nostrip"
-DEPEND="virtual/x11
-	media-libs/jpeg"
-#RDEPEND=""
-S=${WORKDIR}/${MY_PN}
+DEPEND="media-libs/jpeg
+	|| (
+	( x11-misc/imake
+	x11-misc/gccmakedep
+	app-text/rman
+	x11-proto/renderproto
+	x11-proto/fontsproto
+	x11-proto/xproxymanagementprotocol
+	x11-proto/xcmiscproto
+	x11-proto/trapproto
+	x11-proto/scrnsaverproto
+	x11-proto/printproto
+	x11-proto/randrproto
+	x11-proto/recordproto
+	x11-proto/xf86rushproto
+	x11-proto/resourceproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86miscproto
+	x11-proto/xextproto
+	x11-proto/xf86bigfontproto
+	x11-proto/xf86dgaproto
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/fontcacheproto
+	x11-proto/kbproto
+	x11-proto/inputproto
+	x11-proto/glproto
+	x11-proto/xineramaproto )
+	virtual/x11 )"
+RDEPEND="|| (
+	( media-libs/mesa
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libSM
+	x11-libs/libXp
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXvMC
+	x11-libs/libXcursor
+	x11-libs/libXres
+	x11-libs/libXrandr
+	x11-libs/libxkbfile
+	x11-libs/libXv
+	x11-libs/libxkbui
+	x11-libs/libfontenc
+	x11-libs/libFS
+	x11-libs/libXft
+	x11-libs/libdrm
+	x11-libs/libXdmcp )
+	virtual/x11 )"
+
+S="${WORKDIR}/${MY_PN}"
 
 src_unpack() {
 	# we can't use ${A} because of bug #61977
@@ -40,9 +93,9 @@
 	unpack ${SRC_NXDESKTOP}
 	unpack ${SRC_NXESD}
 
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}"/${P}.xprint.patch
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	epatch "${FILESDIR}"/${P}-gcc4.patch
 }
 
@@ -112,5 +165,5 @@
 	# nxesd support will have to wait for a later release
 
 	cd ../nxesd
-	emake DESTDIR=${D} install || die "unable to install nxesd"
+	make DESTDIR="${D}" install || die "unable to install nxesd"
 }