From c01e5f3e6236c79a6d6bf19363afb7ea7b795dc0 Mon Sep 17 00:00:00 2001
From: x-drum <x-drum@localhost>
Date: Mon, 30 Nov 2009 23:10:54 +0000
Subject: Version bump

svn path=/trunk/; revision=756
---
 app-emulation/virtualbox-ose/ChangeLog             |  31 ++-
 app-emulation/virtualbox-ose/Manifest              |   6 +-
 .../virtualbox-ose/virtualbox-ose-3.0.12.ebuild    | 260 --------------------
 .../virtualbox-ose/virtualbox-ose-3.1.0.ebuild     | 261 +++++++++++++++++++++
 4 files changed, 285 insertions(+), 273 deletions(-)
 delete mode 100644 app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild
 create mode 100644 app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 0db438a..56013e9 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,18 +1,29 @@
 # 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.38 2009/11/10 01:48:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.42 2009/11/30 11:19:21 maekke Exp $
 
-  18 Nov 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -files/virtualbox-ose-1.6.6-remove-unused.patch,
-  -files/virtualbox-ose-1-config, -files/virtualbox-ose-1-wrapper,
-  -files/virtualbox-ose-2-config, -files/virtualbox-ose-2-localconfig,
-  -files/virtualbox-ose-2-wrapper, -virtualbox-ose-3.0.10.ebuild,
+  30 Nov 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-ose-3.0.12.ebuild, +virtualbox-ose-3.1.0.ebuild:
+  Version bump
+
+  30 Nov 2009; Markus Meier <maekke@gentoo.org>
+  virtualbox-ose-3.0.12.ebuild:
+  amd64 stable, bug #294678
+
+  27 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  virtualbox-ose-3.0.12.ebuild:
+  stable x86, security bug 294678
+
+  21 Nov 2009; Patrick Lauer <patrick@gentoo.org> files/vboxwebsrv-initd:
+  Fixing vboxwebsrv path for #293791
+
+*virtualbox-ose-3.0.12 (19 Nov 2009)
+
+  19 Nov 2009; Patrick Lauer <patrick@gentoo.org>
   +virtualbox-ose-3.0.12.ebuild, +files/virtualbox-ose-3-config,
   +files/virtualbox-ose-3-localconfig, files/virtualbox-ose-3-wrapper,
-  -files/virtualbox-ose-fix-insecure-lockfiles.patch,
-  -files/virtualbox-ose-fix-nodbus-build.patch,
-  -files/virtualbox-ose-interfaces:
-  Version bump
+  files/vboxwebsrv-confd, files/vboxwebsrv-initd:
+  Bump, closes #293556
 
   10 Nov 2009; Patrick Lauer <patrick@gentoo.org>
   -virtualbox-ose-1.6.6.ebuild, -virtualbox-ose-1.6.6-r1.ebuild,
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 4676a84..ac52e96 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -6,7 +6,7 @@ AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022
 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
 AUX virtualbox-ose-3.0.8-without-hal-fix.patch 1318 RMD160 9fbefc7f4a783dc2f2c84773cf52b30b9e16777c SHA1 0e2e06c38de7023920cbd819be24e1dbc9ff8408 SHA256 125bbf9f926ad19a5dac6a0c68cc7b2abbd2c246c071917b1f9b447b38addbe5
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
-DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
-EBUILD virtualbox-ose-3.0.12.ebuild 8240 RMD160 64b57abab536393d6c018394d84b9c0740096fcb SHA1 14515d6e265bb99e568f7dc1962e3e4e67273ceb SHA256 5eb6435b93050396839760f293f76780c753cff8b536e7f4e00b21e3070861ec
-MISC ChangeLog 21573 RMD160 6134c6f67cd4911a4ff4694769aef582b230dee3 SHA1 0afd7ecce127603a0afa46b8cd693085bd54062e SHA256 37c47d108a58ee9f4ce8fbbe679286c3814f24ab93aeed0ae87d7aac634df8af
+DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
+EBUILD virtualbox-ose-3.1.0.ebuild 8281 RMD160 3897ac9e8b76b5d6347f72e98ec9e4c446d139fe SHA1 8f79b28f3dde1080c5e1aa614f73c99730f0b4b4 SHA256 6399c442081de7ba7f8eb43ffe758e9b4246ee8b3c959ae395355e1d847eebb2
+MISC ChangeLog 21747 RMD160 7900adaafcbb9e4e95a1a675bb1d2fcf83b3a06f SHA1 d1ae92986f88c7a9cc44b787dfd7242081711a8c SHA256 9614fecec1f69347a20f92ef35ed6ad754551eb1665a0c8242dac54aab216c00
 MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild
deleted file mode 100644
index 47968f4..0000000
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild
+++ /dev/null
@@ -1,260 +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-3.0.6.ebuild,v 1.3 2009/09/30 17:09:49 ayoy 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}.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 +opengl python +qt4 sdk vboxwebsrv"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	!headless? (
-		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-		opengl? ( virtual/opengl virtual/glut )
-		x11-libs/libXcursor
-		media-libs/libsdl[X,video]
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.5-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	sys-libs/libcap
-	dev-util/pkgconfig
-	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.13 )"
-RDEPEND="${RDEPEND}
-	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox-ose/VBoxSDL.so
-	usr/lib/virtualbox-ose/VBoxPython2_4.so
-	usr/lib/virtualbox-ose/VBoxSharedFolders.so
-	usr/lib/virtualbox-ose/VBoxDD2.so
-	usr/lib/virtualbox-ose/VBoxOGLrenderspu.so
-	usr/lib/virtualbox-ose/VBoxPython.so
-	usr/lib/virtualbox-ose/VBoxDD.so
-	usr/lib/virtualbox-ose/VBoxDDU.so
-	usr/lib/virtualbox-ose/VBoxREM64.so
-	usr/lib/virtualbox-ose/VBoxSharedClipboard.so
-	usr/lib/virtualbox-ose/VBoxHeadless.so
-	usr/lib/virtualbox-ose/VBoxRT.so
-	usr/lib/virtualbox-ose/VBoxREM.so
-	usr/lib/virtualbox-ose/VBoxSettings.so
-	usr/lib/virtualbox-ose/VBoxKeyboard.so
-	usr/lib/virtualbox-ose/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox-ose/VBoxVMM.so
-	usr/lib/virtualbox-ose/VirtualBox.so
-	usr/lib/virtualbox-ose/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox-ose/components/VBoxC.so
-	usr/lib/virtualbox-ose/components/VBoxSVCM.so
-	usr/lib/virtualbox-ose/components/VBoxDDU.so
-	usr/lib/virtualbox-ose/components/VBoxRT.so
-	usr/lib/virtualbox-ose/components/VBoxREM.so
-	usr/lib/virtualbox-ose/components/VBoxVMM.so
-	usr/lib/virtualbox-ose/VBoxREM32.so
-	usr/lib/virtualbox-ose/VBoxPython2_5.so
-	usr/lib/virtualbox-ose/VBoxXPCOMC.so
-	usr/lib/virtualbox-ose/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox-ose/VBoxNetDHCP.so"
-
-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
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	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}-3-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic mesa checks in configure
-	epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
-
-	# stupid hal being stupid code
-	use hal || epatch "${FILESDIR}/${PN}-3.0.8-without-hal-fix.patch"
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf="${myconf} --disable-alsa"
-	use opengl     || myconf="${myconf} --disable-opengl"
-	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 --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		${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}-3-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}-3-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,NetAdpCtl,NetDHCP} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl binary needs to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-
-	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
-
-		if use opengl ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		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}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild
new file mode 100644
index 0000000..92b9fe1
--- /dev/null
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild
@@ -0,0 +1,261 @@
+# 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-3.0.6.ebuild,v 1.3 2009/09/30 17:09:49 ayoy 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}.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 +opengl python +qt4 sdk vboxwebsrv"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	!headless? (
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
+		opengl? ( virtual/opengl virtual/glut )
+		x11-libs/libXcursor
+		media-libs/libsdl[X,video]
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.5-r1
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	media-libs/libpng
+	sys-libs/libcap
+	dev-util/pkgconfig
+	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.13 )"
+RDEPEND="${RDEPEND}
+	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox-ose/VBoxSDL.so
+	usr/lib/virtualbox-ose/VBoxSharedFolders.so
+	usr/lib/virtualbox-ose/VBoxDD2.so
+	usr/lib/virtualbox-ose/VBoxOGLrenderspu.so
+	usr/lib/virtualbox-ose/VBoxPython.so
+	usr/lib/virtualbox-ose/VBoxDD.so
+	usr/lib/virtualbox-ose/VBoxDDU.so
+	usr/lib/virtualbox-ose/VBoxREM64.so
+	usr/lib/virtualbox-ose/VBoxSharedClipboard.so
+	usr/lib/virtualbox-ose/VBoxHeadless.so
+	usr/lib/virtualbox-ose/VBoxRT.so
+	usr/lib/virtualbox-ose/VBoxREM.so
+	usr/lib/virtualbox-ose/VBoxSettings.so
+	usr/lib/virtualbox-ose/VBoxKeyboard.so
+	usr/lib/virtualbox-ose/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox-ose/VBoxVMM.so
+	usr/lib/virtualbox-ose/VirtualBox.so
+	usr/lib/virtualbox-ose/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox-ose/components/VBoxC.so
+	usr/lib/virtualbox-ose/components/VBoxSVCM.so
+	usr/lib/virtualbox-ose/components/VBoxDDU.so
+	usr/lib/virtualbox-ose/components/VBoxRT.so
+	usr/lib/virtualbox-ose/components/VBoxREM.so
+	usr/lib/virtualbox-ose/components/VBoxVMM.so
+	usr/lib/virtualbox-ose/VBoxREM32.so
+	usr/lib/virtualbox-ose/VBoxPython2_4.so
+	usr/lib/virtualbox-ose/VBoxPython2_5.so
+	usr/lib/virtualbox-ose/VBoxPython2_6.so
+	usr/lib/virtualbox-ose/VBoxXPCOMC.so
+	usr/lib/virtualbox-ose/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox-ose/VBoxNetDHCP.so"
+
+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
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	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}-3-localconfig > LocalConfig.kmk || die
+
+	# unset useless/problematic mesa checks in configure
+	epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
+
+	# stupid hal being stupid code
+	use hal || epatch "${FILESDIR}/${PN}-3.0.8-without-hal-fix.patch"
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf="${myconf} --disable-alsa"
+	use opengl     || myconf="${myconf} --disable-opengl"
+	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 --disable-opengl"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		${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}-3-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}-3-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,NetAdpCtl,NetDHCP} *so *r0 *gc ; do
+		doins $each || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+	# VBoxNetAdpCtl binary needs to be suid root in any case..
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
+
+	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
+
+		if use opengl ; then
+			doins VBoxTestOGL || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		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}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
-- 
cgit v1.2.3-65-gdbad