Version bump. Fixed link lazy patch (bug #494478)

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

5 files changed, 207 insertions, 20 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index b08f032901c4..d26b768df44f 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.127 2013/12/18 20:54:59 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.128 2014/01/11 21:25:31 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.2.22 (11 Jan 2014)
+
+  11 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.2.22.ebuild, xf86-video-virtualbox-4.3.6.ebuild,
+  +files/xf86-video-virtualbox-4.3.6-link-lazy.patch:
+  Version bump. Fixed link lazy patch (bug #494478).
 
 *xf86-video-virtualbox-4.3.6 (18 Dec 2013)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 293c10c23244..82e73a5deebf 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -7,31 +7,34 @@ AUX xf86-video-virtualbox-3-vboxvideo_drm.makefile 6810 SHA256 ccf3eaaa8e1ed4a9c
 AUX xf86-video-virtualbox-3.2.8-mesa-check.patch 701 SHA256 6b4ce64673cda33631e7a60ac94f23ab2d020d52b6160bb072ad8d6f9547c251 SHA512 59fc6c412cb9e9b95d8bc93eb2a980296e3363890ca7663fcad46e61a442b453eeba4d90f00d06cacc37a52cc704af7d67b38303261c6bcda2d9c8c589740f64 WHIRLPOOL 4024356c7acd641cf4cc82ee772cdaae05f6dbf609f2f15f4c9807d2fb670f6d3de965d6c356e214ec5b7dacf9604cc4f077622162ce9d8cb4aebf3f1e7c3363
 AUX xf86-video-virtualbox-4-makeself-check.patch 289 SHA256 31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966 SHA512 7f60a857213b1b045247f5a041ebed60099f0f634b7d843bd85062eb4cf8504e8d5907b43df852dc49465248e2cbe3d998acefeb676113ca9a38e72da6d926a7 WHIRLPOOL 3e1a1d4f2b52fd1d67d50eaae965bb99d1a3f31864d5798dcff1dc6e9625019d01a77af87016c66f84e2b5af63c42b788bd7673fe37f7af1d22e5f57291821eb
 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-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b SHA512 f7c1b13a12d91884f0faabc23af345cde06315b23900d12ba0fead64c7818c1aa721cd6710c905c2758bcb5cbec9f7ea3a8b515fcab14ef4965d4e1c27fbab94 WHIRLPOOL a3e3cc997172557086741ee3d689411b4f1964a480b800d315fbd3a43c2d507448840a4812d8e735428a543b9a0c1838736aad692dc6460f29489bdb4c2010ab
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
 DIST VirtualBox-4.2.20.tar.bz2 77050211 SHA256 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61 SHA512 53cd847490e74ed7255a63a0e15b5de424d10c32934212b9aa50ef5beae69194895195991f4c58a5baf4ad9645bf90473e0474c287c395c3c064fc217ea7957e WHIRLPOOL 0177201a63978fdd75ebe65a8567d561bcb12609d936c8e9f98fef61ecafd2630235d988e17a38c82d39de9a729a32d5b0c493833cf88a35f88b3f8b7e558498
+DIST VirtualBox-4.2.22.tar.bz2 77039185 SHA256 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1 SHA512 136b3f3ea9a79493aecd86883c619d10934d80c391ce88985501736fc95d7066e0e31d02e7867974f9077eae5a431519d0c1001fc781d240f0578a1c63c29ee6 WHIRLPOOL e6ea0768587ee152463c3388476199333cf39f56f7bda43094ad98ea2179b8f0e81819004c6433133a68d7ede9606d2aaa4ee2aa96ad05bda06a7706f4e079cc
 DIST VirtualBox-4.3.4.tar.bz2 89614288 SHA256 d2b9020d088c08cbf3d2dfb05eaa0922e2c91b46c9767911796b785a9ccb2e1f SHA512 b8cc6bb6af62d279d76ff1bbc16763f9dd9a577a55a2ef77683d995a229bb8c1b73ab548cca85ccb97bdf021cc8a6aaf3cb2dc4bf7e57b00e3f94cd05986e2e0 WHIRLPOOL 2ffe8fdbb0fc96c7bf2ed4314278ec78b8fd0e5f05bda572841b788a275dc263a364ecf8e1e0a691da505383bdd09ad483f34abcd3f7baea89373ee161822f8d
 DIST VirtualBox-4.3.6.tar.bz2 89609199 SHA256 c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27 SHA512 8cb540a825afa5f6069ad2bb155e825af4a222f6d20c5e653bf6bbbb07dfbc4d122640da5f249b72f1aa34f8afd92ef41c525911db30090a2d108b9609da4a38 WHIRLPOOL 12fd27c9499d9fac0283c01a276e02ac3c10c72c66e0ffea8db49beefa66b44f6b4c8fb727da5d74cc0ed2feb00531a67b65f52a5f55ceef2a8db64868cfc89a
 EBUILD xf86-video-virtualbox-4.2.18.ebuild 4938 SHA256 22e4dc18bfb6255362a59bcca5d0a2e7182e8e239cbe4f96640b89920421dc88 SHA512 78c1f90332863a1c5e51a947243086853b51d60ce50c778416447d27fd14aab733cf492c44ecde4557c98372eb43661420eb9471e2cb2bc92f2dc83da949cdbf WHIRLPOOL 67316a6b0d9784dac1ba0a683841dcd9b489fecd34860d2a0f5d94c2146d40a621481f193bb16377194bccc0b8201884369fc53c72a7a79c142be39e0d3b72ee
 EBUILD xf86-video-virtualbox-4.2.20.ebuild 4328 SHA256 34e0859e0b5183c7672e5b4d4dbd6222f3592cf298813d064333bba66457a650 SHA512 b1374cd4210c036caa28fb70949f9ddbec40aa96b4d97012b98ee1fac8955c6b747652e7c9975e6c8671137cc3336fb8d154637925afa323d27a4e47e4d9a888 WHIRLPOOL 2baae296ff91f7a2c257a58b6d3c5c0252dcf0eb3148e42c0e5d980485ba3b1224712eb928a77c6189c2c7491f741d9ae6369fc891311691a0c621e5312fea25
+EBUILD xf86-video-virtualbox-4.2.22.ebuild 4328 SHA256 8eb981c771f6dcf26ec77963535c150ec2bc8610ae6161f2c20d82cd9376d3fa SHA512 48e67a6ccc58def4d7cd3242e6330b7f7bc7a95f73a2b1d789b9568acc62159c0ebbcbc59c7e34ac7477b62626d2ed8de9d2f2a4c4be3b81e9549729e4f111d7 WHIRLPOOL 377093aa7408e09f7a7f0b40f0cf918d9839874236e60a8a92ae3da7c5e24ea638e0d2bf2e21d0b52ae8a39c72d032fc28ef81c5084cda4588db96b435ddc9c5
 EBUILD xf86-video-virtualbox-4.3.4.ebuild 4330 SHA256 89a3759fbfc985fe19287f7cc646287999143d45a5713dbbd9e67f1f66b0306b SHA512 c113e321f6e58d5cd3bcfbf67196d9c90d3e82ad188a613efbb11236f1e20a053d4c507fb2fd1be1ffaa9fe176e7ecab0112cfbc731159acc4adab7febb614e1 WHIRLPOOL 884cb70c551a097019e88ffa8be91eaf25a3a3cc079426e935e196da51a6fe40734514cbe2fdeabf0f751b6b489d7742956b867024d6b1ca44f943746203e0dd
-EBUILD xf86-video-virtualbox-4.3.6.ebuild 4330 SHA256 6407c8599c0a526f26f00e7a16f8202e300f039857f1779a4166df4a208726f4 SHA512 975d2fad8097c77e8d54e73c20c5f39daac125ac2b03516a1049efe781b120313327b0a78a7442be50e18e6112073c93a40e036d7a23404d22096be0dc220184 WHIRLPOOL df645c00ea6d2325c9a4400372acd3efbb3d18016355b972aff1c54407e88afc40afd1525b0e839c2f2173f5a23bf0963ba7f0f07812e93dd837012af8dab839
-MISC ChangeLog 27338 SHA256 96aab91e083939798a0753a0c7cdb44b7e8c8cf7649e71708a19ade22d469c72 SHA512 92ce5b86884a86228d13a82a652b18603a68cb628f671d2413bbb746abc756104201af7619388e58ac6c98f384e378c71d9f63786c7104ea77ea9e5bf1545a56 WHIRLPOOL 5e5805dadb3bf3867de49a9e4754f75de4dd32c1302b37962b69cccf1a42df7ccc37bedca79d5ec7db837a55929ab4ccfa67da7c4aa896cd1f42c6ff6f1154e6
+EBUILD xf86-video-virtualbox-4.3.6.ebuild 4336 SHA256 70d060272d8669a6e3473189252ad71ab02e60290e107c6f8961cc64285f9def SHA512 b6fbe56c28b3a83405174031cc2a3f66cd7e3bf13e0fed305bf3758265ea188bb76975d87f03703a478a3f8f2948fd8eaf99bedbc2ee5f5578cf066b2cb441b2 WHIRLPOOL 1f2b7eb4cfd712402918e9c0932ae2ca8ddd9d03c8cdbf77f82d60854bedf389829738d4f9c0c4a73dfd55caf37383585723944fc4ff43058fb16d3d14900ddd
+MISC ChangeLog 27621 SHA256 70185ce5a34430c2af740da89997b10119285658f2e8c164f1d1be17e59c8bd0 SHA512 1eb0e3d00cc97d22a33f954948d77a1315150eba179d7d337b60cc9c6b819c80da4b184174b0f94663573f9f1c4d6c6a228303fa9fa859ca4f8c736c2c54d128 WHIRLPOOL 47caf052801884da56972042f0767969c8ccae66fbb60d0d38d6257244d61336b50b0f83fdaec080a330e3cedfe7db050b371eef34b5050bc574c3dbae9fb8b3
 MISC metadata.xml 359 SHA256 ab2e6dee370bc02d436bf0c03dbdaa826c9ceae9a4678975242e1fe7f3855608 SHA512 add99ae916087d7466647e197d30ae21049ead1fa892539e6081b0bc88f9cf19c12492984576a00581a35a2ae323528f417e48cc04a12152e3fde63da2f37cdf WHIRLPOOL 459e98c740f891deb8ba95788b0a9ecd609744bdf13e60c1086d9e7981951b5767ce1e44e63e4793dd75718e27ed3a24ad0de806f15459f0c8bd251a73996975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSsgukAAoJEPiazRVxLXTFxrkP/3DTEmY1rD3cB5R47RNAR/ab
-4tb+OpSxkqcadMOCBEtOTUQBA9Z5hjM2af63Q83qzJUX2NfaNLsNjcDTSf/HnBh4
-fsWLa2ge7HzOJRN+5c30+eKDS3LmrvgxxGAkORCkk8I/ZAJBCi5aaM4SnCDj/exw
-wZd5GBJNwKRRsWkZqAT4gpiuznNCz2exSsFp9noGV3EhgbQNm0+WdUvFlKw9bb9Z
-9fN3GZgCqqr3htnUH84SpoMcnq70D12bg1O/mOEeXm0n/6TABBzH3lJhIDsIrFHC
-rGEfwbtzEEPz1mNDQXrUSs9N/+e/arMo8DY0yFcWLP8WX6N+Xaz/1/qyz2YGBY7n
-Xsl6SQ0VC27lfGf8R/2za8lQrsoAM/sp3+AgvuCYUgiBdvsW0Gup9ROU+cxB0W4b
-ajaTaVXFQqU+yyyy1YTrEVwpx7/QKSRzwZ++qGM8Tr6zFytF4A6btOJdNBamlKHE
-p4w/PheYJGgbvairRpiitQOIjiKZJjgV6a1BNg65XSTVCIfONc/Dd615NMaUOW4T
-206Bg8jB07/4rcQnEHcR0lIqzq37olIezgcSjL9/uoJ3zd49Uy4NKZ08qc218Q4z
-u3DRluqlOJuiJEZoXa5FKGu64WlrZzqJcKGHtzqHjacmsygId0BFkH8+jGRsc1w+
-Q3sCML+WMV2MhilsvmxS
-=L3Lt
+iQIcBAEBCAAGBQJS0bbMAAoJEPiazRVxLXTF02cP/2M1ilYvGLu5nEuSAhMhsmfX
+O7bOim78cD6rPsX00I+VttD1iUPFDoIOlDgB/SpUTdmgWotT8N+QXD83r4ADrCEn
+JjdrqIvFPAqo8uUYuho08lGT/nzm63ywYJjwZL+2+R8GeonQUjApqZqAvGLcE2Nj
+M8IV88fIIBT6zjlaYylanefiS8ZoySE6ARt5DPAl7lJbBzCh8uo8/nwOH6A3dmfF
+IypKwTpXrHYowSkGZ5dgcgm9TsoPH2MtrE7RRMcyPpIdx8O1T9kDKh9eG8hIsFM2
++qaFXxEqpzsPG7NhXPqXLwV6rUrBUJKBFIr5liNxs5rvXzhJi074Iu3UIwmOFmOK
+8yuLZCYYi/jo98ydi9/uxd5M8M7oqqei1tyDLWIIDeSEj0JY0f9iRXRPp0gh0lAG
+9gN5gkQHvCZUeacRUUggq0RwXI0JAdF9wABcI1EXsoRnYGrGZGsEP2gRxNLA0sAN
+6APYL5x4+t2knQf4Jd29P0e39/67yZpSPIkNLf8A94hbSA8hQoSsVHUTO4r1NtlG
+qojqOOvCRfcAVDwiTzvSsQIGagAbtVgZLYfKMIZMMm9Gh6nUlV9bnkQZQXZaBrQG
++2qmKmUOKbMRaa+LAMfLStIInw0P6ZQFMKuOtagLmQEwnojy+jZ2+b89xFLyTpGr
+wVQ1wNh+/iCQJbYNFBPo
+=ptTj
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
new file mode 100644
index 000000000000..1dd6e46f112f
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
@@ -0,0 +1,17 @@
+2012-02-26    Magnus Granberg <zorry@gentoo.org>
+
+    #394757
+    * Config.kmk    TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
+
+diff -Naurw a/Config.kmk b/Config.kmk
+--- a/Config.kmk	2013-12-18 16:05:32.000000000 +0000
++++ b/Config.kmk	2014-01-11 15:46:48.950785377 +0000
+@@ -4997,7 +4997,7 @@
+   endif
+   TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS      := $(filter-out $(VBOX_GCC_pipe) $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),$(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)) -pipe
+   TEMPLATE_VBOXGUESTR3EXE_CFLAGS        := $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)
+-  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT) $(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux))
++  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT) $(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
+  endif
+  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
+ endif
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild
new file mode 100644
index 000000000000..c77a89248ec4
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild
@@ -0,0 +1,160 @@
+# 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.22.ebuild,v 1.1 2014/01/11 21:25:31 polynomial-c 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/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.3.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.6.ebuild
index f455a64cfb73..6b36829ac3fe 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.6.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.3.6.ebuild,v 1.1 2013/12/18 20:54:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.6.ebuild,v 1.2 2014/01/11 21:25:31 polynomial-c Exp $
 
 EAPI=5
 
@@ -87,7 +87,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
 }