Version bump

svn path=/trunk/; revision=687

3 files changed, 117 insertions, 4 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 492e736..da34675 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,11 +1,17 @@
 # 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 $
 
-  30 May 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -xf86-input-virtualbox-2.2.2.ebuild, +xf86-input-virtualbox-2.2.4.ebuild:
+  02 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +xf86-input-virtualbox-3.0.0.ebuild:
   Version bump
 
+*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,
   -xf86-input-virtualbox-2.0.4-r1.ebuild,
diff --git a/x11-drivers/xf86-input-virtualbox/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index a349ef4..7ad438d 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -1,5 +1,7 @@
 AUX xf86-input-virtualbox-2-localconfig 876 RMD160 db4b06bd8646f237260e8d61c5651a1fb4c22787 SHA1 9ab92582b1e0cc8a6a36cbd2fb52974bc90a5e8d SHA256 a11765d7e2623a081857ede04a650151742ef827bc7675323b4f7b14d06a3d64
 DIST VirtualBox-2.2.4-OSE.tar.bz2 50948689 RMD160 12577f01568e362d6285aa19eeb8eeb9ca6eadb7 SHA1 ebc5566c4b8115c649a82bde743e94ea62ed1a26 SHA256 b5d52a67b94510275eb3dc8649eb7d3063446da4f3ac038f821d598c62b5d6c5
+DIST VirtualBox-3.0.0-OSE.tar.bz2 51171539 RMD160 6d32630b1650b9c47faa1345cc770c6c05b61227 SHA1 168ce7b058894f5cc771953b9e4daf1ca5f5c542 SHA256 d5301fc222d8ea36f1b417159855b43f473d089c4e376c1580fa57a207f42937
 EBUILD xf86-input-virtualbox-2.2.4.ebuild 2496 RMD160 632f7801eb9bd160e09fe40f9a5b0c9d291c9011 SHA1 d08f0103dd89b2e47c54e4239f2e88f427eda8ab SHA256 0734c2dded94d12eaf9248bc31e540c76ad902c4605a992a32b66be161118b03
-MISC ChangeLog 5514 RMD160 0681a360959af00a161e850d4bc23ab510143d81 SHA1 08901798f79488b166b53c5127cc5887b8989df5 SHA256 daa9be8f7220f9fc7fb62eb373d7a1065bf27df5f24b1093be0d21a2027e3bc9
+EBUILD xf86-input-virtualbox-3.0.0.ebuild 2992 RMD160 4fff6bf9ecb13d091d2b62e76167b9b24437ae79 SHA1 c3aa88d02c9e423199ac04aa3c6e5ae376801e6e SHA256 81c03a1c503a8e4971f23c7f7b90d720ff928c1c07c27e916e7959fd0d239eda
+MISC ChangeLog 5686 RMD160 6f000a21d5c72e2dfaac9700278c92cd6ff0897a SHA1 fee207a553ba8e09f06bc6a10c0bc60f592d421b SHA256 4bfb4795de0aeb49399774371c52dd10478997bcf25641ce4137c2827b09d778
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.0.0.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.0.0.ebuild
new file mode 100644
index 0000000..a61b8c6
--- /dev/null
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.0.0.ebuild
@@ -0,0 +1,105 @@
+# 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.2 2009/06/01 13:31:15 mr_bones_ 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 ""
+		if has_version ">=x11-base/xorg-server-1.5" ; then
+			elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection"
+			elog "you may install the hal information file about the mouse driver:"
+			elog ""
+			elog "/usr/share/hal/fdi/information/20thirdparty/90-vboxguest.fdi"
+			elog ""
+			elog "dropping it into: /etc/hal/fdi/policy/"
+			elog ""
+		fi
+}