src_compile cleanups in 2X server

svn path=/testing/; revision=161

2 files changed, 15 insertions, 79 deletions

diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index d3724f2..f2f76a5 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -31,10 +31,10 @@ MD5 1eb7778fcae558d88ca6a16dc85e58e7 files/1.5.0/nxserver-2xterminalserver-1.5.0
 RMD160 1399d4e0a1e2da8f1e2c9203465bece738be6452 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
 SHA256 f521231e67fe9e9aa1cbaa82a679483b5c4cdc01aac27b02cd72d5de350edfc6 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
 DIST linuxterminalserver-1.5.0-r21-src.tar.gz 112952553 RMD160 0e0e96243419d03b5d290ebba286b61b06edc75e SHA1 0a3e9c0babdeaafe36e72d139c1eed19ddb86921 SHA256 e0b48e4f917cb84115c2c653f88aa33d3915901fff0a6cb2e779066c54b269d5
-EBUILD nxserver-2xterminalserver-1.5.0.ebuild 5439 RMD160 d838ba5e9608305e77b595423da89a2da7c09082 SHA1 52ddae3a13277c45608b183197ca35d501a48e50 SHA256 df7077ffe91332951c4e68ae1fc435addebf9d1ad08f7aff25939dda941bd544
-MD5 3610d18649aab75802fff6e60bedf3fa nxserver-2xterminalserver-1.5.0.ebuild 5439
-RMD160 d838ba5e9608305e77b595423da89a2da7c09082 nxserver-2xterminalserver-1.5.0.ebuild 5439
-SHA256 df7077ffe91332951c4e68ae1fc435addebf9d1ad08f7aff25939dda941bd544 nxserver-2xterminalserver-1.5.0.ebuild 5439
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 4766 RMD160 b85b05b2183688cd763b8fb589484115c545d256 SHA1 f2fb1e456147e02368d1c22fc2939603a5fc0492 SHA256 c87693f5b6cc79db578959c0df0848dfa0515aa25226ab94cc45ae61ce00c5b2
+MD5 3a49f8fec4491526302d8513c80111ac nxserver-2xterminalserver-1.5.0.ebuild 4766
+RMD160 b85b05b2183688cd763b8fb589484115c545d256 nxserver-2xterminalserver-1.5.0.ebuild 4766
+SHA256 c87693f5b6cc79db578959c0df0848dfa0515aa25226ab94cc45ae61ce00c5b2 nxserver-2xterminalserver-1.5.0.ebuild 4766
 MD5 9ce3d064f488428d2ca91d7fddbd898f files/digest-nxserver-2xterminalserver-1.5.0 310
 RMD160 9863e56c29cc5e2c78c52e616149f338bc192306 files/digest-nxserver-2xterminalserver-1.5.0 310
 SHA256 827043de6eaf9a30d0256b9479470b9bb20d2deb9bf5dc82c1d9eb9e02ec047b files/digest-nxserver-2xterminalserver-1.5.0 310
diff --git a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
index bb9a1c9..b6258b8 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -52,87 +52,38 @@ src_unpack() {
 	find . -type f -exec sed -i "s/@PRODUCT_NAME@/2X TerminalServer/g" {} \;
 }
 
-build_nxagent()
-{
-	einfo
-	einfo "Building nxcompext"
-	einfo
-
+src_compile() {
 	cd ${S}/common/nxcompext
 	append-ldflags "-L/usr/NX/lib"
 	econf || die
 	emake || die
 
-	einfo
-	einfo "Building nx-X11"
-	einfo
-
 	cd ${S}/common/nx-X11
 	emake World || die
-}
 
-build_nxdesktop()
-{
-	einfo
-	einfo "Building nxdesktop"
-	einfo
-
-	cd ${S}/client/nxdesktop
-	CC=(tc-getCC) ./configure || die
-
-	emake || die
-}
-
-build_nxviewer()
-{
-	einfo
-	einfo "Building nxviewer"
-	einfo
-
-	cd ${S}/server/nxviewer
-	# Imakefile needs patching to find the libraries in the right place
-	xmkmf -a || die
-	emake World || die
-}
+	if use rdesktop; then
+		cd ${S}/client/nxdesktop
+		CC=(tc-getCC) ./configure || die
+		emake || die
+	fi
 
-build_nxspool()
-{
-	einfo
-	einfo "Building nxspool"
-	einfo
+	if use vnc; then
+		cd ${S}/server/nxviewer
+		xmkmf -a || die
+		emake World || die
+	fi
 
 	cd ${S}/server/nxspool/source
 	econf --without-ldap --without-krb5 || die
 	# We can't use emake here - it doesn't trigger the right target
 	# for some reason
 	make || die
-}
-
-build_nxsensor()
-{
-	einfo
-	einfo "Building nxsensor"
-	einfo
 
 	cd ${S}/server/nxsensor
 	emake glib12=1 || die
-}
-
-build_nxuexec()
-{
-	einfo
-	einfo "Building nxuexec"
-	einfo
 
 	cd ${S}/server/nxuexec
 	emake || die
-}
-
-build_nxserver()
-{
-	einfo
-	einfo "Building nxserver"
-	einfo
 
 	cd ${S}/server/nxnode/src
 	./configure || die
@@ -140,21 +91,6 @@ build_nxserver()
 	make nxnode.pl nxserver.pl || die
 }
 
-src_compile() {
-	build_nxagent
-	if use rdesktop; then
-		build_nxdesktop
-	fi
-	build_nxdesktop
-	if use vnc; then
-		build_nxviewer
-	fi
-	build_nxspool
-	build_nxsensor
-	build_nxuexec
-	build_nxserver
-}
-
 src_install() {
 	into /usr/NX
 	dobin ${S}/common/nx-X11/programs/Xserver/nxagent