Added missing media-Ãlibs/jpeg dependancy. Closes bug #176959. Added new revision where mouse support is optionl via a new USE flag. Closes bug #176970.

Package-Manager: portage-2.1.2.9

6 files changed, 157 insertions, 11 deletions

diff --git a/net-misc/directvnc/ChangeLog b/net-misc/directvnc/ChangeLog
index 4484a31e7c57..945239e3f7a1 100644
--- a/net-misc/directvnc/ChangeLog
+++ b/net-misc/directvnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/directvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/ChangeLog,v 1.19 2007/01/08 16:00:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/ChangeLog,v 1.20 2007/07/20 15:42:44 s4t4n Exp $
+
+*directvnc-0.7.5-r1 (20 Jul 2007)
+
+  20 Jul 2007; Michele Noberasco <s4t4n@gentoo.org> +directvnc-0.7.5-r1.ebuild:
+  Revision bump, with patch to make mouse support optional. Closes bug #176970.
+  directvnc-0.7.5.ebuild:
+  Added missing media-libs/jpeg dependancy. Closes bug #176959.
 
   08 Jan 2007; Michele Noberasco <s4t4n@gentoo.org> directvnc-0.7.5.ebuild:
   Added missing x11-proto/xproto dependancy. Fixed DEPEND and RDEPEND.
diff --git a/net-misc/directvnc/Manifest b/net-misc/directvnc/Manifest
index 57b6a53b9e86..e2666dc9ee6c 100644
--- a/net-misc/directvnc/Manifest
+++ b/net-misc/directvnc/Manifest
@@ -1,12 +1,20 @@
+AUX directvnc-mouse.patch 2310 RMD160 7949a809a688a4d545d0931e53c999b83e5d5175 SHA1 44d8a7304bb8fdba4638fad2e6b7bfcf4350f649 SHA256 5edff6451fd470b1cf22b2b910369b8899a620269c6266c90915b3a35a0255e7
+MD5 5b08be4ddcccd41d9abe0330bb71bf89 files/directvnc-mouse.patch 2310
+RMD160 7949a809a688a4d545d0931e53c999b83e5d5175 files/directvnc-mouse.patch 2310
+SHA256 5edff6451fd470b1cf22b2b910369b8899a620269c6266c90915b3a35a0255e7 files/directvnc-mouse.patch 2310
 DIST directvnc-0.7.5.tar.gz 253013 RMD160 ea7703c5b904a2cccc3b049971e14189ce4b471c SHA1 ed6f974baa8cb3227bf295a40bdd6a27a7d7faca SHA256 f604ce7c58fba00b3a8f72b153ca6e49c6b6b48f70840472204f86a28c94a071
-EBUILD directvnc-0.7.5.ebuild 1017 RMD160 c4620f0ed148673ee715f55f11d481fa8fbc74f4 SHA1 479db6e3259e32796d94ac31f38bf50bb0cc4517 SHA256 241f8afc6cc3c080ddcc6d109d5ae257000d5855a75b0923b44a68d8deed39f9
-MD5 40b1d4b0aa2b3fea608c7e8047614434 directvnc-0.7.5.ebuild 1017
-RMD160 c4620f0ed148673ee715f55f11d481fa8fbc74f4 directvnc-0.7.5.ebuild 1017
-SHA256 241f8afc6cc3c080ddcc6d109d5ae257000d5855a75b0923b44a68d8deed39f9 directvnc-0.7.5.ebuild 1017
-MISC ChangeLog 2546 RMD160 5896dbdf66bd6d7d4a4f5452019eea509fe400bc SHA1 7bb2e0873dc9698a61135371f438163f350f30f3 SHA256 020da62bc8f29c4c54cb2849942cf31acb65827fa80d9f979e82bcba6c7c073a
-MD5 eba612e52a4ccb7d58f656a908175fe1 ChangeLog 2546
-RMD160 5896dbdf66bd6d7d4a4f5452019eea509fe400bc ChangeLog 2546
-SHA256 020da62bc8f29c4c54cb2849942cf31acb65827fa80d9f979e82bcba6c7c073a ChangeLog 2546
+EBUILD directvnc-0.7.5-r1.ebuild 1185 RMD160 6f99f886abe62119ca2833089db62a560d0d4699 SHA1 740b9429aa9483980c9be464c60adb79c9df9384 SHA256 7d4b77902b17f2e6761d029974d75ae30435f1680d5155d1556c7d46744ebac0
+MD5 8f22ca03c054845dc6ef5cd347d85c61 directvnc-0.7.5-r1.ebuild 1185
+RMD160 6f99f886abe62119ca2833089db62a560d0d4699 directvnc-0.7.5-r1.ebuild 1185
+SHA256 7d4b77902b17f2e6761d029974d75ae30435f1680d5155d1556c7d46744ebac0 directvnc-0.7.5-r1.ebuild 1185
+EBUILD directvnc-0.7.5.ebuild 1042 RMD160 344129d9573593e648450d80fc804994c8b60731 SHA1 b51b383ef1c4b348bfff9bf10399cc559f1e2a5c SHA256 86f0782df5f6430f0a87bdaee291847f500cd1270cc861481a4b1f45e9f16dd8
+MD5 37c311ef98aa2977cdaec3516e34890a directvnc-0.7.5.ebuild 1042
+RMD160 344129d9573593e648450d80fc804994c8b60731 directvnc-0.7.5.ebuild 1042
+SHA256 86f0782df5f6430f0a87bdaee291847f500cd1270cc861481a4b1f45e9f16dd8 directvnc-0.7.5.ebuild 1042
+MISC ChangeLog 2832 RMD160 d66d727272d8c465083ee0aaa7de051749f2b1ca SHA1 34c3d25777e480d0e24ab0a7df7d6be5a3de798f SHA256 ae2bf3f4189bac377ad73e4b9b1c183af9593078f2a6648c9652794c27a8ebf8
+MD5 684710386156c1d256d8973b5a63f61b ChangeLog 2832
+RMD160 d66d727272d8c465083ee0aaa7de051749f2b1ca ChangeLog 2832
+SHA256 ae2bf3f4189bac377ad73e4b9b1c183af9593078f2a6648c9652794c27a8ebf8 ChangeLog 2832
 MISC metadata.xml 254 RMD160 5c1b976d4bf83b9cb6770e8b6065df0c2fbad264 SHA1 f9659da73dc287f4249415f8609dd4256100bbb8 SHA256 51a4815eae0d318310ac2894236be562b906c9e662cbd13013c9733f9cc8503c
 MD5 4d01239e46295f54006f3d3afd40ac08 metadata.xml 254
 RMD160 5c1b976d4bf83b9cb6770e8b6065df0c2fbad264 metadata.xml 254
@@ -14,3 +22,6 @@ SHA256 51a4815eae0d318310ac2894236be562b906c9e662cbd13013c9733f9cc8503c metadata
 MD5 1c277e2e44accc505bac131de81b9866 files/digest-directvnc-0.7.5 247
 RMD160 bf88103eda294ae00d9deb197340b491f118f10d files/digest-directvnc-0.7.5 247
 SHA256 060bc42b0242e7b6faa3b83323a13c055b22ddc8af2fd7e4c8eb2c9397ec5352 files/digest-directvnc-0.7.5 247
+MD5 1c277e2e44accc505bac131de81b9866 files/digest-directvnc-0.7.5-r1 247
+RMD160 bf88103eda294ae00d9deb197340b491f118f10d files/digest-directvnc-0.7.5-r1 247
+SHA256 060bc42b0242e7b6faa3b83323a13c055b22ddc8af2fd7e4c8eb2c9397ec5352 files/digest-directvnc-0.7.5-r1 247
diff --git a/net-misc/directvnc/directvnc-0.7.5-r1.ebuild b/net-misc/directvnc/directvnc-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..c9735b005871
--- /dev/null
+++ b/net-misc/directvnc/directvnc-0.7.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/07/20 15:42:44 s4t4n Exp $
+
+inherit eutils
+
+DESCRIPTION="Very thin VNC client for unix framebuffer systems"
+HOMEPAGE="http://adam-lilienthal.de/directvnc/"
+SRC_URI="http://www.adam-lilienthal.de/directvnc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="mouse"
+
+RDEPEND="dev-libs/DirectFB
+	>=media-libs/jpeg-6b-r7"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-apps/sed-4
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack "${A}"
+
+	# Make mouse support optional
+	cd "${S}/src"
+	use mouse || epatch "${FILESDIR}/${PN}-mouse.patch"
+}
+
+src_compile() {
+	econf || die
+
+	# Fix bug #116148, DFBGraphicsDeviceDescription is no longer present in
+	# newer DirectFB version, but the application never uses it :-/
+	local comment_out="DFBCardCapabilities caps;"
+	sed -i -e "s:${comment_out}://${comment_out}:" src/dfb.c
+
+	emake DEBUGFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+	rm -rf ${D}/usr/doc
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/net-misc/directvnc/directvnc-0.7.5.ebuild b/net-misc/directvnc/directvnc-0.7.5.ebuild
index ff3b592033b0..00d53e7cce1a 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-2007 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.8 2007/01/08 16:00:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5.ebuild,v 1.9 2007/07/20 15:42:44 s4t4n Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-RDEPEND="dev-libs/DirectFB"
+RDEPEND="dev-libs/DirectFB
+	>=media-libs/jpeg-6b-r7"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-misc/directvnc/files/digest-directvnc-0.7.5-r1 b/net-misc/directvnc/files/digest-directvnc-0.7.5-r1
new file mode 100644
index 000000000000..f344bc067cd6
--- /dev/null
+++ b/net-misc/directvnc/files/digest-directvnc-0.7.5-r1
@@ -0,0 +1,3 @@
+MD5 1fba84dc5450751bb402b68a9b9fb429 directvnc-0.7.5.tar.gz 253013
+RMD160 ea7703c5b904a2cccc3b049971e14189ce4b471c directvnc-0.7.5.tar.gz 253013
+SHA256 f604ce7c58fba00b3a8f72b153ca6e49c6b6b48f70840472204f86a28c94a071 directvnc-0.7.5.tar.gz 253013
diff --git a/net-misc/directvnc/files/directvnc-mouse.patch b/net-misc/directvnc/files/directvnc-mouse.patch
new file mode 100644
index 000000000000..4396aef6a9a1
--- /dev/null
+++ b/net-misc/directvnc/files/directvnc-mouse.patch
@@ -0,0 +1,77 @@
+*** dfb.c	2003-01-31 03:51:59.000000000 -0500
+--- dfb-new.c	2005-07-10 15:12:37.000000000 -0400
+***************
+*** 24,34 ****
+  /* DirectFB interfaces needed */
+  IDirectFB               *dfb = NULL;
+  IDirectFBSurface        *primary;
+  IDirectFBDisplayLayer   *layer;
+  IDirectFBInputDevice    *keyboard;
+! IDirectFBInputDevice    *mouse;
+  IDirectFBEventBuffer    *input_buffer;
+  DFBResult err;
+  DFBSurfaceDescription dsc;
+  DFBCardCapabilities caps;
+  DFBDisplayLayerConfig layer_config;
+--- 24,34 ----
+  /* DirectFB interfaces needed */
+  IDirectFB               *dfb = NULL;
+  IDirectFBSurface        *primary;
+  IDirectFBDisplayLayer   *layer;
+  IDirectFBInputDevice    *keyboard;
+! /* IDirectFBInputDevice    *mouse; */
+  IDirectFBEventBuffer    *input_buffer;
+  DFBResult err;
+  DFBSurfaceDescription dsc;
+  DFBCardCapabilities caps;
+  DFBDisplayLayerConfig layer_config;
+***************
+*** 64,74 ****
+       dsc.pixelformat = DSPF_RGB16;
+       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 (dfb->CreateInputEventBuffer (dfb, DICAPS_ALL, DFB_TRUE, &input_buffer));
+  }
+  
+  
+  /*
+--- 64,74 ----
+       dsc.pixelformat = DSPF_RGB16;
+       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 (dfb->CreateInputEventBuffer (dfb, DICAPS_ALL, DFB_TRUE, &input_buffer));
+  }
+  
+  
+  /*
+***************
+*** 78,88 ****
+  dfb_deinit()
+  {
+       primary->Release( primary );
+       input_buffer->Release(input_buffer);
+       keyboard->Release( keyboard );
+!      mouse->Release( mouse );
+       layer->Release( layer );
+       dfb->Release( dfb ); 
+  }
+   
+  void
+--- 78,88 ----
+  dfb_deinit()
+  {
+       primary->Release( primary );
+       input_buffer->Release(input_buffer);
+       keyboard->Release( keyboard );
+!      /* mouse->Release( mouse ); */
+       layer->Release( layer );
+       dfb->Release( dfb ); 
+  }
+   
+  void