Index: nxcomp-1.5.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild,v
retrieving revision 1.1
diff -u -b -B -r1.1 nxcomp-1.5.0-r1.ebuild
--- nxcomp-1.5.0-r1.ebuild	15 Dec 2005 17:29:33 -0000	1.1
+++ nxcomp-1.5.0-r1.ebuild	20 Jan 2006 23:27:31 -0000
@@ -18,18 +18,18 @@
 	media-libs/libpng
 	virtual/libc
 	sys-libs/zlib
-	virtual/x11"
+	|| (
+	( >=x11-proto/xproto-7.0.4
+	>=x11-libs/libXt-1.0.0 )
+	virtual/x11
+	)"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/nxcomp-1.5.0-r1-pic.patch
-}
-
-src_compile() {
-	./configure
-	emake || die "emake failed"
+	epatch "${FILESDIR}"/${PN}-1.5.0-r1-pic.patch
+	epatch "${FILESDIR}"/${PN}-1.5.0-gcc4.patch
 }
 
 src_install() {
@@ -37,7 +37,7 @@
 	dolib libXcomp.so*
 	if [[ $(get_libdir) != lib ]]; then
 		# necessary for nxclient to work, it seems
-		ln -s "$(get_libdir)" ${D}/usr/NX/lib
+		ln -s "$(get_libdir)" "${D}"/usr/NX/lib
 	fi
 
 	preplib /usr/NX/lib
@@ -45,8 +45,8 @@
 	insinto /usr/NX/include
 	doins NX*.h MD5.h
 
-	dodoc README README-IPAQ LICENSE VERSION
+	dodoc README README-IPAQ VERSION
 
 	dodir /etc/env.d
-	echo "LDPATH=/usr/NX/$(get_libdir)" >${D}/etc/env.d/50nxcomp
+	echo "LDPATH=/usr/NX/$(get_libdir)" >"${D}"/etc/env.d/50nxcomp
 }