Update to the latest 2.1.4 src tarball #260331 and cleanup the ebuild in general.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 229 insertions, 239 deletions

diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 85de2293cf05..6efa5f53f918 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -14,13 +14,13 @@ DIST VirtualBox-2.1.4-43001-Linux_amd64.run 38900311 RMD160 c0422ab86a7489d17637
 DIST VirtualBox-2.1.4-43001-Linux_x86.run 38951506 RMD160 63cbaa4d0cf05ac114c004fa20333db52d9d6a26 SHA1 5c9cf8ee45f8f7cd0eb503666c0294c4ffdfd46a SHA256 a241515a7f0252701eb700c7b9168aa4b5148c55a79475e0dd8edecc8531e753
 DIST VirtualBoxSDK-2.1.4-42893.zip 7027346 RMD160 fb04aa01fb8f0bdc291bd3495c7e37c9e23a67b5 SHA1 63c7290e4efe1e5310f73f5b6872f10bdcb288a3 SHA256 10c7dd59b5e86e09b2b56d0872514fbe601d1d82e7e1fa847b8aa95657a1c64a
 EBUILD virtualbox-bin-1.6.6.ebuild 5049 RMD160 76f02cf431c0cdc0cda526970bb15c3c44215e49 SHA1 dd83a9499ce96a6b51ec6c0b9890309913707221 SHA256 4bdf3df0d327cca71e531399642b63ba754dbda6d2638937f2e83fc4cd4dbad7
-EBUILD virtualbox-bin-2.1.4.ebuild 4887 RMD160 0643e8db73527d3d21d8e8b420f1086a4327aaf7 SHA1 522b3d7f950c81948130299215ccc9ad2c0da3de SHA256 a707ea8fa4db036af9d5176a3a40aee455fd2995b371a1da78c57ad69dd1fe4a
-MISC ChangeLog 10424 RMD160 512dddea5ce8af571906e344f8c7d957c6fde43f SHA1 9789f222d2c033861076f71dc21dd3c942ee2ac6 SHA256 714fb8700468e2e3cd9ee867290f9d102eb10cda8b23bc79e0fb8b1a0fa1d45e
+EBUILD virtualbox-bin-2.1.4.ebuild 4903 RMD160 97bfaef9a3e23db9c1616c8d19d1f3d5d07afa8a SHA1 e8d7046efc4db60217b8e23a706d79d513002dae SHA256 c2d7be1f558d35e5902ae81accea78e8f4031a68e045e8bcd1dfadc5392e2057
+MISC ChangeLog 10554 RMD160 98d382fce43837e589ac7336b4d1b3d5829127f1 SHA1 840dad986a8fd34a0dbc132b31ac3182b04a62ae SHA256 6d52bb5411f5eb5c61b10d540d0780108918e694d0769f2760169ea2aaaaf3a1
 MISC metadata.xml 692 RMD160 bd100896b73d952e89bdeda736d25b152c3a73f3 SHA1 f4fb4965fed9ff2468a27a56fe73f0ec23b6a9a0 SHA256 ba708f6a2506cb9762fbabb0f4096bb41fe330e85e219949fe6fa84488a2090b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmvfdUACgkQn/5bYzqsSmFpCQCePOuYe+RyxL691kwjR0LBx+rT
-1wQAoJ0afHn46ohjCsoyeI1ArICmrmUy
-=OSdc
+iEYEARECAAYFAkmvjqsACgkQn/5bYzqsSmE85QCeJgJZKhCDOdO0+ZvSiBf+mow+
+POYAn1YMo7feoxz5h/STxzCIzk6KtJJ6
+=pgb5
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 005113634767..540a3f4cb9f1 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.10 2009/03/03 07:11:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.11 2009/03/05 08:31:21 vapier Exp $
+
+*virtualbox-ose-2.1.4-r1 (05 Mar 2009)
+
+  05 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  -virtualbox-ose-2.1.4.ebuild, +virtualbox-ose-2.1.4-r1.ebuild:
+  Update to the latest 2.1.4 src tarball #260331 and cleanup the ebuild in
+  general.
 
 *virtualbox-ose-2.1.4 (03 Mar 2009)
 
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index f1c1ecaa5340..b6f973692614 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX virtualbox-ose-1-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f
 AUX virtualbox-ose-1-wrapper 4054 RMD160 7e8509dc313cfac5d1e63efe05e98e351c22050b SHA1 35ffda3b1663953ce3b1d89b0fe104cb43c5e949 SHA256 d03f50600234b6c9507a564c953320b41be8bbc14dc6b957e75578d052ac8697
 AUX virtualbox-ose-1.6.6-remove-unused.patch 3379 RMD160 d0a346f5ce9d236a5de2b05fc34b2fb02be4727d SHA1 bb59f6b6c615834977841efefd1e9570e6407614 SHA256 139aa3353fd323d88fa759819dc78f3dacba902a669b63bd4cf4581ea09bfabb
@@ -11,14 +14,21 @@ DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d19059
 DIST VirtualBox-2.0.2-OSE.tar.bz2 37548591 RMD160 4156f2efe5245236f9890abcd0adb5ad5291f86f SHA1 cdc51cc4e5ff189cf9eff832179494009df1334a SHA256 0318c69eace3db0979f0aefd27aeb6c54d7c1aafcc6a156b076bc116a1d8805b
 DIST VirtualBox-2.0.4-OSE.tar.bz2 37841781 RMD160 390a2b4d97a3ed6fdc885b89354884a07b3fc464 SHA1 f8e7c109546c033927bd41e78f259adb81cb1504 SHA256 5618fb09efafac3fc9c183a44aa3c1d8c44d1d7fa58bfb5a73c221f1dd8740fd
 DIST VirtualBox-2.0.6-OSE.tar.bz2 37834467 RMD160 d75b9fbfe1311a5d83388d470d665ba8da0ab73b SHA1 e0f43d59b3309b37fe1703fb19b234f590598733 SHA256 75aea6e429beb953c8d0427cc38e4d25ccd849505ed57fdee0be22cada5497c5
-DIST VirtualBox-2.1.4-OSE.tar.bz2 47896348 RMD160 57b77785b2cb36c0790998b80082db4ab5f01265 SHA1 7d29e5b454f3b33c32097aec0bd70bf8953f7e4b SHA256 f3007fa07831cd9bcb2d358ab32c609171c31c46410cca5a0cdeeb1af9c036e9
+DIST VirtualBox-2.1.4-3-OSE.tar.bz2 47896952 RMD160 b1dcb6fad2d6fb392a1cbb38475f719e64228c5c SHA1 50e5f273d6407c404a8b04d17cad2c2a020eda2c SHA256 c3b4a38c5b18c833cd51ff27cd4e146aa686813cbef910d4dd584569c9e40b22
 EBUILD virtualbox-ose-1.6.6-r1.ebuild 5980 RMD160 c9519cae1e6bc46b2aa1996fc4f0f56e23c6f720 SHA1 46fba0a8ba3a53c947b556f4f55f473679a0b74e SHA256 39b12e4f940702bc5b58ac809eba6e37bececc2ce4bc64c61fd5545363034765
 EBUILD virtualbox-ose-1.6.6.ebuild 5864 RMD160 054f462186c4601179544ea3222ce2fd88d25985 SHA1 bcd6591ed387035c8e6026a912762888201b77d2 SHA256 9530de02954d12a923daa768a7ca09bc8d74169e84b0eb41b0b07b508e107a37
 EBUILD virtualbox-ose-2.0.2.ebuild 6860 RMD160 16974d8a97146a32d085a8ec6f3763b24e340cdf SHA1 120a76d693c1ff3861b6154bd827e5e51594599e SHA256 49bc446773926df6832077153e151274da71940b4175f886061695c0c2665d99
 EBUILD virtualbox-ose-2.0.4-r1.ebuild 6978 RMD160 fdf029f32e09071b934e89826a01d5dfeb313140 SHA1 5187f7f326c0621876bb9537185f871135b02c97 SHA256 3ecf6f47bab09413c6bd6c033a90073aa6cfb296dfc7c09478ffc33079bc0e82
 EBUILD virtualbox-ose-2.0.4.ebuild 6860 RMD160 41830bdb8e52060fcab3226c1cee322a295e4ffc SHA1 dd78a4bf1b64b101a05d7c23ed3675e6def34dfb SHA256 24467161314a40ebc313b8e5f0ac348ae83e9083dbd11b7c6291dcdd663dee6c
 EBUILD virtualbox-ose-2.0.6.ebuild 6868 RMD160 248fcb1464cba9c3328ed09fd4e83a3fe7b99141 SHA1 3b752beb4b8e6d7ea5f3ec3a3a973f365b9ae40d SHA256 87b1008512208f30f430e1a27367d3ca2fd19a1a88f7a791e78bf3402f8d8277
-EBUILD virtualbox-ose-2.1.4.ebuild 6417 RMD160 135cf36947fe53b4eba45cd08a897921dadd2027 SHA1 47a5798bf4b9391590e95aacdcd5112d1fa5f6cf SHA256 273bc805b8fe06f775941f5dde3d2925557906ac7a57ed06329c19a3f7cf0ae5
+EBUILD virtualbox-ose-2.1.4-r1.ebuild 6095 RMD160 cc0b7f76161e12cc3670bcb969cd53226e8ac208 SHA1 d5695f254a948af01214a7e0fab2807414e88f40 SHA256 8fc75435d3e05bd3b56e0c9b30a8441d5b75cd32f6d35796d1d86429f45d0906
 EBUILD virtualbox-ose-9999.ebuild 5717 RMD160 a720d64a0f941083f300263eb6277651babf1e7a SHA1 25e58d977b78a1ce8370dafb5fcd012bdf41f279 SHA256 892b91d5027b8a8cf8b6d91a6645ae92059e5b1784c9e83c566ef85294ac25bf
-MISC ChangeLog 16131 RMD160 c1034b226cc7ea4cc96c5a18d713b5114a985473 SHA1 e42e6a7aedeaafcf3d650f2f3d9ea8ac55817311 SHA256 de270807ad5cbdfe06541396479747f824a045a36e46017d8b86b6ae89ff40b4
+MISC ChangeLog 16372 RMD160 2626c918cd148b4e360f6fd74bcc96b2ee223d18 SHA1 fc9035fe05f6dbb974ab13b6d8b5f0c5fb6599eb SHA256 f922b2f12f1b89b556793793aed98707043d049fad0402642217caf6575ba418
 MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmvjeAACgkQn/5bYzqsSmGDVwCgn0VOfhSKxXwM6Fwu41qZI/7y
+bU8An082vaP2N6YmliPvcaTW+riAjB+j
+=Rdcr
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4-r1.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..aed35e286c87
--- /dev/null
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4-r1.ebuild,v 1.1 2009/03/05 08:31:21 vapier Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	# XXX: should finish merging the -9999 ebuild into this one ...
+	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
+	inherit linux-mod subversion
+else
+	MY_P=VirtualBox-${PV}-OSE
+	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P/-O/-3-O}.tar.bz2"
+	S=${WORKDIR}/${MY_P/-OSE/_OSE}
+fi
+
+DESCRIPTION="Software family of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa +hal headless pulseaudio python +qt4 sdk vboxwebsrv"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	!headless? (
+		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.5
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	media-libs/libpng
+	sys-libs/libcap
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	hal? ( sys-apps/hal )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( >=dev-lang/python-2.3 )
+	vboxwebsrv? ( <=net-libs/gsoap-2.7.9f )"
+RDEPEND="${RDEPEND}
+	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+		"${FILESDIR}"/${PN}-2-localconfig > LocalConfig.kmk || die
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf="${myconf} --disable-alsa"
+	use pulseaudio || myconf="${myconf} --disable-pulse"
+	use python     || myconf="${myconf} --disable-python"
+	use hal        || myconf="${myconf} --disable-dbus"
+	use vboxwebsrv && myconf="${myconf} --enable-webservice"
+	if ! use headless ; then
+		use qt4 || myconf="${myconf} --disable-qt4"
+	else
+		myconf="${myconf} --build-headless"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-qt3 \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	strip-flags
+
+	MAKE="kmk" emake \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.*/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-2-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s/MY_LIBDIR/$(get_libdir)/" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components || die
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
+		doins $each || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins $each || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+		done
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+		fi
+
+		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
+		domenu "${FILESDIR}"/${PN}.desktop
+	else
+		doins VBoxHeadless || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r nls
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The lastest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4.ebuild
deleted file mode 100644
index d0e03355de69..000000000000
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4.ebuild,v 1.1 2009/03/03 07:11:05 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4 toolchain-funcs
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio python +qt4 sdk vboxwebsrv"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	!headless? (
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXt )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.5
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	sys-libs/libcap
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	hal? ( sys-apps/hal )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-lang/python-2.3 )
-	vboxwebsrv? ( <=net-libs/gsoap-2.7.9f )"
-RDEPEND="${RDEPEND}
-	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-MY_LIBDIR="$(get_libdir)"
-
-pkg_setup() {
-	if ! use headless; then
-			if ! use qt4; then
-					einfo ""
-					einfo "No USE=\"qt4\" selected, this build will not include"
-					einfo "any Qt frontend."
-					einfo ""
-			fi
-	else
-			if use qt4; then
-					einfo ""
-					einfo "You selected USE=\"headless qt4\", defaulting to"
-					einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-					einfo ""
-			fi
-	fi
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
-
-	# Disable the VBoxNetFlt kernel driver
-	sed -i \
-			-e "s/MY_LIBDIR/${MY_LIBDIR}/" LocalConfig.kmk \
-			|| die "LocalConfig.kmk sed failed"
-
-	# Fix an upstream typo in Config.kmk
-	sed -i \
-			-e "2511d" Config.kmk || die "Config.kmk sed failed"
-}
-
-src_configure() {
-	local myconf
-	# Don't build vboxdrv kernel module, disable deprecated qt3 support
-	myconf="--disable-kmods --disable-qt3"
-
-	if ! use alsa; then
-			myconf="${myconf} --disable-alsa"
-	fi
-	if ! use pulseaudio; then
-			myconf="${myconf} --disable-pulse"
-	fi
-	if ! use python; then
-			myconf="${myconf} --disable-python"
-	fi
-	if ! use hal; then
-			myconf="${myconf} --disable-dbus"
-	fi
-	if ! use headless; then
-			if ! use qt4; then
-					myconf="${myconf} --disable-qt4"
-			fi
-	else
-			myconf="${myconf} --build-headless"
-	fi
-	if use vboxwebsrv; then
-			myconf="${myconf} --enable-webservice"
-	fi
-
-	./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \
-	${myconf} || die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	strip-flags
-
-	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-2-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-			-e "s/MY_LIBDIR/${MY_LIBDIR}/" \
-			"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/${MY_LIBDIR}/${PN}
-	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBox
-	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBox
-
-	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/${MY_LIBDIR}/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/${MY_LIBDIR}/${PN}
-	doins -r components
-
-	if use sdk; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/vboxwebsrv
-		fperms 0750 /usr/${MY_LIBDIR}/${PN}/vboxwebsrv
-		dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
-		doins $each
-		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
-		fperms 0750 /usr/${MY_LIBDIR}/${PN}/${each}
-	done
-
-	if use amd64; then
-		doins VBoxREM2.rel
-		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
-		fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
-	fi
-
-	if ! use headless; then
-			for each in VBox{SDL,Headless} ; do
-				doins $each
-				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
-				fperms 4750 /usr/${MY_LIBDIR}/${PN}/${each}
-				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/${each}
-			done
-
-			dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxSDL
-
-			if use qt4; then
-				doins VirtualBox
-				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VirtualBox
-				fperms 4750 /usr/${MY_LIBDIR}/${PN}/VirtualBox
-				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VirtualBox
-
-				dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VirtualBox
-			fi
-
-			newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-			domenu "${FILESDIR}"/${PN}.desktop
-	else
-			doins VBoxHeadless
-			fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
-			fperms 4750 /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
-			pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VBoxHeadless
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r nls
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	elog ""
-	if ! use headless; then
-			elog "To launch VirtualBox just type: \"VirtualBox\""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The last user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}