Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

6 files changed, 52 insertions, 30 deletions

diff --git a/x11-misc/vnc2swf/ChangeLog b/x11-misc/vnc2swf/ChangeLog
index ab351db0736f..6d123237755d 100644
--- a/x11-misc/vnc2swf/ChangeLog
+++ b/x11-misc/vnc2swf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/vnc2swf
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vnc2swf/ChangeLog,v 1.12 2005/10/08 22:03:13 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vnc2swf/ChangeLog,v 1.13 2006/01/21 19:48:28 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/vnc2swf-0.4.2-gcc4.patch, -vnc2swf-0.3.ebuild,
+  vnc2swf-0.4.2-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   08 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
   vnc2swf-0.4.2-r1.ebuild:
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
index e280563c9f13..e4567bc86137 100644
--- a/x11-misc/vnc2swf/Manifest
+++ b/x11-misc/vnc2swf/Manifest
@@ -1,6 +1,6 @@
+MD5 7ced630ab91023f6e93de34af95aed60 .vnc2swf-0.4.2-r1.ebuild.swp 12288
 MD5 c7780250586ef66fa26c28fd915516bd ChangeLog 1492
-MD5 e05e7fbd6825ae9524ca79ee7b5772fe files/digest-vnc2swf-0.3 63
 MD5 e74ce76e3c172ee7681b82394d3e5002 files/digest-vnc2swf-0.4.2-r1 65
+MD5 adb67484257784991ae22b8bc8cbf630 files/vnc2swf-0.4.2-gcc4.patch 861
 MD5 427e58a2a402d09cdf22976c7d733f46 metadata.xml 685
-MD5 6616b941ac957d779baf1caabb2b7029 vnc2swf-0.3.ebuild 599
-MD5 69a03cc107aa2ce5a44224d02423aeb4 vnc2swf-0.4.2-r1.ebuild 1051
+MD5 83dca16251f65a39b095ce2bee834210 vnc2swf-0.4.2-r1.ebuild 1089
diff --git a/x11-misc/vnc2swf/files/digest-vnc2swf-0.3 b/x11-misc/vnc2swf/files/digest-vnc2swf-0.3
deleted file mode 100644
index 859387031b3e..000000000000
--- a/x11-misc/vnc2swf/files/digest-vnc2swf-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 81df40c0c97a0e1bc3d91d73f40a3a48 vnc2swf-0.3.tar.gz 104506
diff --git a/x11-misc/vnc2swf/files/vnc2swf-0.4.2-gcc4.patch b/x11-misc/vnc2swf/files/vnc2swf-0.4.2-gcc4.patch
new file mode 100644
index 000000000000..941f8c897915
--- /dev/null
+++ b/x11-misc/vnc2swf/files/vnc2swf-0.4.2-gcc4.patch
@@ -0,0 +1,26 @@
+diff -Nru vnc2swf-0.4.2.vanilla/desktop.c vnc2swf-0.4.2/desktop.c
+--- vnc2swf-0.4.2.vanilla/desktop.c	2006-01-21 20:41:56.000000000 +0100
++++ vnc2swf-0.4.2/desktop.c	2006-01-21 20:42:58.000000000 +0100
+@@ -22,6 +22,7 @@
+  * desktop.c - functions to deal with "desktop" window.
+  */
+ 
++#define ___gentoo_gcc4
+ #include "vncviewer.h"
+ #include <X11/Xaw/Viewport.h>
+ #include <X11/Xmu/Converters.h>
+diff -Nru vnc2swf-0.4.2.vanilla/vncviewer.h vnc2swf-0.4.2/vncviewer.h
+--- vnc2swf-0.4.2.vanilla/vncviewer.h	2006-01-21 20:41:56.000000000 +0100
++++ vnc2swf-0.4.2/vncviewer.h	2006-01-21 20:43:27.000000000 +0100
+@@ -157,9 +157,11 @@
+ 
+ extern Atom wmDeleteWindow;
+ extern Widget form, viewport, desktop;
++#ifndef ___gentoo_gcc4
+ extern Window desktopWin;
+ extern GC gc;
+ extern GC srcGC, dstGC;
++#endif
+ extern Dimension dpyWidth, dpyHeight;
+ extern XImage* image;
+ 
diff --git a/x11-misc/vnc2swf/vnc2swf-0.3.ebuild b/x11-misc/vnc2swf/vnc2swf-0.3.ebuild
deleted file mode 100644
index fcf2a700f945..000000000000
--- a/x11-misc/vnc2swf/vnc2swf-0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vnc2swf/vnc2swf-0.3.ebuild,v 1.9 2005/07/11 23:07:15 swegener Exp $
-
-SLOT="0"
-DESCRIPTION="A tool for recording Shock wave Flash movies from vnc sessions"
-SRC_URI="http://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
-HOMEPAGE="http://www.unixuser.org/~euske/vnc2swf"
-LICENSE="GPL-2"
-DEPEND=">=media-libs/ming-0.2a
-		virtual/libc
-		virtual/x11"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-src_install () {
-	dobin vnc2swf || die "Install Failed"
-	dodoc README TODO
-}
diff --git a/x11-misc/vnc2swf/vnc2swf-0.4.2-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.4.2-r1.ebuild
index 8a855b755e3a..4db0416d2042 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.4.2-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vnc2swf/vnc2swf-0.4.2-r1.ebuild,v 1.5 2005/10/08 22:03:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vnc2swf/vnc2swf-0.4.2-r1.ebuild,v 1.6 2006/01/21 19:48:28 nelchael Exp $
 
 inherit eutils
 
@@ -13,9 +13,19 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="x11vnc"
 
-DEPEND=">=media-libs/ming-0.2a
-	virtual/libc
-	virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )
+	>=media-libs/ming-0.2a
 	sys-apps/sed
 	x11vnc? ( x11-misc/x11vnc )
 	sys-libs/zlib"
@@ -25,6 +35,7 @@ src_unpack() {
 	cd "${S}"
 	sed -ie "s:docs:html:" README
 	sed -ie "s:-mouse ::" recordwin.sh
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_install() {