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

Package-Manager: portage-2.1.2.9

5 files changed, 49 insertions, 43 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/Manifest b/app-emulation/virtualbox/Manifest
index ab81f4b04e38..a3681db8c6c8 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX virtualbox-1.3.8-remove-alsa.patch 732 RMD160 e398d436f74d594fcc29c223b24b02ce801fc5cf SHA1 a70c8be16afb805b469bd74ea5760195ba31d9e6 SHA256 1944d96f9673dbd59b3ca6e2bb433711b6c8444a4701acae0b99c70b7109f4c5
 MD5 beb8a2c21a4796a200bbe7905a81f539 files/virtualbox-1.3.8-remove-alsa.patch 732
 RMD160 e398d436f74d594fcc29c223b24b02ce801fc5cf files/virtualbox-1.3.8-remove-alsa.patch 732
@@ -21,28 +18,28 @@ AUX virtualbox-wrapper 1606 RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 SHA1
 MD5 424b5ca7e892bbb82a7c3e38661d1a43 files/virtualbox-wrapper 1606
 RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 files/virtualbox-wrapper 1606
 SHA256 28a6305a7162c1864fee241568c1dd25e758c129069790512a0b1d7767656168 files/virtualbox-wrapper 1606
-AUX virtualbox.desktop 249 RMD160 9fa141cf63f4a7e387dc281d0a8794a17235051c SHA1 e58fb63f70ed041bd15f6a8a2487be44687477d6 SHA256 3c0174cd67eba7925c72dcddf834d78ad8d28a2afc516854adb80f8a65c15efc
-MD5 c5bc3c92fce4aa813b6c6ce05bc91704 files/virtualbox.desktop 249
-RMD160 9fa141cf63f4a7e387dc281d0a8794a17235051c files/virtualbox.desktop 249
-SHA256 3c0174cd67eba7925c72dcddf834d78ad8d28a2afc516854adb80f8a65c15efc files/virtualbox.desktop 249
+AUX virtualbox.desktop 244 RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a SHA1 0a1d0d934ceabefde69e20d0fb913811e0b71fcb SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd
+MD5 51d18d34fc1d53bee67b9c124265b599 files/virtualbox.desktop 244
+RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a files/virtualbox.desktop 244
+SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd files/virtualbox.desktop 244
 DIST VirtualBox-OSE-1.3.8.tar.bz2 17458132 RMD160 e832fc31773c4d2dc1ecfa7a24a68cfd190818a7 SHA1 2769c1064fb21d6a37d7588fa0b9b6f73309ac43 SHA256 14d84c38932f783bfa0bfbf1a91347cc2bba6fd3d4ba60744e7a0ace4bd5cce4
 DIST VirtualBox-OSE-1.4.0.tar.bz2 21720127 RMD160 60a445f8ee68b834f19d8004c329e0aed426a15b SHA1 352a7e1291cef696dc65149a203b950d8b766f41 SHA256 32307799f1d03fd9e87b23588279a627ac3856fbea3d4c44f50a2b9c4194a434
-EBUILD virtualbox-1.3.8.ebuild 4268 RMD160 018660aeab1a360ebfb781a11dabc88a309c3104 SHA1 2a79eaaddddc65ef440a06e8e6894ad05f5e3272 SHA256 5583a0d2b14044f0a354e5ff8e1487fd6a07a883b1be42826d3c8920df9dbd09
-MD5 1dfb7036483e263df672d3dcc7e9ccb3 virtualbox-1.3.8.ebuild 4268
-RMD160 018660aeab1a360ebfb781a11dabc88a309c3104 virtualbox-1.3.8.ebuild 4268
-SHA256 5583a0d2b14044f0a354e5ff8e1487fd6a07a883b1be42826d3c8920df9dbd09 virtualbox-1.3.8.ebuild 4268
-EBUILD virtualbox-1.4.0.ebuild 4272 RMD160 e0ecc15cdfdd5256635f1cbeb5dcac409cb41439 SHA1 7d8bf97abeb6c2e5478bc71d7b6e6cb4bf96a566 SHA256 d80ad166db8f7e7a2be18e4b3589b9ffbaa9a9c9f5f6c7ca673748bc243acd64
-MD5 802f6fffb8a1359064796a3e09670ea1 virtualbox-1.4.0.ebuild 4272
-RMD160 e0ecc15cdfdd5256635f1cbeb5dcac409cb41439 virtualbox-1.4.0.ebuild 4272
-SHA256 d80ad166db8f7e7a2be18e4b3589b9ffbaa9a9c9f5f6c7ca673748bc243acd64 virtualbox-1.4.0.ebuild 4272
+EBUILD virtualbox-1.3.8.ebuild 4268 RMD160 bd1fe616c4c888fd7ef77da68a70bdc668195770 SHA1 fa32cc5a06ba2a3729b937b4cf110b8e5adf75a1 SHA256 277f5c37854bca3b8531073e72ada6ccae07f90712eb5f3370337a46dae53a34
+MD5 34b96e2257d0706d7c13b374c42e5546 virtualbox-1.3.8.ebuild 4268
+RMD160 bd1fe616c4c888fd7ef77da68a70bdc668195770 virtualbox-1.3.8.ebuild 4268
+SHA256 277f5c37854bca3b8531073e72ada6ccae07f90712eb5f3370337a46dae53a34 virtualbox-1.3.8.ebuild 4268
+EBUILD virtualbox-1.4.0.ebuild 4585 RMD160 92d89d580d0447411e2d15a13c09ec8f2c0fb6c8 SHA1 8d316ab8697da177b1f49843b5c5ee428750fa27 SHA256 ab9d80075af523179d461d92ac3b06847446dfa5a0a62a8197bd412b9bc20dde
+MD5 4782a594d31d17d0e9f4b209df45381c virtualbox-1.4.0.ebuild 4585
+RMD160 92d89d580d0447411e2d15a13c09ec8f2c0fb6c8 virtualbox-1.4.0.ebuild 4585
+SHA256 ab9d80075af523179d461d92ac3b06847446dfa5a0a62a8197bd412b9bc20dde virtualbox-1.4.0.ebuild 4585
 EBUILD virtualbox-9999.ebuild 4632 RMD160 bc874de951e1f6daa0c97e6932e26e4ff06d5d51 SHA1 68345523d8bf71506a4c498605ef38b5de3a65de SHA256 7bde48290a35a4df032c94f26f894c64b2249a2e96f3e55099a13b40c2173684
 MD5 ee9575e9cb84ec9190faa475c929a212 virtualbox-9999.ebuild 4632
 RMD160 bc874de951e1f6daa0c97e6932e26e4ff06d5d51 virtualbox-9999.ebuild 4632
 SHA256 7bde48290a35a4df032c94f26f894c64b2249a2e96f3e55099a13b40c2173684 virtualbox-9999.ebuild 4632
-MISC ChangeLog 3623 RMD160 989372bdd1e0d5551a8e0211dae1143e2b509205 SHA1 c215445c0c02daea221106439380bc29ec36426b SHA256 6e5708b59599daa839905cb2dc4da4bda0da34d3ff5bef2127660cc12c8602be
-MD5 5d1a99d7513332782a08ff9310a6c607 ChangeLog 3623
-RMD160 989372bdd1e0d5551a8e0211dae1143e2b509205 ChangeLog 3623
-SHA256 6e5708b59599daa839905cb2dc4da4bda0da34d3ff5bef2127660cc12c8602be ChangeLog 3623
+MISC ChangeLog 4027 RMD160 52cf13bcae45296e1ceae80672f3e5e83b34ce2b SHA1 8bf3585bb287281c44508bc01f8ee0289a0ef6c2 SHA256 f4e5ba95efaabec28faed564f0534839ba93aa7195ffe852307bd858cefb8d4f
+MD5 5b43b52658d6d8c3ef9ad6e9aea081f5 ChangeLog 4027
+RMD160 52cf13bcae45296e1ceae80672f3e5e83b34ce2b ChangeLog 4027
+SHA256 f4e5ba95efaabec28faed564f0534839ba93aa7195ffe852307bd858cefb8d4f ChangeLog 4027
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
@@ -56,10 +53,3 @@ SHA256 fc987148b43443ef9f30399f4f13cc97db7434ec714d76c282239a91a04068c7 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-virtualbox-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-virtualbox-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-virtualbox-9999 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGZxE4z974XjDVpbkRAvNFAKDR5CfMPozwzx7+zkqrAQ/+rJv5tgCfXh9O
-ntb084D8Z6MnO52Rhn5IgIs=
-=mdtI
------END PGP SIGNATURE-----
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() {