Version bump

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

3 files changed, 190 insertions, 15 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 5ab89960980f..cef830259a0c 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.91 2012/04/26 18:22:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.92 2012/05/23 09:49:52 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.16 (23 May 2012)
+
+  23 May 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.1.16.ebuild:
+  Version bump.
 
 *xf86-video-virtualbox-4.1.14 (26 Apr 2012)
 
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 76e2f308fa84..c8cb5a1bcae1 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -10,24 +10,26 @@ AUX xf86-video-virtualbox-4-mkisofs-check.patch 356 RMD160 2562cee4530976224ae12
 AUX xf86-video-virtualbox-link-lazy.patch 996 RMD160 587325847ef92508959b9ab58011f6c3b757d80c SHA1 f85cb63faa7dfea274ee90d05045684818cf922a SHA256 976e922756f9f2f01f625b07a012d6f287811b3d099f1a855c9d4453cc4f5a3b
 DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
 DIST VirtualBox-4.1.14.tar.bz2 73260319 RMD160 68bb81486dad190a1bd74251ad32ee16d47be625 SHA1 126e61d5f7187d62b2b213b658912c83f49e6de6 SHA256 034cfd19d5dd701cd1375b994ad6f2d41c207b6760c6b8c5fe3005e53134dff8
+DIST VirtualBox-4.1.16.tar.bz2 73255692 RMD160 979317bed30a1e7d8ca5082b3c4ee0977adb7d24 SHA1 3dae2a7192d64ccaceb239407d2b03c0bedcb3fe SHA256 b670499804c718a8ebbc7c2ddee37f70e98771a151391a597b5808f4310f824e
 EBUILD xf86-video-virtualbox-4.1.12.ebuild 4672 RMD160 39b83308c0bf9e9ad52779a815d296ca3b6d3191 SHA1 240a07e8a344a2664fa30372e9ae3e8a4aabd643 SHA256 78bf76beead6997f9db81744031637a575a91c820b38380f4fd8d041c388b5d3
 EBUILD xf86-video-virtualbox-4.1.14.ebuild 4683 RMD160 d4fc4365e58d93ff7c36e562cf936babf397b09c SHA1 4160b0da603e36b89ce1e4c0c2876a4269851eae SHA256 0733732b4d91b57d1790b0cb3f05e3db9842a48a893b5bdd24d926af437c5deb
-MISC ChangeLog 20511 RMD160 0b59cbd47daf5e4ee1eaec052fa787599d521b5f SHA1 3205c230c732b805444f22c47fd72229271bacf4 SHA256 53a12cf859002400f075d9472f3ea612b0fece7e73dced6c073872fc755266b2
+EBUILD xf86-video-virtualbox-4.1.16.ebuild 4683 RMD160 b2c3fa993761eea963841332c243b13764641735 SHA1 d1849f9a6c703b8779b4761ae7fb4b620122fe94 SHA256 a7e480e1c3076b1b35a0b78ca494d108f7677973e240b6c272c1a6b2c5b275b5
+MISC ChangeLog 20667 RMD160 00750ad873c0f56f869f28698e18d395617a3994 SHA1 343e52c43ae0f20e451b362c7982064469a8adb8 SHA256 46fc7d40b98a3c0fd84c1079c526fac4fc3484f91ea9af0b4572523ab48f4127
 MISC metadata.xml 328 RMD160 d36053bee7fcf8469ff02d45d7d320c3abdf26ab SHA1 9a8133ee6195fe35d220c0ee9d96c8f3d85abea4 SHA256 18c49e38babc89b001d395d7abd3612daf5a46e80d175a20077a2bec61d5eb24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPmZJTAAoJEPiazRVxLXTF41cQANU7hR2Sp3JLWp3/IkJF7MUy
-4Za21T633+WL4ZNEoiGMmwyr2gGNuj1k3s7AB4kQPu+XRGUhGGf8fruZhZ9g3Zn/
-7Ho3hlISG3D0xhIcJGKQOJ4DdSvIBSU6QL9mv7RNCDCdCNbstgwdaD8alDwxCyr4
-pcSmA1qp3IBVKZBAUn0LqShEHIG82Y3L8YlC2Uy/B/Cy1VYV0i3+BwgIVJfD9bmZ
-HLH0TiaAV7sohX6rmVc4bxK0uq/brg4uMcxlJftbRKit+nMQViYN8FIusQcrYDn+
-WcUKg93cgW12JmteDnt8no/+PkAu4re29vzgSkquWGS+qsMats6k4FQMUsy6hqfD
-aW2Vc2BjJSozZE26Et1RZytpp2dcrsM2x5F90oLHTRAh6+bmvBsb31bl5o6qbJd0
-Ef+CGX+KJiFyRf5TmbS2W8z18eVUO9vWOLYpLt0LZu6/4tf8TCIqNcJlBQzCX1nh
-5CQf+Jm7tEuZB1yVJwYi778tlWmuCAVTLPXFIsR3ff3dVBc7u6l7MS+dDi5v8pk/
-Keiv6kpcK18jtireU6OxFxdfX2K6Up4wZ5yQdJ5BoGt8iwrb3EtyOD9dB9ct2gR1
-6xjW+6F+nFWNTCs0z9HV9yWpUqHk1KSwhIAT8NQ7hNBoAnoSWPyTsWl+9b6N6AZP
-vUNlgmVd1MBaUe90mPc7
-=fLtd
+iQIcBAEBCgAGBQJPvLLFAAoJEPiazRVxLXTFv/EQALaygYb8q0LtW6EmNu2R1xql
+sv6giC1rrB3+dohhNXz87qVF1+5djUoV4x+PKs9FOQ1eOUrl68077UyY1qChg59L
+LMc1JbDIYau7eG8UpQfPQASHHCcFU8QsEm01l3z39J2dQyBnMH6sKeol+zbn1cq9
+FxPpKB9IshCv8gVt4W2Ifezod3BZgvPpgET92SQcULY4M8GHmzpKG3IOw7yHSr5S
+dYp+b7fg6d872G+CaMiORG9Sx63KYhvQDn693hr1lnvN1sUkV94tFfO0yWcQ1Xlu
+Ijh2BoYP+NfUDTpezJt9ruKH+wetk1Rx2LGU0+RloDPKsibyO/ZS4ANOELyr74xQ
+XmezgrshdpZc9Ikg85A9DwctDQ4Wv+sLXJLYV9j1gyaEAb4SmEVuEoIsf1Ln/G3r
+JY4AaY4WBaXvWG2SfUTg5BBztZzLVO1b1wJ3CUCc/01U5klrS+DSJ3jZM6fUJW6N
+9a3Wn+w08X6Edtj3qbb1vzNfWjEbL9/tbn/PjX73chY9q9CmbD/UQkfO5s6p4a09
+AAGWNRN8xYTP6bFXbY9NumoTZumeAUVN087pvIXewWSQ9jJGHzJjb4dyyQ1Xlgpu
+QmyLODwmrsO9mBQcD9r0esgI6l1llXbTpGMXlSFVETwxi0/Z6VHADY0y5eLUXEaA
+8COnLgsm7KLxlQh48myt
+=yrrr
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..aba7d2780b64
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.16.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.16.ebuild,v 1.1 2012/05/23 09:49:52 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}"
+
+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
+}