--- /usr/portage/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild	2015-07-14 07:33:13.000000000 -0700
+++ virtualbox-guest-additions-5.0.0-r1.ebuild	2015-07-29 22:07:43.684314411 -0700
@@ -80,7 +80,7 @@
 	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 
 	# stupid new header references...
-	for vboxheader in {product,revision}-generated.h ; do
+	for vboxheader in {version,product,revision}-generated.h ; do
 		for mdir in vbox{guest,sf} ; do
 			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
 				"${WORKDIR}/${mdir}/${vboxheader}"
@@ -110,20 +110,10 @@
 }
 
 src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/sharedfolders ; do
-			cd "${S}"${each} || die
-			MAKE="kmk" \
-			emake TOOL_YASM_AS=yasm \
-			KBUILD_VERBOSE=2
-	done
-
-	if use X; then
-		cd "${S}"/src/VBox/Additions/x11/VBoxClient || die
-		MAKE="kmk" \
-		emake TOOL_YASM_AS=yasm \
-		KBUILD_PATH="${S}/kBuild"
-	fi
+	cd "${S}" || die
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	KBUILD_VERBOSE=2
 
 	# Now creating the kernel modules. We must do this _after_
 	# we compiled the user-space tools as we need two of the
--- /usr/portage/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5-localconfig	2015-07-14 07:33:13.000000000 -0700
+++ files/virtualbox-guest-additions-5-localconfig	2015-07-29 21:36:58.822365101 -0700
@@ -28,3 +28,5 @@
 
 ## don't build with -Werror
 VBOX_WITH_WARNINGS_AS_ERRORS :=
+
+VBOX_WITH_X11_ADDITIONS :=