Version bump wrt bug #191142

(Portage version: 2.1.3.7)

7 files changed, 90 insertions, 83 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 804b8faace16..8a9e317f04af 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,16 @@
 # 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.22 2007/06/23 15:59:27 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.23 2007/09/04 23:38:07 jokey Exp $
+
+*virtualbox-1.5.0 (04 Sep 2007)
+
+  04 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-1.3.8-remove-alsa.patch,
+  -files/virtualbox-1.3.8-remove-splitted-stuff.patch,
+  +files/virtualbox-1.5.0-remove-alsa.patch,
+  +files/virtualbox-1.5.0-remove-splitted-stuff.patch,
+  -virtualbox-1.3.8.ebuild, +virtualbox-1.5.0.ebuild:
+  Version bump wrt bug #191142
 
   23 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
   virtualbox-1.3.8.ebuild, virtualbox-1.4.0.ebuild, virtualbox-9999.ebuild:
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.8 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.8
deleted file mode 100644
index aaef4a5a6a5b..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c012923a084a44ed91966f8df887927f VirtualBox-OSE-1.3.8.tar.bz2 17458132
-RMD160 e832fc31773c4d2dc1ecfa7a24a68cfd190818a7 VirtualBox-OSE-1.3.8.tar.bz2 17458132
-SHA256 14d84c38932f783bfa0bfbf1a91347cc2bba6fd3d4ba60744e7a0ace4bd5cce4 VirtualBox-OSE-1.3.8.tar.bz2 17458132
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.0
new file mode 100644
index 000000000000..e6ddffe5c6d1
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.5.0
@@ -0,0 +1,3 @@
+MD5 56c074900260c109ed735c08e726fe81 VirtualBox-1.5.0_OSE.tar.bz2 23951481
+RMD160 fe9f52d2b944535c6a6f2fb499d88f61ef67cbd4 VirtualBox-1.5.0_OSE.tar.bz2 23951481
+SHA256 1eb1d7e49324303b47c584cb150f0f676873a93bc1d426afe77fbeca05991cba VirtualBox-1.5.0_OSE.tar.bz2 23951481
diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch
deleted file mode 100644
index 41da11680006..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-alsa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Config.kmk.orig	2007-03-14 13:10:41.000000000 +0100
-+++ Config.kmk	2007-03-14 13:11:07.000000000 +0100
-@@ -163,7 +163,7 @@
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable ALSA support for Linux
--VBOX_WITH_ALSA = 1
-+#VBOX_WITH_ALSA = 1
- # Disable WINMM support for Windows (not implemented)
- VBOX_WITH_WINMM =
- # Enable the kchmviewer
---- configure.orig	2007-03-14 13:10:49.000000000 +0100
-+++ configure	2007-03-14 13:11:01.000000000 +0100
-@@ -1200,7 +1200,7 @@
- (($OSE==0)) && check_pam
- [ "$OS" != "darwin" ] && check_sdl
- (($OSE==0)) && check_sdl_ttf
--[ "$OS" != "darwin" ] && check_alsa
-+[ "$OS" != "darwin" ]
- [ "$OS" != "darwin" ] && check_x
- [ "$OS" != "darwin" ] && check_xcursor
- (($WITH_QT==1)) && check_qt
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
new file mode 100644
index 000000000000..9cad2afaf52b
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch
@@ -0,0 +1,21 @@
+--- ./Config.kmk.orig	2007-09-05 01:29:01.000000000 +0200
++++ ./Config.kmk	2007-09-05 01:31:13.064035667 +0200
+@@ -202,7 +202,7 @@
+ # Enable the ISCSI feature.
+ VBOX_WITH_ISCSI = 1
+ # Enable ALSA support for Linux
+-VBOX_WITH_ALSA = 1
++#VBOX_WITH_ALSA = 1
+ # 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 @@
+ # Linux-specific
+ if [ "$OS" = "linux" ]; then
+   check_linux
+-  check_alsa
+   check_compiler_h
+   [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
+ fi
diff --git a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
index 5de2a32dd4d4..c50a9b3f8964 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.3.8-remove-splitted-stuff.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
@@ -1,43 +1,8 @@
---- Config.kmk.orig	2007-03-14 12:54:24.000000000 +0100
-+++ Config.kmk	2007-03-14 12:56:24.000000000 +0100
-@@ -102,7 +102,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)
-@@ -134,7 +134,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
-@@ -167,11 +167,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-03-14 12:56:30.000000000 +0100
-+++ configure	2007-03-14 13:00:47.000000000 +0100
-@@ -1161,14 +1161,14 @@
+--- configure.orig	2007-08-31 14:42:12.000000000 +0200
++++ configure	2007-09-04 18:21:49.000000000 +0200
+@@ -1281,14 +1281,14 @@
  # some things are not available in for OSE
- if (($OSE)); then
+ if [ $OSE -ge 1 ]; then
    cnf_append "VBOX_OSE" "1"
 -  cnf_append "VBOX_WITH_TESTSUITE" ""
 +#  cnf_append "VBOX_WITH_TESTSUITE" ""
@@ -56,3 +21,26 @@
    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.3.8.ebuild b/app-emulation/virtualbox/virtualbox-1.5.0.ebuild
index 88d1bdc542ba..deb040fd1576 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.5.0.ebuild
@@ -1,18 +1,18 @@
 # 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.3.8.ebuild,v 1.7 2007/06/26 01:37:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.0.ebuild,v 1.1 2007/09/04 23:38:07 jokey Exp $
 
 inherit eutils flag-o-matic qt3 toolchain-funcs
 
-MY_P=VirtualBox-OSE-${PV}
+MY_P=VirtualBox-${PV}_OSE
 DESCRIPTION="Softwarefamily of powerful x86 virtualization"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-amd64 x86"
-IUSE="additions alsa nowrapper sdk vboxbfe vditool"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions alsa hal nowrapper sdk vboxbfe"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -22,17 +22,17 @@ RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/xerces-c
 	media-libs/libsdl
 	x11-libs/libXcursor
-	$(qt_min_version 3.3.5)"
+	$(qt_min_version 3.3.5)
+	hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}
 	sys-devel/bin86
 	sys-devel/dev86
 	sys-power/iasl
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	=virtual/libstdc++-3.3"
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
 RDEPEND="${RDEPEND}
 	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
 
-S=${WORKDIR}/vbox-ose-${PV}
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	# The VBoxSDL frontend needs media-libs/libsdl compiled
@@ -57,7 +57,14 @@ src_unpack() {
 
 src_compile() {
 	cd "${S}"
-	./configure || die "configure failed"
+
+	local myconf
+	if ! use hal; then
+		myconf="${myconf} --without-hal"
+	fi
+
+	./configure \
+	${myconf} || die "configure failed"
 	source ./env.sh
 
 	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
@@ -78,16 +85,13 @@ src_install() {
 	if use sdk; then
 		doins -r sdk
 		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
-	fi
-	if use vditool; then
-		doins vditool
-		make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		fperms 0755 /opt/VirtualBox/vditool
+		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
+		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
 	fi
 	if use vboxbfe; then
 		doins VBoxBFE
-		fperms 0755 /opt/VirtualBox/VBoxBFE
+		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
+		fperms 0750 /opt/VirtualBox/VBoxBFE
 
 		if use nowrapper ; then
 			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
@@ -100,7 +104,8 @@ src_install() {
 
 	doins -r *
 	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
-		fperms 0755 /opt/VirtualBox/${each}
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
 	done
 
 	if use nowrapper ; then
@@ -111,6 +116,9 @@ src_install() {
 	else
 		exeinto /opt/VirtualBox
 		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
+		fowners root:vboxusers /opt/VirtualBox/wrapper.sh
+		fperms 0750 /opt/VirtualBox/wrapper.sh
+
 		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
 		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
 		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
@@ -121,6 +129,7 @@ src_install() {
 	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
 	insinto /usr/share/applications
 	doins "${FILESDIR}"/${PN}.desktop
+	dosed -e "s/Version=/Version=${PV}/" /usr/share/applications/${PN}.desktop
 }
 
 pkg_postinst() {
@@ -133,7 +142,8 @@ pkg_postinst() {
 		elog "To launch VirtualBox just type: \"virtualbox\""
 	fi
 	elog ""
-	elog "You must be in the vboxusers group to use VirtualBox."
+	elog "You must be in the vboxusers group to use VirtualBox,"
+	elog "\"vditool\" is now deprecated, use \"VBoxManage\" instead."
 	elog ""
 	elog "The last user manual is available for download at:"
 	elog "http://www.virtualbox.org/download/UserManual.pdf"