Bump tightvnc to fix java support.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 153 insertions, 2 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index b130256be40f..4accdd2ef4a4 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.122 2008/07/14 17:38:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.123 2008/09/11 11:14:57 ali_bush Exp $
+
+*tightvnc-1.3.9-r2 (11 Sep 2008)
+
+  11 Sep 2008; Alistair Bush <ali_bush@gentoo.org>
+  +files/tightvnc-1.3.9-java-build.patch, +tightvnc-1.3.9-r2.ebuild:
+  Bump tightvnc to fix java support.
 
   14 Jul 2008; Raúl Porcel <armin76@gentoo.org> files/tightvnc.initd:
   Fix init script, bug #231492
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 18a7f19f6f88..dc98ccb81320 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -6,10 +6,13 @@ AUX tightvnc-1.3.8-darwin.patch 827 RMD160 f1bb43e02807ad8424dabbc284a3a8b843710
 AUX tightvnc-1.3.8-imake-tmpdir.patch 956 RMD160 efa2723e879f96a2176685252854905207516120 SHA1 5a79393b313205db152a825f245dc2d67d14098a SHA256 01c00a5ef8eed18633ed3b800ea23dc08602bdaa2c737e60ea13803243731aef
 AUX tightvnc-1.3.8-mips.patch 3107 RMD160 d1fd85f10376576936f29abd651d582ed68dd644 SHA1 ee9f9c4b8ee72a78cc05bc1adc1d8f038d820798 SHA256 02c281c12f6846c356aca104a757e6fadc73d507fc222908c9d7059ffb071788
 AUX tightvnc-1.3.8-pathfixes.patch 871 RMD160 aef060a40ba1c79bc8478ddd494283fdb97358ad SHA1 e937e328c4af00206e7d6d723e336e42c9d42512 SHA256 10c2e9d604235443e953a8c13b986d0c212d2cdad6858a54db819a6aa87eabf5
+AUX tightvnc-1.3.9-java-build.patch 474 RMD160 d98499ae8f07abaf028a91c0f370022544fa3834 SHA1 aaa2a579cbe4a5be9867068256b748dd7c8a0175 SHA256 cc45aaf3add037d266f76769d58abb120a419015fee8d6fac538be567286e5fe
 AUX tightvnc.confd 341 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d SHA1 4b7f5f708cb92f5fc82508141422003ab05c1452 SHA256 3463105ab7f4aec95b9a72bcfcb9808b3acdcad0c1e5b608f1408faa79f3d4a0
 AUX tightvnc.initd 1558 RMD160 1f3d5f7a2a98aa64a9103b36967fb371ecd6b4f9 SHA1 40a85b3764d754dafe89ac0a191050481a75f7c3 SHA256 8ae8dac21b83a6582caaf3baef5f9ed489532fba75da060c9ad46d50d954db7f
 AUX vncviewer.png 495 RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 SHA1 c835d70475bde75e93818676b2b43cb8d7f07081 SHA256 dfe4eaf3f68a4905b3ab90e7cae528449c7d13a4f712f97d8855058ed9cc3fc4
+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
-MISC ChangeLog 18238 RMD160 6f0dcf5135817e91c80ac134ec929e2929bd5d24 SHA1 8bf4364d5405550722a55b7d45fa1c68780a0522 SHA256 6c80fd245a8a7dd32fa45bab674b3af8a8ed7acf6887b8dd2a265d48838b6b5e
+EBUILD tightvnc-1.3.9-r2.ebuild 3316 RMD160 0ac7532b85d24bf44cdd78c8a8786df4018bdc52 SHA1 d756013bcc7393d6ad6dc7ada745a846e98c902d SHA256 7da37b5dd2268ac417a4af9e23c399d7016cbdbb0e1870742392ab038128a8c0
+MISC ChangeLog 18431 RMD160 313879cd873cd6141a90c66aff64b521bea401c8 SHA1 1e6d3780dcfd798c058cd4583b3f225ec30d05bc SHA256 b045ebd3a423777c42c8d3afd270f3901d8afe5544365706e604728a06034212
 MISC metadata.xml 379 RMD160 be155401d5ff67986af89edbf395b46a01ba6976 SHA1 19539086c3aa290dba3a04a16c216eb34c20d76c SHA256 ff5eef1f3d62cd4f7d2bf129b0763206e3e1a194d6f39e70e752da108c58b43b
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.9-java-build.patch b/net-misc/tightvnc/files/tightvnc-1.3.9-java-build.patch
new file mode 100644
index 000000000000..8503a30c50cf
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.9-java-build.patch
@@ -0,0 +1,19 @@
+--- vnc_javasrc/Makefile.bak	2008-09-11 21:17:37.000000000 +1200
++++ vnc_javasrc/Makefile	2008-09-11 21:18:30.000000000 +1200
+@@ -4,7 +4,6 @@
+ 
+ CP = cp
+ JC = javac
+-JCFLAGS = -target 1.1
+ JAR = jar
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF
+@@ -32,7 +31,7 @@
+ all: $(CLASSES) $(ARCHIVE)
+ 
+ $(CLASSES): $(SOURCES)
+-	$(JC) $(JCFLAGS) -O $(SOURCES)
++	$(JC) $(JAVACFLAGS) -O $(SOURCES)
+ 
+ $(ARCHIVE): $(CLASSES) $(MANIFEST)
+ 	$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
diff --git a/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild b/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..a0227d9a38e3
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.3.9-r2.ebuild
@@ -0,0 +1,123 @@
+# 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 $
+
+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 ~hppa ~mips ~ppc ~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.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}"/server-CVE-2007-1003.patch
+	epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
+	epatch "${FILESDIR}"/${PV}-fbsd.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
+}