Bump

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 162 insertions, 2 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 5073cf3b3810..d9874fa54c92 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.31 2010/01/28 11:58:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.32 2010/02/13 19:20:03 patrick Exp $
+
+*virtualbox-guest-additions-3.1.2 (13 Feb 2010)
+
+  13 Feb 2010; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-guest-additions-3.1.2.ebuild:
+  Bump
 
   28 Jan 2010; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Taking over maintenance from Jokey
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 273a07b00897..9baaea721f05 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -4,7 +4,9 @@ AUX virtualbox-guest-additions-3.initd 1454 RMD160 617d486535efccfd2cf013ffeb7c2
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
 DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
+DIST VirtualBox-3.1.2-OSE.tar.bz2 55553394 RMD160 be66ad7198f04c71471eeffd5b95ff9d5078eab7 SHA1 ac85e5d098684080ce0571406d741f3db03064b8 SHA256 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
 EBUILD virtualbox-guest-additions-3.0.12.ebuild 4203 RMD160 220f120b9491918acc465e6949af44281df8eeeb SHA1 f457f354fd4fe30a6238c01a59c42127f1fbde4a SHA256 1d59c89a053ba58b8193c2bfeafacabe6ff99e2f9017bd55f0c39fdddf55c5e6
 EBUILD virtualbox-guest-additions-3.1.0.ebuild 4233 RMD160 e602da9e2b65e7606dbc47cfbc8e54e0d06b0fb1 SHA1 7028c2776f7cab8ce546d20228a345f3ea13bf82 SHA256 fa3351d86525202171e1c7b47976ab8bb30de794fd71f5765f4964aa1d2c2108
-MISC ChangeLog 12090 RMD160 94f04b3ee4e4b9701ba6d33255a338be356a9cdc SHA1 812327ca62cc6c6f1d2ab2c40196f51b1df83228 SHA256 8e0e926244f0df6a24e9f4deda54e5674c0bb4d0e8fda15463faf2e9e608c814
+EBUILD virtualbox-guest-additions-3.1.2.ebuild 4232 RMD160 5c59a9b0751a2177725bb83415e223b5ffa1df8e SHA1 f68eecf05a6767df3d9d7262173e12c5d93f9f36 SHA256 2724d31a7ed8c65a749193054da65b4483e27fa96c573d3bcc6dbb2af185f359
+MISC ChangeLog 12241 RMD160 2b167888fb4af22723b368f7ad9b2d7bb5ff5b60 SHA1 a1223e962b3ed6ef08341cd236f5b10b401a0222 SHA256 89b86bfb0e45103aee0a85e534c4e2a9dfe45b4f10ff11f3d8048fef12963d47
 MISC metadata.xml 353 RMD160 0fd52505150025043cf0f6d53b54736082f266bb SHA1 60aa8776951b13cd71fde130db73849977b4c48f SHA256 c8c97cdc3c8878c361444f278d234b1ad6fe9db06d8c4d4d9bcee711a2f6369d
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild
new file mode 100644
index 000000000000..d947b8aaad8f
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild,v 1.1 2010/02/13 19:20:03 patrick Exp $
+
+inherit eutils linux-mod
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+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="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 ~x11-drivers/xf86-input-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE
+			 amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.5-r1
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-power/iasl
+		X? ( x11-proto/renderproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
+
+S=${WORKDIR}/${MY_P/-OSE/_OSE}
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+}
+
+src_unpack() {
+		unpack ${A}
+
+		# Create and unpack a tarball with the sources of the Linux guest
+		# kernel modules, to include all the needed files
+		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+		unpack ./vbox-kmod.tar.gz
+
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		cd "${S}"
+		rm -rf kBuild/bin tools
+
+		# Disable things unused or splitted into separate ebuilds
+		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+}
+
+src_compile() {
+		linux-mod_src_compile
+
+		# 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
+
+		for each in	/src/VBox/{Runtime,Additions/common} \
+		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+				cd "${S}"${each}
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxControl failed"
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxClient failed"
+		fi
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins VBoxRandR.sh VBoxRandR
+			fperms 0755 /usr/bin/VBoxRandR
+
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /etc/udev/rules.d
+		echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! useq X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System input and video drivers"
+		fi
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to load all"
+		elog "needed modules and services."
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}