Version bump. Removed old. Let the driver compile against system xorg headers (bug #492942)

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

4 files changed, 36 insertions, 63 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 3e8e1a2001b1..f0bc916ca31e 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,15 @@
 # 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.124 2013/11/29 08:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.125 2013/11/30 18:22:20 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.3.4 (30 Nov 2013)
+
+  30 Nov 2013; Lars Wendler <polynomial-c@gentoo.org>
+  xf86-video-virtualbox-4.2.20.ebuild, -xf86-video-virtualbox-4.3.0.ebuild,
+  +xf86-video-virtualbox-4.3.4.ebuild:
+  Version bump. Removed old. Let the driver compile against system xorg
+  headers. Thanks to Walter Meinl for the bug report and providing a patch in
+  bug #492942.
 
 *xf86-video-virtualbox-4.2.20 (29 Nov 2013)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 0629d26f8a83..3a74c1a42b94 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -11,29 +11,29 @@ AUX xf86-video-virtualbox-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a01
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 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.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
 DIST VirtualBox-4.3.2.tar.bz2 89709005 SHA256 137ee464dcf3ec81fd74793022ecb53d7f4399682759e00cafd322b0dc92967e SHA512 5a622636ab5f25ebd18a51c07ce16a98aac5a020d356060321a7433682e110983442ed3c17c4d70e40dca343caeedb5f15bc34a924c95c29239c2e5b1ba6bd6e WHIRLPOOL 34b34f5cc9b495d8a67c0a41db205aeed1b9bd514586261ec6acaff652192832c04993df8867ec8f886ff4d56e0500225800449d3b1684c90fc93ec5dc5ac4a7
+DIST VirtualBox-4.3.4.tar.bz2 89614288 SHA256 d2b9020d088c08cbf3d2dfb05eaa0922e2c91b46c9767911796b785a9ccb2e1f SHA512 b8cc6bb6af62d279d76ff1bbc16763f9dd9a577a55a2ef77683d995a229bb8c1b73ab548cca85ccb97bdf021cc8a6aaf3cb2dc4bf7e57b00e3f94cd05986e2e0 WHIRLPOOL 2ffe8fdbb0fc96c7bf2ed4314278ec78b8fd0e5f05bda572841b788a275dc263a364ecf8e1e0a691da505383bdd09ad483f34abcd3f7baea89373ee161822f8d
 EBUILD xf86-video-virtualbox-4.1.26.ebuild 4744 SHA256 fb9648679ba7bebb9b19035eb8464737c23f6a8f558917e3d54248aad1a51bb3 SHA512 b978df642c77e8550a8bd1c2ec2323a221f777c131593baa997cebab5a0fe47eada20d44334bf1bfd57669007a74825877c808709cb526f710848b1926610351 WHIRLPOOL 70f580658f077a231c59e7455925380af058d308eb1671805aa1d7570f1dfa52242a97426bbfc8bd5e384f8bed4ea660bc67c70ca963ef6ca8aaad205185333b
 EBUILD xf86-video-virtualbox-4.2.18.ebuild 4942 SHA256 537456141d4bcac894d877da8fab74e62d137477b979978745b1a11337d91fd4 SHA512 e4abbb03660ed95b38298fd1c5732a6951ef3a692d80a61eaa613e7aaacf66a3c0f874d6ffddb0034f0ba0e06197082181ff63a5e658671178d1477b2c0cd59e WHIRLPOOL 3e7422460500db39b54ccb04bc9f1e57f4c36841f258d168a7af51486f91a6a626e51a8a5dacba8beede28118fe94721e5cf78c478cd740f325f8ade9daa8547
-EBUILD xf86-video-virtualbox-4.2.20.ebuild 4947 SHA256 6c51029922aa2df2a030ea9ffd4adfa0f3c5c7aaba0ff95aec26577748356214 SHA512 09dac4f9d218153c103e0180aaa85198539f1b70852eb95e32f67f7c533ea2f1b2256c680c7e37bc8aabb146320ad48827fd21a35794c58afd82994bde721b74 WHIRLPOOL df49fe4ed2c3cb54d8ed9a16692aec85489d04d892f52620ccf122e998cbc767af0427078887b58957a39f41a11096f99e146a0c4420a8a23c027460772e4667
-EBUILD xf86-video-virtualbox-4.3.0.ebuild 4949 SHA256 e085df30916e8e17ff59258e17c8177e6fc07f4354f095b9e1d79fca369a0555 SHA512 4e3deea7768f4322f819a3f30d156a2894541d25b2b6ca86d0e2f033e613bbdbbe835855aa1a5f73952684ef1d6c682555a98523326b755d39ede8eb88e88769 WHIRLPOOL 8a5775f125c0e2754dc23723f4d49da75bc31e10c94c9b14e99924d8e73b978e0b4a66fe977075396c02ca736e296fef9add876ebbcb08d3c39da98d29cb2499
+EBUILD xf86-video-virtualbox-4.2.20.ebuild 4328 SHA256 34e0859e0b5183c7672e5b4d4dbd6222f3592cf298813d064333bba66457a650 SHA512 b1374cd4210c036caa28fb70949f9ddbec40aa96b4d97012b98ee1fac8955c6b747652e7c9975e6c8671137cc3336fb8d154637925afa323d27a4e47e4d9a888 WHIRLPOOL 2baae296ff91f7a2c257a58b6d3c5c0252dcf0eb3148e42c0e5d980485ba3b1224712eb928a77c6189c2c7491f741d9ae6369fc891311691a0c621e5312fea25
 EBUILD xf86-video-virtualbox-4.3.2.ebuild 4949 SHA256 19f7f104c374e550aed5af8ad4830e3903f8f2a7ce0dfd79119f32f1781821c9 SHA512 71753b484e09a6ee97340722db08ffe460ff240dabb85bd61ca9b02d2b81549584a705a3a8e313fabf69f4bd4eac9ed781217685b1b0455d2576832619ce3aa9 WHIRLPOOL 56fcb590649c767864c7c9dba27b5994e1c61d7b190525978edbcd563579120a2538d07fa5eb562b1292b16b1f72f7312a6648e04f1181ed9c32399af48af6d6
-MISC ChangeLog 26603 SHA256 6fb53b177ae7d4356c7f97c9103f8d1a86279eb3ea8618d7db1c571b0826264d SHA512 872e8c8a018f7865121a6274ba2e1822816f5c3d47295ad4cb435121cb79ba3d5db0d08a99a97d76c21d3d06a03a27647588441eec22104492cfb7141b906653 WHIRLPOOL b4e6b1f515e51c7c5c654b12e7910be71eb9852851b78822d59c3fb65e298982478bbece9065b053187ff589bcd1024ef4b0f08422a6dbd05fbacbc7470fbbf8
+EBUILD xf86-video-virtualbox-4.3.4.ebuild 4330 SHA256 89a3759fbfc985fe19287f7cc646287999143d45a5713dbbd9e67f1f66b0306b SHA512 c113e321f6e58d5cd3bcfbf67196d9c90d3e82ad188a613efbb11236f1e20a053d4c507fb2fd1be1ffaa9fe176e7ecab0112cfbc731159acc4adab7febb614e1 WHIRLPOOL 884cb70c551a097019e88ffa8be91eaf25a3a3cc079426e935e196da51a6fe40734514cbe2fdeabf0f751b6b489d7742956b867024d6b1ca44f943746203e0dd
+MISC ChangeLog 26982 SHA256 c710aa153731061017f30e787a383fd63823d9e9db03637f8d6ddd47b1346873 SHA512 2b6d7f384bb011a37732ff34a43d51584fc9bc9b1de70e26fc1b21f22864222eaa1e64b7100eeb0bde9fbe3093d6141badd142350389443756d673070ea12a8a WHIRLPOOL 1fd9fc13608f6ce355e087ed5870150683572b7001fedf4cba372d17fb0017910078edf7b2f22889ca6144364142275600c7597dca1890f9981b1ecaab763574
 MISC metadata.xml 359 SHA256 ab2e6dee370bc02d436bf0c03dbdaa826c9ceae9a4678975242e1fe7f3855608 SHA512 add99ae916087d7466647e197d30ae21049ead1fa892539e6081b0bc88f9cf19c12492984576a00581a35a2ae323528f417e48cc04a12152e3fde63da2f37cdf WHIRLPOOL 459e98c740f891deb8ba95788b0a9ecd609744bdf13e60c1086d9e7981951b5767ce1e44e63e4793dd75718e27ed3a24ad0de806f15459f0c8bd251a73996975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSmE0/AAoJEPiazRVxLXTF4NIP/3LcrJVxcPaDURF/8yKO1+45
-4/pHUflc0tUU0lDqW20bzZAIgg0uwltYsafm9s8HPr2gLAT2udCLLNiB3sxMoB+2
-2GbPxWF2UZYgLANRsCQPtKUoPc8bQRsJBRg+slHuXCoFIdZAqzNSjuHJn6mfqjuy
-0ipMQBngTEqV+DOztDw1RT6EX4wZ9Adp3s6YbBq5eIUrGPMbfmRrZ7DnTiEJmQ9z
-azsb6sv7CNR6/u57ZOGky4RXP5xG0S1JsgsG7E+n4oRy0OAlfIm7a3LcA9TkOX1h
-53bvvmz5cGULXhD4TTGYXpqRvlynW4iNecFumHhrXkhPonggXqL4eTYoZMKr+6BQ
-2TcxPHmaNYUuYu2wwPBI0VaYAy3JOo6yUlnCmkBHObosET4a/GxBX0ylvComo0ft
-l7fT4x1zUuUvXaCUT6XKvkxfyYpkxYVK8MUoK5YmCcouER/pZf9VEwxUGOgSqD/r
-iZhMib6XB0wAqzj/A/d0vWViG1TMpBh7bk5FjlII6MCDhbDHeqbFyONBu29S98Yf
-enO3Izq4bjAzY3k8x+K69gFySvFVmH6It7zN8epechLO+V+GDy4BSEdCvhvQ55f9
-EQT6ZkXebFp0HJVCtAwA34L1caktmUUGzNH98TxHrswgh0Hzzp67i65vjmnVS+js
-K/72xucTWt2CxvdffJfh
-=V9XQ
+iQIcBAEBCAAGBQJSmizeAAoJEPiazRVxLXTFsYkQAIv3bB0pb+OSs+kRM3rtMtAq
+gyjWyQQ/WBgR28LTaE1cwOekvOC98Q8LBfBJZYc8YZebZQyvryrXPllVDQVDt20K
+Y0BgNCKcel7+eOoU/s8b5ayaghTTxOw8s8is8Rgv3KU9MKC89EXQBODh1CIKD7Hw
+bTQdZl6Jj09iUtd2CpXEQ1HTWLKtftTQo0OuPoJEbFaN59H9cqeioQAvb0QJF0dc
+vsJ/Zv1CXnTpnv7bHuwRRfEKj6qvRYYY74/UbOogcjiwWazD6Iv1sJ6P26686CD/
+639Wr2thJ7RjJZgBuAlPoYcLMeVOKHrSvXRtu6HijpImM07fuMaMCXQdE08SeGR/
+taUN6id/e1UOyTOIWQX3YwTJ4O4A3s+bK0XdldFG+MnpdN+BoLJHwwnufHATxJl8
+wKhr7xJ898xcigi/ncvlD3IBEx1z5F2woY/I4xIz2RGbGuuy/qMhTNpM430u2BKs
+ua1gdnUTGKQwwjrg/6r754G0OsbDah14O8WVwY3a47bAAfj7eG0J8tnwWyzh+zSq
+pOLqNGJ+nDTasV22kcn8HjMNEQHxtph8YAoTfoOJ9Wr2G83j8UFzXIZkZDjYQMOB
+BeZOCtT/y/x6uM5f86C2iC7TVma22Qq7qWYqrJTy8f4COVwI26Jfl0pnTdtlZFGe
+Emdngdv/YOleLqrrKMZ6
+=dewk
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.20.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.20.ebuild
index 48bd86ad6d69..1ae532a44202 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.20.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.20.ebuild,v 1.1 2013/11/29 08:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.20.ebuild,v 1.2 2013/11/30 18:22:20 polynomial-c Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
-RDEPEND="<x11-base/xorg-server-1.14.99[-minimal]
+RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998_pre20120806
@@ -109,6 +109,7 @@ src_compile() {
 		/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
@@ -128,26 +129,7 @@ src_install() {
 
 	cd "${S}/out/linux.${ARCH}/release/bin/additions"
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
-
-#	# xorg-server-1.14.x
-	if has_version ">=x11-base/xorg-server-1.13.99" ; then
-		newins vboxvideo_drv_114.so vboxvideo_drv.so
-	# xorg-server-1.13.x
-	elif has_version ">=x11-base/xorg-server-1.12.99" ; then
-		newins vboxvideo_drv_113.so vboxvideo_drv.so
-	# xorg-server-1.12.x
-	elif has_version ">=x11-base/xorg-server-1.12" ; then
-		newins vboxvideo_drv_112.so vboxvideo_drv.so
-	# xorg-server-1.11.x
-	elif has_version ">=x11-base/xorg-server-1.11" ; then
-		newins vboxvideo_drv_111.so vboxvideo_drv.so
-	# xorg-server-1.10.x
-	elif has_version ">=x11-base/xorg-server-1.10" ; then
-		newins vboxvideo_drv_110.so vboxvideo_drv.so
-	# xorg-server-1.9.x
-	else
-		newins vboxvideo_drv_19.so vboxvideo_drv.so
-	fi
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
 
 	# Guest OpenGL driver
 	insinto /usr/$(get_libdir)
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.4.ebuild
index 584243e1cbb4..2b4c080a803a 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.0.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0.ebuild,v 1.2 2013/10/15 14:17:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.4.ebuild,v 1.1 2013/11/30 18:22:20 polynomial-c Exp $
 
 EAPI=5
 
@@ -19,10 +19,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
-RDEPEND="<x11-base/xorg-server-1.14.99[-minimal]
+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
@@ -109,6 +109,7 @@ src_compile() {
 		/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
@@ -128,26 +129,7 @@ src_install() {
 
 	cd "${S}/out/linux.${ARCH}/release/bin/additions"
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
-
-#	# xorg-server-1.14.x
-	if has_version ">=x11-base/xorg-server-1.13.99" ; then
-		newins vboxvideo_drv_114.so vboxvideo_drv.so
-	# xorg-server-1.13.x
-	elif has_version ">=x11-base/xorg-server-1.12.99" ; then
-		newins vboxvideo_drv_113.so vboxvideo_drv.so
-	# xorg-server-1.12.x
-	elif has_version ">=x11-base/xorg-server-1.12" ; then
-		newins vboxvideo_drv_112.so vboxvideo_drv.so
-	# xorg-server-1.11.x
-	elif has_version ">=x11-base/xorg-server-1.11" ; then
-		newins vboxvideo_drv_111.so vboxvideo_drv.so
-	# xorg-server-1.10.x
-	elif has_version ">=x11-base/xorg-server-1.10" ; then
-		newins vboxvideo_drv_110.so vboxvideo_drv.so
-	# xorg-server-1.9.x
-	else
-		newins vboxvideo_drv_19.so vboxvideo_drv.so
-	fi
+	newins vboxvideo_drv_system.so vboxvideo_drv.so
 
 	# Guest OpenGL driver
 	insinto /usr/$(get_libdir)