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.

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089-dirty x86_64)

7 files changed, 27 insertions, 13 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index 5d182e210b4e..08aa9e6f63e9 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.39 2008/08/30 22:33:16 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.40 2008/09/06 21:40:57 chainsaw Exp $
+
+  06 Sep 2008; <chainsaw@gentoo.org> synaptics-0.14.5-r1.ebuild,
+  synaptics-0.14.6.ebuild, synaptics-0.14.6-r1.ebuild,
+  synaptics-0.14.6-r2.ebuild, synaptics-0.14.6-r3.ebuild,
+  synaptics-0.14.6_p20070706-r1.ebuild:
+  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.
 
 *synaptics-0.14.6_p20070706-r1 (30 Aug 2008)
 
diff --git a/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild b/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild
index 291f7e9343b4..3445908dd1d8 100644
--- a/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.5-r1.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.5-r1.ebuild,v 1.9 2008/08/29 20:01:49 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild,v 1.10 2008/09/06 21:40:57 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -17,7 +17,8 @@ KEYWORDS="amd64 ppc ppc64 x86"
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}
 	x11-base/xorg-server
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	!x11-drivers/xf86-input-synaptics"
 
 src_unpack() {
 	unpack ${A} ; cd "${S}"
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild
index 376ffcee88d2..20a5568027d0 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r1.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-r1.ebuild,v 1.4 2008/08/29 20:01:49 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r1.ebuild,v 1.5 2008/09/06 21:40:57 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -18,7 +18,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"
 
 src_unpack() {
 	unpack ${A} ; cd "${S}"
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
index 541f508709ee..ec32d0681acf 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r2.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-r2.ebuild,v 1.4 2008/04/07 15:17:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.5 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
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
diff --git a/x11-drivers/synaptics/synaptics-0.14.6.ebuild b/x11-drivers/synaptics/synaptics-0.14.6.ebuild
index 2f6c93589021..2a7061aa0da7 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6.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.ebuild,v 1.11 2008/08/29 20:01:49 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.12 2008/09/06 21:40:57 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -18,7 +18,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"
 
 src_unpack() {
 	unpack ${A} ; cd "${S}"
diff --git a/x11-drivers/synaptics/synaptics-0.14.6_p20070706-r1.ebuild b/x11-drivers/synaptics/synaptics-0.14.6_p20070706-r1.ebuild
index 7ea422e23863..45d27fde89d4 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6_p20070706-r1.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6_p20070706-r1.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_p20070706-r1.ebuild,v 1.1 2008/08/30 22:33:17 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6_p20070706-r1.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