Backport USE="hal" change because stable xorg-server doesn't support it anymore.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 11 insertions, 18 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 899f3c978fab..04161ba0bfc4 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.60 2011/02/20 18:30:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.61 2011/03/14 19:20:21 ssuominen Exp $
+
+  14 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xf86-input-virtualbox-3.2.12.ebuild:
+  Backport USE="hal" change because stable xorg-server doesn't support it
+  anymore.
 
   20 Feb 2011; Lars Wendler <polynomial-c@gentoo.org>
   -xf86-input-virtualbox-3.1.8-r1.ebuild:
diff --git a/x11-drivers/xf86-input-virtualbox/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index 1ff229aa6e6e..7626ad09dbd3 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -2,8 +2,8 @@ AUX xf86-input-virtualbox-3-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30
 DIST VirtualBox-3.2.12-OSE.tar.bz2 58239733 RMD160 9bcb80327655d77cede13b1f76b1fa6c763b1a25 SHA1 73ddd9365588ea56a54ff81117719ac818e842f9 SHA256 064eb382e5b752a3f9189c930734393765125e70b5f99679a63ff4eb6186e261
 DIST VirtualBox-4.0.2.tar.bz2 69867297 RMD160 50677557729595d77f152157bbb65018beca6c4b SHA1 82218448fd572ae706c4455fc9e7e0a970ea8bd1 SHA256 3dbb3303a6237b8a3732c0bb12abc89ae3ad5c804579bc1390325713c741c568
 DIST VirtualBox-4.0.4.tar.bz2 70190670 RMD160 5445bd0ff31adee6de872ae02058fa104c986b82 SHA1 4ca74dd7ac4314058df811d6e69f60d412456328 SHA256 f049fe428e2f54c6a4593283ad44680051bd582253f2863b71ed3379a77b0ac7
-EBUILD xf86-input-virtualbox-3.2.12.ebuild 2832 RMD160 296c8cbe9fc9a9506e5a00dd2ce8f0ae1efdf691 SHA1 1261aa2ac3d46ca4c7ce4673d260e6fd8fdc7a9d SHA256 8c978891c1c2271fd28c63f23bf1d4cdb0c108e803648913464b45d980a87db4
+EBUILD xf86-input-virtualbox-3.2.12.ebuild 2407 RMD160 5a2dc46b4f6fd686dc23091d05389b78f4f6adfc SHA1 65941150be03483e82b4f58deb80954afcc34352 SHA256 f93a342a3e18e7af59a0ece979a968a6d8ad19d0747ac54c126b014d1666442a
 EBUILD xf86-input-virtualbox-4.0.2-r2.ebuild 2930 RMD160 a973f3274bc76885cdf3ba5c19e2d4cb89be84a0 SHA1 b36b8c11f19830f905abe9e27556f0f1c58ae710 SHA256 15e22c79b2e74cc4a969226da4a1129922f59f238949ddd19a27c9683f8988a4
 EBUILD xf86-input-virtualbox-4.0.4.ebuild 2930 RMD160 ead191595118bb7fd60d5f44746f9bb43e62c96a SHA1 c979404bd8105e9b37297125647906d9433e7d4a SHA256 a7bcf3d988373ce8030d5cf81d7b74d51b376ac70f686ab7b5c7086fd136f8e0
-MISC ChangeLog 14199 RMD160 0e0264f348693b8c2a433e6ba1a6dbf4fe662da4 SHA1 3f3531d29bae4004116027d0274eb7f4220cccca SHA256 835a10314224afafc2b97e54d3a96d40641e696901b08070c2974dcb523cbc96
+MISC ChangeLog 14375 RMD160 1c2638590b38a5369d3397b84247ca18bac25419 SHA1 2ce7c0ef1060e5720a08a2c26b89f1a9d181ef12 SHA256 2b230edfc92b9d422e06ac0dbf2ac24d69d04d0ce603650e1a6c075be7123d29
 MISC metadata.xml 440 RMD160 e17df324a907dc57e613009dc2c5ac9c24c2c8c7 SHA1 8848e0d9d23b9f40348f1fa46978ca231a524e7c SHA256 61e0bc766b9c9e813c3ab1868c23e73cd35fe38de6922dedf22aa5018a9791d8
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.12.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.12.ebuild
index 3910de783377..a9d9f8bdeb8d 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.12.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-3.2.12.ebuild,v 1.5 2011/02/03 07:53:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.12.ebuild,v 1.6 2011/03/14 19:20:21 ssuominen Exp $
 
 EAPI=2
 
@@ -14,12 +14,11 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="hal"
+IUSE=""
 
 RDEPEND="x11-base/xorg-server
 	|| ( x11-drivers/xf86-input-mouse
-	    x11-drivers/xf86-input-evdev )
-	hal? ( sys-apps/hal )"
+	    x11-drivers/xf86-input-evdev )"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.5-r1
 	>=dev-lang/yasm-0.6.2
@@ -78,13 +77,6 @@ src_install() {
 		else
 				newins vboxmouse_drv_17.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 /etc/hal/fdi/policy
-			doins 90-vboxguest.fdi
-		fi
 }
 
 pkg_postinst() {
@@ -93,8 +85,4 @@ pkg_postinst() {
 		elog "	Driver  \"vboxmouse\""
 		elog ""
 		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
-		elog ""
-		elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection."
-		elog "This ebuild provides a working default which has been installed into:"
-		elog "    /etc/hal/fdi/policy/90-vboxguest.fdi"
 }