Use unpack_makeself instead of executing the script (and bundled static binaries) and cleanup ebuild style.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.10 x86_64

3 files changed, 44 insertions, 49 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 4e3a3d875aaf..c26692ac324e 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.28 2008/07/28 20:41:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.29 2008/07/29 07:02:21 vapier Exp $
+
+  29 Jul 2008; Mike Frysinger <vapier@gentoo.org>
+  virtualbox-bin-1.6.2.ebuild:
+  Use unpack_makeself instead of executing the script (and bundled static
+  binaries) and cleanup ebuild style.
 
   28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index ae84e8de4c91..6a70f5ce410f 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vboxwebsrv-confd 621 RMD160 1418c29b163fbec787fc253c3254e85b198411f0 SHA1 d9d250a78c9735fd70a54bf54c379ffcbb5d4828 SHA256 2c15ccb6e6032cfae69db26928007d8d96ec1c1a8fe5ba0a8502f5cefe080063
 AUX vboxwebsrv-initd 914 RMD160 9ab70364b4cb847ec43c9435cb37a663c3627f89 SHA1 ec6adb93fb56285eee06ab5482f419b899ff58da SHA256 62eeedb05e01bb4849e4e58661fd2fcb5dd309be5290127f6ea28f81dcd74a80
 AUX virtualbox-bin-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f
@@ -18,13 +15,6 @@ DIST VirtualBox_1.5.6-1_Linux_x86.run 16469455 RMD160 a81057243c1f480f39b8778261
 EBUILD virtualbox-bin-1.5.2-r1.ebuild 4046 RMD160 efe7d1e7112ce858e152618eb8035fc3747da716 SHA1 180db48d9b53a24dcb4bd0251e71a31262411dff SHA256 5aae38a016f998bd70fa1c88431686dea9d42622d411de630e0820898b1f1562
 EBUILD virtualbox-bin-1.5.4.ebuild 3841 RMD160 881481e2ddbb4241b13faaada3adbbdbcbdad227 SHA1 3fee520e111b9064874c10222106393fe60b57f1 SHA256 dc5ca0331b67c975719b2cfb7d7899a7a54296ccb9c2de9b6f24dca9706c5d8f
 EBUILD virtualbox-bin-1.5.6.ebuild 3850 RMD160 7e21772cccf32fcba4c077e86fc6ede93c4e6e10 SHA1 2338e43f618e41a3102ac3a8619d3ad8355f5afb SHA256 8e63e5129f9693f4bf22904a85d52085e9bfe6605bdb2ad41dceefbe017d7660
-EBUILD virtualbox-bin-1.6.2.ebuild 4965 RMD160 22eef5bba021d9945435d8971f5cd29f77fb0950 SHA1 2c8ff4f9abc4ec0b016dec1dca64c5cfbc928e10 SHA256 6cdf81a8e9ddb18181178d39d2c5b8e1c27341b5e7f228a406039b4ad5bd637b
-MISC ChangeLog 5299 RMD160 e691a609d6931f1b32def51a30cf6da3bd084d41 SHA1 8578803acff766c2e1caf7ee96b88ba9972ae338 SHA256 19c8732f0ee1ea1e5512737c57500b79893c0e2a901164518f9b9d2566ed100b
+EBUILD virtualbox-bin-1.6.2.ebuild 4927 RMD160 913add73c9d73cba146792cfa2aff03998b25419 SHA1 ef575d1b396c839d4d589ac6c3698dfdd6058a9c SHA256 eddf9b797e7dd9ca1f5e14170965bd8e9551a0a809a9115e4fe41adc807b107c
+MISC ChangeLog 5493 RMD160 0587f67ad1f60cdc0211a5cbff8a0967f68717e2 SHA1 5c0a014fb5861e019c6a664f711bd7909cbb1d93 SHA256 b24b9626e70a67cd0d7f3245c6f8a6b410a80df7b3a0dc635ec2d894af3f8321
 MISC metadata.xml 674 RMD160 227ce8924ca2756736cafabca6db6d392045c046 SHA1 39897f3c50ad79428f105790727cdd1c8b9a2d33 SHA256 4a6a5fb269164b795ab5927c44408e3f7a18822df080ee989071d834f5bfd54b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiOLxEACgkQoeSe8B0zEfyB4gCdHfKW6gspngzi30Agt5+anVNJ
-eEAAn2tV7ypvIceWAvcVSLYp3rS78yyy
-=iowH
------END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
index 235540218108..a6727bd323ee 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild,v 1.4 2008/07/29 06:56:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild,v 1.5 2008/07/29 07:02:21 vapier Exp $
 
 EAPI=1
 
@@ -57,7 +57,7 @@ RESTRICT="fetch"
 pkg_nofetch() {
 	elog "Please from the site:"
 	elog "https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_SMI-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=innotek-1.6-G-F@CDS-CDS_SMI"
-	if use amd64; then
+	if use amd64 ; then
 		elog "select \"Linux (AMD64)\" and download \"${MY_P}_amd64.run\""
 	else
 		elog "select \"Linux i386\" and download \"${MY_P}_x86.run\""
@@ -68,12 +68,12 @@ pkg_nofetch() {
 pkg_setup() {
 	# The VBoxSDL frontend needs media-libs/libsdl compiled
 	# with USE flag X enabled (bug #177335)
-	if ! use headless; then
-			if ! built_with_use media-libs/libsdl X; then
-				eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
-				eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
-				die "media-libs/libsdl should be compiled with the \"X\" USE flag."
-			fi
+	if ! use headless ; then
+		if ! built_with_use media-libs/libsdl X ; then
+			eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
+			eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
+			die "media-libs/libsdl should be compiled with the \"X\" USE flag."
+		fi
 	fi
 
 	check_license
@@ -85,9 +85,9 @@ src_unpack() {
 }
 
 src_install() {
-	if ! use headless; then
-			newicon VBox.png virtualbox.png
-			newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
+	if ! use headless ; then
+		newicon VBox.png virtualbox.png
+		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
 	fi
 
 	# create virtualbox configurations files
@@ -116,31 +116,31 @@ src_install() {
 	fi
 
 	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install* routines.sh \
-	runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
-	VirtualBox.tar.bz2 vboxnet.sh LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest
+		runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 vboxnet.sh LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest
 
-	if use headless; then
-			rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \
 			VirtualBox.chm
 	fi
 
-	doins -r *
+	doins -r * || die
 
-	if ! use headless; then
-			for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox; do
-				fowners root:vboxusers /opt/VirtualBox/${each}
-				fperms 0750 /opt/VirtualBox/${each}
-				pax-mark -m "${D}"/opt/VirtualBox/${each}
-			done
+	if ! use headless ; then
+		for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 0750 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
 
-			dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
-			dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
+		dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
 	else
-			for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do
-				fowners root:vboxusers /opt/VirtualBox/${each}
-				fperms 0750 /opt/VirtualBox/${each}
-				pax-mark -m "${D}"/opt/VirtualBox/${each}
-			done
+		for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 0750 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
 	fi
 
 	exeinto /opt/VirtualBox
@@ -160,13 +160,13 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	elog ""
-	if ! use headless; then
-			elog "To launch VirtualBox just type: \"VirtualBox\""
-			elog ""
-			elog "In order to use the online help, create a link"
-			elog "to your favourite chm viewer, for example:"
-			elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer"
-			elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+		elog "In order to use the online help, create a link"
+		elog "to your favourite chm viewer, for example:"
+		elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer"
+		elog ""
 	fi
 	elog "You must be in the vboxusers group to use VirtualBox"
 	elog ""