Version bump

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

3 files changed, 201 insertions, 15 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 0242da1a0956..3e8e1a2001b1 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.123 2013/11/02 15:16:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.124 2013/11/29 08:15:58 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.2.20 (29 Nov 2013)
+
+  29 Nov 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.2.20.ebuild:
+  Version bump.
 
 *xf86-video-virtualbox-4.3.2 (02 Nov 2013)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index aae8d1c6dcc3..0629d26f8a83 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -10,28 +10,30 @@ AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 SHA256 0e72a5ef8d915c550fd92
 AUX xf86-video-virtualbox-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b SHA512 f7c1b13a12d91884f0faabc23af345cde06315b23900d12ba0fead64c7818c1aa721cd6710c905c2758bcb5cbec9f7ea3a8b515fcab14ef4965d4e1c27fbab94 WHIRLPOOL a3e3cc997172557086741ee3d689411b4f1964a480b800d315fbd3a43c2d507448840a4812d8e735428a543b9a0c1838736aad692dc6460f29489bdb4c2010ab
 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
 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.3.2.ebuild 4949 SHA256 19f7f104c374e550aed5af8ad4830e3903f8f2a7ce0dfd79119f32f1781821c9 SHA512 71753b484e09a6ee97340722db08ffe460ff240dabb85bd61ca9b02d2b81549584a705a3a8e313fabf69f4bd4eac9ed781217685b1b0455d2576832619ce3aa9 WHIRLPOOL 56fcb590649c767864c7c9dba27b5994e1c61d7b190525978edbcd563579120a2538d07fa5eb562b1292b16b1f72f7312a6648e04f1181ed9c32399af48af6d6
-MISC ChangeLog 26447 SHA256 fc7468d3d51a4d3ecae0851abb713a0359907371fa8f3710764844c8b2a9184e SHA512 45a38aa78789c6825ef41bc22d1ba0e971750adf5fde913769e8ce7505cd5de2bd647b9caca2573fd5cd9aa0698227b60c1df653f24c31191716fc4b25ffffda WHIRLPOOL 4ebe68f7c26248672739bb5d6bb48b08fc35ce07c45518612cc670ece75a518a9d115ea0911bb9c999b7ef5086ab5a22d7fad18cb81e2728586dd54e06b7d3ed
+MISC ChangeLog 26603 SHA256 6fb53b177ae7d4356c7f97c9103f8d1a86279eb3ea8618d7db1c571b0826264d SHA512 872e8c8a018f7865121a6274ba2e1822816f5c3d47295ad4cb435121cb79ba3d5db0d08a99a97d76c21d3d06a03a27647588441eec22104492cfb7141b906653 WHIRLPOOL b4e6b1f515e51c7c5c654b12e7910be71eb9852851b78822d59c3fb65e298982478bbece9065b053187ff589bcd1024ef4b0f08422a6dbd05fbacbc7470fbbf8
 MISC metadata.xml 359 SHA256 ab2e6dee370bc02d436bf0c03dbdaa826c9ceae9a4678975242e1fe7f3855608 SHA512 add99ae916087d7466647e197d30ae21049ead1fa892539e6081b0bc88f9cf19c12492984576a00581a35a2ae323528f417e48cc04a12152e3fde63da2f37cdf WHIRLPOOL 459e98c740f891deb8ba95788b0a9ecd609744bdf13e60c1086d9e7981951b5767ce1e44e63e4793dd75718e27ed3a24ad0de806f15459f0c8bd251a73996975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSdRdsAAoJEPiazRVxLXTFxCIP/iEPN1I5rsJuJsizIX7Xa5zS
-sRBn58ss2oElhAYhJD0QklbiCIlvlfDkvoKIkFIebCVgssz2pmP556MXWseNzTaL
-+RbKtiYA32Ev2XdW/5XxrUQX85BbGLmvpwZ52nbZQQCgPBHpD1BAobuVblMrG0J8
-6NDzz/5Q3u8XzoNgzwkAnAlbidwLn40KI3epWxB3fMxFbL4VTCGYWUcZDD5/keSS
-7VNzTiVi5mg3hBKwjyjTOxOFobU18moezd/EPgKCVLVDrYzr1aU4HXbWferH/fFQ
-WpFd7l8iFvgMjf7z0YkItB4la3ut8VoGXyrZpt0pKwNDdY8LMQwnTZaForkJxbxb
-t6lxVFNr/7SA19h2bLE0+scb+PY/gpOHtCcNx6+MkLHA2Z+SvNfv1KviLgb+Ppnv
-4iJMcZXNVgXQ7uqQmRY2XdzXoepGSbvdPx7ut5wXVv2D5job7R6zdGbF0txLlUcf
-zHxrSC9/nFiZWsrIChNGbhm1eBlUjjcFSsqyKl+qS/ix1O/s3ZrXP9Dg+r8FeUX1
-nhJQe3qQNqy0D6QRp+cxXOW+gC7vEskeWlP0AB/s1yYZqgXXHZl6qBnRDmnPYK3R
-Sr/6/+87OCkAUHI2sFW4EdhlnR5bQwoC6yY77DZJfQcImxZkCeZaCunKOUtm3dRk
-846+8no1Uu0bfy/OvW+X
-=HoJ8
+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
 -----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
new file mode 100644
index 000000000000..48bd86ad6d69
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.20.ebuild
@@ -0,0 +1,178 @@
+# 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 $
+
+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.14.99[-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 \
+			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
+
+#	# 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
+
+	# 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
+}