bug #8810 is fixed, so adding virtual/x11 back as a DEP. Closes bug #76062 by Tony...

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 2df478cd88f745eba89954adab08a43478acea0d..0072169744dd6b3d5021799a40013cde8f890b88 100644 (file)
--- 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/Manifest b/x11-terms/xterm/Manifest
index 19d054f7daa989a13e8182629d6a0072d3fba93b..0207fbaa3c1ca594210df6ced32636701ccf6634 100644 (file)
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,9 @@
-MD5 21eebdf1534a7bb89b2b294be4484c0b xterm-196.ebuild 1465
-MD5 2a0d22fe383489c7b5172e139b123d3d ChangeLog 8166
-MD5 0fd191467a481848800ec258c9b29a4c xterm-196-r1.ebuild 1742
+MD5 fd0cc912e9977bb987cc5cf1f037cd94 xterm-196.ebuild 1358
+MD5 9bd303bdd39adc2156ab0d14d23ac392 xterm-196-r1.ebuild 1635
+MD5 39f90b3daeca13edea7209dbaff2976d xterm-197.ebuild 1632
+MD5 26868176ec484170c50d0c88d288667e ChangeLog 8397
 MD5 a8f4e2b68b04b535b32e12816278f1da metadata.xml 231
-MD5 813fb2f6cf3be225b2cc7c354ae3d591 xterm-197.ebuild 1735
 MD5 22861d1a4affc7229c468095a0103257 files/xterm-184-remove-termcap-breakage.patch 377
-MD5 262f724e0a5b9a083a6fb77ba48e5e12 files/digest-xterm-197 58
-MD5 222267de7af1500b6d28efe51a296e1b files/digest-xterm-196 58
 MD5 222267de7af1500b6d28efe51a296e1b files/digest-xterm-196-r1 58
+MD5 222267de7af1500b6d28efe51a296e1b files/digest-xterm-196 58
+MD5 262f724e0a5b9a083a6fb77ba48e5e12 files/digest-xterm-197 58

diff --git a/x11-terms/xterm/xterm-196-r1.ebuild b/x11-terms/xterm/xterm-196-r1.ebuild
index 502a05434b40491b269f3b3be1f7b1eb3c112c9f..27fdb4077b20426eeb55e81233e84ca10ee7eb3c 100644 (file)
--- 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 0f4dee9a6cba8ad4261de343006eae74eecb8edc..b5dbaf7b4c745e414684354173c8ec0297860209 100644 (file)
--- 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 7dea2eef9dcd997df26c4e72e4742cd8c5feff1c..b8823fd3a444244325c1819aab8b6ace45a7f5c0 100644 (file)
--- 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}