Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335

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

10 files changed, 660 insertions, 5 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 4aed1e22eb63..ec478561ee09 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.48 2009/04/30 16:24:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.49 2009/06/01 00:24:12 patrick Exp $
+
+*virtualbox-bin-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-bin-2.2.4.ebuild:
+  Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335
 
 *virtualbox-bin-2.2.2 (30 Apr 2009)
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-2.2.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.2.4.ebuild
new file mode 100644
index 000000000000..33846d5b47ff
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-2.2.4.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-2.2.4.ebuild,v 1.1 2009/06/01 00:24:12 patrick Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime pax-utils
+
+MY_PV=${PV}-47978
+MY_P=VirtualBox-${MY_PV}-Linux
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
+	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless sdk vboxwebsrv"
+RESTRICT="strip"
+
+RDEPEND="!!app-emulation/virtualbox-ose
+	!app-emulation/virtualbox-ose-additions
+	~app-emulation/virtualbox-modules-${PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libmng
+		media-libs/jpeg
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	x86? ( sys-libs/libstdc++-v3 )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	if use sdk; then
+		unpack VirtualBoxSDK-${MY_PV}.zip
+	fi
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newicon VBox.png ${PN}.png
+		newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
+	fi
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use additions; then
+		doins -r additions || die
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm || die
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index d659834079c8..bf68679dc3f5 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.12 2009/04/30 16:33:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.13 2009/06/01 00:24:41 patrick Exp $
+
+*virtualbox-guest-additions-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-guest-additions-2.2.4.ebuild:
+  Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   -virtualbox-guest-additions-2.0.2.ebuild,
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 000000000000..b1a01caea946
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.2.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2009 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-2.2.4.ebuild,v 1.1 2009/06/01 00:24:41 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="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 ""
+}
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index feab24159a19..65dd1160922d 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.36 2009/04/30 16:33:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.37 2009/06/01 00:25:05 patrick Exp $
+
+*virtualbox-modules-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-modules-2.2.4.ebuild:
+  Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   -virtualbox-modules-2.0.2.ebuild, -virtualbox-modules-2.0.4.ebuild,
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-2.2.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-2.2.4.ebuild
new file mode 100644
index 000000000000..40c09762fd6e
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-2.2.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-2.2.4.ebuild,v 1.1 2009/06/01 00:25:05 patrick Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://gentoo.zerodev.it/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-ose-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Starting with the 2.1 release a new kernel module was added,"
+	elog "be sure to load all the needed modules."
+	elog ""
+	elog "Please add \"vboxdrv\" and \"vboxnetflt\" 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 ""
+}
diff --git a/app-emulation/virtualbox-ose-additions/ChangeLog b/app-emulation/virtualbox-ose-additions/ChangeLog
index e4b1e07eeefd..20d54b2f3234 100644
--- a/app-emulation/virtualbox-ose-additions/ChangeLog
+++ b/app-emulation/virtualbox-ose-additions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-ose-additions
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.13 2009/04/30 16:34:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.14 2009/06/01 00:25:56 patrick Exp $
+
+*virtualbox-ose-additions-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-ose-additions-2.2.4.ebuild:
+  Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   -virtualbox-ose-additions-2.0.2.ebuild,
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.2.4.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.2.4.ebuild
new file mode 100644
index 000000000000..c0b70a0246cb
--- /dev/null
+++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 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-2.2.4.ebuild,v 1.1 2009/06/01 00:25:56 patrick Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="Guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-ose-9999"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 28f5bbd5e086..344127f5623e 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.17 2009/04/30 16:34:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.18 2009/06/01 00:25:30 patrick Exp $
+
+*virtualbox-ose-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-ose-2.2.4.ebuild:
+  Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   -virtualbox-ose-2.0.2.ebuild, -virtualbox-ose-2.0.4.ebuild,
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild
new file mode 100644
index 000000000000..81198d9c80f4
--- /dev/null
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild,v 1.1 2009/06/01 00:25:30 patrick Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	# XXX: should finish merging the -9999 ebuild into this one ...
+	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
+	inherit linux-mod subversion
+else
+	MY_P=VirtualBox-${PV}-OSE
+	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P/-OSE/_OSE}
+fi
+
+DESCRIPTION="Software family of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	!headless? (
+		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		opengl? ( virtual/opengl virtual/glut )
+		x11-libs/libXcursor
+		media-libs/libsdl[X,video]
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.5-r1
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	media-libs/libpng
+	sys-libs/libcap
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	hal? ( sys-apps/hal )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( >=dev-lang/python-2.3 )
+	vboxwebsrv? ( >=net-libs/gsoap-2.7.9f )"
+RDEPEND="${RDEPEND}
+	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+		"${FILESDIR}"/${PN}-2-localconfig > LocalConfig.kmk || die
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf="${myconf} --disable-alsa"
+	use opengl     || myconf="${myconf} --disable-opengl"
+	use pulseaudio || myconf="${myconf} --disable-pulse"
+	use python     || myconf="${myconf} --disable-python"
+	use hal        || myconf="${myconf} --disable-dbus"
+	use vboxwebsrv && myconf="${myconf} --enable-webservice"
+	if ! use headless ; then
+		use qt4 || myconf="${myconf} --disable-qt4"
+	else
+		myconf="${myconf} --build-headless --disable-opengl"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	strip-flags
+
+	MAKE="kmk" emake \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.*/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-2-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s/MY_LIBDIR/$(get_libdir)/" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components || die
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
+		doins $each || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins $each || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+		done
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox || die
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+		fi
+
+		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
+		domenu "${FILESDIR}"/${PN}.desktop
+	else
+		doins VBoxHeadless || die
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r nls
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The lastest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}