Version bump; add a DEPEND conditional on USE X to avoid X11 dependency even when X support is disabled bug #271341 Thanks to Brad House; create the vboxadd user/group to avoid problems with udev bug #269335.

svn path=/trunk/; revision=677

4 files changed, 188 insertions, 12 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 1feb066..c7881f5 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,17 +1,34 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.9 2009/03/03 07:48:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.12 2009/04/30 16:33:26 patrick Exp $
 
-  28 Apr 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-guest-additions-2.2.0.ebuild,
+  30 May 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  virtualbox-guest-additions-2.2.2.ebuild,
+  +virtualbox-guest-additions-2.2.4.ebuild:
+  Version bump; add a DEPEND conditional on USE X to avoid
+  X11 dependency even when X support is disabled bug #271341
+  Thanks to Brad House; create the vboxadd user/group to
+  avoid problems with udev bug #269335.
+
+  30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  -virtualbox-guest-additions-2.0.2.ebuild,
+  -virtualbox-guest-additions-2.0.4.ebuild,
+  -virtualbox-guest-additions-2.0.4-r1.ebuild,
+  -virtualbox-guest-additions-2.0.6.ebuild:
+  Remove old 2.0
+
+*virtualbox-guest-additions-2.2.2 (30 Apr 2009)
+
+  30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   +virtualbox-guest-additions-2.2.2.ebuild:
-  Version bump
+  Bump to 2.2.2, thanks to Alessio Cassibba. Fixes #267838
+
+*virtualbox-guest-additions-2.2.0 (18 Apr 2009)
 
-  10 Apr 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-guest-additions-2.1.4.ebuild,
+  18 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   +virtualbox-guest-additions-2.2.0.ebuild:
-  Version bump; update RDEPEND for VBoxClient; drop old xinitrc files; update
-  udev rules; add new VBoxClient-all startup script
+  Bump to 2.2.0. Many thanks to Alessio Cassibba for the ebuilds. Part of
+  #265510
 
 *virtualbox-guest-additions-2.1.4 (03 Mar 2009)
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 0963b0b..e5af372 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,6 +1,8 @@
 AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-2.2.2-OSE.tar.bz2 50937824 RMD160 b29f67dff7c9432d373bf62447e708bbdff92693 SHA1 31d928b786d9c1ca4cc30fd8c6d9089aceb05cad SHA256 868ccdfaa9f2d364ba1cf407234d59713a464837e4012104e5a2a5b2ad4c2d5d
-EBUILD virtualbox-guest-additions-2.2.2.ebuild 4040 RMD160 66669ccce2e920f4cdb06336a264df124c4971c0 SHA1 a89b038c0d9cfb25a8eef82dc2346f944075c0ad SHA256 62a912048ed58765ad7e33d38cde52bc8c1c2a671ca2282d430ced94caf6d64b
-MISC ChangeLog 8533 RMD160 25b887f74a4a4e3efb778ff8ec9c466aae571783 SHA1 2e7f6d5a98ddb9cd61bbc8c9e5a0ee00e5149468 SHA256 0debdc014a7890760007f3c25701ed8266149b4f8a05621e808e54ed1b3705c3
+DIST VirtualBox-2.2.4-OSE.tar.bz2 50948689 RMD160 12577f01568e362d6285aa19eeb8eeb9ca6eadb7 SHA1 ebc5566c4b8115c649a82bde743e94ea62ed1a26 SHA256 b5d52a67b94510275eb3dc8649eb7d3063446da4f3ac038f821d598c62b5d6c5
+EBUILD virtualbox-guest-additions-2.2.2.ebuild 4265 RMD160 fc04abb607a00caa97980d8009c125766d9c7caa SHA1 99c86b20ee22c9cbe03e2dee71a1fc11d31a739a SHA256 96218050705113f6dbee704c9d0944f5de43849db973579d20d87bd15cd7a1fb
+EBUILD virtualbox-guest-additions-2.2.4.ebuild 4122 RMD160 4da86609db1123880e386271c83803ef58a1ea1d SHA1 1847a11e7d2efed84dbb3c5ccfdeb95fbdae15ce SHA256 d3e8420ffbc53b9e73aadb4f755ab1e40f0f0d27859ac36869a6a5a4ea95920a
+MISC ChangeLog 9134 RMD160 7db64f50020fe81ec6b785d3fe55e4ec3ff84ca7 SHA1 7a9bf1e11464086d483586582c10d44c62b70385 SHA256 0e37ffb64573f82379bf2abafcaaa29f73d75e64e0879c34a067092a04b2a14e
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild
index 99ac844..fc38677 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.2.ebuild,v 1.1 2009/04/30 16:24:56 patrick Exp $
 
 inherit eutils linux-mod
 
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 		sys-devel/bin86
 		sys-devel/dev86
 		sys-power/iasl
-		x11-proto/renderproto"
+		X? ( x11-proto/renderproto )"
 
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
@@ -46,6 +46,8 @@ S=${WORKDIR}/${MY_P/-OSE/_OSE}
 pkg_setup() {
 		linux-mod_pkg_setup
 		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxadd
+		enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd
 }
 
 src_unpack() {
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild
new file mode 100644
index 0000000..5312575
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="x11-libs/libXt
+		amd64? ( app-emulation/emul-linux-x86-xlibs )
+		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 )"
+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="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd)
+			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 vboxadd
+		enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd
+}
+
+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}-2-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
+
+		# shared folders
+		insinto /sbin
+		newins mountvboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		# time synchronisation system service
+		insinto /usr/sbin
+		doins vboxadd-timesync
+		fperms 0755 /usr/sbin/vboxadd-timesync
+
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		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=="vboxadd", NAME="vboxadd", OWNER="vboxadd", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", 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 ""
+}