Drivers don't work with >=xorg-server-1.12.99. Fixed tab spaces

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 343 insertions, 331 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index c2aad262dba7..7deddc791a86 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.93 2012/06/20 16:15:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.94 2012/08/04 10:01:24 polynomial-c Exp $
+
+  04 Aug 2012; Lars Wendler <polynomial-c@gentoo.org>
+  xf86-video-virtualbox-4.1.12.ebuild, xf86-video-virtualbox-4.1.16.ebuild,
+  xf86-video-virtualbox-4.1.18.ebuild:
+  Drivers don't work with >=xorg-server-1.12.99 so make them depend on older
+  versions for now. Fixed tab spaces.
 
 *xf86-video-virtualbox-4.1.18 (20 Jun 2012)
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
index 6cbf39674cb0..bdf0edfee14b 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1.12.ebuild,v 1.3 2012/04/24 17:09:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild,v 1.4 2012/08/04 10:01:24 polynomial-c Exp $
 
 EAPI=2
 
@@ -16,27 +16,27 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="dri"
 
-RDEPEND="x11-base/xorg-server[-minimal]
+RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		=dev-lang/python-2*
-		>=dev-lang/yasm-0.6.2
-		sys-devel/dev86
-		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 )"
+	>=dev-util/kbuild-0.1.999
+	=dev-lang/python-2*
+	>=dev-lang/yasm-0.6.2
+	sys-devel/dev86
+	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 )"
 
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
@@ -47,121 +47,123 @@ 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}"
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 
-		python_set_active_version 2
-		python_pkg_setup
+	python_set_active_version 2
+	python_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
+	# 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 \
+	# 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
+	source ./env.sh
 }
 
 src_compile() {
-		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+	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" \
-			|| die "kmk failed"
-		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
+				|| die "kmk failed"
+	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.12.x
-		if 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* || die
-
-		if use dri ; then
-			dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-		fi
+	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.12.x
+	if 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* || die
+
+	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 ""
+	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.1.16.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.16.ebuild
index aba7d2780b64..a9432be8d0d6 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.16.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1.16.ebuild,v 1.1 2012/05/23 09:49:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.16.ebuild,v 1.2 2012/08/04 10:01:24 polynomial-c Exp $
 
 EAPI=2
 
@@ -16,27 +16,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
-RDEPEND="x11-base/xorg-server[-minimal]
+RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		=dev-lang/python-2*
-		>=dev-lang/yasm-0.6.2
-		sys-devel/dev86
-		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 )"
+	>=dev-util/kbuild-0.1.999
+	=dev-lang/python-2*
+	>=dev-lang/yasm-0.6.2
+	sys-devel/dev86
+	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 )"
 
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
@@ -47,121 +47,123 @@ 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}"
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 
-		python_set_active_version 2
-		python_pkg_setup
+	python_set_active_version 2
+	python_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
+	# 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 \
+	# 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
+	source ./env.sh
 }
 
 src_compile() {
-		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+	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" \
-			|| die "kmk failed"
-		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
+				|| die "kmk failed"
+	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.12.x
-		if 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* || die
-
-		if use dri ; then
-			dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-		fi
+	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.12.x
+	if 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* || die
+
+	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 ""
+	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.1.18.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.18.ebuild
index f9b54b6707da..e9952d03c02e 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.18.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1.18.ebuild,v 1.1 2012/06/20 16:15:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.18.ebuild,v 1.2 2012/08/04 10:01:24 polynomial-c Exp $
 
 EAPI=2
 
@@ -16,27 +16,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
-RDEPEND="x11-base/xorg-server[-minimal]
+RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		=dev-lang/python-2*
-		>=dev-lang/yasm-0.6.2
-		sys-devel/dev86
-		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 )"
+	>=dev-util/kbuild-0.1.999
+	=dev-lang/python-2*
+	>=dev-lang/yasm-0.6.2
+	sys-devel/dev86
+	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 )"
 
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
@@ -47,121 +47,123 @@ 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}"
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 
-		python_set_active_version 2
-		python_pkg_setup
+	python_set_active_version 2
+	python_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
+	# 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 \
+	# 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
+	source ./env.sh
 }
 
 src_compile() {
-		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+	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" \
-			|| die "kmk failed"
-		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
+				|| die "kmk failed"
+	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.12.x
-		if 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* || die
-
-		if use dri ; then
-			dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-		fi
+	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.12.x
+	if 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* || die
+
+	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 ""
+	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
 }