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

8 files changed, 44 insertions, 20 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/Manifest b/x11-drivers/synaptics/Manifest
index 42d13602f8f1..4a637e9a9084 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 11-x11-synaptics.fdi 460 RMD160 973e332bd506d0160e573a028115bf3c0924e334 SHA1 77cc42785faecc3fb9b33ffac0b433ba9ba03808 SHA256 51c0da7a8e7048a753afa83d2d81e62fa8b61e0a1718083a2cc110767a76a8a3
 AUX rc.conf 330 RMD160 75825d70b749ae4e8b59b4066428d73815b19d70 SHA1 639736e2b424fcd3d6a78d0e6a3f90bed49ee6f4 SHA256 1776915a739c2f1432ab1602717cac1ff2464160a9d33d20124853a93605f6a5
 AUX rc.init 440 RMD160 82c30d248ef010cdd41600e3b19878b9f2ea6ff0 SHA1 cfb299682f9ec85340950917cbfebe5387080b32 SHA256 314d7d7c7d20608a398b439427e9c74cfaf2521996abc50af8a7963f1e7f22b8
@@ -16,11 +19,18 @@ AUX synaptics_input_api.diff 2181 RMD160 c7adda057b1591721abb4e2cba73e5fca144236
 DIST synaptics-0.14.5.tar.bz2 126743 RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 SHA1 54788ea58ff0c07b3ae492e8dae9a2253b586af5 SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796
 DIST synaptics-0.14.6.tar.bz2 126833 RMD160 7a8b103aa314eb13dc512c663c501108cc24a574 SHA1 41443e253e73546657b40435c8c9bfa0a91662bc SHA256 f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 DIST synaptics-0.14.6_p20070706.tar.bz2 129509 RMD160 bacf7f08c04a9164af2883133d479ace59f7a3ce SHA1 55077ecf4bba3ced44702aa516af7a23c5172c03 SHA256 a22e3995756ce2050832a9ee1a8b300dfa18101e00e940399e329e4f9e78cb90
-EBUILD synaptics-0.14.5-r1.ebuild 1343 RMD160 c7f963ed6ddcb094b96fff26e1a07e87a5e0a9a0 SHA1 53fa6ec7f012f3fd8ab77cfd61ef3d3de69eeba2 SHA256 2dd35c45a2626795240ece1b9250b7bae082fddc8ff970381ce080654110b121
-EBUILD synaptics-0.14.6-r1.ebuild 1489 RMD160 c3557e675525529556820e080e4405ab8df82fd3 SHA1 19c178feb284d1cf328694b1a79fcd6d0cd110b8 SHA256 0890650b349dfcced8a99d3a2f60c35d64299b51601a932d1f9cc38b807fbeb8
-EBUILD synaptics-0.14.6-r2.ebuild 2668 RMD160 c9522389758831bff4a04ff378fd86a72b3fe224 SHA1 f2dbc5ffb0cee371e6a3e0f3f2f817ec48f1f0cf SHA256 8def1f5a331ebf7dda383fa8128d09879f7b27c700668f44577c6e7c4022d67d
-EBUILD synaptics-0.14.6-r3.ebuild 2801 RMD160 048a6e21e4e457bd532557588da70d46f44e0390 SHA1 941605c80fd23dbb91e59774f8047ecfbbe14431 SHA256 c42b7f6e0156383cd3c88cf1346a40ab041230b5739204980644fe8805c3c24b
-EBUILD synaptics-0.14.6.ebuild 1279 RMD160 1fa2942ca32f97267d9faf57c84db995865aa9a7 SHA1 5d7aa9963e43411d9945b5fb74bf55605eaa69f0 SHA256 a957b171c46d85b4dff88eba3a912d462bdad238510534cbd873131e242dfdfb
-EBUILD synaptics-0.14.6_p20070706-r1.ebuild 2842 RMD160 ad632e59ed493d9f0fc02094766e7dd396e1f6a9 SHA1 bf5144f09e1bd2410a0db2d1b8f18ed557179678 SHA256 3dfa5bfc2e941baf784a8edafb786193ef554f25566548ae07484a5dfaf0f6ef
-MISC ChangeLog 17765 RMD160 20ab97d43fa7ec7f4679af7c421c53b7375ea126 SHA1 a7283a61df1821ff68b3e05311e6dbf9e40d10a8 SHA256 373508b8f2129f5d457afd0bdbc69e68dd8df31ab5050d7904aab83e46c05430
+EBUILD synaptics-0.14.5-r1.ebuild 1380 RMD160 31fab8716a7ff25fae772b8c273cc3ac3296c596 SHA1 c37daa94f49582bd4aa8d927c28e4d79158a0bcc SHA256 4c94ecedaaf8aa0283ddf8e627302f333d8400915c4034ed7b79f83ab51cbbe0
+EBUILD synaptics-0.14.6-r1.ebuild 1525 RMD160 7a4ff080ae0eaabd744eec48386357383558752d SHA1 c469dd9c463a7a9de5e6aa8a3d4016dc7b2ff29d SHA256 4203686773512a0166fa6f5335659f8f0b33b6ab5a5b8a4400bdda1b846342b6
+EBUILD synaptics-0.14.6-r2.ebuild 2705 RMD160 857ce973e03b4701d99f7eb888f97ebb87ec0ea4 SHA1 cb50a794b53497039b3a5c017629efa3d69cb4b9 SHA256 9183845eb23328ae103274032519c5a4cd941e8b9c5c29d9d52ef8bc5cf210ef
+EBUILD synaptics-0.14.6-r3.ebuild 2840 RMD160 007ed6e8f9057fd2a6a3a26e1e02f71b6a8db4da SHA1 7dbe6c81649b81a75a05bfa2f515645593a6fe1a SHA256 c6149476f1a60defe7276e3dc3f287f2f586a352e5dd4497eb62e03c19516aab
+EBUILD synaptics-0.14.6.ebuild 1315 RMD160 66d4a0b615ff571e19d4ef3232d2e9b5ec016f17 SHA1 d46e1ddcef2309c97cee383765ed646857380df0 SHA256 7349c3844956fbe7342972d40ece1d0afda206ca8acba6ec029148f99049d6af
+EBUILD synaptics-0.14.6_p20070706-r1.ebuild 2878 RMD160 a19e6528322b807bdd82103505c2cf9a29ea3496 SHA1 92cc1bc2c6ef6b8a81b475f446dc174106bd0411 SHA256 86ec76546b618fcfc67fe2b5ffbe7c329cdb93e610b257170e910ecc09bca4c3
+MISC ChangeLog 18149 RMD160 6e2136f71fe759941dadc5ce8318527b9843c94f SHA1 c24e35d41362f413e77bcf55205a155d6bcdaad1 SHA256 1aa3b1475dee35e2548b98910053fc0f2641f034540132581cddaca177992612
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjC+U4ACgkQp5vW4rUFj5rbtACfWKxKIKizhlIkHZGQsqsvoFN+
+3hQAn2YPx3S7kLr9Ubug99eOduRc1lTM
+=6fUs
+-----END PGP SIGNATURE-----
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