Remove virtual/x11 from deps for bug 166361.

Package-Manager: portage-2.1.2-r9

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 04d2fa602a315c4c7850ab48dcbe2ae15d574a36..acb93e9b40ddc53bc25aabbc633c8d540f9b47c7 100644 (file)
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.192 2007/02/05 08:15:30 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.193 2007/02/14 14:50:29 drac Exp $
+
+  14 Feb 2007; Samuli Suominen <drac@gentoo.org> xterm-223.ebuild:
+  Remove virtual/x11 from deps for bug 166361.
 
   05 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> xterm-222.ebuild:
   Stable on MIPS; bug #156741

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 5a0dfca19cf50855c7d2fe272e2cc24729c4eee9..41f3e796298a8d5a4aa1fe14067d6f480961e9f3 100644 (file)
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xterm-app-defaults-ref.patch 572 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 SHA1 d80445dccc4a52bc22d118787929db937417ce50 SHA256 41616cb3a3dd687b9c5e1e60ff0e5ebfc6a116f3e0de89c86705235ecfc6203f
 MD5 307a0970129ebdd2044f781e24dd434e files/xterm-app-defaults-ref.patch 572
 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 files/xterm-app-defaults-ref.patch 572
@@ -16,14 +13,14 @@ EBUILD xterm-222.ebuild 2783 RMD160 f471486af1df1c068159ca150314e921bfeda76f SHA
 MD5 c1b4b57abf2b0dcf87bbb9aa1fed8f3f xterm-222.ebuild 2783
 RMD160 f471486af1df1c068159ca150314e921bfeda76f xterm-222.ebuild 2783
 SHA256 26ec56bb8fbec70627293fa85b6466603049dcca4f9033e8ec4d8fdf6d650e0d xterm-222.ebuild 2783
-EBUILD xterm-223.ebuild 2796 RMD160 03d02451e1b73deadbca5026ad0b8a5cf750a51f SHA1 d60aa75ea7aa81c2b0b9bb4357baefa4bd3cd055 SHA256 3f1a7062bb18c922372de0d84f279a482921d35676b047bb47f3b9bb65fb90af
-MD5 631a184f1f2e10f1fc575547ab1cdea7 xterm-223.ebuild 2796
-RMD160 03d02451e1b73deadbca5026ad0b8a5cf750a51f xterm-223.ebuild 2796
-SHA256 3f1a7062bb18c922372de0d84f279a482921d35676b047bb47f3b9bb65fb90af xterm-223.ebuild 2796
-MISC ChangeLog 26976 RMD160 a32d2a73586c593da9b5cf5ba4eccf142db40525 SHA1 311a6400c72659ebc826cdbe6dd1908364cb6848 SHA256 bbcb698d2fcb6f69222c353b7f5c53a32944b367c1d16329189f0a521dfd0f4b
-MD5 1c9a4013af0cf00341c2e97703042f8f ChangeLog 26976
-RMD160 a32d2a73586c593da9b5cf5ba4eccf142db40525 ChangeLog 26976
-SHA256 bbcb698d2fcb6f69222c353b7f5c53a32944b367c1d16329189f0a521dfd0f4b ChangeLog 26976
+EBUILD xterm-223.ebuild 2742 RMD160 9812c8e5b7436cdd37aacd797c4262c03f6f8c6e SHA1 bbb4d3faacc00db9e41ec981c41246991be80bce SHA256 e078d18fa6112b632ab95e69b92fa2eb740b069391d7d4ef2cdb34f9d5b55fce
+MD5 e6c10ddc2c886ae41e51218dfd2cf774 xterm-223.ebuild 2742
+RMD160 9812c8e5b7436cdd37aacd797c4262c03f6f8c6e xterm-223.ebuild 2742
+SHA256 e078d18fa6112b632ab95e69b92fa2eb740b069391d7d4ef2cdb34f9d5b55fce xterm-223.ebuild 2742
+MISC ChangeLog 27090 RMD160 1d22b83f0be4aaf2e96466ab867383a1911fb3f3 SHA1 7a365ac1539b4fc1fd63495dd5fa99bbfee64cf5 SHA256 1476aac60d1d179c1b5df0bed2e5566b6de9f6daeb879b7b0ace83de9d1e1b8b
+MD5 037f99a7de35c2ef0263595444419918 ChangeLog 27090
+RMD160 1d22b83f0be4aaf2e96466ab867383a1911fb3f3 ChangeLog 27090
+SHA256 1476aac60d1d179c1b5df0bed2e5566b6de9f6daeb879b7b0ace83de9d1e1b8b ChangeLog 27090
 MISC metadata.xml 509 RMD160 39ae1f61046102dd264cc33c0f40cfe7e8e55792 SHA1 aa63afb7f246cd7b5081c3b448cebe4c0764c161 SHA256 2ab8a9c341e551c98695b765c4e1cff5b1e11a277e6a5cc03e8c4e272fdd3ab9
 MD5 ab0944e9348abcf04ea4a782274063cc metadata.xml 509
 RMD160 39ae1f61046102dd264cc33c0f40cfe7e8e55792 metadata.xml 509
@@ -37,10 +34,3 @@ SHA256 3c727680d9239506117208fd3a1927c3271a7cf3242ac93c170791995492f9bd files/di
 MD5 200265f42b8c0f15ecc6d975b1373d6c files/digest-xterm-223 220
 RMD160 13913332ad2ae19b778fc3aa9d32c0bbb08076d5 files/digest-xterm-223 220
 SHA256 d1c784ae7480ed406f7b003370e94a2dab456ad162ff5619c9079f4efe9a9513 files/digest-xterm-223 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFxueE6Xxn2nLwtdQRAmeyAKDJ/FUThF5K0dtMqvEeADH8kA8ZmQCgub56
-ObVTjHZFwAyzV9WOXEDyWfo=
-=dOTs
------END PGP SIGNATURE-----

diff --git a/x11-terms/xterm/xterm-223.ebuild b/x11-terms/xterm/xterm-223.ebuild
index 9c02a667f564def2327fbb066c9b280100628c24..f7cf3d0f4c36698a500695c414e26a0e80aefd65 100644 (file)
--- a/x11-terms/xterm/xterm-223.ebuild
+++ b/x11-terms/xterm/xterm-223.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-223.ebuild,v 1.2 2006/12/01 14:34:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-223.ebuild,v 1.3 2007/02/14 14:50:29 drac Exp $
 
 inherit flag-o-matic
 
@@ -13,20 +13,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="truetype Xaw3d unicode toolbar paste64"
 
-RDEPEND="|| ( (        x11-libs/libX11
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXmu
-               x11-libs/libxkbfile
-               x11-libs/libXft
-               x11-libs/libXaw
-               unicode? ( x11-apps/luit ) )
-       virtual/x11 )
+RDEPEND="x11-libs/libX11
+       x11-libs/libXrender
+       x11-libs/libXt
+       x11-libs/libXmu
+       x11-libs/libxkbfile
+       x11-libs/libXft
+       x11-libs/libXaw
+       unicode? ( x11-apps/luit )
        Xaw3d? ( x11-libs/Xaw3d )
        sys-libs/libutempter"
-
 DEPEND="${RDEPEND}
-       || ( x11-proto/xproto virtual/x11 )"
+       x11-proto/xproto"
 
 pkg_setup() {
        if has_version "x11-libs/libX11"; then