Version bump: add support for x11-base/xorg-server-1.5.0, add hal USE flag

svn path=/trunk/; revision=498

3 files changed, 90 insertions, 3 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index a3fe930..e201d0b 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -2,10 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  10 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   +xf86-input-virtualbox-2.0.0.ebuild,
+  +xf86-input-virtualbox-2.0.2.ebuild,
   +files/xf86-input-virtualbox-2.0.0-localconfig:
-  Version bump
+  Version bump: add support for x11-base/xorg-server-1.5.0, add hal USE flag
 
 *xf86-input-virtualbox-1.6.6 (06 Sep 2008)
 
diff --git a/x11-drivers/xf86-input-virtualbox/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index 75655bf..8d85d08 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -3,8 +3,10 @@ AUX xf86-input-virtualbox-2.0.0-localconfig 845 RMD160 5cd3b73046f0dbe8eebef9041
 DIST VirtualBox-1.6.4-OSE.tar.bz2 35484117 RMD160 af94b774d9964757da125c4614e393396f7e892b SHA1 457ae85f2d10028ac7c56e4b35ee47028ec0208b SHA256 7e777e5f602d7b48bf5a8b1d580ee43dd6327b9037816fde484a13db8a86b422
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
 DIST VirtualBox-2.0.0-OSE.tar.bz2 37204751 RMD160 d0d1b94a4cb5b63ebeebc84434d7f44627278221 SHA1 a5fad49895e72d9d2261c7d2f8cffea4167be2c9 SHA256 9036ecab78d3f160d45a3fcdbdfb4266426a88c1b0cb7bb44ea65c6dc08be21e
+DIST VirtualBox-2.0.2-OSE.tar.bz2 37548591 RMD160 4156f2efe5245236f9890abcd0adb5ad5291f86f SHA1 cdc51cc4e5ff189cf9eff832179494009df1334a SHA256 0318c69eace3db0979f0aefd27aeb6c54d7c1aafcc6a156b076bc116a1d8805b
 EBUILD xf86-input-virtualbox-1.6.4-r1.ebuild 1572 RMD160 49248b2c46a67a20a2ed918f64ec5f43987ea325 SHA1 1a1c2f9759fdfbfff8700bf31889066527e045c0 SHA256 c8a528c4453a987844480a0397c62ed76166181c675a71951edfcfbc3585c8e9
 EBUILD xf86-input-virtualbox-1.6.6.ebuild 1640 RMD160 dbe4c5c9bda5969cdabf3ed639d935201f55d7af SHA1 a23d8940a8261f145c887af5fff69599791b5a46 SHA256 32ce6fe6791ff0b99d49afb7e549a7c268d167b599f488d9948266150a8d6519
 EBUILD xf86-input-virtualbox-2.0.0.ebuild 1784 RMD160 e669cb3ee31149bc22b71f2afdc2d3681fa2a583 SHA1 966deebdee72f3034e0c6fd7f224738edf226772 SHA256 0b9c2e9946d0ef1e4effef20c4bedf1799982f65375113b8ffc42b878f764984
-MISC ChangeLog 2744 RMD160 3195c0c48acae0b93651745582ac7d615ed6a123 SHA1 4d0f9b9abac8d76b14471b1b9df28762c334e672 SHA256 32d6aa9044aaa8baba706c94bd7e85ee7283cad9b0ac8450cd7c944efb4528cf
+EBUILD xf86-input-virtualbox-2.0.2.ebuild 2026 RMD160 9c8a12fca45d4bbf14c9dcee01bd26cbd65d1b07 SHA1 f7441646631a218b9a959ca2f833fc1f559916e1 SHA256 70126e7eca342a5a88caa9a31a06be5d5fdf53202f86978c77458230b4e8fea3
+MISC ChangeLog 2845 RMD160 af351808c40a6a85d52ab79d227d1f0d054b0126 SHA1 48968c90407349074f6db05265346d685dd67c22 SHA256 9b63d83226536c97386d4a052ab3c5efca56b06e9f4ac7d531421c0f1dc23f2d
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2.ebuild
new file mode 100644
index 0000000..4f90a48
--- /dev/null
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+		>=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/}
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}"
+
+		# 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.0.0-localconfig" LocalConfig.kmk
+}
+
+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/VBoxGuestLib} \
+		src/VBox/Additions/x11/xmouse ; do
+			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
+
+		if has_version "=x11-base/xorg-server-1.5" ; then
+				newins vboxmouse_drv_15.so vboxmouse_drv.so
+		elif has_version "=x11-base/xorg-server-1.4" ; then
+				newins vboxmouse_drv_14.so vboxmouse_drv.so
+		else
+				newins vboxmouse_drv_71.so vboxmouse_drv.so
+		fi
+
+		if use hal; then
+			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 ""
+}