Version bump

(Portage version: 2.1.6.7/cvs/Linux i686)

3 files changed, 150 insertions, 1 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 748b3eaf13df..d869cc15b3f0 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.131 2009/02/21 10:56:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.132 2009/03/06 17:11:50 armin76 Exp $
+
+*tightvnc-1.3.10 (06 Mar 2009)
+
+  06 Mar 2009; Raúl Porcel <armin76@gentoo.org>
+  +files/tightvnc-1.3.10-pathfixes.patch, +tightvnc-1.3.10.ebuild:
+  Version bump
 
   21 Feb 2009; Raúl Porcel <armin76@gentoo.org> -tightvnc-1.3.9-r1.ebuild,
   tightvnc-1.3.9-r2.ebuild:
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.10-pathfixes.patch b/net-misc/tightvnc/files/tightvnc-1.3.10-pathfixes.patch
new file mode 100644
index 000000000000..f61a74902294
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.10-pathfixes.patch
@@ -0,0 +1,16 @@
+--- vncserver.orig	2009-03-06 17:33:16.000000000 +0100
++++ vncserver	2009-03-06 17:35:39.000000000 +0100
+@@ -32,10 +32,11 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/vnc/classes";
++$vncClasses = "/usr/share/tightvnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/Type1/";
+ $authType = "-rfbauth $vncUserDir/passwd";
++$colorPath = "/usr/share/X11/rgb";
+ 
+ # Read configuration from the system-wide and user files if present.
+ 
diff --git a/net-misc/tightvnc/tightvnc-1.3.10.ebuild b/net-misc/tightvnc/tightvnc-1.3.10.ebuild
new file mode 100644
index 000000000000..fde631678a80
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.3.10.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10.ebuild,v 1.1 2009/03/06 17:11:50 armin76 Exp $
+
+inherit eutils toolchain-funcs java-pkg-opt-2
+
+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
+		java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
+HOMEPAGE="http://www.tightvnc.com/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+CDEPEND="~media-libs/jpeg-6b
+	server? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+		x11-apps/rgb
+		x11-apps/xauth
+		x11-apps/xsetroot
+	)
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXt
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.4 )"
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	x11-proto/xextproto
+	x11-proto/xproto
+	server? (
+		x11-proto/inputproto
+		x11-proto/kbproto
+		x11-proto/printproto
+	)
+	>=x11-misc/imake-1
+	x11-misc/gccmakedep
+	x11-misc/makedepend
+	!net-misc/vnc"
+
+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}/${PN}-1.3.10-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
+	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}"/1.3.9-fbsd.patch
+	epatch "${FILESDIR}"/1.3.9-arm.patch
+	epatch "${FILESDIR}"/1.3.9-sh.patch
+
+	if use java; then
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}/${P}-java-build.patch"
+	fi
+}
+
+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"
+			make EXTRA_LIBRARIES="${myextra}" \
+				CDEBUGFLAGS="${CFLAGS}"  \
+				EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
+		else
+			make CDEBUGFLAGS="${CFLAGS}" || die
+		fi
+	fi
+	if use java; then
+		cd "${WORKDIR}/vnc_javasrc" || die
+		make JAVACFLAGS="$(java-pkg_javac-args)" all || die
+	fi
+
+}
+
+src_install() {
+	# the web based interface and the java viewer need the java class files
+	if use java; then
+		java-pkg_newjar "${WORKDIR}/vnc_javasrc/VncViewer.jar"
+		java-pkg_dolauncher "${PN}-java"
+	fi
+
+	dodir /usr/share/man/man1 /usr/bin
+	./vncinstall "${D}"/usr/bin "${D}"/usr/share/man || die "vncinstall failed"
+
+	if use server; then
+		newconfd "${FILESDIR}"/tightvnc.confd vnc
+		newinitd "${FILESDIR}"/tightvnc.initd vnc
+	else
+		rm -f "${D}"/usr/bin/vncserver
+		rm -f "${D}"/usr/share/man/man1/{Xvnc,vncserver}*
+	fi
+
+	doicon "${FILESDIR}"/vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	dodoc ChangeLog README WhatsNew
+	use java && dodoc "${FILESDIR}"/README.JavaViewer
+	newdoc vncviewer/README README.vncviewer
+}