[gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-input-virtualbox: ChangeLog xf86-input-virtualbox-4.0.2-r1.ebuild xf86-input-virtualbox-4.0.2.ebuild

[Lars Wendler (polynomial-c)]

polynomial-c    11/01/30 12:09:21

  Modified:             ChangeLog
  Added:                xf86-input-virtualbox-4.0.2-r1.ebuild
  Removed:              xf86-input-virtualbox-4.0.2.ebuild
  Log:
  Install xorg and udev rules if we are on xorg-server-1.8 or higher
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.56                 x11-drivers/xf86-input-virtualbox/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog?r1=1.55&r2=1.56

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog	18 Jan 2011 19:33:18 -0000	1.55
+++ ChangeLog	30 Jan 2011 12:09:21 -0000	1.56
@@ -1,6 +1,13 @@
 # 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.55 2011/01/18 19:33:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.56 2011/01/30 12:09:21 polynomial-c Exp $
+
+*xf86-input-virtualbox-4.0.2-r1 (30 Jan 2011)
+
+  30 Jan 2011; Lars Wendler <polynomial-c@g.o>
+  -xf86-input-virtualbox-4.0.2.ebuild, +xf86-input-virtualbox-4.0.2-r1.ebuild:
+  Install xorg and udev rules if we are on xorg-server-1.8 or higher. Thanks to
+  Eriks Latosheks for reporting this in bug #353217.
 
   18 Jan 2011; Lars Wendler <polynomial-c@g.o>
   -xf86-input-virtualbox-3.2.10-r1.ebuild:



1.1                  x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: xf86-input-virtualbox-4.0.2-r1.ebuild
===================================================================
# 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-4.0.2-r1.ebuild,v 1.1 2011/01/30 12:09:21 polynomial-c Exp $

EAPI=2

inherit eutils multilib linux-info

MY_P=VirtualBox-${PV}
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
	|| ( x11-drivers/xf86-input-mouse
	    x11-drivers/xf86-input-evdev )
	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"

src_prepare() {
	if kernel_is -ge 2 6 33 ; then
		# evil patch for new kernels - header moved
		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' || die "Failed replacing"
	fi
	# Remove shipped binaries (kBuild,yasm), see bug #232775
	rm -rf kBuild/bin tools

	# Disable things unused or splitted into separate ebuilds
	cp "${FILESDIR}/${PN}-3-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/$(get_libdir)/xorg/modules/input

		# xorg-server-1.9
		if has_version "=x11-base/xorg-server-1.9*" ; then
				newins vboxmouse_drv_19.so vboxmouse_drv.so
		# xorg-server-1.8
		elif has_version "=x11-base/xorg-server-1.8*" ; then
				newins vboxmouse_drv_18.so vboxmouse_drv.so
		# xorg-server-1.7
		else
				newins vboxmouse_drv_17.so vboxmouse_drv.so
		fi

		cd "${S}/src/VBox/Additions/linux/installer" || die
		# install hal information file about the mouse driver
		if use hal; then
			insinto /etc/hal/fdi/policy
			doins 90-vboxguest.fdi
		fi

		if has_version ">=x11-base/xorg-server-1.8" ; then
			# install udev information file about the mouse driver
			insinto /etc/udev/rules.d
			doins 70-xorg-vboxmouse.rules

			# install X11 information file about the mouse driver
			insinto /etc/X11/xorg.conf.d
			doins "${S}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf"
		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 ""
		elog "Up to version 1.8, 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"
		elog "This is no longer necessary for X.Org Server 1.9 or higher. Use"
		elog "the server's udev autodetection with such versions."
}