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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 103 insertions, 1 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 6e03e0098642..edc7644204e5 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.12 2009/04/30 16:36:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.13 2009/06/01 00:26:21 patrick Exp $
+
+*xf86-input-virtualbox-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +xf86-input-virtualbox-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>
   -xf86-input-virtualbox-2.0.2.ebuild, -xf86-input-virtualbox-2.0.4.ebuild,
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.2.4.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.2.4.ebuild
new file mode 100644
index 000000000000..d3c56318408d
--- /dev/null
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.2.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.2.4.ebuild,v 1.1 2009/06/01 00:26:21 patrick Exp $
+
+EAPI=2
+
+inherit x-modular eutils
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox input 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="hal"
+
+RDEPEND="x11-base/xorg-server
+		hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.5-r1
+		>=dev-lang/yasm-0.6.2
+		sys-devel/dev86
+		sys-power/iasl
+		x11-proto/inputproto
+		x11-proto/randrproto
+		x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P/-OSE/_OSE}
+
+src_prepare() {
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		rm -rf kBuild/bin tools
+
+		# Disable things unused or splitted into separate ebuilds
+		cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
+}
+
+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/Additions/x11/vboxmouse ; do
+			cd "${S}"${each}
+			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			KBUILD_PATH="${S}/kBuild" \
+			|| die "kmk failed"
+		done
+}
+
+src_install() {
+		cd "${S}/out/linux.${ARCH}/release/bin/additions"
+		insinto /usr/lib/xorg/modules/input
+
+		# xorg-server-1.6.x (currently on the official x11 overlay)
+		if has_version ">=x11-base/xorg-server-1.6" ; then
+				newins vboxmouse_drv_16.so vboxmouse_drv.so
+		# xorg-server-1.5.x 
+		elif has_version ">=x11-base/xorg-server-1.5" \
+		&& has_version "<x11-base/xorg-server-1.6" ; then
+				newins vboxmouse_drv_15.so vboxmouse_drv.so
+		# xorg-server-1.4.x
+		elif has_version ">=x11-base/xorg-server-1.4" \
+		&& has_version "<x11-base/xorg-server-1.5" ; then
+				newins vboxmouse_drv_14.so vboxmouse_drv.so
+		# xorg-server-1.3.x
+		else
+				newins vboxmouse_drv_71.so vboxmouse_drv.so
+		fi
+
+		# install hal information file about the mouse driver
+		if use hal; then
+			cd "${S}/src/VBox/Additions/linux/installer"
+			insinto /usr/share/hal/fdi/information/20thirdparty
+			doins 90-vboxguest.fdi
+		fi
+}
+
+pkg_postinst() {
+		elog "You need to edit the file /etc/X11/xorg.conf and set:"
+		elog ""
+		elog "	Driver  \"vboxmouse\""
+		elog ""
+		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
+		elog ""
+}