Fixed client use flag

3 files changed, 49 insertions, 38 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index d67ff40ff534..3452d961b3bb 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/vnc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.31 2005/01/07 18:45:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.32 2005/01/08 15:37:10 aliz Exp $
+
+  08 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0-r1.ebuild:
+  Fixed optional building of server.
 
 *vnc-4.0-r1 (07 Jan 2005)
 
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 17c98002f204..597ebed89230 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,7 +1,7 @@
-MD5 90426deb4f2e2a25ccf0813d2c1d93fe vnc-4.0-r1.ebuild 2351
+MD5 90f3aee76ea70271650624ac6fc351c6 vnc-4.0-r1.ebuild 2537
 MD5 9f66c7decfb747aef1c43e2df6a85757 vnc-4.0.ebuild 2089
 MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628
-MD5 5d5b2e5db8e939437ae078723fc127c7 ChangeLog 6057
+MD5 2215d969f0b195b49300a1ca72e94638 ChangeLog 6162
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575
 MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
index e3efbf155c35..1d881e898805 100644
--- a/net-misc/vnc/vnc-4.0-r1.ebuild
+++ b/net-misc/vnc/vnc-4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.2 2005/01/07 18:45:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.3 2005/01/08 15:37:10 aliz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,14 +10,16 @@ MY_P="${P}-unixsrc"
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.realvnc.com/"
 SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
-	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz
-	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz
-	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz"
+	server? (
+		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz
+		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz
+		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE="client server"
+IUSE="server"
 
 DEPEND="sys-libs/zlib
 	media-libs/freetype
@@ -27,57 +29,63 @@ DEPEND="sys-libs/zlib
 PROVIDE="virtual/vnc"
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if ! use client && ! use server ; then
-		die "You must have either client or server or both in USE"
-	fi
-}
-
 src_unpack() {
-	mkdir -p ${S}/xc ; cd ${S}
-
-	unpack X11R${X_VERSION}-src1.tar.gz
-	unpack X11R${X_VERSION}-src2.tar.gz
-	unpack X11R${X_VERSION}-src3.tar.gz
-
-	cd ${WORKDIR}
 	unpack ${MY_P}.tar.gz ; cd ${S}
 
-	# patches from Redhat
+	epatch ${FILESDIR}/${P}/vnc-gcc34.patch
 	epatch ${FILESDIR}/${P}/vnc-cookie.patch
-	epatch ${FILESDIR}/${P}/vnc-def.patch
 	epatch ${FILESDIR}/${P}/vnc-fPIC.patch
-	epatch ${FILESDIR}/${P}/vnc-gcc34.patch
 	epatch ${FILESDIR}/${P}/vnc-idle.patch
 	epatch ${FILESDIR}/${P}/vnc-restart.patch
-	epatch ${FILESDIR}/${P}/vnc-sparc.patch
 	epatch ${FILESDIR}/${P}/vnc-via.patch
-	epatch ${FILESDIR}/${P}/vnc-xclients.patch
-	epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
-	epatch ${FILESDIR}/${P}/vnc-xorg.patch
-	epatch ${FILESDIR}/${P}/imake-tmpdir.patch
 
-	epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
-	epatch xc.patch
+	use server && ( 
+		unpack X11R${X_VERSION}-src1.tar.gz
+		unpack X11R${X_VERSION}-src2.tar.gz
+		unpack X11R${X_VERSION}-src3.tar.gz
+
+		# patches from Redhat
+		epatch ${FILESDIR}/${P}/vnc-sparc.patch
+		epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
+		epatch ${FILESDIR}/${P}/vnc-def.patch
+		epatch ${FILESDIR}/${P}/vnc-xclients.patch
+		epatch ${FILESDIR}/${P}/vnc-xorg.patch
+		epatch ${FILESDIR}/${P}/imake-tmpdir.patch
+
+		epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
+		epatch xc.patch
 
-	echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def
+		echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def
+	)
 }
 
 src_compile() {
-	use client && (
 	econf --with-installed-zlib || die
-	emake || die )
+	emake || die
 
 	use server && (
-	cd ${S}/xc
-	make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die )
+		cd ${S}/xc
+		make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die 
+	)
 }
 
 src_install() {
-	# client
-	dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions
+	dodir /usr/bin /usr/share/man/man1
+	use server && dodir /usr/X11R6/lib/modules/extensions
+
 	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die
 	dodoc LICENCE.TXT README
 
+	use server || (
+		rm ${D}/usr/bin/vncserver
+		rm ${D}/usr/bin/x0vncserver
+		rm ${D}/usr/share/man/man1/vncpasswd.1.gz
+		rm ${D}/usr/bin/vncpasswd
+		rm ${D}/usr/share/man/man1/vncconfig.1.gz
+		rm ${D}/usr/bin/vncconfig
+		rm ${D}/usr/share/man/man1/vncserver.1.gz
+		rm ${D}/usr/share/man/man1/x0vncserver.1.gz
+	)
+
 	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
 }