Version bump (bug #540128). Removed old

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 37 insertions, 192 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 59fa3e8d4a0a..41ebb91d3dd0 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.145 2014/12/22 13:12:45 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.146 2015/03/04 07:11:16 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.3.24 (04 Mar 2015)
+
+  04 Mar 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.2.24.ebuild, -xf86-video-virtualbox-4.2.26.ebuild,
+  +xf86-video-virtualbox-4.3.24.ebuild:
+  Version bump (bug #540128). Removed old.
 
   22 Dec 2014; Lars Wendler <polynomial-c@gentoo.org>
   -xf86-video-virtualbox-4.3.16.ebuild, xf86-video-virtualbox-4.3.18.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 1a7bf06695f1..85b0c413bef4 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -10,30 +10,28 @@ AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 SHA256 0e72a5ef8d915c550fd92
 AUX xf86-video-virtualbox-4.3.6-link-lazy.patch 1168 SHA256 3877a6b2c326051cb6ee3e44cae2e4dbb6e5718674413d18351c1e7db8a7743d SHA512 de0999c51759d4e62d2c5959ab7708d31e58e22a8648008c7acfccdbd70c5f7634fa965da8e9cf90fb30b4daa9405f27cbf45e7b2fb4081dafc720dd0bc1c933 WHIRLPOOL 72a631d93946db1533b296ae5487f0f6d7c3384d5d7acc3bd7afd596df1d56df846646eaecdf44cc3cffc44402cab4404d2d513e9f7e5d034d7cca9045af931b
 AUX xf86-video-virtualbox-4.3.8-vboxvideo_compilefixes.patch 897 SHA256 f00cf61787ddcfb450552262745e8fced7032eca1fdc4301ef457f51ba45e84e SHA512 c6cb7e263a942bcaa3ebd70da88b22e809935ebc2da2a1a67d68195f3ebde7cb1d0631dfc4f73b2b2349597eba277795072e340cf808a6f09e9cca1f3b1f6a15 WHIRLPOOL 169a0c7c10c56789a24be0cc63f6b7313affa1b191bdc56c46ab484a17a671b64d0f2bd7caed23031ec8bfa016d03e25dc57875bc35eaabff9b19719f0cc0f39
 AUX xf86-video-virtualbox-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b SHA512 f7c1b13a12d91884f0faabc23af345cde06315b23900d12ba0fead64c7818c1aa721cd6710c905c2758bcb5cbec9f7ea3a8b515fcab14ef4965d4e1c27fbab94 WHIRLPOOL a3e3cc997172557086741ee3d689411b4f1964a480b800d315fbd3a43c2d507448840a4812d8e735428a543b9a0c1838736aad692dc6460f29489bdb4c2010ab
-DIST VirtualBox-4.2.24.tar.bz2 77067941 SHA256 6ae695a84f722e1a9fbf1fa5e89d2c05239f058a6a20f04a708d47d7f2081b9d SHA512 df75324e43c6781af41caccad7718ce71cae293f3deec907785678bf7769810df70a57f61a83f593c1766bcedde1209f8e1698bb5aaf0681fc3f51a2e80037c4 WHIRLPOOL 5f546b35a5bb0431ff3c3d585ab46f59630dce6e08a31a69663700ba05692ff89f7b6d019aff416fae4f4a546c3fb5b1ed29db7af4918afe48981c45c82be4de
-DIST VirtualBox-4.2.26.tar.bz2 77724304 SHA256 7fa840edd5c0e691936c14fcf49d50f4654fd63e2b71510232c226dda863b270 SHA512 c2a0c201e677a23702865256b80af2118b067356313939b1d3af3bf8f42746c2eaf04ab3d7ece8a3d98b2be67c1d3d2b2b34d4debbe2fc667e375391f2510b51 WHIRLPOOL 495cd625e1641e630ef826ca6d287d462af681b699205af7095b04bc96e381af728beb0c265fac609830955208c1c17265469c3450e495e077146a0545c20694
 DIST VirtualBox-4.3.18.tar.bz2 98022191 SHA256 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb SHA512 d19933f9869b2fe6ed121896b49da0f82451954ff9ee3b53d6d3374a1bd178049d1528df78100187e2fc1d36518c924f19cf12bd3d1718c98a5771e2112ee5d3 WHIRLPOOL eeaf2f8d72e2d02792f5b58fa21297c80d58f5fd66801c04721bf24780600e5643b2446d6a6115625e8922565c8197b8b67e7384a2138509dddd7b2fa32a95be
 DIST VirtualBox-4.3.20.tar.bz2 100184338 SHA256 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965 SHA512 5398bcd03eb8987978682dfe84512bfa2935e7d50164e22abf3f8f424fc24a29d4aea486399da01d9895eca4ad07a1f15ca6f5880aff3a255700519fe0f19dc5 WHIRLPOOL 9e7419d4958bb307ca7232c7e8d3935ed43687bec1e1b881a22fe44987cd0bc66e927922a0e8ac78457567b22300ecc76ca0f40e71bcbcf0b75b07c1e86c0cfd
-EBUILD xf86-video-virtualbox-4.2.24.ebuild 4368 SHA256 b4fdc913760aa334576626cee256ea54258f075876cc2318fd08f1bd39a9a898 SHA512 d2eaed5ef360f36a2da57731a330ad73ad9381642fc8c02a145c8c11247ca3e98fb78e015959f1084850814a3df04ef2f68eac69ead89ab58708eb0bfaf32e81 WHIRLPOOL 665008d3638d599a8bbbc2b8dd5430a862acdde5cabd37504b6b9c28209124530c3f96aa31d607c9ee2b60b8f6d97cb0e9da472b42b3abbb7f41ab9e6b579158
-EBUILD xf86-video-virtualbox-4.2.26.ebuild 4379 SHA256 8ae72cbe42c2778aab00ef0f38e010faa131c1327be417fe6767e1d0f0e9349e SHA512 dc1f6da399492e10adbb9cc8a5aa0419e60a3da829da19a60b127b6e6cad0f46ad4d95adb0739096f559f335e4adb5f013397b2fa515889dafa92c581814ec80 WHIRLPOOL 4e20a996298023b6056a7f39130fe15602b54ac70b6c563f184558c9f29806b998ed07397567f78e650a060811f884818899e02b1e8d8f9e62e6ce88a8ae3b34
+DIST VirtualBox-4.3.24.tar.bz2 102647661 SHA256 e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc SHA512 e9a5be9f95c83b832bdecf0f56c01e4e16574455b8583d20d2ce26bf771747d5139fec4117706316b89862771fbe3d21a3c124fcd7cc2d04338de1b08b2c34f0 WHIRLPOOL c7ca87f3b2dd0d44beb154ce9753620cc60ea5a10f9b2afa1dbc50cefa223f239d116977f08520e53d57a51e7e5d72de2db6589bd7548ad74b32bf8ba6b71e84
 EBUILD xf86-video-virtualbox-4.3.18.ebuild 4411 SHA256 ae4072a519a4ffbd7e12840a12e61815ca70e1abd36924c337c0f79b1f58becd SHA512 b2fce881a86c1b6627b5ef3ec6bf6b39bc9c2cf034448282f814cd868e8445e656dc610c49c61268b0590b36cbb7f0b8de02f5d2f5b73dea0698827ca4ec07cf WHIRLPOOL 29ff10564c0b4693649559f3817a5c67968d54b2bb4453baad11cd6fabd984747f2be0f620382c6aee63a753325c4b145ddf80b19c9d1265f78364037ca9bdb3
 EBUILD xf86-video-virtualbox-4.3.20.ebuild 4413 SHA256 05347d6d8415a6fe6907f5e8f66a462bb82c17b33168221e97bcf07430ba90d3 SHA512 aeeb94cd4ca98e337410214a92e75cb3757d61ea1e3faffcadb515ee6863a6daea84a518bd16e7e2e20e77f0272254bba92998bdc2a16698e1ec05bb54741837 WHIRLPOOL 280edbf45ade0f28ba2a3713a7b6f72e05eb201f1a1eee81c9f11580a11efd6dc31f04f3559c1f4714d34080c95497490df585d8ad383258b8ebebc744e78d5f
-MISC ChangeLog 30807 SHA256 54b8914f09ae46e67a8f8244ba5902471f53065ee2e0cfb7641c1ca4868fb8e5 SHA512 c54a8577ec3dffc6ab411d3f244201054dcc4e4c7715e1620a3701f710a48a6ab6478c7d14e691c523ac86acad6a8ff05742a414e3fe35719a540e551569f1fb WHIRLPOOL 5fa9516e7f428dbdf1962ec4a7cafd29c85e832aacb3ce329cd7a81c195f22f448f529c6f6508192e46f9e671638fd73593eefa4540160c396c4f63d5e411fd6
+EBUILD xf86-video-virtualbox-4.3.24.ebuild 4413 SHA256 bc817f3a9b3b9d7d1a707d6acff69b9edaf12bf71a7c14ab0a3a733f0660f75f SHA512 2c4d48c7ef0feeaeb37661c81357fc9dfda4e6efc65283d1c304c00185a9149e7422f16c74159b26a2c637f24c03bb24e5ec2dbdb4104a7b124fd0bd50cfb649 WHIRLPOOL 1926df9c0d10f8ac84c3abd35ee7d5abe6e8bcb3f4d74fae0904cc335e98c9d30a1208841cc671acf16b7957746b1d66247f2ceb5d15634c4d51381dd03cf8ba
+MISC ChangeLog 31068 SHA256 792a9aee8125b22e43e219394fbb2bb882ec476acd58f461835978206e6144bf SHA512 9e47499540945523e777ba72982f2568cfac864884eebf282081239b34c883e53183aae44849b7b9f0ed4f1161eb7389cca7d762800605dba0444b7e8bf871e3 WHIRLPOOL 14afcbc22a577df5c15ce359faaa698a787e508b02cd074b2d16a706b44d0aff0b4fef104191567c46fa44b4c3788014e1c2b7fac4730da393db55410407fe88
 MISC metadata.xml 235 SHA256 7ab38883293d8e5e781c6b4b53e4f485f3972c9a90a1a6603b18d31162465ddc SHA512 8ff1545754985c71d64d30d69f9debbe4c5e3adada494c3b6f275fecbbbf4c96510d88bd549ac9774540d7c3c69201b62fb43883685cc6554cf549c4459e5854 WHIRLPOOL f784321704be4979fcf6432ce1c82a858051cf8135dcc488fa089ed2dabb4637a343b903fd62bf2a3fbb9c7b9795e95de83a01f95bfc470dc20fd84cc586ef88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUmBjOAAoJEPiazRVxLXTFGqcQAI9CsUxiCGWZo9inEZZKASOS
-0mf6F9paSffe0K+5T2rrAD+Hc5r37w1rl69MvB5usGJHpYy2mSVj52uQhl1nfb9P
-FT5mG1kU9/1C+rVTO3NYGkCFYiHfIBMtvBl/VRkhJijyYYu9X3A6OrwGxXWkZers
-/eToScDJsr5YWJnIE3RY4kRUt6KG9JZ14ogRGyufebjUrZEPqgeuj8GGetYplZOY
-lBtqQnT9riuAxARy+Mjf/7JynzB0ix8Bk/49B0L1BkxRW4rtVZeNjbsJVEcrsvSM
-BF7Te41aGF/eE0OVm6NtfjR+Dx5TyzzLN9na4Lz0FIUsPf57kBnCWxJtl49mTJJd
-Ni/BbYHlY1hRBNJdmV9gOaA54yN/R1reo2tceLykquBZfxyCczvX11APliToYHvV
-5pDmovl132uU/kwmiVyonw+izUjaExhFVRMmGG/YDhTEpqSOg73qDlzVzQiPBdgS
-VqreKI22gDBiUbgqCfHKE0W2gUPFwwaSBKpkd+NzHovKtrYPQQB2eATLQypA+hLd
-LpyjYhn9GwJxUOGCBpJQVJo48WTf+vUfHFNkMoYkd/rnlGS5wqda0wQTYVEBwa1I
-e++3JqagiNNgKUY5Vku16ljL7+U71RZ5K+0/IG7dlIvnf9z2rwNfbt+bakN0LNW1
-rifM9g364G0xRJ3Wrofc
-=fgDW
+iQIcBAEBCAAGBQJU9rAVAAoJEPiazRVxLXTFBzoP/AhRqv1x2kjrGAWpUe/Fu6I2
+hX9UNQWajGwv2UR5uYFB8X3aY1jiRUrrixyaX+ajv/FZ8P1x2Wwkuowx//btlOlV
+PWOYs9AenK9B8anf+ofYXU7B53BQuIGJmEWEDsgxlJJP+1Io1sbkpzUf6tuw3A+P
+CL3yWrzWmj/Vd8yQReHLm03aWezFlqTemSO6KsR+J7zr/av0MF3Bo9DfRSau9lRO
+lMU5NrwgiRgaVAWaF6L0jkZkk/3NapOKRsLMj+Sf3h3AnVOcgDGcZFKrPBL+8ZcA
+1IVi317rAB7S002nDOomBR2gnam2w263mNM/wdIMngi/tfVUx6HM1A1tCl4iuQPk
+U150cD4MXTB/ZhcYnDM6wm4QD9pN2ljLf8ZqN0QQo83S0gfKEda7oJftPOShpQ7A
+xE1ZyHoc3NnyrYpWyoOfPDfBhsiN1bANuzJ+tc4nk8N+DmXBGeRBKUj11xac4jc5
+NClbynOs45yweyMWkYoUUiqmGYpAhroYsBr2NezuEV+APZeSNaNeItDXYt0LIv4a
+oFQ1WaQ9o+wSq1P93x4BG8gGj36tJzBKp9/BjB0U1coUyXO5RXPIXu1HAmVXbpE7
+aO3t+nwkFxxdZiVq80FaMpoDrcFb6psY11x73tZZMq51V4N68mMgK0w8+R65Mb5f
+V6BKECJUfgc+tysQoHaT
+=LYte
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild
deleted file mode 100644
index e6133ec6086f..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild,v 1.3 2014/06/08 09:44:31 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20120806
-	${PYTHON_DEPS}
-	>=dev-lang/yasm-0.6.2
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
-		|| die "cannot copy vboxvideo_drm directory"
-	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" \
-			|| die "cannot copy vboxvideo_drm Makefile"
-
-	# stupid new header references...
-	for vboxheader in {product,version}-generated.h ; do
-		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-	done
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-	# Ugly hack to build the opengl part of the video driver
-	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# Patch to link with lazy on hardened #394757
-	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-link-lazy.patch"
-	fi
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	./configure \
-		--nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-	source ./env.sh
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each}
-			MAKE="kmk" emake TOOL_YASM_AS=yasm \
-			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-			KBUILD_PATH="${S}/kBuild" \
-			KBUILD_VERBOSE=2
-	done
-
-	if use dri; then
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use dri; then
-		linux-mod_src_install
-	fi
-
-	cd "${S}/out/linux.${ARCH}/release/bin/additions"
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-	elog ""
-	if use dri; then
-		elog "To use the kernel drm video driver, please add:"
-		elog "\"vboxvideo\" to:"
-		if has_version sys-apps/openrc ; then
-			elog "/etc/conf.d/modules"
-		else
-			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-		fi
-		elog ""
-	fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.24.ebuild
index 2f6a836944c6..b157e6dcec59 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild,v 1.1 2014/07/18 13:52:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.24.ebuild,v 1.1 2015/03/04 07:11:16 polynomial-c Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
-MY_PV="${PV/rc/RC}"
+MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="VirtualBox video driver"
 HOMEPAGE="http://www.virtualbox.org/"
@@ -22,7 +22,7 @@ IUSE="dri"
 RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20120806
+	>=dev-util/kbuild-0.1.9998_pre20131130
 	${PYTHON_DEPS}
 	>=dev-lang/yasm-0.6.2
 	sys-power/iasl
@@ -77,7 +77,7 @@ src_prepare() {
 	rm -rf kBuild/bin tools
 
 	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
 
 	# Ugly hack to build the opengl part of the video driver
 	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
@@ -89,7 +89,7 @@ src_prepare() {
 
 	# Patch to link with lazy on hardened #394757
 	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-link-lazy.patch"
+		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
 	fi
 }
 
@@ -109,14 +109,15 @@ src_compile() {
 	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
 		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
 		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each}
-			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
 			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
 			KBUILD_PATH="${S}/kBuild" \
 			KBUILD_VERBOSE=2
 	done
 
-	if use dri; then
+	if use dri ; then
 		# Now creating the kernel modules. We must do this _after_
 		# we compiled the user-space tools as we need two of the
 		# automatically generated header files. (>=3.2.0)
@@ -138,7 +139,8 @@ src_install() {
 	doins -r VBoxOGL*
 
 	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
 	fi
 }