Second pass. Cleanup by moving arch-conditional parts to ends of blocks. Add x11-misc/linuxwacom.

Package-Manager: portage-2.1_pre4

3 files changed, 39 insertions, 25 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2450a3ada384..e736a8c732b1 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.511 2006/01/28 23:16:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.512 2006/01/28 23:20:39 spyderous Exp $
+
+  28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-7.0-r1.ebuild:
+  Second pass. Cleanup by moving arch-conditional parts to ends of blocks. Add
+  x11-misc/linuxwacom.
 
   28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 78d309bf5450..b7b8a81e3c04 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,6 @@
-MD5 13cc742402e122482635f41bc18439a6 ChangeLog 114184
-RMD160 60d1af94a9cfaf9fe642cb530667f43d0ad90331 ChangeLog 114184
-SHA256 c06647ffdd83279ccc42268f433e02a9d28ccdeac87f73abdbe2835edbe870ca ChangeLog 114184
+MD5 62c6d0361945d1d890920db3b961eea5 ChangeLog 114368
+RMD160 1cb74a1b953e3e83e87727489d0b17e7d5f30270 ChangeLog 114368
+SHA256 ba91c073265c29da1b241e54eeae7645aa436f83d49736d81e55952891a17b1c ChangeLog 114368
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
 SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
@@ -28,9 +28,9 @@ SHA256 8318e0d8d3ae52fd2206ca57e83217d43c052716d5ae317d434f4926f4aa48c0 xorg-x11
 MD5 fd0a1f5519f3c1704de9c3744b7670ec xorg-x11-6.8.99.15-r4.ebuild 54157
 RMD160 aa87ce403b2398d82061197321a41f3c26cffc22 xorg-x11-6.8.99.15-r4.ebuild 54157
 SHA256 a776983eb4bd04de304af15a6bfb3a68ee558d48a164a26fd8aaadbb47d4be93 xorg-x11-6.8.99.15-r4.ebuild 54157
-MD5 f885843942913bfafb28ce02bff55df3 xorg-x11-7.0-r1.ebuild 12640
-RMD160 5c0cde6b13e16c5cf983186a919c4773b35e957d xorg-x11-7.0-r1.ebuild 12640
-SHA256 736fb66f120c21c3d08460034c9daeb16b60f76e29fb6b6b26811f765b59337b xorg-x11-7.0-r1.ebuild 12640
+MD5 76ad8a7d120fa59b7eec9d62a6fa4ab0 xorg-x11-7.0-r1.ebuild 12775
+RMD160 9fee2e9156ca6f16e30d0b83ca7597a7be2315f3 xorg-x11-7.0-r1.ebuild 12775
+SHA256 198f5e02f36880d1e699f479824d0cdc27a55f2e91a3092dcef568d2f0700792 xorg-x11-7.0-r1.ebuild 12775
 MD5 b8256074d549617ad13279d98fdaafb9 xorg-x11-7.0.ebuild 3726
 RMD160 04a4b2ec7794ef3f67a122e82a870d7487d8a8bc xorg-x11-7.0.ebuild 3726
 SHA256 4cf8b8fdb8e6391a98d099aa26ca3ce10155e1a3b869b4fd5226c71e25a6a4b7 xorg-x11-7.0.ebuild 3726
diff --git a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
index 9f75dd77c7ca..0097576706f2 100644
--- a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.3 2006/01/28 23:16:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.4 2006/01/28 23:20:39 spyderous Exp $
 
 inherit eutils
 
@@ -41,7 +41,8 @@ IUSE_INPUT_DEVICES="
 	input_devices_vmmouse
 	input_devices_void
 
-	input_devices_synaptics"
+	input_devices_synaptics
+	input_devices_wacom"
 IUSE_VIDEO_CARDS="
 	video_cards_apm
 	video_cards_ark
@@ -171,6 +172,7 @@ RDEPEND="${RDEPEND}
 				input_devices_void? ( x11-drivers/xf86-input-void )
 
 				input_devices_synaptics? ( x11-drivers/synaptics )
+				input_devices_wacom? ( x11-misc/linuxwacom )
 			)
 			(
 				x11-drivers/xf86-input-acecad
@@ -199,13 +201,19 @@ RDEPEND="${RDEPEND}
 				x11-drivers/xf86-input-summa
 				x11-drivers/xf86-input-tek4957
 				x11-drivers/xf86-input-ur98
-				amd64? ( x11-drivers/xf86-input-vmmouse )
-				x86? ( x11-drivers/xf86-input-vmmouse )
 				x11-drivers/xf86-input-void
 
-				x86? ( x11-drivers/synaptics )
-				amd64? ( x11-drivers/synaptics )
-				ppc? ( x11-drivers/synaptics )
+				x86? ( x11-drivers/xf86-input-vmmouse
+					x11-drivers/synaptics
+					x11-misc/linuxwacom
+				)
+				amd64? ( x11-drivers/xf86-input-vmmouse
+					x11-drivers/synaptics
+					x11-misc/linuxwacom
+				)
+				ppc? ( x11-drivers/synaptics
+					x11-misc/linuxwacom
+				)
 			)
 		)
 	|| (
@@ -283,14 +291,6 @@ RDEPEND="${RDEPEND}
 				x11-drivers/xf86-video-siliconmotion
 				x11-drivers/xf86-video-sis
 				x11-drivers/xf86-video-sisusb
-				sparc? ( x11-drivers/xf86-video-sunbw2
-					x11-drivers/xf86-video-suncg14
-					x11-drivers/xf86-video-suncg3
-					x11-drivers/xf86-video-suncg6
-					x11-drivers/xf86-video-sunffb
-					x11-drivers/xf86-video-sunleo
-					x11-drivers/xf86-video-suntcx
-				)
 				x11-drivers/xf86-video-tdfx
 				x11-drivers/xf86-video-tga
 				x11-drivers/xf86-video-trident
@@ -299,11 +299,20 @@ RDEPEND="${RDEPEND}
 				x11-drivers/xf86-video-vesa
 				x11-drivers/xf86-video-vga
 				x11-drivers/xf86-video-via
-				x86? ( x11-drivers/xf86-video-vmware )
-				amd64? ( x11-drivers/xf86-video-vmware )
 				x11-drivers/xf86-video-voodoo
 
-				x86? ( >=media-libs/glide-v3-3.10 )
+				sparc? ( x11-drivers/xf86-video-sunbw2
+					x11-drivers/xf86-video-suncg14
+					x11-drivers/xf86-video-suncg3
+					x11-drivers/xf86-video-suncg6
+					x11-drivers/xf86-video-sunffb
+					x11-drivers/xf86-video-sunleo
+					x11-drivers/xf86-video-suntcx
+				)
+				x86? ( x11-drivers/xf86-video-vmware
+					>=media-libs/glide-v3-3.10
+				)
+				amd64? ( x11-drivers/xf86-video-vmware )
 				alpha? ( >=media-libs/glide-v3-3.10 )
 			)
 		)"