Revbump to fix HAL mess and fix permissions for VBoxTunctl, bug #191473

(Portage version: 2.1.3.9)

6 files changed, 67 insertions, 60 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 6b12a1dbdfc4..4787cd251e23 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.24 2007/09/04 23:56:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.25 2007/09/17 09:41:37 jokey Exp $
+
+*virtualbox-1.5.0-r1 (17 Sep 2007)
+
+  17 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  files/virtualbox-1.5.0-remove-alsa.patch,
+  files/virtualbox-1.5.0-remove-splitted-stuff.patch,
+  -virtualbox-1.5.0.ebuild, +virtualbox-1.5.0-r1.ebuild,
+  virtualbox-9999.ebuild:
+  Revbump to fix HAL mess and fix permissions for VBoxTunctl, bug #191473
 
   04 Sep 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-9999.ebuild:
   fix group creation, bug #184504
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1
index e6ddffe5c6d1..e6ddffe5c6d1 100644
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch
index 9cad2afaf52b..4e6560f6e3d8 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch
@@ -1,5 +1,5 @@
---- ./Config.kmk.orig	2007-09-05 01:29:01.000000000 +0200
-+++ ./Config.kmk	2007-09-05 01:31:13.064035667 +0200
+--- Config.kmk.orig	2007-09-05 10:29:18.000000000 +0200
++++ Config.kmk	2007-09-05 10:29:58.000000000 +0200
 @@ -202,7 +202,7 @@
  # Enable the ISCSI feature.
  VBOX_WITH_ISCSI = 1
@@ -9,13 +9,14 @@
  # Disable WINMM support for Windows (not implemented)
  VBOX_WITH_WINMM =
  # Enable the kchmviewer
---- ./configure.orig	2007-09-05 01:29:01.000000000 +0200
-+++ ./configure	2007-09-05 01:31:44.065802440 +0200
-@@ -1336,7 +1336,6 @@
+--- configure.orig	2007-09-05 10:29:24.000000000 +0200
++++ configure	2007-09-05 10:34:34.000000000 +0200
+@@ -1336,7 +1336,7 @@
  # Linux-specific
  if [ "$OS" = "linux" ]; then
    check_linux
 -  check_alsa
++#  check_alsa
    check_compiler_h
    [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
  fi
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
index c50a9b3f8964..8b28893a0602 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
@@ -1,5 +1,40 @@
---- configure.orig	2007-08-31 14:42:12.000000000 +0200
-+++ configure	2007-09-04 18:21:49.000000000 +0200
+--- Config.kmk.orig	2007-09-05 10:17:41.000000000 +0200
++++ Config.kmk	2007-09-05 10:20:27.000000000 +0200
+@@ -134,7 +134,7 @@
+ 
+ # Build linux / win32 additions.
+ ifeq ($(BUILD_TARGET),linux)
+-  VBOX_WITH_LINUX_ADDITIONS = 1
++#  VBOX_WITH_LINUX_ADDITIONS = 1
+   VBOX_WITH_WIN32_ADDITIONS = 1
+ endif
+ ifeq ($(BUILD_TARGET),l4)
+@@ -173,7 +173,7 @@
+ VBOX_WITHOUT_IDT_PATCHING = 1
+ endif
+ # The kernel driver/module and related runtime libraries.
+-VBOX_WITH_VBOXDRV = 1
++#VBOX_WITH_VBOXDRV = 1
+ # build with secure label support
+ ifeq ($(filter win.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),) # too much work with freetype and all that.
+ VBOX_WITH_SECURELABEL = 1
+@@ -206,11 +206,11 @@
+ # Disable WINMM support for Windows (not implemented)
+ VBOX_WITH_WINMM =
+ # Enable the kchmviewer
+-VBOX_WITH_KCHMVIEWER = 1
++#VBOX_WITH_KCHMVIEWER = 1
+ # Build the testsuite.
+-VBOX_WITH_TESTSUITE = 1
++#VBOX_WITH_TESTSUITE = 1
+ # Build the testcases.
+-VBOX_WITH_TESTCASES = 1
++#VBOX_WITH_TESTCASES = 1
+ # Set this to not use COM or XPCOM in places where it can be avoided.
+ #VBOX_WITHOUT_COM = 1
+ # Set this to skip installing the redistributable compiler runtime.
+--- configure.orig	2007-09-05 10:20:35.000000000 +0200
++++ configure	2007-09-05 10:23:44.000000000 +0200
 @@ -1281,14 +1281,14 @@
  # some things are not available in for OSE
  if [ $OSE -ge 1 ]; then
@@ -21,26 +56,3 @@
    echo >> $CNF
  fi
  
---- Config.kmk.orig	2007-08-31 15:01:30.000000000 +0200
-+++ Config.kmk	2007-09-04 18:20:50.000000000 +0200
-@@ -135,7 +135,7 @@
- # Build linux / win32 additions.
- ifeq ($(BUILD_TARGET),linux)
-   VBOX_WITH_LINUX_ADDITIONS = 1
--  VBOX_WITH_WIN32_ADDITIONS = 1
-+#  VBOX_WITH_WIN32_ADDITIONS = 1
- endif
- ifeq ($(BUILD_TARGET),l4)
-  VBOX_WITH_LINUX_ADDITIONS = 1
-@@ -206,9 +206,9 @@
- # Disable WINMM support for Windows (not implemented)
- VBOX_WITH_WINMM =
- # Enable the kchmviewer
--VBOX_WITH_KCHMVIEWER = 1
-+#VBOX_WITH_KCHMVIEWER = 1
- # Build the testsuite.
--VBOX_WITH_TESTSUITE = 1
-+#VBOX_WITH_TESTSUITE = 1
- # Build the testcases.
- VBOX_WITH_TESTCASES = 1
- # Set this to not use COM or XPCOM in places where it can be avoided.
diff --git a/app-emulation/virtualbox/virtualbox-1.5.0.ebuild b/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild
index deb040fd1576..55f304b4843d 100644
--- a/app-emulation/virtualbox/virtualbox-1.5.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.5.0-r1.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/app-emulation/virtualbox/virtualbox-1.5.0.ebuild,v 1.1 2007/09/04 23:38:07 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild,v 1.1 2007/09/17 09:41:37 jokey Exp $
 
 inherit eutils flag-o-matic qt3 toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="additions alsa hal nowrapper sdk vboxbfe"
+IUSE="additions alsa nowrapper sdk vboxbfe"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -23,7 +23,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	media-libs/libsdl
 	x11-libs/libXcursor
 	$(qt_min_version 3.3.5)
-	hal? ( sys-apps/hal )"
+	sys-apps/hal"
 DEPEND="${RDEPEND}
 	sys-devel/bin86
 	sys-devel/dev86
@@ -58,13 +58,7 @@ src_unpack() {
 src_compile() {
 	cd "${S}"
 
-	local myconf
-	if ! use hal; then
-		myconf="${myconf} --without-hal"
-	fi
-
-	./configure \
-	${myconf} || die "configure failed"
+	./configure || die "configure failed"
 	source ./env.sh
 
 	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 9971a0857622..2692d4e975e1 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.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/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.18 2007/09/04 23:56:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.19 2007/09/17 09:41:37 jokey Exp $
 
 inherit eutils flag-o-matic linux-mod qt3 subversion toolchain-funcs
 
@@ -11,7 +11,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="hal nowrapper sdk vboxbfe vditool"
+IUSE="nowrapper sdk vboxbfe vditool"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/libIDL
@@ -21,7 +21,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	media-libs/libsdl
 	x11-libs/libXcursor
 	$(qt_min_version 3.3.5)
-	hal? ( sys-apps/hal )"
+	sys-apps/hal"
 DEPEND="${RDEPEND}
 	sys-devel/bin86
 	sys-devel/dev86
@@ -51,13 +51,7 @@ pkg_setup() {
 src_compile() {
 	cd "${S}"
 
-	local myconf
-	if ! use hal; then
-		myconf="${myconf} --without-hal"
-	fi
-
-	./configure \
-	${myconf} || die "configure failed"
+	./configure || die "configure failed"
 	source ./env.sh
 
 	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
@@ -79,6 +73,9 @@ src_install() {
 	cd "${S}"/out/linux.${ARCH}/release/bin
 
 	insinto /opt/VirtualBox
+
+	make_wrapper vboxtunctl "./VBoxTunctl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+
 	if use sdk; then
 		doins -r sdk
 		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
@@ -97,10 +94,11 @@ src_install() {
 		fi
 	fi
 
-	rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall SUPUninstall
+	rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall \
+	SUPUninstall VBox.sh VBox.png
 
 	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
 	done
@@ -135,13 +133,6 @@ src_install() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	if use amd64; then
-		elog ""
-		elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
-		elog "you may need to update your bootloader configuration and pass the option:"
-		elog "nmi_watchdog=0"
-	fi
-	elog ""
 	if use nowrapper; then
 		elog "In order to launch VirtualBox you need to start the"
 		elog "VirtualBox XPCom Server first, with:"