summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-01-17 21:03:31 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-01-17 21:03:31 +0000
commitbbee41affef0b62c30c23812f3b83f5234c6f857 (patch)
tree3cffce032edee8eb36e2653549241ad35ae86f8d /app-emulation/virtualbox
parentRemoved vnc USE flag (diff)
downloadgentoo-2-bbee41affef0b62c30c23812f3b83f5234c6f857.tar.gz
gentoo-2-bbee41affef0b62c30c23812f3b83f5234c6f857.tar.bz2
gentoo-2-bbee41affef0b62c30c23812f3b83f5234c6f857.zip
Removed vnc-patch as well
(Portage version: 2.2.0_alpha15/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/virtualbox')
-rw-r--r--app-emulation/virtualbox/Manifest1
-rw-r--r--app-emulation/virtualbox/files/virtualbox-4-vnc.patch101
2 files changed, 0 insertions, 102 deletions
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 627cfe541be4..750af633eb54 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,7 +6,6 @@ AUX virtualbox-4-localconfig 1434 RMD160 773b58324831c919afaf6a85ddbbccd03c49dea
AUX virtualbox-4-makeself-check.patch 289 RMD160 ff0385e86ad83501d58ff051b6c80c5122f6d956 SHA1 aa54f6621bf40da58897539aa4efda6f21a26a96 SHA256 31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966
AUX virtualbox-4-mkisofs-check.patch 356 RMD160 2562cee4530976224ae128a732ae99d79eece99d SHA1 050479d15ee5fed1504646c0687fd6e2c8a22dc1 SHA256 0e72a5ef8d915c550fd92865b40c265153dc2d4621714a599d3a7172726b6fff
AUX virtualbox-4-restore_old_machines_dir.patch 506 RMD160 663e6dd09c77c4e578d09f0acc1fe2e015f1874d SHA1 2ae740adc15fbd2523ae17c78669b6a0000ed503 SHA256 0bf28d75a01d041145b12730917c880a382e42b3d5ad3b2fa85c9d9f233b6d99
-AUX virtualbox-4-vnc.patch 2471 RMD160 3e86ed80f592ee0258fdc295245ddf228ce3e41c SHA1 14bf8b20ec60024336d50c06d15cba37b29265af SHA256 5d7219d05928021af0e333a9459dc3c3bcc98c8babfe75f221f1a7f3bc2d6d37
AUX virtualbox-ose-3-config 38 RMD160 44974362ca28f2762c0501b4d4c18de2634aa063 SHA1 d475cbdbf469dd3a178fa9a4a8580859aacd7c37 SHA256 cc3cd896be49a421b06665683a22edb0fe17d6588fc259140b139c3d8a8581b5
AUX virtualbox-ose-3-localconfig 1434 RMD160 773b58324831c919afaf6a85ddbbccd03c49dead SHA1 6ab0f7e45f5778c1d392025dcec07c332678546a SHA256 e7d23a6c15b5982f7132c38ee5d660bae111a46c6a5603c2212488637cdcfe20
AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644
diff --git a/app-emulation/virtualbox/files/virtualbox-4-vnc.patch b/app-emulation/virtualbox/files/virtualbox-4-vnc.patch
deleted file mode 100644
index 1546ff206e1b..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-4-vnc.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- VirtualBox-4.0.0_OSE/configure
-+++ VirtualBox-4.0.0_OSE/configure
-@@ -88,6 +88,7 @@
- WITH_OPENGL=1
- WITH_HARDENING=1
- WITH_VDE=0
-+WITH_VNC=0
- WITH_DOCS=1
- BUILD_LIBXML2=
- BUILD_LIBXSLT=
-@@ -123,6 +124,8 @@
- MESA="-lGL"
- INCZ=""
- LIBZ="-lz"
-+INCVNCSERVER=""
-+LIBVNCSERVER="-lvncserver"
- CXX_FLAGS=""
- if [ "$OS" = "freebsd" ]; then
- INCCURL="-I/usr/local/include"
-@@ -956,6 +959,47 @@
- }
-
- #
-+# Check for libvncserver, needed for VNC
-+#
-+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()
-@@ -2116,6 +2160,7 @@
- [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)"
- [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff"
- [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation"
-+[ $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
-@@ -2280,6 +2325,9 @@
- --enable-webservice)
- [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
- ;;
-+ --enable-vnc)
-+ WITH_VNC=1
-+ ;;
- --disable-hardening)
- WITH_HARDENING=0
- ;;
-@@ -2553,6 +2601,15 @@
- cnf_append "VBOX_WITH_DOCS_PACKING" ""
- 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'."