make vnc multilib-capable, bug 91755

Package-Manager: portage-2.0.51.19

3 files changed, 30 insertions, 23 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 22c9371afe77..265f0bc76f3a 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.36 2005/06/09 15:07:20 omkhar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.37 2005/06/25 18:53:40 blubb Exp $
+
+  25 Jun 2005; Simon Stelling <blubb@gentoo.org> vnc-4.0-r1.ebuild:
+  make vnc multilib-capable, bug 91755
 
   09 Jun 2005; <omkhar@gentoo.org> +files/xc.patch-eieio.patch,
   vnc-4.0-r1.ebuild:
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index c992bc2858c4..9aed842749fe 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,27 +1,27 @@
-MD5 f915651ee1c8a1d1fd423f770f341578 vnc-4.0.ebuild 2078
+MD5 df0e87f3d27f875f159b7c0708572a52 ChangeLog 6751
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 23009addce18bd7a5d801235f22c5041 vnc-4.0-r1.ebuild 2575
 MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628
-MD5 dde9c4be055e942bc87085fbd9818fd5 ChangeLog 6644
+MD5 6ae1e58212ccd011866645d1f44c9a6e vnc-4.0-r1.ebuild 2793
+MD5 f915651ee1c8a1d1fd423f770f341578 vnc-4.0.ebuild 2078
+MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
+MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
 MD5 bc74b6827faf0e3039de99a4e21cc5bd files/digest-vnc-4.0-r1 270
-MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
+MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575
+MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
 MD5 69dfbaa72c6b66cba94868885c09fc92 files/vnc-3.3.4-platform-fixes.patch 63005
-MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
 MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781
-MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
-MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
+MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
 MD5 2132dc5ea4e5a5349f5ec193ea3667c6 files/xc.patch-eieio.patch 703
-MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
-MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
-MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
-MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557
-MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440
-MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482
-MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
+MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
+MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819
 MD5 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365
 MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401
 MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911
-MD5 6572073121cd6b24eb72ec9df69927e0 files/vnc-4.0/vnc-via.patch 5681
-MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819
-MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
+MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482
+MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
 MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244
+MD5 6572073121cd6b24eb72ec9df69927e0 files/vnc-4.0/vnc-via.patch 5681
+MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557
+MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
+MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
index f8302f77d12a..946aff819edf 100644
--- a/net-misc/vnc/vnc-4.0-r1.ebuild
+++ b/net-misc/vnc/vnc-4.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.10 2005/06/10 15:31:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.11 2005/06/25 18:53:40 blubb Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
 X_VERSION="6.8.1"
 
@@ -54,7 +54,11 @@ src_unpack() {
 		epatch ${FILESDIR}/xc.patch-eieio.patch
 		epatch xc.patch
 
-		echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def
+		HOSTCONF="${S}/xc/config/cf/vnc.def"
+		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+		echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
+		echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
+		echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF}
 	fi
 }
 
@@ -70,9 +74,9 @@ src_compile() {
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
-	use server && dodir /usr/X11R6/lib/modules/extensions
+	use server && dodir /usr/$(get_libdir)/modules/extensions
 
-	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die
 	dodoc LICENCE.TXT README
 
 	use server || (