cleanup

6 files changed, 16 insertions, 105 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 0d513f3d81ec..b00db6ac581c 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.41 2004/10/15 06:47:50 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.42 2004/10/18 14:08:31 morfic Exp $
+
+  18 Oct 2004; Daniel Goller <morfic@gentoo.org> metadata.xml,
+  tightvnc-1.3_alpha5.ebuild, -tightvnc-4.0_beta20031113.ebuild:
+  physically removed realvnc 4 beta from folder
+  fix up of changelog
+  readd the lost keywords into 1.3_alpha5
 
   15 Oct 2004; Daniel Goller <morfic@gentoo.org> :
   Cleaning realvnc out of tightvnc, too buggy to maintain, 1.3 dev5 is here in
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index cd74bf51133d..cb4e0c56c726 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,9 +1,8 @@
 MD5 ad61c2374702756a5341de9f1a63efda tightvnc-1.2.8.ebuild 1595
 MD5 d01764ac5ba53bd68acb369eb016fb12 tightvnc-1.2.9-r1.ebuild 1721
-MD5 778524cf028a58d7a58572b693d953df tightvnc-4.0_beta20031113.ebuild 2656
-MD5 82bbda4dd742d5c033034acfcdf8eacd tightvnc-1.3_alpha5.ebuild 2031
-MD5 a1ee6ebcf2cefcfb5759bfbf924ef440 ChangeLog 5590
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 1462f33f856e08c236c35d315c5e85ca tightvnc-1.3_alpha5.ebuild 2024
+MD5 2fe61a1c1cc8ea52e25ab466ada88011 ChangeLog 5831
+MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309
 MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
 MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
 MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
diff --git a/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031113 b/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031113
deleted file mode 100644
index 09fcdd1cd33f..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-4.0_beta20031113
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0eed650932d0e9fb14ed87eb6c7d419e vnc-4.0b4-unixsrc.tar.gz 467831
-MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622
-MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239
-MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363
-MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
-MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
diff --git a/net-misc/tightvnc/metadata.xml b/net-misc/tightvnc/metadata.xml
index 8060c04f89e1..9c6cec7f156b 100644
--- a/net-misc/tightvnc/metadata.xml
+++ b/net-misc/tightvnc/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
+ <email>morfic@gentoo.org</email>
+ <name>Daniel Goller</name>
+</maintainer>
+<maintainer>
   <email>aliz@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
index 0d4305cb919b..38110ead8ec4 100644
--- a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild,v 1.9 2004/10/03 21:50:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild,v 1.10 2004/10/18 14:08:31 morfic Exp $
 
 inherit eutils gcc
 
@@ -11,8 +11,7 @@ DESCRIPTION="A great client/server software package allowing remote network acce
 SRC_URI="mirror://sourceforge/vnc-tight/${P/_alpha/dev}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-#can't test on anything but x86
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
deleted file mode 100644
index a2057c685b2f..000000000000
--- a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.7 2004/06/25 00:15:13 agriffis Exp $
-
-inherit eutils
-IUSE="java tcpd"
-
-# Setup XFree version and sources
-XFREE_PV="4.3.0"
-MY_SV="${XFREE_PV//\.}"
-SRC_PATH="mirror://xfree/${BASE_PV}/source"
-
-# 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-${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
-	${SRC_PATH}/X${MY_SV}src-4.tgz
-	${SRC_PATH}/X${MY_SV}src-5.tgz"
-
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="-* ~amd64 ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="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() {
-	mkdir -p ${S}
-	cd ${S}
-	unpack X${MY_SV}src-{1,2,3,4,5}.tgz
-
-	cd ${WORKDIR}
-	unpack vnc-${REALVNC_PV}-unixsrc.tar.gz
-
-	cd ${S}
-	epatch ${FILESDIR}/tightvnc_cvs${TIGHTVNC_CVS}.patch.bz2
-	epatch ${FILESDIR}/${PN}-4.0_gcc-3.4.patch
-
-	cd ${S}/xc
-	epatch ../xc.patch
-	epatch ${FILESDIR}/${PN}-4.0_linux-headers.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 IncludeSharedObjectInNormalLib" >>config/cf/vnc.def
-
-	cd ${S}/rfb
-	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
-
-	cd ${S}/xc
-}
-src_compile() {
-	autoconf
-	libtoolize -c -f
-
-	econf --with-installed-zlib --with-installed-jpeg || die
-
-	make CXXFLAGS="${CXXFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" || die
-
-	cd ${S}/xc
-	make World || die
-}
-
-src_install() {
-	mkdir -p  ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions
-	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions
-}