Port changes from jokey's overlay; thanks to x-drum: minor changes to desktop entry; fix missing fperms; adjust perms for VirtualBox's executables; remove virtual/libstdc++ from DEPEND, no longer required by kBuild; fix USE flag hal in src_compile

(Portage version: 2.1.2.9)

4 files changed, 33 insertions, 17 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 00fbaddf71ef..27b6cc2447ec 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2007/06/06 19:55:26 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.20 2007/06/22 13:29:33 masterdriverz Exp $
+
+  22 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  files/virtualbox.desktop, virtualbox-1.3.8.ebuild,
+  virtualbox-1.4.0.ebuild:
+  Port changes from jokey's overlay; thanks to x-drum: minor changes to
+  desktop entry; fix missing fperms; adjust perms for VirtualBox's
+  executables; remove virtual/libstdc++ from DEPEND, no longer required by
+  kBuild; fix USE flag hal in src_compile
 
   06 Jun 2007; Markus Ullmann <jokey@gentoo.org>
   +files/virtualbox-1.4.0-remove-alsa.patch,
diff --git a/app-emulation/virtualbox/files/virtualbox.desktop b/app-emulation/virtualbox/files/virtualbox.desktop
index a6cf264c8cbf..902b45d7ec16 100644
--- a/app-emulation/virtualbox/files/virtualbox.desktop
+++ b/app-emulation/virtualbox/files/virtualbox.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=1.3.4
-Name=InnoTek VirtualBox
+Version=
+Name=Innotek VirtualBox
 Type=Application
 Comment=Run several virtual systems on a single host computer
 Exec=virtualbox
diff --git a/app-emulation/virtualbox/virtualbox-1.3.8.ebuild b/app-emulation/virtualbox/virtualbox-1.3.8.ebuild
index 7b1735589016..b972dd76eb89 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.3.8.ebuild
@@ -22,13 +22,13 @@ RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/xerces-c
 	media-libs/libsdl
 	x11-libs/libXcursor
-	$(qt_min_version 3.3.5)
-	=virtual/libstdc++-3.3"
+	$(qt_min_version 3.3.5)"
 DEPEND="${RDEPEND}
 	sys-devel/bin86
 	sys-devel/dev86
 	sys-power/iasl
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	=virtual/libstdc++-3.3"
 RDEPEND="${RDEPEND}
 	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
 
diff --git a/app-emulation/virtualbox/virtualbox-1.4.0.ebuild b/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
index 1a9764caa404..fa57e83fa5fb 100644
--- a/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
@@ -28,8 +28,7 @@ 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} )"
 
@@ -49,11 +48,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	local myconf
-	if ! use hal; then
-		myconf="${myconf} --without-hal"
-	fi
-
 	# Don't build vboxdrv and additions: splitted into separate ebuilds
 	epatch "${FILESDIR}/${P}-remove-splitted-stuff.patch"
 	# Don't build the Alsa audio driver and remove Alsa checks in configure
@@ -63,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)
@@ -84,11 +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
+		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"
@@ -101,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
@@ -112,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
@@ -122,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() {