New CVS patch, removed old ebuild

15 files changed, 50 insertions, 184 deletions

diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 52387200191e..c9e8f3d90271 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,33 +1,23 @@
 MD5 aabc422807dc831faa049e754fe2a782 tightvnc-1.2.9.ebuild 1618
-MD5 f59a2d623ee3214e0abbf2038d657f26 tightvnc-1.2.6.ebuild 1330
 MD5 e3d97376c0f029056522d630552f86f6 tightvnc-1.2.8.ebuild 1614
-MD5 b70d370c8bd1460d90f8faf8692e44e8 tightvnc-4.0_beta20031031.ebuild 2772
 MD5 a613ebdf42737fcd7b12fc3051e9851d tightvnc-1.2.9-r1.ebuild 1936
-MD5 6436cd0c83384349f6106e6150d72964 tightvnc-1.2.3-r2.ebuild 1230
-MD5 52fa1deb115eb70594056ac82cc291c2 tightvnc-4.0_beta20031113.ebuild 2902
-MD5 9aa1200bb5192b165843c3251df387ef tightvnc-1.2.7.ebuild 1550
-MD5 6bdbd6b1364b448352ab0d8b25cc7a44 ChangeLog 3478
+MD5 a1222b060eb995a6c1b1c1ac4444744a tightvnc-4.0_beta20031113.ebuild 2555
+MD5 72defe784ccb64b94e329ec73588c9e3 ChangeLog 3719
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031031 367
 MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031113 367
-MD5 451572c22930322934ee8f6a857f9630 files/digest-tightvnc-1.2.6 76
-MD5 0fc7f73784063287c23b1945458e85b3 files/digest-tightvnc-1.2.7 76
 MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
 MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9 76
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.9-gentoo.diff 657
-MD5 da10d05f6a76bdc27a59276c0acde9d9 files/0180_amd64_4.2.99.4-glx-nopic.patch 364
 MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
-MD5 55068075897cef6ddd710f410ba25c21 files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
 MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
-MD5 6d664eb489cd0aa90b5adbbb956987a4 files/tightvnc.patch.bz2 16268
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
-MD5 19c42aff4dfa179a0b028316e845e14f files/0121_all_4.2.99.3-build-libs-with-pic.patch 949
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
 MD5 e77df1134e59b0a9881ef1221eeffd37 files/tightvnc_cvs20031113.patch.bz2 19007
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
-MD5 26245c32cb730e80df02c71470b05b8a files/tight.tar.bz2 9058
-MD5 9138c55d41bebf73ee177ef75fee2cd1 files/digest-tightvnc-1.2.3-r2 76
 MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
+MD5 da10d05f6a76bdc27a59276c0acde9d9 files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch 364
+MD5 55068075897cef6ddd710f410ba25c21 files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
+MD5 19c42aff4dfa179a0b028316e845e14f files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch 949
diff --git a/net-misc/tightvnc/files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch b/net-misc/tightvnc/files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch
new file mode 100644
index 000000000000..a900c48b6e18
--- /dev/null
+++ b/net-misc/tightvnc/files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch
@@ -0,0 +1,22 @@
+--- XFree86-4.2.99.3/xc/lib/Xau/Imakefile.build-libs-with-pic	2001-01-17 14:42:24.000000000 -0500
++++ XFree86-4.2.99.3/xc/lib/Xau/Imakefile	2003-01-09 11:25:46.000000000 -0500
+@@ -37,6 +37,8 @@ SRCS =	AuDispose.c AuFileName.c AuGetAdd
+ OBJS =	AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
+ 	AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
+ 
++#define IncludeNormalLibInSharedObject
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/parser/Imakefile.build-libs-with-pic	2002-05-31 14:46:02.000000000 -0400
++++ XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/parser/Imakefile	2003-01-09 11:25:51.000000000 -0500
+@@ -36,6 +36,8 @@ CONFIG_DEFINES = -DXCONFIGDIR=\"$(XCONFI
+ 		 -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
+ 		 -DXVERSION="$(XVERS)"
+ 
++#define IncludeNormalLibInSharedObject
++
+ #include <Library.tmpl>
+ 
+ SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
diff --git a/net-misc/tightvnc/files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch b/net-misc/tightvnc/files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
index d3090f01b9e8..d3090f01b9e8 100644
--- a/net-misc/tightvnc/files/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
+++ b/net-misc/tightvnc/files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
diff --git a/net-misc/tightvnc/files/0180_amd64_4.2.99.4-glx-nopic.patch b/net-misc/tightvnc/files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch
index 5b8950d71710..5b8950d71710 100644
--- a/net-misc/tightvnc/files/0180_amd64_4.2.99.4-glx-nopic.patch
+++ b/net-misc/tightvnc/files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r2 b/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r2
deleted file mode 100644
index eef258320fd2..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35a2561f83eeabec7b0c91c251fbcfb4 tightvnc-1.2.3_unixsrc.tar.bz2 1688195
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.6 b/net-misc/tightvnc/files/digest-tightvnc-1.2.6
deleted file mode 100644
index 86b84af07520..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b48da1465ee78b614f0d26f4a8c7aaf tightvnc-1.2.6_unixsrc.tar.bz2 1717851
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.7 b/net-misc/tightvnc/files/digest-tightvnc-1.2.7
deleted file mode 100644
index 4eb443a60ddf..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17f305cbf56af8ce75f6b5dacde1ac5a tightvnc-1.2.7_unixsrc.tar.bz2 1725728
diff --git a/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031031 b/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031113
index 09fcdd1cd33f..09fcdd1cd33f 100644
--- a/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031031
+++ b/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031113
diff --git a/net-misc/tightvnc/files/tight.tar.bz2 b/net-misc/tightvnc/files/tight.tar.bz2
deleted file mode 100644
index 835ad5c2bd25..000000000000
--- a/net-misc/tightvnc/files/tight.tar.bz2
+++ /dev/null
diff --git a/net-misc/tightvnc/files/tightvnc.patch.bz2 b/net-misc/tightvnc/files/tightvnc.patch.bz2
deleted file mode 100644
index 6388e0638be0..000000000000
--- a/net-misc/tightvnc/files/tightvnc.patch.bz2
+++ /dev/null
diff --git a/net-misc/tightvnc/files/tightvnc_cvs20031113.patch.bz2 b/net-misc/tightvnc/files/tightvnc_cvs20031113.patch.bz2
new file mode 100644
index 000000000000..dc8583505ced
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc_cvs20031113.patch.bz2
diff --git a/net-misc/tightvnc/tightvnc-1.2.3-r2.ebuild b/net-misc/tightvnc/tightvnc-1.2.3-r2.ebuild
deleted file mode 100644
index b1b18667642b..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# Modified by Ivan C.  <navi_@hotmail.com>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.3-r2.ebuild,v 1.10 2003/06/12 21:53:50 msterret Exp $
-
-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="virtual/glibc
-	>=x11-base/xfree-4.1.0
-	>=dev-lang/perl-5.6.1
-	~media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	xmkmf || die
-	make World || die
-	cd Xvnc
-	make World || die
-}
-
-src_install() {
-	dodir /usr/man
-	dodir /usr/man/man1
-	dodir /usr/bin
-
-	# fix the web based interface, it needs the java class files
-	dodir /usr/share/tightvnc
-	dodir /usr/share/tightvnc/classes
-	insinto /usr/share/tightvnc/classes ; doins classes/*
-
-	# and then patch vncserver to point to /usr/share/tightvnc/classes
-	patch -p0 < ${FILESDIR}/tightvnc-gentoo.diff || die
-
-	./vncinstall ${D}/usr/bin ${D}/usr/man || die
-}
diff --git a/net-misc/tightvnc/tightvnc-1.2.6.ebuild b/net-misc/tightvnc/tightvnc-1.2.6.ebuild
deleted file mode 100644
index de4febef770a..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.6.ebuild
+++ /dev/null
@@ -1,51 +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.6.ebuild,v 1.5 2003/03/11 21:11:46 seemant Exp $
-
-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 alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/x11
-	dev-lang/perl
-	~media-libs/jpeg-6b
-	sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	#patch <${FILESDIR}/tightvnc-gentoo.diff || die
-
-	# fix #6814
-	cp vncserver vncserver.orig
-	sed -e 's%^if (!xauthorityFile) {%if (!\$xauthorityFile) {%' \
-		vncserver.orig > vncserver
-}
-
-src_compile() {
-	xmkmf || die
-	make World || die
-	cd Xvnc
-	./configure || die
-	make || die
-}
-
-src_install() {
-	dodir /usr/man
-	dodir /usr/man/man1
-	dodir /usr/bin
-
-	# fix the web based interface, it needs the java class files
-	dodir /usr/share/tightvnc
-	dodir /usr/share/tightvnc/classes
-	insinto /usr/share/tightvnc/classes ; doins classes/*
-
-	# and then patch vncserver to point to /usr/share/tightvnc/classes
-	patch -p0 < ${FILESDIR}/tightvnc-gentoo.diff || die
-
-	./vncinstall ${D}/usr/bin ${D}/usr/man || die
-}
diff --git a/net-misc/tightvnc/tightvnc-1.2.7.ebuild b/net-misc/tightvnc/tightvnc-1.2.7.ebuild
deleted file mode 100644
index 4a007c3f3951..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.7.ebuild
+++ /dev/null
@@ -1,53 +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.7.ebuild,v 1.6 2003/09/05 22:01:49 msterret Exp $
-
-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"
-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 )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	patch -p0 < ${FILESDIR}/tightvnc-${PVR}-gentoo.diff || die "Failed to 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_beta20031031.ebuild b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
index c7b9e2f818c0..55b39c7e2501 100644
--- a/net-misc/tightvnc/tightvnc-4.0_beta20031031.ebuild
+++ b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
@@ -1,16 +1,24 @@
 # 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-4.0_beta20031031.ebuild,v 1.2 2003/11/03 21:25:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.1 2003/11/27 11:14:17 aliz Exp $
 
 inherit eutils
 IUSE="java tcpd"
 
-BASE_PV="4.3.0"
-MY_SV="${BASE_PV//\.}"
+# Setup XFree version and sources
+XFREE_PV="4.3.0"
+MY_SV="${XFREE_PV//\.}"
 SRC_PATH="mirror://xfree/${BASE_PV}/source"
-S="${WORKDIR}/vnc-4.0b4-unixsrc"
+
+# realvnc beta number
+REALVNC_PV="4.0b4"
+
+# tightvnc cvs patch
+TIGHTVNC_CVS="20031113"
+
+S="${WORKDIR}/vnc-${REALVNC_PV}-unixsrc"
 DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
-SRC_URI="http://www.realvnc.com/dist/vnc-4.0b4-unixsrc.tar.gz
+SRC_URI="http://www.realvnc.com/dist/vnc-${REALVNC_PV}-unixsrc.tar.gz
 	${SRC_PATH}/X${MY_SV}src-1.tgz
 	${SRC_PATH}/X${MY_SV}src-2.tgz
 	${SRC_PATH}/X${MY_SV}src-3.tgz
@@ -39,38 +47,34 @@ src_unpack() {
 	unpack X${MY_SV}src-{1,2,3,4,5}.tgz
 
 	cd ${WORKDIR}
-		unpack vnc-4.0b4-unixsrc.tar.gz
+	unpack vnc-${REALVNC_PV}-unixsrc.tar.gz
 
 	cd ${S}
-	tar -jxf ${FILESDIR}/tight.tar.bz2
-	epatch ${FILESDIR}/tightvnc.patch.bz2
+	epatch ${FILESDIR}/tightvnc_cvs${TIGHTVNC_CVS}.patch.bz2
 
 	cd ${S}/xc
 	epatch ../xc.patch
-	epatch ${FILESDIR}/0121_all_4.2.99.3-build-libs-with-pic.patch
-	epatch ${FILESDIR}/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
-	epatch ${FILESDIR}/0180_amd64_4.2.99.4-glx-nopic.patch
+	epatch ${FILESDIR}/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch
+	epatch ${FILESDIR}/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
+	epatch ${FILESDIR}/4.0/0180_amd64_4.2.99.4-glx-nopic.patch
 
 
 	echo "#define InstallManPages NO" >>config/cf/vnc.def
 	echo "#define OptimizedCDebugFlags ${CFLAGS} -fPIC" >> config/cf/vnc.def
 	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} -fPIC" >> config/cf/vnc.def
 	echo "#define ExtraLibraries -ljpeg" >> config/cf/vnc.def
-
-#	echo "#define PositionIndependentCFlags -fpic" >>config/cf/vnc.def
-#	echo "#define PositionIndependentCplusplusFlags -fpic" >>config/cf/vnc.def
 	echo "#define IncludeSharedObjectInNormalLib" >>config/cf/vnc.def
 
 	cd ${S}/rfb
-#	sed -i 's:#include <stdio.h>:#include <stdio.h>\n#include "jpeglib.h":g' TightEncoder.h
 	sed -i 's:#include "jpeg/jpeglib.h":#include "jpeglib.h":g' TightEncoder.h
-
 	sed -i 's:#include <rfb/TightEncoder.h>:#include <rfb/TightEncoder.h>\nextern "C" {\n#include <jpeglib.h>\n}:g' TightEncoder.cxx
 }
 src_compile() {
-#	econf --with-installed-zlib
-	econf --with-installed-zlib --with-installed-jpeg
-#	make CXXFLAGS="${CXXFLAGS} -DNEED_SHORT_EXTERNAL_NAMES -fPIC" CFLAGS="${CFLAGS} -fPIC -DNEED_SHORT_EXTERNAL_NAMES" || die
+	autoconf
+	libtoolize -c -f
+
+	econf --with-installed-zlib --with-installed-jpeg || die
+
 	make CXXFLAGS="${CXXFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" || die
 
 	cd ${S}/xc