Bump #439366

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64

3 files changed, 184 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index f8d7230c79df..d1cf3ced9251 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.101 2012/09/18 05:37:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.102 2012/10/24 04:45:39 patrick Exp $
+
+*xf86-video-virtualbox-4.2.2 (24 Oct 2012)
+
+  24 Oct 2012; Patrick Lauer <patrick@gentoo.org>
+  +xf86-video-virtualbox-4.2.2.ebuild:
+  Bump #439366
 
   18 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
   -xf86-video-virtualbox-4.1.12.ebuild, -xf86-video-virtualbox-4.1.18.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 1d94e0a9ab60..02f9368fe887 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -7,7 +7,9 @@ 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.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
 DIST VirtualBox-4.2.0.tar.bz2 76590194 SHA256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6 SHA512 76cddb682a2f5615e8ab465e8766d0ba19e1482b595a185cb401fdb962fb6f161945986ea5514934652305fa3d25f66a88767572fa4e0c5d3b5d5ffeb15c8005 WHIRLPOOL 5c4521a1dfc5b249c6c9692741a83014dc98496086e31186883e8b3f43c18af700f8002c3586b1475fd2c8bac2cbcaadc90aafb259ec50ebbeb3703440ddb822
+DIST VirtualBox-4.2.2.tar.bz2 75655741 SHA256 943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700 SHA512 d6a85175e15d3dc49aab825aeb9aa4fb9b2640e6bb3c65dfeaaf492fe8589abe70ad5dbf8ed07d502f337c243b469a7da35d4bf23bb26f5ad3b0ee0a06a51a10 WHIRLPOOL ad45932ca5ea7e990af975a1c3823d58cc9b180a9f1e0c23576e1c6fb2aead39cdd2d0303b830f334d811c1f4b6b8b585d243a177253f13b53735303ae247c33
 EBUILD xf86-video-virtualbox-4.1.22.ebuild 4595 SHA256 7aa362c3fd38af87bf1cdad8f595f711cb451b7fb692a7b8a2c4286b2d9cfaf9 SHA512 1e1a552da1921c0eb9578e570ca5aa9108c0fa9ec26b683ab91114bcfa3f61c6ab118db3a90e02f9bf8797c35fa2ae54c0682c43742247eee0c51c218a6e71ab WHIRLPOOL 583173e00a2316d2848a286c93db7a537031152f77273fa058355d7eb9e04313c26e2767fd923cbbfe4d0e0b50d8876dbc01698a3751a82493aec871e45cfa9a
 EBUILD xf86-video-virtualbox-4.2.0.ebuild 4824 SHA256 0db1b3910d4821a8d64c7b5acbe7dc6b5d7235090b13fd7d9f30b9d16c77a1f1 SHA512 6920a16acc98e382bb549067421328f66d3241952f35868247811ccef8c27b7a5da1ac546259784b61ae5776ebff056b38cc1671c799e1541b273971001de371 WHIRLPOOL 3e239367c54163e8ccd4b56a8940409fa3ca0a04beb50eaf4ecdfc7c1ce52f4a0f37e8837ede439983e49bcaf165dd19bb4b60c14cfa27228d47d5628b8cd602
-MISC ChangeLog 22260 SHA256 b4c48029e134c0dfb4edc855ba5cca38949d51a3bd91c6197c5ed30f0221b222 SHA512 15cb740f1567950fa744b682e40da9b85ac0b2f4874d56f14d4c91deac52df40e5015cabb985ddac68001d746068c4e6f07ce704904556489cabb0b64a957c97 WHIRLPOOL f22137bec7158d282802078f957f9d29d8853735c3e89664556d469c28aaf84e67762c908bb4f2fb76288d527e7147908f8d8ffe1b09763b951778e9b0be8217
+EBUILD xf86-video-virtualbox-4.2.2.ebuild 4819 SHA256 18c9bdb5f5e4188e4c7e4f2b8caa91537e05b97c50dd513b3b50fcb5ffce001a SHA512 00963bd953dc2bb921e4961805010742519697a5dd0187b6adc6d304c88930aacc602cdb6565f899eeaf9290d32bbcd63d9591c339823701cd52b081feeae45c WHIRLPOOL d0a6ae3f70897d147f7dc5de1eba233489f44b72bac4577551bf1a65c39ee75bd18c9679007803ffde4ea81bc64b497fb7f5499f3ab1757790b483764362ea66
+MISC ChangeLog 22404 SHA256 2e43a134f14dfae5110306092ca7a5416809272db980b0b37acc7437e9845e16 SHA512 86a42e43ac625175271eb7a7035cca69e2b52821f9f349e6925154be8bf4453bdb85e2a262f7e078dc26b668b8cf8631b7df61d4188174ac0a2ea682449a3570 WHIRLPOOL 7798d360bce758a900a92221250ca1acebeb34425bf5217c58a22bf6bf2e43938b35b55b98f926661f2bc390e2afd33aa42b504b36362e97a2bb8ed1f9b13128
 MISC metadata.xml 328 SHA256 18c49e38babc89b001d395d7abd3612daf5a46e80d175a20077a2bec61d5eb24 SHA512 550b7deac2d386c8f85cd249f7ea4b8c127ca273e394646e3a2ee2102c5ee98efd0fc2691fa4add4ead6f383a96bc063b00e99138403777b8e0571c354b37760 WHIRLPOOL 4933aeeb80163f70bed2515ed2baac94e142e2fd5073d6ab3470a6860e34b739bb6837f2b31147907ecea7ec1c970d00b6e5bbf5387fe2284c2a3b6c60b8da1f
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
new file mode 100644
index 000000000000..a74aecea1449
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
@@ -0,0 +1,174 @@
+# 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.2.2.ebuild,v 1.1 2012/10/24 04:45:39 patrick Exp $
+
+EAPI=2
+
+inherit eutils linux-mod multilib python 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.12.99[-minimal]
+	x11-libs/libXcomposite"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20120806
+	=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}"
+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_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
+}
+
+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" \
+				|| 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.13.x
+	#if has_version ">=x11-base/xorg-server-1.12.99" ; then
+	#	newins vboxvideo_drv_113.so vboxvideo_drv.so || die
+	# xorg-server-1.12.x
+	if has_version ">=x11-base/xorg-server-1.12" ; then
+		newins vboxvideo_drv_112.so vboxvideo_drv.so || die
+	# xorg-server-1.11.x
+	elif has_version ">=x11-base/xorg-server-1.11" ; then
+		newins vboxvideo_drv_111.so vboxvideo_drv.so || die
+	# xorg-server-1.10.x
+	elif has_version ">=x11-base/xorg-server-1.10" ; then
+		newins vboxvideo_drv_110.so vboxvideo_drv.so || die
+	# xorg-server-1.9.x
+	else
+		newins vboxvideo_drv_19.so vboxvideo_drv.so || die
+	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 ""
+	fi
+}