summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2008-09-06 21:40:57 +0000
committerTony Vroon <chainsaw@gentoo.org>2008-09-06 21:40:57 +0000
commita2e151bbcea663c59977c2226850900d5d64c492 (patch)
tree325e080933df338c6fcfdf8d59c0df5f2d0993fb /x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild
parentppc stable, bug #235822 (diff)
downloadhistorical-a2e151bbcea663c59977c2226850900d5d64c492.tar.gz
historical-a2e151bbcea663c59977c2226850900d5d64c492.tar.bz2
historical-a2e151bbcea663c59977c2226850900d5d64c492.zip
Block x11-drivers/xf86-input-synaptics, making the two ebuilds mutually exclusive and fixing the X.Org 1.5 upgrade path. Herd approval from Battousai on IRC.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089-dirty x86_64
Diffstat (limited to 'x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild')
-rw-r--r--x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild
index fbd416b70f97..31a93cc0560e 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild,v 1.1 2008/07/30 13:13:24 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r3.ebuild,v 1.2 2008/09/06 21:40:57 chainsaw Exp $
inherit toolchain-funcs eutils linux-info
@@ -19,7 +19,8 @@ RDEPEND="x11-libs/libXext
DEPEND="${RDEPEND}
x11-base/xorg-server
x11-proto/inputproto
- >=sys-apps/sed-4"
+ >=sys-apps/sed-4
+ !x11-drivers/xf86-input-synaptics"
evdev-input_check() {
# Check kernel config for required event interface support (either