update to close #138779

(Portage version: 2.1.1_pre3-r1)

4 files changed, 100 insertions, 1 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index c287692d237f..f55e3b2fc1f7 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.67 2006/06/06 18:19:55 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.68 2006/07/22 18:30:09 humpback Exp $
+
+  22 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/tightvnc-1.2.9-gentoo-2.diff, +tightvnc-1.2.9-r2.ebuild:
+  Added -r2 that fixes issue with new X files location. Thanks to Coornaert
+  David in bug #138779.
 
   06 Jun 2006; Guy Martin <gmsoft@gentoo.org> tightvnc-1.3_alpha7.ebuild:
   Stable on hppa.
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r2 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r2
new file mode 100644
index 000000000000..d72709d4f9b6
--- /dev/null
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r2
@@ -0,0 +1,3 @@
+MD5 f804b26c098625e3a2675a0aa7709e31 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
+RMD160 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
+SHA256 c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo-2.diff b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo-2.diff
new file mode 100644
index 000000000000..c19b1611b89a
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo-2.diff
@@ -0,0 +1,15 @@
+--- vncserver.ori	2006-07-22 19:21:09.000000000 +0100
++++ vncserver	2006-07-22 19:25:56.000000000 +0100
+@@ -41,10 +41,10 @@
+ $fontPath = "unix/:-1";
+ 
+ # 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/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/corefonts/";
+ 
+ # 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.2.9-r2.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..4dbb1019edc7
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r2.ebuild
@@ -0,0 +1,76 @@
+# 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.2.9-r2.ebuild,v 1.1 2006/07/22 18:30:09 humpback Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE="java tcpd"
+
+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="~x86 ~ppc ~sparc ~alpha ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="|| ( ( x11-libs/libXaw
+						x11-proto/xextproto
+						>=x11-misc/imake-1
+						x11-misc/gccmakedep
+						app-text/rman
+						x11-libs/libXp
+						x11-proto/inputproto
+						x11-proto/kbproto
+						x11-proto/printproto
+						x11-proto/scrnsaverproto
+				)
+				virtual/x11
+		)
+	~media-libs/jpeg-6b
+	sys-libs/zlib
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	!net-misc/vnc"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.security.patch
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	[[ "$(gcc-version)" == "3.4" ]] || [[ "$(gcc-major-version)" == "4" ]] && epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/x86.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch ${FILESDIR}/${P}-gentoo-2.diff
+}
+
+src_compile() {
+	local CDEBUGFLAGS="${CFLAGS}"
+
+	xmkmf -a || die "xmkmf failed"
+
+	make CDEBUGFLAGS="${CDEBUGFLAGS}" World || die "make World failed"
+	cd Xvnc && ./configure || die "Configure failed."
+
+	if use tcpd; then
+		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
+	else
+		make CDEBUGFLAGS="${CDEBUGFLAGS}"
+	fi
+}
+
+src_install() {
+	# the web based interface and the java viewer need the java class files
+	insinto /usr/share/tightvnc/classes ; doins classes/*
+
+	dodir /usr/share/man/man1 /usr/bin
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
+
+	dodoc ChangeLog README WhatsNew
+	use java && dodoc ${FILESDIR}/README.JavaViewer
+	newdoc vncviewer/README README.vncviewer
+}