bug #8810 is fixed, so adding virtual/x11 back as a DEP. Closes bug #76062 by Tony Murray <tonymurray@fastmail.fm>

4 files changed, 12 insertions, 13 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 2df478cd88f7..0072169744dd 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.56 2004/12/28 22:21:10 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.57 2004/12/29 20:33:33 seemant Exp $
+
+  29 Dec 2004; Seemant Kulleen <seemant@gentoo.org> xterm-196-r1.ebuild,
+  xterm-196.ebuild, xterm-197.ebuild:
+  bug #8810 is fixed, so adding virtual/x11 back as a DEP. Closes bug #76062
+  by Tony Murray <tonymurray@fastmail.fm>
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/x11-terms/xterm/xterm-196-r1.ebuild b/x11-terms/xterm/xterm-196-r1.ebuild
index 502a05434b40..27fdb4077b20 100644
--- a/x11-terms/xterm/xterm-196-r1.ebuild
+++ b/x11-terms/xterm/xterm-196-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-196-r1.ebuild,v 1.2 2004/12/19 08:28:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-196-r1.ebuild,v 1.3 2004/12/29 20:33:33 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,11 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="truetype Xaw3d unicode"
 
-DEPEND="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r7 )
+DEPEND="virtual/x11
 	sys-apps/utempter
 	Xaw3d? ( x11-libs/Xaw3d )"
-# Doesn't work because of broken portage (#8810)
-# virtual/x11"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-terms/xterm/xterm-196.ebuild b/x11-terms/xterm/xterm-196.ebuild
index 0f4dee9a6cba..b5dbaf7b4c74 100644
--- a/x11-terms/xterm/xterm-196.ebuild
+++ b/x11-terms/xterm/xterm-196.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-196.ebuild,v 1.11 2004/12/19 08:28:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-196.ebuild,v 1.12 2004/12/29 20:33:33 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,11 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="truetype Xaw3d unicode"
 
-DEPEND="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r7 )
+DEPEND="virtual/x11
 	sys-apps/utempter
 	Xaw3d? ( x11-libs/Xaw3d )"
-# Doesn't work because of broken portage (#8810)
-# virtual/x11"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-terms/xterm/xterm-197.ebuild b/x11-terms/xterm/xterm-197.ebuild
index 7dea2eef9dcd..b8823fd3a444 100644
--- a/x11-terms/xterm/xterm-197.ebuild
+++ b/x11-terms/xterm/xterm-197.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-197.ebuild,v 1.1 2004/12/28 17:26:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-197.ebuild,v 1.2 2004/12/29 20:33:33 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,11 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="truetype Xaw3d unicode"
 
-DEPEND="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r7 )
+DEPEND="virtual/x11
 	sys-apps/utempter
 	Xaw3d? ( x11-libs/Xaw3d )"
-# Doesn't work because of broken portage (#8810)
-# virtual/x11"
 
 src_unpack() {
 	unpack ${A}