add X11 to DEPEND #57687 and move to stable

7 files changed, 3 insertions, 248 deletions

diff --git a/net-misc/directvnc/directvnc-0.6.1.ebuild b/net-misc/directvnc/directvnc-0.6.1.ebuild
deleted file mode 100644
index 9714566caf2b..000000000000
--- a/net-misc/directvnc/directvnc-0.6.1.ebuild
+++ /dev/null
@@ -1,47 +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/directvnc/directvnc-0.6.1.ebuild,v 1.12 2004/07/15 02:44:15 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Very thin VNC client for unix framebuffer systems"
-HOMEPAGE="http://adam-lilienthal.de/directvnc"
-SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc -sparc"
-IUSE=""
-
-DEPEND="dev-libs/DirectFB
-	sys-devel/automake
-	sys-devel/autoconf
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-
-	# fix src/dfb.c to handle the new API changes in DirectFB
-	epatch ${FILESDIR}/${P}-api-fix.patch
-
-	#fix broken Makefile.am
-	mv Makefile.am Makefile.am.orig
-	sed -e 's/-$(DIRECTFB_LIBS)/$(DIRECTFB_LIBS)/' Makefile.am.orig > Makefile.am
-	cd ..
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	econf || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-}
diff --git a/net-misc/directvnc/directvnc-0.7.5.ebuild b/net-misc/directvnc/directvnc-0.7.5.ebuild
index 3751c1203f75..430f4eaeb623 100644
--- a/net-misc/directvnc/directvnc-0.7.5.ebuild
+++ b/net-misc/directvnc/directvnc-0.7.5.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/directvnc/directvnc-0.7.5.ebuild,v 1.2 2004/06/24 23:41:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5.ebuild,v 1.3 2004/07/20 20:36:33 vapier Exp $
 
 inherit eutils
 
@@ -10,10 +10,11 @@ SRC_URI="http://www.adam-lilienthal.de/directvnc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND="dev-libs/DirectFB
+	virtual/x11
 	dev-util/pkgconfig"
 
 src_compile() {
diff --git a/net-misc/directvnc/directvnc-0.7.ebuild b/net-misc/directvnc/directvnc-0.7.ebuild
deleted file mode 100644
index 1da963ed6608..000000000000
--- a/net-misc/directvnc/directvnc-0.7.ebuild
+++ /dev/null
@@ -1,43 +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/directvnc/directvnc-0.7.ebuild,v 1.11 2004/07/15 02:44:15 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Very thin VNC client for unix framebuffer systems"
-HOMEPAGE="http://adam-lilienthal.de/directvnc"
-SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc -sparc"
-IUSE=""
-
-DEPEND="dev-libs/DirectFB
-	sys-devel/automake
-	sys-devel/autoconf
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-
-	# fix src/dfb.c to handle the new API changes in DirectFB
-	epatch ${FILESDIR}/${P}-api-fix.patch
-
-	#fix broken Makefile.am
-	mv Makefile.am Makefile.am.orig
-	sed -e 's/-$(DIRECTFB_LIBS)/$(DIRECTFB_LIBS)/' \
-		Makefile.am.orig > Makefile.am
-	cd ..
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-}
diff --git a/net-misc/directvnc/files/digest-directvnc-0.6.1 b/net-misc/directvnc/files/digest-directvnc-0.6.1
deleted file mode 100644
index 612bd1fe8295..000000000000
--- a/net-misc/directvnc/files/digest-directvnc-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa4793b31df33a760735be3387b8c8cd directvnc-0.6.1.tar.gz 99328
diff --git a/net-misc/directvnc/files/digest-directvnc-0.7 b/net-misc/directvnc/files/digest-directvnc-0.7
deleted file mode 100644
index a0e72bac9c05..000000000000
--- a/net-misc/directvnc/files/digest-directvnc-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389bc15c04110026860e59ede8dc7ca9 directvnc-0.7.tar.gz 124669
diff --git a/net-misc/directvnc/files/directvnc-0.6.1-api-fix.patch b/net-misc/directvnc/files/directvnc-0.6.1-api-fix.patch
deleted file mode 100644
index f49f4e55d73a..000000000000
--- a/net-misc/directvnc/files/directvnc-0.6.1-api-fix.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- dfb.c	2002-05-25 04:12:15.000000000 -0400
-+++ ../../dfb.c	2002-07-06 10:20:21.000000000 -0400
-@@ -18,7 +18,6 @@
-  */
- 
- #include "directvnc.h"
--#include "keysymdef.h"
- #include <math.h>
- 
- /* DirectFB interfaces needed */
-@@ -61,14 +60,13 @@
-      /* FIXME */
-      dsc.pixelformat = DSPF_RGB16;
-          
--     dfb->CreateSurface(dfb, &dsc, &primary );
-+     DFBCHECK(dfb->CreateSurface(dfb, &dsc, &primary ));
-      primary->GetSize (primary, &opt.client.width, &opt.client.height);
- 
-      DFBCHECK(dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard ));
-      DFBCHECK(dfb->GetInputDevice( dfb, DIDID_MOUSE, &mouse ));
-      DFBCHECK(keyboard->CreateEventBuffer(keyboard, &input_buffer));
-      DFBCHECK(mouse->AttachEventBuffer(mouse, input_buffer));
--     
- }
- 
- 
-@@ -156,36 +154,23 @@
-     * screen gets blanked for every unsuccessful connect (wrong password)
-     * which is not pretty either. I think I prefer checking here for the time
-     * being. */
--
-    if (!dfb)
-       return 0;
--
-    while(input_buffer->GetEvent(input_buffer, DFB_EVENT(&evt)) == DFB_OK)
-    {
-       switch (evt.type)
-       {
- 	 case DIET_KEYPRESS:
--	    /* quit on ctrl-q */
--	    if (evt.key_ascii && evt.key_ascii == 113 
--		  && evt.modifiers & DIMK_CTRL)
-+	    /* quit on ctrl-q FIXME make this configurable*/
-+	    if (evt.key_id == DIKI_Q && evt.modifiers & DIMM_CONTROL)
- 	    {
- 	       dfb_deinit();
- 	       exit(1);
- 	    }
--	    /* ascii 13 is CR. We want XK_Return, so dont send the ascii but
--	     * translate into keysym */
--	    if (evt.key_ascii && evt.key_ascii != 13)
--	    {
--	       rfb_send_key_event(evt.key_ascii, 1);
--	    }
--	    else
--	       rfb_send_key_event(dfb_get_keysym_from_keycode(evt.keycode, evt.modifiers), 1);
-+	    rfb_send_key_event(evt.key_symbol, 1); 
- 	    break;
- 	 case DIET_KEYRELEASE:
--	    if (evt.key_ascii && evt.key_ascii != 13)
--	       rfb_send_key_event(evt.key_ascii, 0);
--	    else
--	       rfb_send_key_event(dfb_get_keysym_from_keycode(evt.keycode, evt.modifiers), 0);
-+	    rfb_send_key_event(evt.key_symbol, 0); 
- 	    break;
- 	 case DIET_AXISMOTION:
- 	    if (evt.flags & DIEF_AXISREL)
-@@ -250,75 +235,6 @@
- }
- 
- int
--dfb_get_keysym_from_keycode(int keycode, int modifiers)
--{
--
--   switch (keycode)
--   {
--      case DIKC_BACKSPACE:   return XK_BackSpace;
--      case DIKC_ENTER:       return XK_Return;
--      case DIKC_PAUSE:       return XK_Pause;
--      case DIKC_SCRLOCK:     return XK_Scroll_Lock;
--      case DIKC_CAPSLOCK:    return XK_Caps_Lock;
--      case DIKC_NUMLOCK:     return XK_Num_Lock;
--			  
--      
--      case DIKC_ALT: return XK_Alt_L;
--      case DIKC_ALTGR: return XK_Super_R;
--      case DIKC_SHIFT: return XK_Shift_R;
--      case DIKC_CTRL: return XK_Control_R;
--      case DIKC_INSERT: return XK_Insert;
--      case DIKC_DELETE: return XK_Delete;
--
--      case DIKC_HOME: return XK_Home;
--      case DIKC_LEFT: return XK_Left;
--      case DIKC_RIGHT: return XK_Right;
--      case DIKC_UP: return XK_Up;
--      case DIKC_DOWN: return XK_Down;
--      case DIKC_PAGEUP: return XK_Page_Up;
--      case DIKC_PAGEDOWN: return XK_Page_Down;
--      case DIKC_END: return XK_End;
--		      
--      /* Keypad Keys */
--      case DIKC_KP_PLUS:    return XK_KP_Add;
--      case DIKC_KP_MULT:    return XK_KP_Multiply;
--      case DIKC_KP_MINUS:    return XK_KP_Subtract;
--      case DIKC_KP_DIV:    return XK_KP_Divide;
--      case DIKC_KP_ENTER:    return XK_KP_Enter;
--      case DIKC_KP_SPACE:    return XK_KP_Space;
--      case DIKC_KP_TAB:    return XK_KP_Tab;
--      
--      case DIKC_KP_0:    return XK_KP_0;
--      case DIKC_KP_1:    return XK_KP_1;
--      case DIKC_KP_2:    return XK_KP_2;
--      case DIKC_KP_3:    return XK_KP_3;
--      case DIKC_KP_4:    return XK_KP_4;
--      case DIKC_KP_5:    return XK_KP_5;
--      case DIKC_KP_6:    return XK_KP_6;
--      case DIKC_KP_7:    return XK_KP_7;
--      case DIKC_KP_8:    return XK_KP_8;
--      case DIKC_KP_9:    return XK_KP_9;
--
--      case DIKC_KP_DELETE:    return XK_KP_Delete;
--      case DIKC_KP_INSERT:    return XK_KP_Insert;
--      case DIKC_KP_END:       return XK_KP_End;
--      case DIKC_KP_DOWN:      return XK_KP_Down;
--      case DIKC_KP_PAGE_DOWN: return XK_KP_Page_Down;
--      case DIKC_KP_LEFT:      return XK_KP_Left;
--      case DIKC_KP_BEGIN:     return XK_KP_Begin;
--      case DIKC_KP_RIGHT:     return XK_KP_Right;
--      case DIKC_KP_HOME:      return XK_KP_Home;
--      case DIKC_KP_UP:        return XK_KP_Up;
--      case DIKC_KP_PAGE_UP:   return XK_KP_Page_Up;
--			 
--      case DIKC_UNKNOWN:
--	 fprintf(stderr, "Unknown key pressed\n");
--   }
--
--   return -1;
--}
--
--int
- dfb_draw_rect_with_rgb(int x, int y, int w, int h, int r, int g, int b)
- {
-    primary->SetColor(primary, r,g,b,0xFF);
diff --git a/net-misc/directvnc/files/directvnc-0.7-api-fix.patch b/net-misc/directvnc/files/directvnc-0.7-api-fix.patch
deleted file mode 100644
index 8e6e7449509e..000000000000
--- a/net-misc/directvnc/files/directvnc-0.7-api-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dfb.c.orig	2003-01-17 23:17:26.000000000 -0500
-+++ src/dfb.c	2003-01-17 23:28:03.000000000 -0500
-@@ -66,7 +66,7 @@
- 
-      
-      DFBCHECK(dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard ));
--     DFBCHECK (dfb->CreateEventBuffer (dfb, DICAPS_ALL, &input_buffer));
-+     DFBCHECK (dfb->CreateEventBuffer (dfb, &input_buffer));
- }
- 
-