Lots of improvements such as creating groups, adding vbox iso and more. Thanks To Alessio Cassibba for the good work

(Portage version: 2.1.2-r8)

6 files changed, 186 insertions, 10 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index f497811485fc..822b73e846d4 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2007/02/12 18:55:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.5 2007/02/15 20:28:11 jokey Exp $
+
+*virtualbox-1.3.4-r1 (15 Feb 2007)
+
+  15 Feb 2007; Markus Ullmann <jokey@gentoo.org> +files/virtualbox.desktop,
+  metadata.xml, +virtualbox-1.3.4-r1.ebuild, virtualbox-9999.ebuild:
+  Lots of improvements such as creating groups, adding vbox iso and more. Thanks
+  To Alessio Cassibba for the good work
 
   12 Feb 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-1.3.4.ebuild,
   virtualbox-9999.ebuild:
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1
new file mode 100644
index 000000000000..d3662f648fa4
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4-r1
@@ -0,0 +1,3 @@
+MD5 67853add4afc2eace5d8f45cfe9a32c5 VirtualBox-OSE-1.3.4.tar.bz2 17491150
+RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 VirtualBox-OSE-1.3.4.tar.bz2 17491150
+SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee VirtualBox-OSE-1.3.4.tar.bz2 17491150
diff --git a/app-emulation/virtualbox/files/virtualbox.desktop b/app-emulation/virtualbox/files/virtualbox.desktop
new file mode 100644
index 000000000000..a6cf264c8cbf
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.3.4
+Name=InnoTek VirtualBox
+Type=Application
+Comment=Run several virtual systems on a single host computer
+Exec=virtualbox
+TryExec=virtualbox
+Path=
+Icon=virtualbox.png
+Categories=Application;Emulator;System;
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 88bdb4223fff..76eddd3fbb1b 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -6,4 +6,8 @@
   <email>jokey@gentoo.org</email>
   <name>Markus Ullmann</name>
 </maintainer>
+<maintainer>
+  <email>swapon@gmail.com</email>
+  <name>Alessio Cassibba</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..9f14ad8ebf4f
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils linux-mod qt3
+
+MY_P=VirtualBox-OSE-${PV}
+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 sdk"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	media-libs/libsdl
+	x11-libs/libXcursor
+	$(qt_min_version 3.3.5)
+	=virtual/libstdc++-3.3"
+DEPEND="${REPEND}
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl"
+RDEPEND="${REPEND}
+	additions? ( =app-emulation/virtualbox-additions-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
+
+src_compile() {
+	cd "${S}"
+	./configure || die "configure failed"
+	source ./env.sh
+	kmk all || die "kmk failed"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin
+
+	insinto /opt/VirtualBox
+	if use sdk; then
+	    doins -r sdk
+	    make_wrapper xpidl "sdk/bin/xpidl" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	    fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+
+	rm -rf sdk src tst* testcase additions vboxdrv.ko SUPInstall SUPUninstall
+
+	doins -r *
+	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; do
+		fperms 0755 /opt/VirtualBox/${each}
+	done
+	make_wrapper vboxsvc "./VBoxSVC" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper virtualbox "./VirtualBox" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxmanage "./VBoxManage" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsdl "./VBoxSDL" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxvrdp "./VBoxVRDP" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_preinst() {
+	enewgroup vboxusers
+}
+
+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 ""
+	elog "In order to launch VirtualBox you need to start VBoxSVC first,"
+	elog "this can be done with:"
+	elog "vboxsvc --daemonize && virtualbox"
+	elog ""
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The last user manual is available for download at:"
+	elog "http://www.virtualbox.org/download/UserManual.pdf"
+	elog ""
+}
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index d899ab9bcea7..4fd673072596 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.4 2007/02/12 18:55:09 jokey Exp $
+# $Header $
 
 inherit eutils linux-mod qt3 subversion
 
@@ -11,42 +11,90 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="additions sdk"
 
-RDEPEND="dev-libs/libIDL
+RDEPEND="!app-emulation/virtualbox-bin
+	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
 	dev-libs/xalan-c
 	dev-libs/xerces-c
 	media-libs/libsdl
 	x11-libs/libXcursor
-	$(qt_min_version 3.3.5)"
+	$(qt_min_version 3.3.5)
+	=virtual/libstdc++-3.3"
 DEPEND="${REPEND}
 	sys-devel/bin86
 	sys-devel/dev86
 	sys-power/iasl"
+RDEPEND="${REPEND}
+	additions? ( =app-emulation/virtualbox-additions-1.3.4 )"
 
+BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 BUILD_TARGETS="all"
-BUILD_PARAMS="KERN_DIR=${KERNEL_DIR}"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
 src_compile() {
 	cd "${S}"
 	./configure || die "configure failed"
 	source ./env.sh
-	kmk all
+	kmk all || die "kmk failed"
 	linux-mod_src_compile
 }
 
 src_install() {
 	linux-mod_src_install
+
 	cd "${S}"/out/linux.${ARCH}/release/bin
-	rm -rf sdk src tst* testcase additions/src
-	rm vboxdrv.ko SUPInstall SUPUninstall
+
 	insinto /opt/VirtualBox
+	if use sdk; then
+	    doins -r sdk
+	    make_wrapper xpidl "sdk/bin/xpidl" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	    fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+
+	rm -rf sdk src tst* testcase additions vboxdrv.ko SUPInstall SUPUninstall
+
 	doins -r *
-	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl additions/vboxadd-timesync ; do
+	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; do
 		fperms 0755 /opt/VirtualBox/${each}
 	done
 	make_wrapper vboxsvc "./VBoxSVC" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 	make_wrapper virtualbox "./VirtualBox" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxmanage "./VBoxManage" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsdl "./VBoxSDL" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxvrdp "./VBoxVRDP" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_preinst() {
+	enewgroup vboxusers
+}
+
+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 ""
+	elog "In order to launch VirtualBox you need to start VBoxSVC first,"
+	elog "this can be done with:"
+	elog "vboxsvc --daemonize && virtualbox"
+	elog ""
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The last user manual is available for download at:"
+	elog "http://www.virtualbox.org/download/UserManual.pdf"
+	elog ""
 }