--- virtualbox-ose-3.2.12.ebuild	2010-12-24 10:36:24.639231002 +0100
+++ virtualbox-ose-4.0.0.ebuild	2010-12-24 10:39:06.389231001 +0100
@@ -11,9 +11,9 @@
 	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
 	inherit linux-mod subversion
 else
-	MY_P=VirtualBox-${PV}-OSE
+	MY_P=VirtualBox-${PV}
 	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P/-OSE/_OSE}
+	S=${WORKDIR}/${MY_P}_OSE
 fi
 
 DESCRIPTION="Software family of powerful x86 virtualization"
@@ -22,7 +22,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa headless pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
+IUSE="+additions alsa headless pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc doc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -44,9 +44,18 @@
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-devel/dev86
+	app-arch/makeself
 	sys-power/iasl
 	media-libs/libpng
 	sys-libs/libcap
+	doc? ( 
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
@@ -88,7 +97,9 @@
 	usr/lib/virtualbox-ose/VBoxPython2_7.so
 	usr/lib/virtualbox-ose/VBoxXPCOMC.so
 	usr/lib/virtualbox-ose/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox-ose/VBoxNetDHCP.so"
+	usr/lib/virtualbox-ose/VBoxNetDHCP.so
+	usr/lib64/virtualbox-ose/components/VBoxVMM.so
+	usr/lib64/virtualbox-ose/VBoxVMM.so"
 
 pkg_setup() {
 	if ! use headless && ! use qt4 ; then
@@ -117,10 +128,13 @@
 	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch"
 
 	# fix build with --as-needed (bug #249295)
-	epatch "${FILESDIR}/${PN}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 
 	# add the --enable-vnc option to configure script (bug #348204)
-	epatch "${FILESDIR}/${PN}-vnc.patch"
+	epatch "${FILESDIR}/${P}-vnc.patch"
+
+	# fix makeself
+	epatch "${FILESDIR}/${P}-fix-makeself.patch"
 }
 
 src_configure() {
@@ -130,6 +144,7 @@
 	use pulseaudio || myconf+=" --disable-pulse"
 	use python     || myconf+=" --disable-python"
 	use vboxwebsrv && myconf+=" --enable-webservice"
+	use doc        || myconf+=" --disable-docs"
 	use vnc        && myconf+=" --enable-vnc"
 	if ! use headless ; then
 		use qt4 || myconf+=" --disable-qt4"
@@ -202,7 +217,7 @@
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
 
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP} *so *r0 *gc ; do
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
 		doins $each || die
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
 		fperms 0750 /usr/$(get_libdir)/${PN}/${each}