unmask and fixes

6 files changed, 10 insertions, 65 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 99ce257dcbe5..f8d73b1650cb 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.24 2003/11/27 11:14:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.25 2004/01/15 15:27:35 aliz Exp $
+
+  15 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> files/tightvnc-1.2.9-gentoo.diff:
+  Change fontpath, closing #22024.
 
 *tightvnc-4.0_beta20031113 (27 Nov 2003)
 
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9
deleted file mode 100644
index 1900142fe09a..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f804b26c098625e3a2675a0aa7709e31 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff
index 508fd2effb0e..25dd2ce6c9c7 100644
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff
@@ -8,7 +8,7 @@
 +$vncClasses = "/usr/share/tightvnc/classes";
  $vncUserDir = "$ENV{HOME}/.vnc";
 -$fontPath = "unix/:7100";
-+# $fontPath = "unix/:7100";
++$fontPath = "unix/:-1";
  
  # Here is another example of setting the font path:
 -# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
index 7c9cbe8a2fd9..a7a7487f7f86 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.5 2003/11/13 13:26:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.6 2004/01/15 15:27:35 aliz Exp $
 
 inherit eutils
 
diff --git a/net-misc/tightvnc/tightvnc-1.2.9.ebuild b/net-misc/tightvnc/tightvnc-1.2.9.ebuild
deleted file mode 100644
index 9c9ae4c94b00..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9.ebuild,v 1.2 2003/09/05 22:01:49 msterret Exp $
-
-inherit eutils
-
-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"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=x11-base/xfree-4.2.1
-	~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}/tightvnc-${PVR}-gentoo.diff
-	epatch ${FILESDIR}/${P}-gentoo.security.patch
-}
-
-src_compile() {
-	xmkmf -a || die "xmkmf failed"
-
-	make CDEBUGFLAGS="$CFLAGS" World || die "make World failed"
-	cd Xvnc && ./configure || die "Configure failed."
-
-	if use tcpd; then
-		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$CFLAGS" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
-	else
-		make CDEBUGFLAGS="$CFLAGS"
-	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
-}
diff --git a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
index 55b39c7e2501..5f6f3e21b2f1 100644
--- a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
+++ b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.1 2003/11/27 11:14:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.2 2004/01/15 15:27:35 aliz Exp $
 
 inherit eutils
 IUSE="java tcpd"
@@ -27,7 +27,7 @@ SRC_URI="http://www.realvnc.com/dist/vnc-${REALVNC_PV}-unixsrc.tar.gz
 
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~amd64"
+KEYWORDS="-* ~amd64"
 LICENSE="GPL-2"
 SLOT="0"