Version bump. Removed old

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

6 files changed, 137 insertions, 28 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 271543653a24..836795afeb16 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.154 2015/06/14 11:48:00 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.155 2015/07/14 14:32:42 polynomial-c Exp $
+
+*xf86-video-virtualbox-5.0.0 (14 Jul 2015)
+*xf86-video-virtualbox-4.3.30 (14 Jul 2015)
+
+  14 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.3.18.ebuild, -xf86-video-virtualbox-4.3.26.ebuild,
+  +xf86-video-virtualbox-4.3.30.ebuild, +xf86-video-virtualbox-5.0.0.ebuild,
+  +files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch,
+  +files/xf86-video-virtualbox-5-localconfig:
+  Version bump. Removed old.
 
   14 Jun 2015; Mikle Kolyada <zlogene@gentoo.org>
   xf86-video-virtualbox-4.3.28.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 1ed7a8cca05a..cefe1bdd455a 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 SHA256 194b7bca875f18e1621f065640d1c1a1364640e17475c493ec3b56f6e7e5ce66 SHA512 98461915a3d692812f770e2284d3d2ab288c128e9fbf9238e5f3284d561494d92b87a6cdbc09f3f24f9057facb94bfcc8e58c7de582e29e62ed4ee53469000f2 WHIRLPOOL 09942c717d94ca1252cce4531ad0873d10b1ce0baf3d321f6847c79709052baf3ae3a99a9e44654fabd0e50a4d680a155c1c27c86b4576d030c644e229f0f2da
 AUX xf86-video-virtualbox-3-localconfig 996 SHA256 ff777086ae7d0337e59066b4f7d6538823ca1804b57906e07cd562c8a48e054f SHA512 f6eeb4e9c01294be7447158b93e6e38179dc39425d2d496c3e44afad146cf9d41102a8e1b1cc9725bc3db56f58289ed14c2b05251b732ae56b09978d0b9b7885 WHIRLPOOL 2c13697d598c05d1fafe3c00d47bb31053880319392f9bcb40358f52bd990839bb9e2d7609f20f71a6562521709c42cf880e9b98a4021ccad6ad8cbe8751d990
@@ -9,21 +9,31 @@ AUX xf86-video-virtualbox-4-makeself-check.patch 289 SHA256 31ddafbeef6d35696d76
 AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 SHA256 0e72a5ef8d915c550fd92865b40c265153dc2d4621714a599d3a7172726b6fff SHA512 9c78927a4a8e99562582feef867f1b3e16663f04c88ebe7f19fd9e2e0c7632b041dc6294da57053645982040b50830f51391b27847467aac6e377062ca32997a WHIRLPOOL cd9ad5d9538467321b4ce56c37966f04edd2e74aaf1b849085675b1d08213b6a99179968adde9ad48aadb9ea67ca2f3283ef794be2f3ea6215ad4ff11031a778
 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-5-localconfig 996 SHA256 472568eba9c27ca365a71cdce4d5da68493192dab13928ba262091b06a2268fb SHA512 385711818aad370b87992190017d35f9caadb96d8dec387cdf6e70a4f70718107af36b98b2396a7255b2fbbd121644267e81804d397a6246969b5977bd9e94e8 WHIRLPOOL 816338bf822a73db1340f3ecc24234e9bc1ea07c5bc9e3ee5ffd519efe3b43f2a0f20dc53fdd84e889c5b4a841cbcfc5f3a4a7ab35a836594422838cfb648feb
+AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 SHA256 a69d882f55ef3c7ff07051dda71c08a623dac3d46d6b8607ccf7364fdf71a474 SHA512 793a7f937eddf955ae7a2ca48d41675c8a6ec8c34e9f76d3edc8618562c2d0333714d9de7ae5927e16df7bc750e0309a3dd4173f3f9e262aa5c0d80190c98302 WHIRLPOOL 1cfbabf87ad9bae4cbcbbae2317ad1b86cc8f1768456317828d94ae710a576f7a22cf3a5300b60564024eaa23cea0e6ae2b32db275ecc4cb110034e479c6576e
 AUX xf86-video-virtualbox-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b SHA512 f7c1b13a12d91884f0faabc23af345cde06315b23900d12ba0fead64c7818c1aa721cd6710c905c2758bcb5cbec9f7ea3a8b515fcab14ef4965d4e1c27fbab94 WHIRLPOOL a3e3cc997172557086741ee3d689411b4f1964a480b800d315fbd3a43c2d507448840a4812d8e735428a543b9a0c1838736aad692dc6460f29489bdb4c2010ab
-DIST VirtualBox-4.3.18.tar.bz2 98022191 SHA256 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb SHA512 d19933f9869b2fe6ed121896b49da0f82451954ff9ee3b53d6d3374a1bd178049d1528df78100187e2fc1d36518c924f19cf12bd3d1718c98a5771e2112ee5d3 WHIRLPOOL eeaf2f8d72e2d02792f5b58fa21297c80d58f5fd66801c04721bf24780600e5643b2446d6a6115625e8922565c8197b8b67e7384a2138509dddd7b2fa32a95be
-DIST VirtualBox-4.3.26.tar.bz2 102676804 SHA256 e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 SHA512 fb55169b7fc8d003746285d6008b70048e83c4245ba41ff7919956696846a8f566c71699c72bbe2c6650e608450fc39990442e0c69782e7dd265596c0efd8cfc WHIRLPOOL 53e175e5581b3a8af7f18ec5c5718789cabec4b6916acb439f5db211059755fcec08e8563ab3d6bcacc625d1c1ff4617f8a8cf83e263fa97ceb9d83cc51d4147
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
-EBUILD xf86-video-virtualbox-4.3.18.ebuild 4411 SHA256 ae4072a519a4ffbd7e12840a12e61815ca70e1abd36924c337c0f79b1f58becd SHA512 b2fce881a86c1b6627b5ef3ec6bf6b39bc9c2cf034448282f814cd868e8445e656dc610c49c61268b0590b36cbb7f0b8de02f5d2f5b73dea0698827ca4ec07cf WHIRLPOOL 29ff10564c0b4693649559f3817a5c67968d54b2bb4453baad11cd6fabd984747f2be0f620382c6aee63a753325c4b145ddf80b19c9d1265f78364037ca9bdb3
-EBUILD xf86-video-virtualbox-4.3.26.ebuild 4602 SHA256 5cc88d8aa5883e6df59de27016a78026623d0480d60f17b3e204e08210c20e83 SHA512 841e1e6a4c2cb1a257d544e3f2f93ebc3c62948d98046376f80815805ba456a5e073cedc90ebab65c7102a4a233555c43bd069b43ed97f949474c92aadf43a63 WHIRLPOOL 3825ec640138b994bb4c3b5c6f9aa2fbcd757b943668c1a04b6fbe6aef4fe3d6ee1ba7770f9cbb9209c292ada1cb2745a237359118df5fed4a42d5aedec03104
+DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
+DIST VirtualBox-5.0.0.tar.bz2 109816664 SHA256 bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 SHA512 c9557820fa04215b1b7905babfab340a01ad2cf733a18462fc608f8db5d0aa908e9ec0d92b3c77075e8a1322c10c92f58f8f14608aa3480052ca730ebd507636 WHIRLPOOL 7cda1523e0cd2851cbea5bb7a202963bac67cc6af29d0ec9a706dcec53746e50e6c85ccea014604eca9558ccaa45e9d2ce05b2eb64dbb54a7edac5f538634134
 EBUILD xf86-video-virtualbox-4.3.28.ebuild 4601 SHA256 80b3887ad40730e1cb8a362ba5f176de94d01ced02fffa5bb3bb7f30dab4f34e SHA512 52bf6a906ddbc2eb0fecb308c21d07b9bf671bc86c64dbdc740a54656652fc9c90cd9e11bf2eeb45ad7dee90ac8dc22f5f1ccac2d4d776c4b63a039ac3394211 WHIRLPOOL c211e42321ce9a438e500ca65f20d99898089df07aa0a38744d15856b0be1b1d24274b9fa777c3a894b2fae6080d72373066eab30a1fa3bf0a53568eff09ec8a
-MISC ChangeLog 32351 SHA256 7f0ea6c76566101def1690e59d49391186ac02b5bbdc8258bd9541863275c38b SHA512 df1d7a0ce0fda427f31081a8b3f2a3d824cee2423001912ae2334051228c0a80dd17efb4b474aed9510781758047f8540ad4203222d8fe62a184d7a3f9a6fee8 WHIRLPOOL d29bb9c422e583f54df7c172e8f56d263f631558ea30532fdca644910ae73be6d0280f22cfa32074668a70aeee983e0f389e6de4eb21b4f839ded0735aa16e63
+EBUILD xf86-video-virtualbox-4.3.30.ebuild 4608 SHA256 246813eb382382772805366abbd13bbb352206adfa164465a1252a4dbff6488c SHA512 f31279ed70bfa43309abd1ee50c59c6d3e4684c104adab4b05e63bae284f4db41f11bf61b95af9a4bc650f6fa0bd42b55ce1da251af10c0edf24906bd163fd01 WHIRLPOOL 948277d90952fe921d9fe1b4b4063327c3b36fdebb8659b58da531804db4b31da0d078eaecbe9540d8c6906b543df2a99ac47e7a1b6cb1399609cbf714db494c
+EBUILD xf86-video-virtualbox-5.0.0.ebuild 4526 SHA256 b8db44d0e95ee3fca5573f8fe122f65106ecda4b65efef9b311ac6baabb8e4a5 SHA512 2b093da06b79488bf239c6207641818b66e3097ee3eba550c789025d604fc29dc9b36390f9a1213fc38340f2b6329484313caa6f456acd38f1cba06cd1caa6c6 WHIRLPOOL 831c05cb65c22b636479ded14b5e6d2432c2947cbaeea3c6f52f2570a458260a31f94f679f89a2fbcf24a777ce069b966c815df208a8b730d1939536b86380b2
+MISC ChangeLog 32796 SHA256 5a3147ae7a3184c7f3290ef2b4718ec31a4971541d8a6b589461d9fa4eeef7fd SHA512 14285cac9051d949904e15fb94bd0d008331aeda34ff1d7a05ee021962b1065c3865a6769b17722544114b641ca6ebcba46ef83c801bad512c9d7cf8a107a12d WHIRLPOOL 29ebaf0e63f0606e7c7c42d3b25573706b6196e657f05459687dc91f2c806f94deca9480ae4ea19d7f52bd0d923e93ba8c02a8bcd742295b3d597d7c4d71fa70
 MISC metadata.xml 235 SHA256 7ab38883293d8e5e781c6b4b53e4f485f3972c9a90a1a6603b18d31162465ddc SHA512 8ff1545754985c71d64d30d69f9debbe4c5e3adada494c3b6f275fecbbbf4c96510d88bd549ac9774540d7c3c69201b62fb43883685cc6554cf549c4459e5854 WHIRLPOOL f784321704be4979fcf6432ce1c82a858051cf8135dcc488fa089ed2dabb4637a343b903fd62bf2a3fbb9c7b9795e95de83a01f95bfc470dc20fd84cc586ef88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlV9aXUACgkQG9wOWsQutdZLKAP+IN4xYZH9WO1utq7iOVAmWK9v
-JJHs7iQIHT213rWFCKfQbMiE8Oh/G+4YsgM4mGTUqKkpt5gtbmAPdzmYyDoMihRu
-LUQe3TT7NNx510E4ldfeV5oKRgTZXhuqf1KGPCIPd1LtUD/TZtBqeT0P7MS627ik
-SZnnyRVD2pOM8yZvdAg=
-=rYeB
+iQIcBAEBCgAGBQJVpR2LAAoJEPiazRVxLXTFY68P/A/9yHIQ7YQCQscPSQ2Tb9Dc
+vTgaKk8UW8qM1gc2AbmAL4mY8xxHmBljCPGTVDgRDLWM3CKm42GHeKPNgsuBmKea
+B0nc0mTXk+zCmLxS9k81vs2HrhpoZzSCklvBmdCkN+XMo0B4CjB1P0FsCxiqJqQm
+aQGF1E45FdmuR0qx7lA1hIjMqAbmPx5TfY0niV7HVrjlSaR9GHQceHz+74Etz8q+
+nJdPfseWept0WGuSSNsY8hrixOL7K6pMOoQJyKGXmojrVwb2I52vZAcT7LjE9ic1
+vxPvXDdHXcWjQejZnnrGVOV64fWkKlvJWHnyhk6iXHIUcydICMKZiFtMbobfP1fD
+6lRnak6zc7wpA1O2vdvBxriA+4UL1yBy9S5sK6f3GQQWbgHpinoIVUk8JRV35KH6
+H6EekxG3yWZLtnG7mOi81MGycPjRD8JBifbPQoIjjiWMY/IKHTjZvRcpF2WOg6MI
+hxZYtxuIlYYxhkbGlFm5M5/8D96tDzCU3tseflrB+IjL6RxzXdcE58PwON0gNBdK
+TgGPxIa/SQJQxejPVER1NCU41TAh9SNhHvZ2pw3IeeSCFiZkWBNePH5oY5y9ztzh
+dNPK0W+gKwwbZGI0ioaNxXWVV8uw+oYtDUXMPTXBNDbcvAF/F4bbLr4grkdoCVk+
+zH4/4AERePe1P1TND7zr
+=HDfb
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
new file mode 100644
index 000000000000..aee5ec1ea83a
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
@@ -0,0 +1,30 @@
+# -*- Makefile -*-
+#
+# Overwrite some default kBuild settings
+#
+
+#
+# Copyright (C) 2006-2008 Sun Microsystems, Inc.
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software Foundation,
+# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
+# distribution. VirtualBox OSE is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+# don't build testcases to save time, they are not needed for the package
+VBOX_WITH_TESTCASES     :=
+VBOX_WITH_VALIDATIONKIT :=
+
+KBUILD_MSG_STYLE        := brief
+
+## paths, origin, hardening
+VBOX_WITH_HARDENING        := 2
+VBOX_WITH_ORIGIN           :=
+VBOX_ONLY_ADDITIONS        := 1
+
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release =
+TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
new file mode 100644
index 000000000000..92f8a182e34d
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
@@ -0,0 +1,52 @@
+--- VirtualBox-5.0.0_BETA3/configure
++++ VirtualBox-5.0.0_BETA3/configure
+@@ -1258,10 +1258,7 @@
+   XCloseDisplay(dpy);
+ }
+ EOF
+-  [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
+-  if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
+-    log_success "found"
+-  fi
++  test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs
+ }
+ 
+ 
+@@ -1415,21 +1412,6 @@
+ #include <GL/glu.h>
+ extern "C" int main(void)
+ {
+-  Display *dpy;
+-  int major, minor;
+-
+-  dpy = XOpenDisplay(NULL);
+-  if (dpy)
+-  {
+-    Bool glx_version = glXQueryVersion(dpy, &major, &minor);
+-    XCloseDisplay(dpy);
+-    if (glx_version)
+-    {
+-      printf("found version %u.%u, OK.\n", major, minor);
+-      return 0;
+-    }
+-  }
+-  printf("found (inactive), OK.\n");
+   return 0;
+ }
+ EOF
+@@ -2706,7 +2688,6 @@
+   # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
+   # [ "$OS" != "darwin" ] && check_yasm
+   [ "$OS" != "darwin"  ] && check_xsltproc
+-  [ "$OS" != "darwin"  ] && check_mkisofs
+ fi
+ 
+ # the libraries
+@@ -2774,7 +2755,6 @@
+   check_compiler_h
+   [ $ONLY_ADDITIONS -eq 0 -a "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+   # tools/common/makeself*
+-  [ $OSE -ge 1 ] && check_makeself
+ fi
+ 
+ [ -n "$SETUP_WINE" ] && setup_wine
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.26.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
index a28cce939847..d92bad5b5996 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.26.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
@@ -1,6 +1,6 @@
 # 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.3.26.ebuild,v 1.5 2015/04/01 19:03:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild,v 1.1 2015/07/14 14:32:42 polynomial-c Exp $
 
 EAPI=5
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.18.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild
index 2a1a5a39ccd4..195e71525743 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.18.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.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.3.18.ebuild,v 1.2 2014/12/22 13:12:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild,v 1.1 2015/07/14 14:32:42 polynomial-c Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
@@ -54,7 +54,7 @@ QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
 
 pkg_setup() {
 	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
 
 	python-single-r1_pkg_setup
 }
@@ -77,15 +77,13 @@ src_prepare() {
 	rm -rf kBuild/bin tools
 
 	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 
 	# 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"
+	epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
 
 	# Patch to link with lazy on hardened #394757
 	if gcc-specs-now ; then
@@ -95,14 +93,23 @@ src_prepare() {
 
 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"
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
 	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
 }
 
 src_compile() {