version bump thanks to armin76

(Portage version: 2.1.2_pre2-r3)

7 files changed, 348 insertions, 1 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index d83160a492c6..d3fb91d16cb9 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.72 2006/08/09 18:48:23 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.73 2006/10/04 18:40:25 genstef Exp $
+
+*tightvnc-1.3.8 (04 Oct 2006)
+
+  04 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/tightvnc-1.3.8-amd64.patch, +files/tightvnc-1.3.8-darwin.patch,
+  +files/tightvnc-1.3.8-imake-tmpdir.patch,
+  +files/tightvnc-1.3.8-pathfixes.patch, +tightvnc-1.3.8.ebuild:
+  version bump thanks to armin76
 
   09 Aug 2006; Thomas Cort <tcort@gentoo.org> tightvnc-1.2.9-r2.ebuild:
   Stable on amd64 wrt Bug #138779.
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3.8 b/net-misc/tightvnc/files/digest-tightvnc-1.3.8
new file mode 100644
index 000000000000..bc139c537f55
--- /dev/null
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.3.8
@@ -0,0 +1,3 @@
+MD5 9b9b0465834289d1b7899982c0096440 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
+RMD160 98013a7074c488d1cfc85ea2d7a9665a05ee2431 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
+SHA256 cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch
new file mode 100644
index 000000000000..9b7153465e7f
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch
@@ -0,0 +1,150 @@
+--- vnc_unixsrc.org/Xvnc/config/cf/Imake.cf	2003-02-06 19:11:28.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/Imake.cf	2006-09-14 21:37:48.000000000 +0200
+@@ -801,6 +801,10 @@
+ # ifdef PpcArchitecture
+ #  define PowerPCArchitecture
+ # endif
++# ifdef __x86_64__
++#  define x86_64Architecture
++#  undef __x86_64__
++# endif
+ #endif /* linux */
+ 
+ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
+--- vnc_unixsrc.org/Xvnc/config/cf/linux.cf	2002-03-20 11:49:23.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/linux.cf	2006-09-14 21:37:48.000000000 +0200
+@@ -43,7 +43,7 @@
+ #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
+     defined(SparcArchitecture) || defined(ArmArchitecure) || \
+     defined(i386Architecture) || defined(s390Architecture) || \
+-    defined(s390xArchitecture)
++    defined(s390xArchitecture) || defined(x86_64Architecture)
+ #define DefaultLinuxCLibMajorVersion	6
+ #else
+ #define DefaultLinuxCLibMajorVersion	5
+@@ -290,6 +290,14 @@
+ #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+ #endif /* PowerPCArchitecture */
+ 
++#ifdef x86_64Architecture
++#define DefaultCCOptions        -fsigned-char
++#define OptimizedCDebugFlags	-O2
++#define LinuxMachineDefines 	-D__x86_64__
++#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
++#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* x86_64PCArchitecture */
++
+ #ifdef ArmArchitecture
+ #define DefaultCCOptions	-fsigned-char
+ #define OptimizedCDebugFlags	-O2
+--- vnc_unixsrc.org/Xvnc/include/Xmd.h	2000-06-11 14:00:52.000000000 +0200
++++ vnc_unixsrc/Xvnc/include/Xmd.h	2006-09-14 21:29:47.000000000 +0200
+@@ -59,7 +59,7 @@
+ #ifdef CRAY
+ #define WORD64				/* 64-bit architecture */
+ #endif
+-#if defined(__alpha) || defined(__alpha__)
++#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
+ #define LONG64				/* 32/64-bit architecture */
+ #endif
+ #ifdef __sgi
+--- vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c	2000-06-11 14:00:52.000000000 +0200
++++ vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c	2006-09-14 21:29:47.000000000 +0200
+@@ -79,7 +79,7 @@
+                 byte,
+                 glyph,
+                 scan;
+-    int         sizes[GLYPHPADOPTIONS];
++    CARD32      sizes[GLYPHPADOPTIONS];
+ {
+     int         widthBits,
+                 widthBytes,
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c	2000-06-11 14:00:51.000000000 +0200
++++ vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c	2006-09-14 21:29:47.000000000 +0200
+@@ -404,6 +404,7 @@
+  */
+ void
+ NoopDDA(
++#undef NeedVarargsPrototypes
+ #if NeedVarargsPrototypes
+     void* f, ...
+ #endif
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c	2003-04-09 00:18:33.000000000 +0200
++++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c	2006-09-14 21:29:47.000000000 +0200
+@@ -39,6 +39,7 @@
+ #endif
+ #if USE_LIBWRAP
+ #include <tcpd.h>
++#include <arpa/inet.h>
+ #endif
+ 
+ #include "rfb.h"
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c	2006-08-15 09:05:07.000000000 +0200
++++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c	2006-09-14 21:29:47.000000000 +0200
+@@ -80,6 +80,7 @@
+ #include <sys/param.h>
+ #include "dix.h"
+ #include "rfb.h"
++#include <time.h>
+ 
+ #ifdef CORBA
+ #include <vncserverctrl.h>
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h	2004-02-27 13:22:47.000000000 +0100
++++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h	2006-09-14 21:29:47.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <rfbproto.h>
+ #include <vncauth.h>
+ #include <zlib.h>
++#include <stdarg.h>
+ 
+ /* It's a good idea to keep these values a bit greater than required. */
+ #define MAX_ENCODINGS 10
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c	2002-10-27 13:36:02.000000000 +0100
++++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c	2006-09-14 21:29:47.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <sys/time.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netinet/tcp.h>
+ #include <netdb.h>
+ #include <fcntl.h>
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h	2000-06-11 14:00:52.000000000 +0200
++++ vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h	2006-09-14 21:29:47.000000000 +0200
+@@ -479,6 +479,7 @@
+ );
+ 
+ extern void NoopDDA(
++#undef NeedVarargsPrototypes
+ #if NeedVarargsPrototypes
+     void *,
+     ...
+--- vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h	2003-02-19 17:39:54.000000000 +0100
++++ vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h	2006-09-14 21:29:47.000000000 +0200
+@@ -374,6 +374,25 @@
+ #define NO_ONE_RECT
+ #endif
+ 
++/* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
++ */
++#ifdef __x86_64__
++#  define BITMAP_SCANLINE_UNIT			64
++# define BITMAP_SCANLINE_PAD 			64
++# define LOG2_BITMAP_PAD			6
++# define LOG2_BYTES_PER_SCANLINE_PAD		3
++
++/* Add for handling protocol XPutImage and XGetImage; see comment in
++ * Alpha section.
++ */
++#define INTERNAL_VS_EXTERNAL_PADDING
++#define BITMAP_SCANLINE_UNIT_PROTO		32
++
++#define BITMAP_SCANLINE_PAD_PROTO 	 	32
++#define LOG2_BITMAP_PAD_PROTO			5
++#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO	2
++#endif
++
+ #endif /* SVR4 / BSD / i386 */
+ 
+ #if defined (linux) && defined (__mc68000__)
+
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-darwin.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-darwin.patch
new file mode 100644
index 000000000000..e5f7aa7016cf
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.8-darwin.patch
@@ -0,0 +1,24 @@
+--- vnc_unixsrc/Xvnc/config/cf/darwin.cf.orig	2005-11-05 16:42:53.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/darwin.cf	2005-11-05 16:46:52.000000000 +0100
+@@ -106,7 +106,6 @@
+ # endif
+ #endif
+ 
+-#define StandardDefines	-DCSRG_BASED
+ #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ 
+ 
+--- vnc_unixsrc/Xvnc/config/cf/vnclibs.def.orig	2005-11-05 17:11:41.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/vnclibs.def	2005-11-05 17:17:21.000000000 +0100
+@@ -11,7 +11,11 @@
+ /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
+ VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
+ #else
++# if HasLibCrypt == YES
+ VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
++# else
++VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
++# endif
+ #endif
+ 
+ VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-imake-tmpdir.patch
new file mode 100644
index 000000000000..9d5ccc58ad76
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.8-imake-tmpdir.patch
@@ -0,0 +1,37 @@
+--- vnc_unixsrc/Xvnc/config/imake/imake.c.orig	2000-06-11 14:00:51.000000000 +0200
++++ vnc_unixsrc/Xvnc/config/imake/imake.c	2003-09-01 22:59:25.000000000 +0200
+@@ -913,12 +913,25 @@
+ static void get_libc_version(inFile)
+   FILE* inFile;
+ {
+-  char *aout = tmpnam (NULL);
++  char aout[PATH_MAX];
+   FILE *fp;
+   const char *format = "%s -o %s -x c -";
+   char *cc;
+   int len;
+   char *command;
++  char *tmpdir;
++  int tmpfd;
++  
++  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX-13))
++    strcpy(aout, tmpdir);
++  else
++    strcpy(aout, "/tmp");
++  strcat(aout, "/imakeXXXXXX");
++  
++  if((tmpfd = mkstemp(aout)) == -1) {
++    perror("mkstemp");
++    abort();
++  }
+ 
+   cc = getenv ("CC");
+   if (cc == NULL)
+@@ -930,6 +943,7 @@
+   if (snprintf (command , len, format, cc, aout) == len)
+     abort ();
+ 
++  close(tmpfd);
+   fp = popen (command, "w");
+   if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
+       || pclose (fp) != 0)
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-pathfixes.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-pathfixes.patch
new file mode 100644
index 000000000000..d9fa5aae30b8
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.8-pathfixes.patch
@@ -0,0 +1,23 @@
+--- vncserver.old	2006-08-10 13:01:07.000000000 +0200
++++ vncserver	2006-09-05 19:31:30.000000000 +0200
+@@ -36,16 +36,16 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/vnc/classes";
++$vncClasses = "/usr/share/tightvnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++$fontPath = "unix/:-1";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ 
+ # Here is another example of setting the font path:
+-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/Type1/";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+-# $colorPath = "/usr/lib/X11/rgb";
++$colorPath = "/usr/share/X11/rgb";
+ 
+ # You might wish to make your vnc directory under /tmp, to make sure
+ # passwords are always kept on the local filesystem. To do that, just
diff --git a/net-misc/tightvnc/tightvnc-1.3.8.ebuild b/net-misc/tightvnc/tightvnc-1.3.8.ebuild
new file mode 100644
index 000000000000..5e24610aebec
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.3.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8.ebuild,v 1.1 2006/10/04 18:40:25 genstef Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE="java tcpd server"
+
+S="${WORKDIR}/vnc_unixsrc"
+DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
+SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
+HOMEPAGE="http://www.tightvnc.com/"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/xproto
+	server? (
+		x11-proto/inputproto
+		x11-proto/kbproto
+		x11-proto/printproto
+	)
+	>=x11-misc/imake-1
+	x11-misc/gccmakedep
+	~media-libs/jpeg-6b
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	!net-misc/vnc"
+
+RDEPEND="${DEPEND}
+	server? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+		x11-apps/rgb
+		x11-apps/xauth
+	)
+	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
+
+src_unpack() {
+
+	if ! use server;
+	then
+		echo
+		einfo "The 'server' USE flag will build tightvnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	fi
+
+	unpack ${A} && cd ${S}
+	epatch "${FILESDIR}/${P}-pathfixes.patch" # fixes bug 78385 and 146099
+	epatch "${FILESDIR}/${P}-imake-tmpdir.patch" # fixes bug 23483
+	epatch "${FILESDIR}/${P}-darwin.patch" # fixes bug 89908
+	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch" # fixes bug 82583
+}
+
+src_compile() {
+	xmkmf -a || die "xmkmf failed"
+
+	make CDEBUGFLAGS="${CFLAGS}" World || die
+
+	if use server; then
+		cd Xvnc && ./configure || die "Configure failed."
+		if use tcpd; then
+			local myextra="-lwrap"
+			use userland_Darwin || myextra="${myextra} -lnss_nis"
+			make EXTRA_LIBRARIES="${myextra}" \
+				CDEBUGFLAGS="${CFLAGS}"  \
+				EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
+		else
+			make CDEBUGFLAGS="${CFLAGS}" || die
+		fi
+	fi
+
+}
+
+src_install() {
+	# the web based interface and the java viewer need the java class files
+	if use java; then
+		insinto /usr/share/tightvnc/classes
+		doins classes/*
+	fi
+
+	dodir /usr/share/man/man1 /usr/bin
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
+
+	if ! use server; then
+		rm -f ${D}/usr/bin/vncserver
+		rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
+	fi
+
+	dodoc ChangeLog README WhatsNew
+	use java && dodoc ${FILESDIR}/README.JavaViewer
+	newdoc vncviewer/README README.vncviewer
+}