Add xterm back to DEPEND for uclibc systems #102402 by Yuri Vasilevski and remove ugly arch-wrappings of 3dfx in DEPEND.

(Portage version: 2.0.51.22-r2)

5 files changed, 20 insertions, 26 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 4c4c26a60f68..e931aeff54df 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.442 2005/07/29 23:52:04 spyderous Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.443 2005/08/17 01:46:29 vapier Exp $
+
+  17 Aug 2005; Mike Frysinger <vapier@gentoo.org> xorg-x11-6.8.2-r1.ebuild,
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild,
+  xorg-x11-6.8.99.15.ebuild:
+  Add xterm back to DEPEND for uclibc systems #102402 by Yuri Vasilevski and
+  remove ugly arch-wrappings of 3dfx in DEPEND.
 
   29 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r1.ebuild
index d3da1336ba41..1e29baf22945 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r1.ebuild,v 1.23 2005/07/18 23:45:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r1.ebuild,v 1.24 2005/08/17 01:46:29 vapier Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -124,14 +124,11 @@ RDEPEND="
 		!virtual/x11"
 
 PDEPEND="x86? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
 			input_devices_synaptics? ( x11-misc/synaptics )
 			input_devices_wacom? ( x11-misc/linuxwacom )
 		)
-		alpha? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
-		)
-		!uclibc? ( x11-terms/xterm )"
+		3dfx? ( >=media-libs/glide-v3-3.10 )
+		x11-terms/xterm"
 
 PROVIDE="virtual/x11
 	opengl? virtual/opengl
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
index 0f313c388fed..c73ef0439241 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.51 2005/07/29 23:52:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.52 2005/08/17 01:46:29 vapier Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -111,14 +111,11 @@ RDEPEND="
 		!virtual/x11"
 
 PDEPEND="x86? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
 			input_devices_synaptics? ( x11-misc/synaptics )
 			input_devices_wacom? ( x11-misc/linuxwacom )
 		)
-		alpha? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
-		)
-		!uclibc? ( x11-terms/xterm )"
+		3dfx? ( >=media-libs/glide-v3-3.10 )
+		x11-terms/xterm"
 
 PROVIDE="virtual/x11
 	opengl? virtual/opengl
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.14.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.14.ebuild
index 37ccec5e65e0..fc7a45d8c288 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.14.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.14.ebuild,v 1.5 2005/07/18 23:45:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.14.ebuild,v 1.6 2005/08/17 01:46:29 vapier Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -112,14 +112,11 @@ RDEPEND="
 		!virtual/x11"
 
 PDEPEND="x86? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
 			input_devices_synaptics? ( x11-misc/synaptics )
 			input_devices_wacom? ( x11-misc/linuxwacom )
 		)
-		alpha? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
-		)
-		!uclibc? ( x11-terms/xterm )"
+		3dfx? ( >=media-libs/glide-v3-3.10 )
+		x11-terms/xterm"
 
 PROVIDE="virtual/x11
 	opengl? virtual/opengl
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild
index f4a772572c7b..7a3321e6a0ec 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild,v 1.6 2005/07/29 23:52:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild,v 1.7 2005/08/17 01:46:29 vapier Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -111,14 +111,11 @@ RDEPEND="
 		!virtual/x11"
 
 PDEPEND="x86? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
 			input_devices_synaptics? ( x11-misc/synaptics )
 			input_devices_wacom? ( x11-misc/linuxwacom )
 		)
-		alpha? (
-			3dfx? ( >=media-libs/glide-v3-3.10 )
-		)
-		!uclibc? ( x11-terms/xterm )"
+		3dfx? ( >=media-libs/glide-v3-3.10 )
+		x11-terms/xterm"
 
 PROVIDE="virtual/x11
 	opengl? virtual/opengl