Version bump

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

4 files changed, 222 insertions, 15 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index ceee2ef26edb..79b4b4a8fd93 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.132 2014/01/23 18:54:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.133 2014/02/26 10:08:04 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.3.8 (26 Feb 2014)
+
+  26 Feb 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.3.8.ebuild,
+  +files/xf86-video-virtualbox-4.3.8-vboxvideo_compilefixes.patch:
+  Version bump.
 
   23 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
   xf86-video-virtualbox-4.2.22.ebuild, xf86-video-virtualbox-4.3.6.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 01b25a208d8e..5fa9e248cdca 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -8,27 +8,30 @@ AUX xf86-video-virtualbox-3.2.8-mesa-check.patch 701 SHA256 6b4ce64673cda33631e7
 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-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.22.tar.bz2 77039185 SHA256 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1 SHA512 136b3f3ea9a79493aecd86883c619d10934d80c391ce88985501736fc95d7066e0e31d02e7867974f9077eae5a431519d0c1001fc781d240f0578a1c63c29ee6 WHIRLPOOL e6ea0768587ee152463c3388476199333cf39f56f7bda43094ad98ea2179b8f0e81819004c6433133a68d7ede9606d2aaa4ee2aa96ad05bda06a7706f4e079cc
 DIST VirtualBox-4.3.6.tar.bz2 89609199 SHA256 c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27 SHA512 8cb540a825afa5f6069ad2bb155e825af4a222f6d20c5e653bf6bbbb07dfbc4d122640da5f249b72f1aa34f8afd92ef41c525911db30090a2d108b9609da4a38 WHIRLPOOL 12fd27c9499d9fac0283c01a276e02ac3c10c72c66e0ffea8db49beefa66b44f6b4c8fb727da5d74cc0ed2feb00531a67b65f52a5f55ceef2a8db64868cfc89a
+DIST VirtualBox-4.3.8.tar.bz2 90224116 SHA256 ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641 SHA512 0bc00254733befee6ba864b9c88e0ddedb5949fff884313b72bbedeaefb572fd129a8d16b179612acef9b53fc3d2203ac775656d6c941d94a77bb944fdd66903 WHIRLPOOL cc689ea459ab7b84a69e31d09d188c96b5fa6e082b18959e475604c4e862d044c95d66d4c34a3293a8a0489f67197cb67ccdcdf352bcdd862b44f58423db5f19
 EBUILD xf86-video-virtualbox-4.2.22.ebuild 4377 SHA256 a1ecf45c767c9f8645e740b4de0e73dfdfd0e48153b23d9b53ef34cf52de0000 SHA512 c8f3013241e7dff03f9cc3e3114ee79f810f3f58dfbe40319189685efd74626d15c8aa478e4d4b8c8e5d806a8de799a8230d5444f8284dce0a0286e84d26dec5 WHIRLPOOL 64b353a78e6616db52cf9f170541c6f00bc2f3e26da4bb7ca2566a414f55441cb9b08313d4e5258d2380ce32e3ce46038bbd8f34e3f4d0ea76e4520ea1900d38
 EBUILD xf86-video-virtualbox-4.3.6.ebuild 4387 SHA256 0c86781f4fc894441acc6f0a85719e2887ee751c3e87aa9cb5195cac84b6b1a4 SHA512 e84a7b62fa5f0f856905b231a2f34219037edec25f250e88e7bac01c9274c5b4600895adc188bdaab2d848ad30b44a201d536ccfc23abf78df5dcffc24fbb469 WHIRLPOOL 918c8f1a3eaaf604131747b75a1e2519bc46e2665c8f584ae08b46218c71d9f27962dd3ddac2d98491a5ef877920368a1d4074771b6dc3a3c0c765d6d436e2f8
-MISC ChangeLog 28334 SHA256 88f3c0e344b5e9b2b95f2f9e13d501d228e3227dd9231acf1637612b8c7acbe9 SHA512 2add2dbd55ef37b4007412bdf4ff5beaee5cc52ee9fd3541712e0d1d682c0bf8473246a89d9d2c3ac18c2793c775640167f7fe46760dc32f38d95e6949635e54 WHIRLPOOL c01e408b08482c5f37df5d85e13caf77ff9f7712bec200ad01e0ef5fe94600b25689820c3e778875745c1667a686eb00b2152c1d11b440525edec3c55fa86ce6
+EBUILD xf86-video-virtualbox-4.3.8.ebuild 4476 SHA256 63d39cb0258ebbb49907190c11841752b0f9b1190a751a2b9791ad3870941c35 SHA512 3c993c824ccb880e92112b4198d57c73f38aa957ecfbcc9bfedeeec229cea2bf10bda2ddabd05371db6f08be2bd954feb406c4db33ef89052e470c4529d38276 WHIRLPOOL 9686ad6d7cfa836553f207898c55aff3f0d86d0d22f1f919c9e6590ab16a9e55d1ecf30bd683fc112f5c7bac5cbd350a6c1e95a984a684811885efcb3e8fc959
+MISC ChangeLog 28555 SHA256 46e53c382a9bce613e1a225f1b8258ef41dff70648051e3a15b840db652d5578 SHA512 48b1f2a57faed14189025ef147518f99ed21f2fa4b3523ec01233a37d4c304646cc7ee26722f76816557c80a94216c8f21b975bcd1a59e0d21f5e5e136c4b520 WHIRLPOOL 6c16b5d24aac25b066d14e10bbcc83ccefeb0881ccd92145bb05ba33bdf5e7fceae096082317627ddc89cd69dde1dd64da73ac909aebe161571776f42307ee7d
 MISC metadata.xml 359 SHA256 ab2e6dee370bc02d436bf0c03dbdaa826c9ceae9a4678975242e1fe7f3855608 SHA512 add99ae916087d7466647e197d30ae21049ead1fa892539e6081b0bc88f9cf19c12492984576a00581a35a2ae323528f417e48cc04a12152e3fde63da2f37cdf WHIRLPOOL 459e98c740f891deb8ba95788b0a9ecd609744bdf13e60c1086d9e7981951b5767ce1e44e63e4793dd75718e27ed3a24ad0de806f15459f0c8bd251a73996975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS4WVqAAoJEPiazRVxLXTF1PAQAK559jbVfA7GbrUYSTIVAg8t
-Raf9y+rFIAGg1pfElHjKWk22xzrLKBm0CMp8yNEa/VAUwDOeyTfvjdnNyNerAEfb
-rmDQ3fKtfKviZkadMUs/7MGSlcoMW6dnMQ5NhVSXT9KTXrbIjh1S0CP8qPAlTSss
-PoYAufA8G3ya9L9WT1HVXOeti8fwHFRjWJIMRF7UmLwO4t6hqNqI/Ck2svgR12kj
-2+rHLwynVcN0iTeoteAEzlJuSjVaOUMUiqrAV+h7WkA8AWWyoQ7F4tPtmTMT6USj
-SFlXCSrHbYo7m7EWUSRuQda0MyC3bDJvS9HpPt6++On86l7id+D24lhOZIHOdOKi
-fpRTqlv2lm0zR2aschZIO6UCgMzKzBItNNsuMsFW16I3Xdj+1GRdSUzy7C8s9Zwc
-HpA6iUA7qe+0qcRt6rbjFMABmBsx8owal6DcQfFBdwaw20+TrtdFuPPwxtm1IfGd
-kE8huN4tdV70hiuTCuBnTJlw/794zCAk25u7225h9dxdbStwxw9o9zVnLNGkUDo2
-UCrf3lblFj62ZV1blWTg55I1U3o1eAhboeZVYZ6RefW0xi8zbXyyBye58RevI8FA
-pbrtzU85UCVjQN2OXhO2n99nYY3om3mEygGKECuKjRDQPSwJVK1mpK4BvkBAMwWh
-2mrBOIq54MHbf0sfey52
-=FuKo
+iQIcBAEBCAAGBQJTDb0FAAoJEPiazRVxLXTF+eYP/0j5fVq1a2GTqdx11ASdD3Mk
+j9zkSAWqV54Jc3AKwZ+LGSkKkBILToHP2p2bgWuEXZ8SQdygzYcpZnwWL4hZOAid
+xum1MhOIY6fo9n/W8tPI9Ep2dpNCMA2tMfwUkOubjvhPaXNUGbDerTSJdoWgm+n8
+Nw5pOHzLvF9n2oSg5HEuUehT713r0z7sgyz5iE8G5hyTbRWvuBBADOgjdc3o1noC
+VJ2t2nUKDP18dgT5YGXYgsHt8NQjSbmVyp+5QGIBSw9kQ50vkz/EVDhjiUVZ+Gm0
+dS+HhXUL/jp6oAnK6/b7xRFIJjBq17BZykYp/hEuFUtXRsU0uNpw+R1x8xO8NefH
+UTFKx/EEMq2NRY0oQReLLI/UMTBtMHFzwbv1lPdZk4jhwkWd2rDvNzGRC6XYhHs8
+iOl1iu/+jsDURZq/3d6xixHJbtvtr1TEaoyg4AUksayQKDT11l9oJ6aJVyumSheL
+BAJ+CRbNfqwOoRHDaVzoZBq2NGNUeKEkfVErW9UhUh3JwjPp+X3EoOOPoGnJJuLu
+/bR145iGj5DBSoyZZf0Hw7sPbZAXHlJhcfLMawJcI/nkyitEm20FlC8U5eFDXE3h
+M2IgPgRRDE2ufcDp+G+dbFEB31MgYQvLrFBCxfmhliYG2ZcHrB6NN0bz9d/Hf+4k
+k5hTMZ/hORNHxuSBPiur
+=mUDk
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.8-vboxvideo_compilefixes.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.8-vboxvideo_compilefixes.patch
new file mode 100644
index 000000000000..23be8a5cb666
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.8-vboxvideo_compilefixes.patch
@@ -0,0 +1,31 @@
+--- VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
++++ VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+@@ -105,7 +105,6 @@
+ #define VBOX_NAME               "VBoxVideo"
+ #define VBOX_DRIVER_NAME        "vboxvideo"
+ 
+-#ifdef VBOX_DRI_OLD
+ /* DRI support */
+ #define _XF86DRI_SERVER_
+ /* Hack to work around a libdrm header which is broken on Solaris */
+@@ -120,7 +119,6 @@
+ /* For some reason this is not in the header files. */
+ extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
+                                 void **configprivs);
+-#endif
+ 
+ #define VBOX_VIDEO_MAJOR  1
+ #define VBOX_VIDEO_MINOR  0
+@@ -191,12 +189,10 @@
+     Bool fAnyX;
+ #ifdef VBOX_DRI
+     Bool useDRI;
+-#ifdef VBOX_DRI_OLD
+     int cVisualConfigs;
+     __GLXvisualConfig *pVisualConfigs;
+     DRIInfoRec *pDRIInfo;
+     int drmFD;
+-# endif
+ #endif
+ } VBOXRec, *VBOXPtr;
+ 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.8.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.8.ebuild
new file mode 100644
index 000000000000..2ed3d6f69fd9
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.8.ebuild
@@ -0,0 +1,166 @@
+# 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.8.ebuild,v 1.1 2014/02/26 10:08:04 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="${MY_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_pre20131130
+	${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 || 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"
+
+	# Patch to link with lazy on hardened #394757
+	if gcc-specs-now ; then
+		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.3.8-vboxvideo_compilefixes.patch
+}
+
+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} || 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
+		# 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
+}