Making gcc patch conditional + cleanup of old versions

(Portage version: 2.0.53_rc7)

6 files changed, 13 insertions, 100 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 38580f24d9d7..e2d5b7965f8f 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.64 2006/02/11 22:47:38 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.65 2006/02/14 00:34:18 morfic Exp $
+
+  14 Feb 2006; Daniel Goller <morfic@gentoo.org>
+  -files/tightvnc-1.2.8-gentoo.diff,
+  -files/tightvnc-1.2.8-gentoo.security.patch, -tightvnc-1.2.8.ebuild,
+  tightvnc-1.2.9-r1.ebuild:
+  Also cleanup of old version
+
+  14 Feb 2006; Daniel Goller <morfic@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  Making gcc patch conditional
 
   11 Feb 2006; Daniel Goller <morfic@gentoo.org>
   +files/tightvnc-1.2.9-amd64.patch, +files/tightvnc-1.2.9-gcc34.patch,
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.8 b/net-misc/tightvnc/files/digest-tightvnc-1.2.8
deleted file mode 100644
index 896013713fcb..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 444e697449259308ef6d27078dfe451d tightvnc-1.2.8_unixsrc.tar.bz2 1733425
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.8-gentoo.diff b/net-misc/tightvnc/files/tightvnc-1.2.8-gentoo.diff
deleted file mode 100644
index 508fd2effb0e..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.8-gentoo.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- vncserver.orig	2002-12-20 01:56:58.000000000 +0100
-+++ vncserver	2002-12-20 01:58:05.000000000 +0100
-@@ -36,12 +36,12 @@
- $geometry = "1024x768";
- $depth = 24;
- $desktopName = "X";
--$vncClasses = "/usr/local/vnc/classes";
-+$vncClasses = "/usr/share/tightvnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+# $fontPath = "unix/:7100";
- 
- # Here is another example of setting the font path:
--# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-+$fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
- 
- # X colors database path is optional, uncomment and edit to use:
- # $colorPath = "/usr/lib/X11/rgb";
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.8-gentoo.security.patch b/net-misc/tightvnc/files/tightvnc-1.2.8-gentoo.security.patch
deleted file mode 100644
index ab65aec892f9..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.8-gentoo.security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /tmp/vncserver	2003-02-21 17:29:45.000000000 +0000
-+++ vncserver	2003-02-21 17:30:10.000000000 +0000
-@@ -153,15 +153,8 @@
- $desktopLog = "$vncUserDir/$host:$displayNumber.log";
- unlink($desktopLog);
- 
--# Make an X server cookie - use as the seed the sum of the current time, our
--# PID and part of the encrypted form of the password.  Ideally we'd use
--# /dev/urandom, but that's only available on Linux.
--
--srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
--$cookie = "";
--for (1..16) {
--    $cookie .= sprintf("%02x", int(rand(256)));
--}
-+# Make an X server cookie - use mcookie
-+$cookie = `/usr/bin/mcookie`;
- 
- system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
- system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); 
diff --git a/net-misc/tightvnc/tightvnc-1.2.8.ebuild b/net-misc/tightvnc/tightvnc-1.2.8.ebuild
deleted file mode 100644
index d65c9a1027eb..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.8.ebuild
+++ /dev/null
@@ -1,57 +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-1.2.8.ebuild,v 1.9 2004/10/03 07:00:41 spyderous 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="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() {
-	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-1.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
index 9fc2384862d4..0a4a403a3a31 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # 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.15 2006/02/11 22:47:38 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.16 2006/02/14 00:34:18 morfic Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 IUSE="java tcpd"
 
@@ -30,7 +30,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
+	[[ "$(gcc-version)" == "3.4" ]] || [[ "$(gcc-major-version)" == "4" ]] && epatch ${FILESDIR}/${P}-gcc34.patch
 	epatch ${FILESDIR}/x86.patch
 	epatch ${FILESDIR}/${P}-amd64.patch
 }