diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-01-30 12:09:21 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-01-30 12:09:21 +0000 |
| commit | b7319dcf5986aa556216214552e625a5282b3115 (patch) | |
| tree | a23a95d5d429eb0cac2ae501b1ac5bc6f7caa05a /x11-drivers | |
| parent | Version bump. Don't call prepalldocs, fixes bug 262925. (diff) | |
| download | gentoo-2-b7319dcf5986aa556216214552e625a5282b3115.tar.gz gentoo-2-b7319dcf5986aa556216214552e625a5282b3115.tar.bz2 gentoo-2-b7319dcf5986aa556216214552e625a5282b3115.zip | |
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)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xf86-input-virtualbox/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r1.ebuild (renamed from x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2.ebuild) | 18 |
2 files changed, 22 insertions, 5 deletions
diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog index 7cb60c2ff857..2f1fb0a6196f 100644 --- a/x11-drivers/xf86-input-virtualbox/ChangeLog +++ b/x11-drivers/xf86-input-virtualbox/ChangeLog @@ -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@gentoo.org> + -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@gentoo.org> -xf86-input-virtualbox-3.2.10-r1.ebuild: diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r1.ebuild index 55a40cd0c48b..f7bb1964a219 100644 --- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2.ebuild +++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r1.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-4.0.2.ebuild,v 1.1 2011/01/18 19:32:02 polynomial-c Exp $ +# $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 @@ -69,22 +69,32 @@ src_install() { insinto /usr/$(get_libdir)/xorg/modules/input # xorg-server-1.9 - if has_version ">=x11-base/xorg-server-1.9" ; then + 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 + 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 - cd "${S}/src/VBox/Additions/linux/installer" 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() { |