Add a patch from Debian to make it work on arm, keyword ~arm

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 i686

4 files changed, 27 insertions, 7 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 4accdd2ef4a4..2b8ff339d15b 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.123 2008/09/11 11:14:57 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.124 2008/09/24 18:31:28 armin76 Exp $
+
+  24 Sep 2008; Raúl Porcel <armin76@gentoo.org> +files/1.3.9-arm.patch,
+  tightvnc-1.3.9-r2.ebuild:
+  Add a patch from Debian to make it work on arm, keyword ~arm
 
 *tightvnc-1.3.9-r2 (11 Sep 2008)
 
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index dc98ccb81320..34457b593b68 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,3 +1,4 @@
+AUX 1.3.9-arm.patch 429 RMD160 41cac81f5369a36deb27fb72af1a5a8f7b76e37b SHA1 3423ca7ca6608b6f5a0b34ea935dfbbce9cd5da6 SHA256 19abda69964903c1947b55cbaf14e0238c1fda7a5280b5eff2642c85c78d0514
 AUX 1.3.9-fbsd.patch 830 RMD160 53be20b8823e8cce0f7cc9742bacb1b2d8a7649d SHA1 62f364cd571c05c30838910ce764409978453ebb SHA256 f465693797f4631f7d845aa54aa48febfd1182a0472d18e5babf3127e57be0b9
 AUX README.JavaViewer 18585 RMD160 e40c2e27bd4c31d9d389a4a59a6ab7ef256bc962 SHA1 7c2b1ca4051ed2ad89e7f745736b985ea5c75ab0 SHA256 44baa12f5ee918aacf762f0d32ae45bffab17eed77e7e3ed5b43d06e2876d150
 AUX server-CVE-2007-1003.patch 1062 RMD160 c7a21dc431924e0d430e4fd1a76e57a0f8564bb6 SHA1 2ed68d40c91eac77eaf6cf617bfe5aaa4912923a SHA256 4c1eda952e06e954e296a4abf304746b32a7ec45f6bdffb9f0adc0b2d692d6d2
@@ -13,6 +14,6 @@ AUX vncviewer.png 495 RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 SHA1 c835d
 DIST tightvnc-1.3.9_javasrc.tar.gz 85794 RMD160 6038ef6e3859b1f7c85342fd2cb20ed07e3427df SHA1 a63498d34e81d3e8c213f1059f99b961e1a00123 SHA256 b2fcc6e63a7f7e22843a89ea177c993cac1ecf379a22f21c23e5bd754d75422e
 DIST tightvnc-1.3.9_unixsrc.tar.bz2 1792459 RMD160 79d858466b7fab740b4d66d6b0963533f48a5163 SHA1 a9529a262a060517402fb9845ef63a0d18c3141f SHA256 99aaca636535f9127f3a435ee71aef6821f821e6319bc6e9b2c775fefd34325a
 EBUILD tightvnc-1.3.9-r1.ebuild 2972 RMD160 2f239dbbe3f44d45d723d9203343a4ae11b399e5 SHA1 8a5e2c570512e96f212d60444174ff26d6f9d5c3 SHA256 0b502f5bd5d85985ab5b8b7ce65798ca8da8570f649388c271bcaaf975adb9a8
-EBUILD tightvnc-1.3.9-r2.ebuild 3316 RMD160 0ac7532b85d24bf44cdd78c8a8786df4018bdc52 SHA1 d756013bcc7393d6ad6dc7ada745a846e98c902d SHA256 7da37b5dd2268ac417a4af9e23c399d7016cbdbb0e1870742392ab038128a8c0
-MISC ChangeLog 18431 RMD160 313879cd873cd6141a90c66aff64b521bea401c8 SHA1 1e6d3780dcfd798c058cd4583b3f225ec30d05bc SHA256 b045ebd3a423777c42c8d3afd270f3901d8afe5544365706e604728a06034212
+EBUILD tightvnc-1.3.9-r2.ebuild 3346 RMD160 990daf1e55fb016ba2b9c33fea733db78e83fe63 SHA1 ee653edf02ed39fa1da24d7ab66eae804c701b71 SHA256 7b3f5728109accc465051cabcd38b379e0031ffaad7ccc60617df76702c6b110
+MISC ChangeLog 18595 RMD160 68b852a439cc3f75b8dc321ec50ce646e634d899 SHA1 b6219c4e6fa8fc2926784eb9e8ac26de6fbd9ba5 SHA256 f5ac147692324f6c78f56f89e63aff456c9c217b8e7bf6f588631ce1d9664ce1
 MISC metadata.xml 379 RMD160 be155401d5ff67986af89edbf395b46a01ba6976 SHA1 19539086c3aa290dba3a04a16c216eb34c20d76c SHA256 ff5eef1f3d62cd4f7d2bf129b0763206e3e1a194d6f39e70e752da108c58b43b
diff --git a/net-misc/tightvnc/files/1.3.9-arm.patch b/net-misc/tightvnc/files/1.3.9-arm.patch
new file mode 100644
index 000000000000..a238e29379c6
--- /dev/null
+++ b/net-misc/tightvnc/files/1.3.9-arm.patch
@@ -0,0 +1,12 @@
+diff -ur vnc_unixsrc.orig/Xvnc/config/cf/Imake.cf vnc_unixsrc/Xvnc/config/cf/Imake.cf
+--- vnc_unixsrc.orig/Xvnc/config/cf/Imake.cf	2008-09-24 18:50:40.000000000 +0200
++++ vnc_unixsrc/Xvnc/config/cf/Imake.cf	2008-09-24 18:51:37.000000000 +0200
+@@ -711,7 +711,7 @@
+ #  undef __alpha__
+ # endif /* __alpha__ */
+ # ifdef __arm__
+-#  define Arm32Architecture
++#  define ArmArchitecture
+ #  undef arm
+ #  undef __arm
+ #  undef __arm__
diff --git a/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild b/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild
index a0227d9a38e3..42395613af49 100644
--- a/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild,v 1.1 2008/09/11 11:14:57 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild,v 1.2 2008/09/24 18:31:28 armin76 Exp $
 
 inherit eutils toolchain-funcs java-pkg-opt-2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2
 		java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -58,14 +58,17 @@ src_unpack() {
 		epause 5
 	fi
 
-	unpack ${A} && cd "${S}"
+	unpack ${A} 
+	cd "${S}"
+
 	epatch "${FILESDIR}/${PN}-1.3.8-pathfixes.patch" # fixes bug 78385 and 146099
 	epatch "${FILESDIR}/${PN}-1.3.8-imake-tmpdir.patch" # fixes bug 23483
 	epatch "${FILESDIR}/${PN}-1.3.8-darwin.patch" # fixes bug 89908
-	use mips && epatch "${FILESDIR}/${PN}-1.3.8-mips.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-mips.patch"
 	epatch "${FILESDIR}"/server-CVE-2007-1003.patch
 	epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
 	epatch "${FILESDIR}"/${PV}-fbsd.patch
+	epatch "${FILESDIR}"/${PV}-arm.patch
 
 	if use java; then
 		cd "${WORKDIR}"