fix for eieio compile error with 2.6 headers and vnc server on ppc64

Package-Manager: portage-2.0.51.19

4 files changed, 44 insertions, 20 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 9a78667b9e42..22c9371afe77 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2005/05/18 04:18:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.36 2005/06/09 15:07:20 omkhar Exp $
+
+  09 Jun 2005; <omkhar@gentoo.org> +files/xc.patch-eieio.patch,
+  vnc-4.0-r1.ebuild:
+  fix for eieio compile error with 2.6 headers and vnc server on ppc64
 
   18 May 2005; Michael Sterrett <mr_bones_@gentoo.org> vnc-4.0.ebuild,
   vnc-4.0-r1.ebuild:
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 42bea345922b..c3b7d466b931 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,26 +1,27 @@
+MD5 a40084c226be2cc64b2c1ebc02019050 vnc-4.0-r1.ebuild 2607
 MD5 f915651ee1c8a1d1fd423f770f341578 vnc-4.0.ebuild 2078
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 50acfca9f6410d79749805411d88f449 vnc-4.0-r1.ebuild 2546
 MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628
-MD5 17e41377efd7d77ec502768ee4293bb8 ChangeLog 6490
-MD5 bc74b6827faf0e3039de99a4e21cc5bd files/digest-vnc-4.0-r1 270
-MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
+MD5 dde9c4be055e942bc87085fbd9818fd5 ChangeLog 6644
+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
 MD5 69dfbaa72c6b66cba94868885c09fc92 files/vnc-3.3.4-platform-fixes.patch 63005
+MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
+MD5 2132dc5ea4e5a5349f5ec193ea3667c6 files/xc.patch-eieio.patch 703
 MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
 MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
 MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
-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 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 bc74b6827faf0e3039de99a4e21cc5bd files/digest-vnc-4.0-r1 270
+MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819
 MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482
-MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
-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 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365
+MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440
+MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
+MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557
 MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
 MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244
+MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911
+MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
+MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401
diff --git a/net-misc/vnc/files/xc.patch-eieio.patch b/net-misc/vnc/files/xc.patch-eieio.patch
new file mode 100644
index 000000000000..cb6966e6c25d
--- /dev/null
+++ b/net-misc/vnc/files/xc.patch-eieio.patch
@@ -0,0 +1,17 @@
+--- xc.orig/programs/Xserver/hw/xfree86/common/compiler.h	2004-12-22 08:24:22.364106000 -0800
++++ xc/programs/Xserver/hw/xfree86/common/compiler.h	2004-12-22 08:26:39.869202576 -0800
+@@ -1076,7 +1076,12 @@
+ 
+ extern volatile unsigned char *ioBase;
+ 
+-#    define eieio()		__asm__ __volatile__ ("eieio" ::: "memory")
++#if defined(linux) && defined(__powerpc64__)
++# include <asm/memory.h>
++#endif /* defined(linux) && defined(__powerpc64__) */
++#ifndef eieio /* We deal with arch-specific eieio() routines above... */
++# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
++#endif /* eieio */
+ 
+ static __inline__ unsigned char
+ xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
+
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
index 7b187c78bf54..da12289e1204 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.8 2005/05/18 04:18:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.9 2005/06/09 15:07:20 omkhar Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,14 +18,15 @@ SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc amd64 ~alpha ~ia64"
+KEYWORDS="~x86 ~sparc ~ppc amd64 ~alpha ~ia64 ppc64"
 IUSE="server"
 
 DEPEND="sys-libs/zlib
-	!net-misc/tightvnc
 	media-libs/freetype
+	!virtual/vnc
 	x11-base/xorg-x11"
 
+PROVIDE="virtual/vnc"
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
@@ -52,6 +53,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${P}/imake-tmpdir.patch
 
 		epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
+		epatch ${FILESDIR}/xc.patch-eieio.patch
 		epatch xc.patch
 
 		echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def