Remove some useless code, and remove the man entries if server is not built

Package-Manager: portage-2.1.6.7/cvs/Linux ia64

3 files changed, 13 insertions, 17 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 690a25b27bbc..a9979f2e3dbd 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.5 2009/04/14 15:51:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.6 2009/04/14 16:40:42 armin76 Exp $
+
+  14 Apr 2009; Raúl Porcel <armin76@gentoo.org>
+  tigervnc-0.0.90_p3751.ebuild:
+  Remove some useless code, and remove the man entries if server is not
+  built
 
   14 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   tigervnc-0.0.90_p3751.ebuild:
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3f1d17e71a58..18061c8390a5 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,6 +7,6 @@ DIST tigervnc-0.0.90_p3631.tar.bz2 3415864 RMD160 29e9e423107a9fc70ea4df71b846b4
 DIST tigervnc-0.0.90_p3751.tar.bz2 2711662 RMD160 08fa8bb7bd5a68bc9568ce49408d06250fec3db3 SHA1 4e8e3b9f54ee4dbd71d3a060f4285091257a55a6 SHA256 1adf3ec7bf5c99f1a74fa3c1ea2a91bc1cf0bf8590bf81a3060370f5d7e4083b
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 EBUILD tigervnc-0.0.90_p3631.ebuild 4576 RMD160 d46b2f83418934ed2b7988874b900d9e977cb4d7 SHA1 3f86115a5cd8e72dbf0d98f81f832058b6e7c9f6 SHA256 afd7317bcd0b6c0944607812d2a08f2c3c84694273e8aba642a13ac0370dcea0
-EBUILD tigervnc-0.0.90_p3751.ebuild 4684 RMD160 bd656d151f205f47f2a6ef7b142b9fdf1b98217b SHA1 824c9e034ce03ee02a086586263c2bab5f3e03fe SHA256 1da0a72850214f6b5ef0c4861f4afe5b53ae437f8586efd6a71a8ec1b6079173
-MISC ChangeLog 871 RMD160 5c00e1b87e2efaf3c943ed5e6444bdd8bb2c8c08 SHA1 1cdfe6426b47fae1e2fac85e005090e4aa30065d SHA256 9f5a91a1dbfd877cce60b6773db1170d463bbec88edf8987bc373587f606fb82
+EBUILD tigervnc-0.0.90_p3751.ebuild 4379 RMD160 cfa15d4ab4bef01de2daa6be827fd80385ccc2c5 SHA1 bb77bdd8f33b492024a8738a5a1a446892bc3af0 SHA256 d88b0536a57df17ff786a2a68e0a7c37e67a4073f3a81618250b8a3042ce3521
+MISC ChangeLog 1033 RMD160 e4e3bfbf79fbcc17464916f0d46f576354990c49 SHA1 bf6094d3df3ee8c55a2eb43bf1f8385942c0fc86 SHA256 8fb5bdd288a1b8842832aadda96d0d2f1ef2724fc6a015ed914fa40e5a5984e9
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
diff --git a/net-misc/tigervnc/tigervnc-0.0.90_p3751.ebuild b/net-misc/tigervnc/tigervnc-0.0.90_p3751.ebuild
index 3867d9e690ff..b40c9b62f52c 100644
--- a/net-misc/tigervnc/tigervnc-0.0.90_p3751.ebuild
+++ b/net-misc/tigervnc/tigervnc-0.0.90_p3751.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-0.0.90_p3751.ebuild,v 1.2 2009/04/14 15:51:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-0.0.90_p3751.ebuild,v 1.3 2009/04/14 16:40:42 armin76 Exp $
 
 EAPI="1"
 
@@ -13,9 +13,7 @@ OPENGL_DIR="xorg-x11"
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.tigervnc.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
 	mirror://gentoo/${PATCH}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
 	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
 
 LICENSE="GPL-2"
@@ -155,27 +153,20 @@ src_install() {
 	make_desktop_entry vncviewer vncviewer vncviewer Network
 
 	if use server ; then
-		dobin vncserver || die "dobin failed"
-		for f in vncviewer/vncviewer vncpasswd/vncpasswd \
-			vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
-			mv $f.man $f.1
-			doman $f.1
-		done
 		cd xserver/hw/vnc
 		emake DESTDIR="${D}" install || die "emake install failed"
 		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
 
-		newman Xvnc.man Xvnc.1
 		newconfd "${FILESDIR}"/${PN}.confd ${PN}
 		newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
 		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
 	else
 		cd "${D}"
-		rm usr/bin/vncconfig
-		rm usr/bin/vncpasswd
-		rm usr/bin/vncserver
-		rm usr/bin/x0vncserver
+		for f in vncserver vncpasswd x0vncserver vncconfig; do
+			rm usr/bin/$f
+			rm usr/share/man/man1/$f.1
+		done
 	fi
 }