summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2008-09-06 21:03:30 +0000
committerTony Vroon <chainsaw@gentoo.org>2008-09-06 21:03:30 +0000
commit42e5bc2bdd3bbdcb7f0d4cce01df93651b1087cc (patch)
treea719a50a3790d09aa38c76e2e524db8350556bc1 /x11-base
parentFix Manifest. (diff)
downloadgentoo-2-42e5bc2bdd3bbdcb7f0d4cce01df93651b1087cc.tar.gz
gentoo-2-42e5bc2bdd3bbdcb7f0d4cce01df93651b1087cc.tar.bz2
gentoo-2-42e5bc2bdd3bbdcb7f0d4cce01df93651b1087cc.zip
Only depend on x11-drivers/xf86-input-synaptics as the older package does not build against this new server. Closes bug #236870 by Seemant Kulleen <seemant_g2@kulleen.org>.
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089-dirty x86_64)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.0.ebuild7
2 files changed, 8 insertions, 6 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index d2282dc60801..64c8d37002f1 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.349 2008/09/06 07:12:13 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.350 2008/09/06 21:03:30 chainsaw Exp $
+
+ 06 Sep 2008; <chainsaw@gentoo.org> xorg-server-1.5.0.ebuild:
+ Only depend on x11-drivers/xf86-input-synaptics as the older package does
+ not build against this new server. Closes bug #236870 by Seemant Kulleen
+ <seemant_g2@kulleen.org>.
*xorg-server-1.5.0 (06 Sep 2008)
diff --git a/x11-base/xorg-server/xorg-server-1.5.0.ebuild b/x11-base/xorg-server/xorg-server-1.5.0.ebuild
index e472193aacf5..859a4e1e1a72 100644
--- a/x11-base/xorg-server/xorg-server-1.5.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.0.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-base/xorg-server/xorg-server-1.5.0.ebuild,v 1.1 2008/09/06 07:12:13 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.0.ebuild,v 1.2 2008/09/06 21:03:30 chainsaw Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -205,10 +205,7 @@ PDEPEND="
input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
-
- input_devices_synaptics? ( ||
- ( x11-drivers/xf86-input-synaptics x11-drivers/synaptics )
- )
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
input_devices_wacom? ( x11-drivers/linuxwacom )
video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.0 )