Version bump

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

3 files changed, 179 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 7bb173de36f7..152caff561fa 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.96 2012/08/21 09:20:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.97 2012/09/09 15:24:32 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.22 (09 Sep 2012)
+
+  09 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.1.22.ebuild:
+  Version bump.
 
 *xf86-video-virtualbox-4.1.20 (21 Aug 2012)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 1ace7743a52e..0eba00726c47 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -8,8 +8,10 @@ AUX xf86-video-virtualbox-link-lazy.patch 996 SHA256 976e922756f9f2f01f625b07a01
 DIST VirtualBox-4.1.12.tar.bz2 73250628 SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02 SHA512 93122eb428c114b73c76775d1643ea297dff3800b9c1950ad0e5ad2dbb3b308a119dd065364d2578035746f5844f813c881227b188c3965752ff31dad5017c5d WHIRLPOOL d8f4446a069b9a73ebc20bcf23d464e16adba40bd356adbba4f1fc1e1a0dca089b101bc7b4483e0c28b0c2b1bd88c0cd28dffa045f4f95303ca926825ce9a2e9
 DIST VirtualBox-4.1.18.tar.bz2 73688436 SHA256 e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7 SHA512 8053daaf45aa8ea4e56f7fc3b53b280ecbf184cb943ef574c7c1005557e762bcd626fe8b28693706c1c5385f497ea1baf39927b2cf83a09dc055076ec7bc8a3e WHIRLPOOL 0e232225431b230fd73e8d23bcdb23e413aa85fc336aa8af179f190c2b855b77057daa324ef1fcc5da08a75c51daa87f04beb97f03bdbd9ce2a270064debca78
 DIST VirtualBox-4.1.20.tar.bz2 73391720 SHA256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb SHA512 ee14844b00e202fb23168d5c583d7dacca2de0506028ede7dd51fe33a2a1b5b7154e706445c85d930e0d7365ee32878d08644d6830d1b591ad5334fef5453c6e WHIRLPOOL 8a33f3553554eae6a4cbb5e80b376e507d9da97cf10e49363a2888fa849d238bf84492aa4941e7c930ec17c9b1c5dc5f1ad4643ef9258d74a44f8b81f84a00c2
+DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
 EBUILD xf86-video-virtualbox-4.1.12.ebuild 4598 SHA256 d8d741c6850e36bf206129494e000f6c721d5fab15c8d1e225df2a10032cf702 SHA512 4d1eacb319eb2907d1bd8cbf5c7b4c32feb2d6ee8d0d5c664db4632a5f95c29581bcdda459b39748c3a02efa4cdbb313b1fa4d009ae9743f7ebd1587dd00c5f2 WHIRLPOOL 32151c7d8824df21c8bda859d2c9a1b07b306c599f6ba5937d261819223353b467ad71b2488b7d4af750f0ead103a4c2ac6b9a8afa95b1104d087e9c2cb292e4
 EBUILD xf86-video-virtualbox-4.1.18.ebuild 4595 SHA256 d7883c020a11a7b0fff7125b07cfa32027dad82aa046fb840bebea121fbce6b7 SHA512 7ea54b2859b9cdf65255df49b628e6224059a570afa7fe971ce8832627e8df30629a97ae9edde0d7e82abb8042338b4f330a897dc61304b2a40f6b5d100a6d95 WHIRLPOOL e63423ce5760b44719ba2b15ad7e703056a242aab9a9159395603e5b5e8a502c7d40e5f85b3fc1cc10d89c61f8636cc0411696c7694f846b5b1a0d512e7f5493
 EBUILD xf86-video-virtualbox-4.1.20.ebuild 4600 SHA256 7b11366d86c4642b6401ff5646e729070cd9d42c4418ff45180136ead2f747f9 SHA512 c3ccb3d48a24a9bc53b987ae615442f9de46bcafca82b8994bed362696b3b75874904b4d0191340369695ec014979a45bc0168011563980359ac5751fcf3cf93 WHIRLPOOL ff9b18a187a3596a14cc6833fa75a6d30c1e73b0912b81a622662a6c247c89f47221fb51708ece36e7ab8ddf78f4a30023fe1749440cd957db0c5df7d284f652
-MISC ChangeLog 21492 SHA256 60afb21f21d30c25c8a717b0ca5cf5abc6b0835617820968cb602927671696d4 SHA512 fb6b2dc4faf46744abbfcd031efe40d359eb235090d964338c0d5a2c60c18054979863b8cb4698fa8ddf4e52c9411d5dbb7f64926c6e4914ed99a11dff58a115 WHIRLPOOL 377604a392c25ff8a42db699863ca29c844dc3a1b7f1712787b2f943c67771c6e1958e88492089ab0e2d6186814d343ed7785c8bf47c5fa1321966dc0c45adda
+EBUILD xf86-video-virtualbox-4.1.22.ebuild 4600 SHA256 1c8110c7f8a1692c677e4ea7de5e1e80ef936fa25fbc088b1409be90cc41f32b SHA512 5571c202c477794634297156a445a63e0aa750537198922af10d77ff12ed95156559b15fb24632a28f1c92f22fa79c0193aa66687e6a133620e35eb86489a216 WHIRLPOOL 2ac62375414f9b891758df5b573b25648ce0db4fd5fc0e45247e017176255e57d5492fdc48e0c9a6af800379b7a692b87e6a4e602a74b3ac5bb442a7a9521a5b
+MISC ChangeLog 21648 SHA256 21ea09dd80e5b398922adfd764115081be20258f0ced9b4ae2626963187b2934 SHA512 c7786ff4b4407d5a631f7d8325c97799b396a32c68ef27391d93288581e691c8515a676a6b90c283c4e0ec911ad2c6cb55aabf44f706dcccb2f00896114e0fc8 WHIRLPOOL 9d214c64701cbf43dfa08b4388d582060bb4951cb41a2700874a28ee90bf26e94d657d7e00d3a4733875544b33b1f25362681cd9db706f1a66121d6fd4e00fe3
 MISC metadata.xml 328 SHA256 18c49e38babc89b001d395d7abd3612daf5a46e80d175a20077a2bec61d5eb24 SHA512 550b7deac2d386c8f85cd249f7ea4b8c127ca273e394646e3a2ee2102c5ee98efd0fc2691fa4add4ead6f383a96bc063b00e99138403777b8e0571c354b37760 WHIRLPOOL 4933aeeb80163f70bed2515ed2baac94e142e2fd5073d6ab3470a6860e34b739bb6837f2b31147907ecea7ec1c970d00b6e5bbf5387fe2284c2a3b6c60b8da1f
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.22.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.22.ebuild
new file mode 100644
index 000000000000..99bfe6c42d14
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.22.ebuild
@@ -0,0 +1,169 @@
+# 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.22.ebuild,v 1.1 2012/09/09 15:24:32 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod multilib python versionator toolchain-funcs
+
+MY_P=VirtualBox-${PV}
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${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.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}"
+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.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 ""
+	fi
+}