Version bump

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

3 files changed, 191 insertions, 6 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 46e95b3ad9b6..5b287fc81eef 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.83 2012/02/26 12:48:15 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.84 2012/03/15 10:02:18 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.10 (15 Mar 2012)
+
+  15 Mar 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.1.10.ebuild:
+  Version bump.
 
   26 Feb 2012; Magnus Granberg <zorry@gentoo.org>
   +files/xf86-video-virtualbox-link-lazy.patch,
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 9c6e45574daf..4a9b4b044ca9 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53f3c0cb285750921287959a6 SHA1 7d68f5529a921f7d9786b232e8ecc7ebe7ba0e1b SHA256 194b7bca875f18e1621f065640d1c1a1364640e17475c493ec3b56f6e7e5ce66
 AUX xf86-video-virtualbox-3-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30ca9d3a33fb3 SHA1 52d13e385d75d55aac64697eb715421df856c728 SHA256 ff777086ae7d0337e59066b4f7d6538823ca1804b57906e07cd562c8a48e054f
@@ -8,18 +8,30 @@ AUX xf86-video-virtualbox-3.2.8-mesa-check.patch 701 RMD160 061b6eaf0b3cdbcaac72
 AUX xf86-video-virtualbox-4-makeself-check.patch 289 RMD160 ff0385e86ad83501d58ff051b6c80c5122f6d956 SHA1 aa54f6621bf40da58897539aa4efda6f21a26a96 SHA256 31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966
 AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 RMD160 2562cee4530976224ae128a732ae99d79eece99d SHA1 050479d15ee5fed1504646c0687fd6e2c8a22dc1 SHA256 0e72a5ef8d915c550fd92865b40c265153dc2d4621714a599d3a7172726b6fff
 AUX xf86-video-virtualbox-link-lazy.patch 996 RMD160 587325847ef92508959b9ab58011f6c3b757d80c SHA1 f85cb63faa7dfea274ee90d05045684818cf922a SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b
+DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
 DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
+EBUILD xf86-video-virtualbox-4.1.10.ebuild 4687 RMD160 2de9f3e3ad5b84edd30a291f2da14b6d110df7f4 SHA1 a3738022316ffc80d897daee77e9340d0b289894 SHA256 d1d8c3080c25ae75fc324bd9b14567f8e47f54ccada62f482ca042ec5ac3b1d7
 EBUILD xf86-video-virtualbox-4.1.4.ebuild 4407 RMD160 69163556717abea1f5059dec71bcff354335c511 SHA1 58db795b6669439860e7aae1900d0023dd6b335d SHA256 984dd1fcee7a14bdceffcf8bac1cfcdb2a93b388bdc0f579bd26ca70f4b81f26
 EBUILD xf86-video-virtualbox-4.1.6-r1.ebuild 4412 RMD160 cc073a0d3eed43e1275df6c84ddfd9f5024e8716 SHA1 95259249d23882ae2eb2d4318ed309bdaf56689b SHA256 feb55c08c97207b80f7731b15c15ce55e1a65e148a2c6ea339d95c8401bdd0af
 EBUILD xf86-video-virtualbox-4.1.8.ebuild 4550 RMD160 725e991bd06045aea4e75bb0e700abab60af2672 SHA1 8b5bec847a4f01013d54843aff19be24ee0a3ffe SHA256 2aa34736c66b4359bdf2e310999bac205d122ff7ae5b184c01b48bb0b540fe12
-MISC ChangeLog 19260 RMD160 6e94d5401418bc61849dd14a709cf4814dcd679d SHA1 1f87c561b2347568589100bf5d98e1c36559e986 SHA256 15760307275d19908e790d779b7598cec55811ff51557f5edc5d0377f1323890
+MISC ChangeLog 19423 RMD160 d91667c7ee43f9ca759862e7376fe5e73a352a6d SHA1 4a6851a5fc93cfe34a4550762653d0d99efe0de5 SHA256 5c7cb03682a5460407a99ac67735c166fabd807acee2f401154691bbca09c92a
 MISC metadata.xml 419 RMD160 13fc3cce48e9838b631212029166c35290f0663c SHA1 8495d64ae5f5e9671015268774b3345db6c26686 SHA256 6f1740d2b3ebdee872cae17b182f9a1f6ef233118a9324105cc00ba881da9b88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9KKhsACgkQe6JQqv15gH++yQCcCAaOG2e5urUPyIRfZ9jef7U0
-CFIAn2fbeTMEsGVnb3RiBb8u2tyyZ1CY
-=oH7H
+iQIcBAEBCgAGBQJPYb4vAAoJEPiazRVxLXTFzQcP/inFJvHa2wEhrXogoVJI0XKa
+sn5HjwqcfX5KBVWPLj0UqG2KWNc8SufKSipuX/3nLO+j5N1gpk9MycoGD9w4Djjt
+UJjbAiEbWD+tJ9tI/LKhd3kYitYW/JoNGMo4R8tj3mu9QFzO+CAO+xICDJimNvwL
+FDr4jGxEBVXbWgArf5yBoJxmrcPPL6912F9sgN5lFtqMRKNFl8A0xI+0wzwYHPvl
+CSbNhnUj7cOUR2JuWCJdKEI8+tc3c/wycGFfMCnYWnkIMBjlEHWbVXXtbAEusF7h
+FL7fNmNVlayq4dW9QQzbCmktDCksOTy3M3U9OeNtLRVFYHZb8hFsJjqxH4IJG4gw
+UiPgyjJuAWMZj3TYKmgEDzmunoN50oMPxfD7CDLx3fnrmtZTW4Oj/DJf2i1EQ0Ha
+gTxxV3W4rEvDjoH0w5GwYB0l6JEgPs7A8UcfwQsMKCVQfSBPO6R9PGsTv1ZtQNED
+wz0dQ6MMFQxGe3APq7H2KcpdkIDArs+hXz2TbhCkiDCniy3ZvX2qw1zsm9KNkzbv
+YYKZiZDv2SZr+fabQfV9Bn8oDyGRG/tvBMAk1/+0Ug4oBb+bXSPjC3yOlpe1R65y
+Ux1omitK0G4aorE2i6Sy0l01rYX00K4vQ7VCW7FJnKxFCdb4XAd+DlwgC6SkhFsK
+o00SRdhfrOz0oOnb4RZj
+=Zl0v
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild
new file mode 100644
index 000000000000..bd6380333912
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild
@@ -0,0 +1,167 @@
+# 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.10.ebuild,v 1.1 2012/03/15 10:02:18 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[-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}_OSE"
+
+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
+}