Version bump; drop version 2.1.0

svn path=/trunk/; revision=617

6 files changed, 30 insertions, 69 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 9616d97..ebe4352 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.9 2008/12/18 12:47:58 flameeyes Exp $
 
+  20 Feb 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -files/virtualbox-ose-fix-2.6.28-headers.patch,
+  -files/virtualbox-ose-2.1.0-allow-gcc43.patch,
+  -virtualbox-ose-2.1.0.ebuild, +virtualbox-ose-2.1.4.ebuild:
+  Version bump; drop version 2.1.0
+
   23 Jan 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   +vboxwebsrv-confd, +vboxwebsrv-initd, +virtualbox-ose-2-wrapper,
   +files/virtualbox-ose-fix-nodbus-build.patch, metadata.xml,
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 217d8c4..3504111 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -6,18 +6,16 @@ AUX virtualbox-ose-1.6.6-remove-unused.patch 3379 RMD160 d0a346f5ce9d236a5de2b05
 AUX virtualbox-ose-2-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d
 AUX virtualbox-ose-2-localconfig 1382 RMD160 1e484d1d7b3955ae425caa6d20ceba629b5f0150 SHA1 f1c7f076c2dfb8011708852391ae35cfe4d82994 SHA256 ebd65235b78f68f3c6f2b2185230f6271e077c04ad35a8c00b072fe563109fc6
 AUX virtualbox-ose-2-wrapper 2813 RMD160 2d05512fa94abfb034f1f6eec6bb207af020df45 SHA1 c2dbe19e5ab603378d6b1c72dc4b02fe4368a3e1 SHA256 ad91be6fc1753dc686e9f9774fd91101e7fd15e064af5419d5fd0769f3434e8b
-AUX virtualbox-ose-2.1.0-allow-gcc43.patch 1005 RMD160 1df49daed9cfeff53fccf1726907d775c9384b07 SHA1 f50b04f92db79f055c946f21d2671e8cdb7b03ff SHA256 6043e881307346b6beaed08dbe27b6bfc05a72191bdde62a66dec592767c21fd
-AUX virtualbox-ose-fix-2.6.28-headers.patch 487 RMD160 329845012c8b27c785ba0a377d7cf7557a2c3b6e SHA1 d95f2be8871f1b9b2674a3b1fb7e201afd5798bd SHA256 f1b4282f1d9a16b1cdbfa75b302defe9b7794d2df0d368e7816daaf4b75b9178
 AUX virtualbox-ose-fix-insecure-lockfiles.patch 2579 RMD160 4b460669369a4da395a335c4357346d932275916 SHA1 0a692a1b6de3e643ca8e60de6da8b9a7613cd352 SHA256 32f253b9c212a66181f7bdab9c6d509dbf5f3220849d0aeb47d840aa9465fcdf
 AUX virtualbox-ose-fix-nodbus-build.patch 461 RMD160 f9e731a1d68947823d23bdfd4bc85ae182e6302c SHA1 f39bcd3bf704d64d45a97b1e1b77b6c47e9a61fc SHA256 cecc8685203f715f446fad31a597a2bf7397967200b1ab90b0c02785b151445b
 AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
-DIST VirtualBox-2.1.0-OSE.tar.bz2 39382682 RMD160 8c35b83889fcba3bc263d54a0523690cc1bda8b3 SHA1 a6ad07118c4a1161c4afa44ccb95db25ef07b7e0 SHA256 80d9dbab379de5ef097019f3b94a8a7e7a6535c37aa0168286c8b2bf4a960c7a
 DIST VirtualBox-2.1.2-OSE.tar.bz2 47889575 RMD160 7deb3f77fa546872abdd16ca3eee39085e8509cf SHA1 1035a4a33a8106c7492b79ef58a7d7c2cf35ad29 SHA256 d3c1ae8ed7594094aaf8496204c5415479e1943e5b5179c5baae8a66885362de
+DIST VirtualBox-2.1.4-OSE.tar.bz2 47895473 RMD160 e0511a66fdda2dab9a9b8e7236a963047b332219 SHA1 cc69ba3b1553964916fad6a04afa2b9ee951ff2a SHA256 4b7adb41ba65dac2b98740382602d07a37e9ac17b5641b88c036c45920b3b95c
 EBUILD virtualbox-ose-1.6.6-r1.ebuild 5993 RMD160 8c6d79e27f62919d45d2e2723e67eb450686969a SHA1 0cf299bee2c373762effd91457533737610b8b3a SHA256 7a30240d9a13b0b82c5c5fa531924c3118a7c4b871d7bf4c5f6b003562342492
-EBUILD virtualbox-ose-2.1.0.ebuild 6780 RMD160 93929e1989f47f8b3b372516f510b91037861e38 SHA1 b02875e15c06778b58f693846362f59844b5f61d SHA256 cb0f843a4908f6c2fa09c029b1842ac667bdc4d6b1d6787e209501052692c646
-EBUILD virtualbox-ose-2.1.2.ebuild 6426 RMD160 a4cd181594123f75c09ee964f781350e330622ae SHA1 60c8489570aa6f1cd6d108738229d237d8b0fe1c SHA256 ff699ca838d7747352c633fd9571e5c599da1994f521074d59bda45fc72ecf66
+EBUILD virtualbox-ose-2.1.2.ebuild 6309 RMD160 6b0a9400d24e0204fed80d866f5655dfcb904de4 SHA1 780a12ba449c2a29911a848f6c31cc8397e97d00 SHA256 291973124e62dd1b54ab70c169856f3522c1ebc9b053b6d3755d9925c2dbbd59
+EBUILD virtualbox-ose-2.1.4.ebuild 6194 RMD160 29dc103aed153723c53d9d00e53b779be4d07a6a SHA1 58d7a6e4b8b122ad0142b4b35ff385740827f645 SHA256 62baeaebad0ef7536df7ea0b00869b0890c34a30414a27fdf800e619294ce9af
 EBUILD virtualbox-ose-9999.ebuild 5380 RMD160 95a67b6fa015e9cd5c338379598353da0ce1b6f3 SHA1 ae7313bfcd8b7cff9e1a580060e0f652fba30454 SHA256 93eeb086be43a97ecb1dfebb41bdfeb4ea93c9884c78ed7cb62bd988b23a5fa4
-MISC ChangeLog 16961 RMD160 e84f572adce1ada0c825edae5297e1f4a1f06653 SHA1 d5191bb59dd7535637aa8e2b6f4007f2003be5c6 SHA256 4bb6abfcb28a845c796691af0e199b3c6cf86afe2a7572176d1ac1ff48a7a542
+MISC ChangeLog 17218 RMD160 c6edf07f2b5862dfd4e6924d950a11206c46e177 SHA1 5ba8ec1889f48e300e371479d00c9da1e5c18b4f SHA256 5c933d082d72392b31bf259633aed95a244499c10a909a6b42e1e537e2817f26
 MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.1.0-allow-gcc43.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.1.0-allow-gcc43.patch
deleted file mode 100644
index 1aae626..0000000
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.1.0-allow-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2008-12-23 16:34:42.000000000 +0100
-+++ configure	2008-12-23 16:35:26.000000000 +0100
-@@ -389,16 +389,6 @@
-         fail really
-       elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "OS" = "darwin" ]; then
-         log_success "found version $cc_ver"
--      elif [ $cc_maj -eq 4 -a $cc_min -eq 3 ]; then
--        if [ -z "$CC_COMPAT" ]; then
--          log ""
--          log "  ** There are known problems with gcc version 4.3 when compiling the recompiler"
--          log "  ** stuff. You need to specify a compatibility compiler with version < 4.3. Look"
--          log "  ** for a package compat-gcc-34 on Fedora systems or something similar on other"
--          log "  ** distributions and call configure with parameter --with-gcc-compat=gcc34."
--          fail really
--        fi
--        log_success "found version $cc_ver + compat version $cc_compat_ver"
-       # gcc-4.0 is allowed for Darwin only
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-2.6.28-headers.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-2.6.28-headers.patch
deleted file mode 100644
index e018eca..0000000
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-2.6.28-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/VBox/Devices/Storage/DrvHostDVD.cpp.orig	2009-01-01 15:56:32.000000000 +0100
-+++ src/VBox/Devices/Storage/DrvHostDVD.cpp	2009-01-01 15:57:03.000000000 +0100
-@@ -48,6 +48,7 @@
- # define _LINUX_BYTEORDER_GENERIC_H
- /* This is another hack for not bothering with C++ unfriendly byteswap macros. */
- # define _LINUX_BYTEORDER_SWAB_H
-+# define _LINUX_BYTEORDER_SWABB_H
- /* Those macros that are needed are defined in the header below */
- # include "swab.h"
- # include <linux/cdrom.h>
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.2.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.2.ebuild
index 977b71f..190561d 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.2.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.0.4.ebuild,v 1.1 2008/10/27 17:19:20 jokey Exp $
+# $Header: $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.0.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4.ebuild
index 7c8eae9..ca5afd9 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.0.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.0.4.ebuild,v 1.1 2008/10/27 17:19:20 jokey Exp $
+# $Header: $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio python +qt4 sdk"
+IUSE="+additions alsa +hal headless pulseaudio python +qt4 sdk vboxwebsrv"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -26,7 +26,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 		media-libs/libsdl:[X]
 		x11-libs/libXt )"
 DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.4
+	>=dev-util/kbuild-0.1.5
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-devel/dev86
@@ -36,27 +36,17 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	hal? ( sys-apps/hal )
 	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-lang/python-2.3 )"
+	python? ( >=dev-lang/python-2.3 )
+	vboxwebsrv? ( <=net-libs/gsoap-2.7.9f )"
 RDEPEND="${RDEPEND}
 	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )
 	sys-apps/usermode-utilities
 	net-misc/bridge-utils"
 
-S=${WORKDIR}/${MY_P/-OSE/}
+S=${WORKDIR}/${MY_P/-OSE/_OSE}
 MY_LIBDIR="$(get_libdir)"
 
 pkg_setup() {
-	# gcc 4.3 is *not supported* by upstream in this release,
-	# please do not report bugs upstream at this time.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "43" ]]; then
-			elog ""
-			elog "Warning:"
-			elog "gcc-$(gcc-major-version).$(gcc-minor-version) was detected"
-			elog "this gcc release is *not supported* by upstream, please"
-			elog "*don't* file bug reports upstream reporting gcc failures."
-			elog ""
-	fi
-
 	if ! use headless; then
 			if ! use qt4; then
 					einfo ""
@@ -78,29 +68,13 @@ src_prepare() {
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
 	rm -rf kBuild/bin tools
 
-	# Disable things unused or splitted into separate ebuilds 
+	# Disable things unused or splitted into separate ebuilds
 	cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
 
 	# Disable the VBoxNetFlt kernel driver
 	sed -i \
-			-e "37d" src/VBox/HostDrivers/Makefile.kmk
-
-	# Set the right libdir 
-	sed -i \
 			-e "s/MY_LIBDIR/${MY_LIBDIR}/" LocalConfig.kmk \
 			|| die "LocalConfig.kmk sed failed"
-
-	# Disable gcc 4.3.x checks in configure
-	epatch "${FILESDIR}/${P}-allow-gcc43.patch"
-
-	# fix headers troubles with 2.6.28 kernel (bug #251335)
-	# original patch from http://www.virtualbox.org/ticket/2936
-	if kernel_is 2 6 28 ; then
-		epatch "${FILESDIR}/${PN}-fix-2.6.28-headers.patch"
-	fi
-
-	# Fix build problems with hal/dbus (when support is disabled)
-	epatch "${FILESDIR}/${PN}-fix-nodbus-build.patch"
 }
 
 src_configure() {
@@ -127,6 +101,9 @@ src_configure() {
 	else
 			myconf="${myconf} --build-headless"
 	fi
+	if use vboxwebsrv; then
+			myconf="${myconf} --enable-webservice"
+	fi
 
 	./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \
 	${myconf} || die "configure failed"
@@ -178,6 +155,15 @@ src_install() {
 		doins -r sdk
 	fi
 
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/vboxwebsrv
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/vboxwebsrv
+		dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
 		doins $each
 		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}