Version bump. Removed old.

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

14 files changed, 114 insertions, 25 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 88fe4c0414a3..66c3be3082ed 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.78 2010/05/20 13:07:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.79 2010/06/03 10:57:52 polynomial-c Exp $
+
+*virtualbox-bin-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-3.1.6.ebuild, +virtualbox-bin-3.2.2.ebuild:
+  Version bump. Removed old.
 
 *virtualbox-bin-3.2.0 (20 May 2010)
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.1.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.2.2.ebuild
index 0ba8142825f5..dc1c45a14c9b 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-3.1.6.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.1.6.ebuild,v 1.1 2010/03/28 13:42:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.2.2.ebuild,v 1.1 2010/06/03 10:57:52 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils fdo-mime pax-utils
 
-MY_PV=${PV}-59338
+MY_PV=${PV}-62298
 MY_P=VirtualBox-${MY_PV}-Linux
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 146ca84cec49..106f64ea728e 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2010/05/20 21:02:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.42 2010/06/03 10:59:53 polynomial-c Exp $
+
+*virtualbox-guest-additions-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-3.1.6.ebuild,
+  +virtualbox-guest-additions-3.2.2.ebuild, metadata.xml:
+  Version bump. Removed old.
 
 *virtualbox-guest-additions-3.1.8-r2 (20 May 2010)
 
diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 856569877fd4..702621ee83d7 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -10,4 +10,8 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild
index be2229f7ee0a..dbbeb376d72d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild,v 1.1 2010/06/03 10:59:53 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
 
 S=${WORKDIR}/${MY_P/-OSE/_OSE}
 
@@ -63,11 +63,17 @@ src_unpack() {
 
 		# Disable things unused or splitted into separate ebuilds
 		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+		# stupid new header references...
+		for vboxheader in {product,revision}-generated.h ; do
+			for mdir in vbox{guest,sf} ; do
+				ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+					"${WORKDIR}/${mdir}/${vboxheader}"
+			done
+		done
 }
 
 src_compile() {
-		linux-mod_src_compile
-
 		# build the user-space tools, warnings are harmless
 		./configure --nofatal \
 		--disable-xpcom \
@@ -91,6 +97,11 @@ src_compile() {
 				KBUILD_PATH="${S}/kBuild" \
 				|| die "kmk VBoxClient failed"
 		fi
+
+		# 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
 }
 
 src_install() {
@@ -102,7 +113,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
@@ -118,19 +129,24 @@ src_install() {
 			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", GROUP="vboxguest", MODE="0660"' \
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
 		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
 		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
 }
 
 pkg_postinst() {
@@ -141,8 +157,20 @@ pkg_postinst() {
 		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 "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X drivers, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
 		elog ""
 		elog "Warning:"
 		elog "this ebuild is only needed if you are running gentoo"
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 20d1dd57ee73..f310bc215f9f 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.61 2010/05/20 12:58:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.62 2010/06/03 10:55:47 polynomial-c Exp $
+
+*virtualbox-modules-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-3.1.6.ebuild, +virtualbox-modules-3.2.2.ebuild,
+  metadata.xml:
+  Version bump. Removed old.
 
 *virtualbox-modules-3.2.0 (20 May 2010)
 
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 856569877fd4..702621ee83d7 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -10,4 +10,8 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-3.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-3.2.2.ebuild
index 7584cd5b5caa..99f65858e126 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-3.1.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-3.1.6.ebuild,v 1.2 2010/05/10 13:17:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-3.2.2.ebuild,v 1.1 2010/06/03 10:55:47 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -12,7 +12,7 @@ inherit eutils linux-mod
 MY_P=vbox-kernel-module-src-${PV}
 DESCRIPTION="Kernel Modules for Virtualbox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://gentooexperimental.org/~patrick/${MY_P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/virtualbox-ose-additions/ChangeLog b/app-emulation/virtualbox-ose-additions/ChangeLog
index cc11b6d93833..937298eee69f 100644
--- a/app-emulation/virtualbox-ose-additions/ChangeLog
+++ b/app-emulation/virtualbox-ose-additions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-ose-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.38 2010/05/20 13:09:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.39 2010/06/03 10:57:11 polynomial-c Exp $
+
+*virtualbox-ose-additions-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-ose-additions-3.1.6.ebuild,
+  +virtualbox-ose-additions-3.2.2.ebuild, metadata.xml:
+  Version bump. Removed old.
 
 *virtualbox-ose-additions-3.2.0 (20 May 2010)
 
diff --git a/app-emulation/virtualbox-ose-additions/metadata.xml b/app-emulation/virtualbox-ose-additions/metadata.xml
index 856569877fd4..702621ee83d7 100644
--- a/app-emulation/virtualbox-ose-additions/metadata.xml
+++ b/app-emulation/virtualbox-ose-additions/metadata.xml
@@ -10,4 +10,8 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.6.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.2.2.ebuild
index fa52fa8408c0..ff23fe699f31 100644
--- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.6.ebuild
+++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.6.ebuild,v 1.1 2010/03/28 13:44:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.2.2.ebuild,v 1.1 2010/06/03 10:57:11 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index d289f6e086e4..55d9060006e4 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.56 2010/05/21 17:41:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.57 2010/06/03 10:56:29 polynomial-c Exp $
+
+*virtualbox-ose-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-ose-3.1.6.ebuild, +virtualbox-ose-3.2.2.ebuild, metadata.xml:
+  Version bump. Removed old.
 
   21 May 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-ose-3.2.0-r1.ebuild:
diff --git a/app-emulation/virtualbox-ose/metadata.xml b/app-emulation/virtualbox-ose/metadata.xml
index c3b07417e4cc..0d3bf67277e5 100644
--- a/app-emulation/virtualbox-ose/metadata.xml
+++ b/app-emulation/virtualbox-ose/metadata.xml
@@ -10,6 +10,10 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
 <use>
 	<flag name='additions'>Install Guest System Tools ISO</flag>
 	<flag name='headless'>Build without any graphic frontend</flag>
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.6.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.2.ebuild
index 5cceca0f0f1c..2b52a33767e8 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.6.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.6.ebuild,v 1.1 2010/03/28 13:44:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.2.ebuild,v 1.1 2010/06/03 10:56:29 polynomial-c Exp $
 
 EAPI=2
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	hal? ( sys-apps/hal )
+	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-lang/python-2.3 )
 	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
@@ -110,7 +111,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-3-localconfig > LocalConfig.kmk || die
 
 	# unset useless/problematic mesa checks in configure
-	epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
+	epatch "${FILESDIR}/${PN}-3.2.0-mesa-check.patch"
+
+	# fix with newer iasl (bug #319127)
+	epatch "${FILESDIR}/${PN}-3.1.8-iasl-length-calculation-fix.patch"
 }
 
 src_configure() {
@@ -207,7 +211,7 @@ src_install() {
 			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
 		done
 
-		if use opengl ; then
+		if use opengl && use qt4 ; then
 			doins VBoxTestOGL || die
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
 			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
@@ -233,6 +237,14 @@ src_install() {
 		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
 	fi
 
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile} || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+	done
+	popd &>/dev/null || die
+
 	insinto /usr/share/${PN}
 	if ! use headless && use qt4 ; then
 		doins -r nls