Added vnc functionality as requested in bugs #322325 and #348204.

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 128 insertions, 15 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 27e14af57258..cdbbc3ac9b1f 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.75 2010/12/03 14:00:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.76 2010/12/08 23:19:41 polynomial-c Exp $
+
+  08 Dec 2010; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-ose-3.2.12.ebuild, +files/virtualbox-ose-vnc.patch:
+  Added vnc functionality as requested in bugs #322325 and #348204. Thanks to
+  Malte Frerichs (request) and Branko Majic (request + patch).
 
 *virtualbox-ose-3.2.12 (03 Dec 2010)
 
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 959c072c79be..7b347c6263ab 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -9,6 +9,7 @@ AUX virtualbox-ose-3.2.0-mesa-check.patch 640 RMD160 efd18643fba1e7d0f655b8ac287
 AUX virtualbox-ose-3.2.8-mesa-check.patch 701 RMD160 061b6eaf0b3cdbcaac7258d85909d1e9d89cdeb3 SHA1 7e5cf6d11421d392d4f2a7bf9846cc71d9688d03 SHA256 6b4ce64673cda33631e7a60ac94f23ab2d020d52b6160bb072ad8d6f9547c251
 AUX virtualbox-ose-asneeded.patch 516 RMD160 28adba1239f394e37a3d1955bb07908868e0bd02 SHA1 8698d7b915a00d824426bdb4d28d877580cd28df SHA256 62f289530b6a3baee4eba8c4c32cc6697acc75bb3a413d4d3c25d8b685df5f6c
 AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
+AUX virtualbox-ose-vnc.patch 2509 RMD160 7c3fa2d923ac9812ede7e3995c5efa729da17772 SHA1 0837f80aefabf3e9c98786e0f6a88d6362d8f0aa SHA256 c1277fd6d0fb0411a1da921f11e40f7c8fa17d8f0b250a03393ad0d8c59225a5
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
 AUX virtualbox-ose.desktop-2 205 RMD160 4b12c9f3cfe235f6544116720781562af631bd51 SHA1 edcc5d07ba695a7ec9a5f76fd24481fb15dc2d89 SHA256 d580e956319e5dd0cda8479c7e59622feae3e99b9721ccc3c48a2b012d11a578
 DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c2631e8b570 SHA1 e29f3070d337d9c475241a68948dba43c363b079 SHA256 b77c8ae7b43401c908a231f8e3b7355f96b351237fd86f1f7416ed99a6081e85
@@ -16,7 +17,7 @@ DIST VirtualBox-3.2.10-OSE.tar.bz2 58175083 RMD160 53b3b77b80e71df145286c387e388
 DIST VirtualBox-3.2.12-OSE.tar.bz2 58239733 RMD160 9bcb80327655d77cede13b1f76b1fa6c763b1a25 SHA1 73ddd9365588ea56a54ff81117719ac818e842f9 SHA256 064eb382e5b752a3f9189c930734393765125e70b5f99679a63ff4eb6186e261
 EBUILD virtualbox-ose-3.1.8.ebuild 8425 RMD160 f7611e5000e2da9a6aec33e27eae058756b31208 SHA1 7c2614acafd5fbecbe48285090e93bf41553a291 SHA256 82ae1ca207e41639619cb30780b0fdbe23bf99b7da80ac4303c42cc7426bc77b
 EBUILD virtualbox-ose-3.2.10.ebuild 9042 RMD160 e5f71638f6c80d11294424a150a7775f5fa41563 SHA1 16777651bcc51bcc605338971080c2f1bea3d06f SHA256 37734f62d0e46c8a6a71bfea13fd004b641877168ad860133939b31eb18e8b5f
-EBUILD virtualbox-ose-3.2.12.ebuild 9042 RMD160 2d2e0c7fd68e33a24ef25476796610971569898f SHA1 4fa31f1be6b7ae44a58056112e90d1df16f9258d SHA256 c25a5c68871bc770b034c5589f3365047bb2c019a9d95095db333d44aab231a2
+EBUILD virtualbox-ose-3.2.12.ebuild 9172 RMD160 0c5e190bbde68da975c759e6b3a79fe79ea7a27a SHA1 65a5ccb5a493ad98d982c512f1871d253fae174f SHA256 8162770486439dcd75b5a42abaf5f84918172bd3378f3914159ea56c9b2f9583
 EBUILD virtualbox-ose-9999.ebuild 5753 RMD160 8fa7e3468f487738c673c9366b187e64babee873 SHA1 31a8db86b24e6a8888d5e9805c456e6fd7bf111d SHA256 d6383260913c5e37370dcaf32eec75357fb45999b07600059882cd697584b6fb
-MISC ChangeLog 27459 RMD160 54004695e89f3b95d7a4ba370fa6b62a7b682d23 SHA1 2a79a0b0d679acf8a4e2f3a9e3370bd52fa223d5 SHA256 41237c173214dc9dd8d339989badc42c7d9dac2e3e00e0a85f5d0dc1d16e3996
+MISC ChangeLog 27720 RMD160 d71f7fa56cca9cb1e06a31867272093b5908bd46 SHA1 8cf44c3391207aafd1582c8e61ce99b11560d7fd SHA256 5f743f2ffaa8ea781faa545227f72ceefd59ebe57c4f0e6de395fd2e0f922fb1
 MISC metadata.xml 721 RMD160 1be9eee129d3def7177854ca114258cf3a0e4760 SHA1 3d3873117be3c1f5ffda9f5c32dbba8c702d5e8c SHA256 17ecae028a8ebed919032580b2f04dcfc1178c9a35267346dae682820e0eb204
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-vnc.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-vnc.patch
new file mode 100644
index 000000000000..b8a2088e27f9
--- /dev/null
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-vnc.patch
@@ -0,0 +1,101 @@
+--- configure.orig	2010-11-20 20:35:43.399739771 +0100
++++ configure	2010-11-20 22:04:15.523490599 +0100
+@@ -87,6 +87,7 @@
+ WITH_OPENGL=1
+ WITH_HARDENING=1
+ WITH_VDE=0
++WITH_VNC=0
+ BUILD_LIBXML2=
+ BUILD_LIBXSLT=
+ BUILD_LIBCURL=
+@@ -122,6 +123,8 @@
+ LIBZ="-lz"
+ INCPNG=""
+ LIBPNG="-lpng"
++INCVNCSERVER=""
++LIBVNCSERVER="-lvncserver"
+ CXX_FLAGS=""
+ if [ "$OS" = "freebsd" ]; then
+   INCCURL="-I/usr/local/include"
+@@ -949,6 +952,47 @@
+ }
+ 
+ #
++# Check for libvncserver, needed for VNC in OSE
++#
++check_vncserver()
++{
++    test_header libvncserver
++    cat > $ODIR.tmp_src.cc <<EOF
++#include <cstdio>
++#include <rfb/rfbconfig.h>
++
++extern "C" int main()
++{
++  const char* v=LIBVNCSERVER_VERSION;
++  unsigned int major = 0, minor = 0, micro = 0;
++
++  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
++  if (*v == '.') v++;
++  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
++  if (*v == '.') v++;
++  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
++
++  printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
++  if (major*10000 + minor*100 + micro >= 907)
++  {
++  printf(", OK.\n");
++  return 0;
++  }
++  else
++  {
++    printf(", expected version 0.9.7 or higher\n");
++    return 1;
++  }
++}
++EOF
++  if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
++    if test_execute; then
++      cnf_append "VBOX_WITH_VNC" "1"
++    fi
++  fi
++}
++
++#
+ # Check for libcurl, needed by S3
+ #
+ check_curl()
+@@ -2063,6 +2107,7 @@
+ [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
+ [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
+ [ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
++[ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
+ [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
+ cat << EOF
+   --disable-hardening      don't be strict about /dev/vboxdrv access
+@@ -2224,6 +2269,9 @@
+     --enable-webservice)
+       [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
+       ;;
++    --enable-vnc)
++      WITH_VNC=1
++      ;;
+     --disable-hardening)
+       WITH_HARDENING=0
+       ;;
+@@ -2484,6 +2532,15 @@
+   fi
+ fi
+ 
++# VNC server support
++if [ $OSE -ge 1 ]; then
++  if [ $WITH_VNC = 1 ]; then
++    check_vncserver
++  else
++    cnf_append "VBOX_WITH_VNC" ""
++  fi
++fi
++
+ # success!
+ echo
+ echo "Successfully generated '$CNF' and '$ENV'."
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild
index be2120c93fa9..27d287efbfb1 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild,v 1.1 2010/12/03 14:00:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.12.ebuild,v 1.2 2010/12/08 23:19:41 polynomial-c Exp $
 
 EAPI=2
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
+IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -30,13 +30,15 @@ RDEPEND="!app-emulation/virtualbox-bin
 	>=dev-libs/libxslt-1.1.19
 	net-misc/curl
 	!headless? (
-		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl?	( x11-libs/qt-opengl:4 ) )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl?
+			( x11-libs/qt-opengl:4 ) )
 		opengl? ( virtual/opengl media-libs/freeglut )
 		x11-libs/libXcursor
 		media-libs/libsdl[X,video]
 		x11-libs/libXt
 	)
-	headless? ( x11-libs/libX11 )"
+	headless? ( x11-libs/libX11 )
+	vnc? ( >=net-libs/libvncserver-0.9.7 )"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.5-r1
 	>=dev-lang/yasm-0.6.2
@@ -117,20 +119,24 @@ src_prepare() {
 
 	# fix build with --as-needed (bug #249295)
 	epatch "${FILESDIR}/${PN}-asneeded.patch"
+
+	# add the --enable-vnc option to configure script (bug #348204)
+	epatch "${FILESDIR}/${PN}-vnc.patch"
 }
 
 src_configure() {
 	local myconf
-	use alsa       || myconf="${myconf} --disable-alsa"
-	use opengl     || myconf="${myconf} --disable-opengl"
-	use pulseaudio || myconf="${myconf} --disable-pulse"
-	use python     || myconf="${myconf} --disable-python"
-	use hal        || myconf="${myconf} --disable-dbus"
-	use vboxwebsrv && myconf="${myconf} --enable-webservice"
+	use alsa       || myconf+=" --disable-alsa"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use hal        || myconf+=" --disable-dbus"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
 	if ! use headless ; then
-		use qt4 || myconf="${myconf} --disable-qt4"
+		use qt4 || myconf+=" --disable-qt4"
 	else
-		myconf="${myconf} --build-headless --disable-opengl"
+		myconf+=" --build-headless --disable-opengl"
 	fi
 	# not an autoconf script
 	./configure \