fixing #151081

Package-Manager: portage-2.1.1-r1

6 files changed, 56 insertions, 13 deletions

diff --git a/x11-terms/xvt/ChangeLog b/x11-terms/xvt/ChangeLog
index c8ba32908980..ecc306e8a242 100644
--- a/x11-terms/xvt/ChangeLog
+++ b/x11-terms/xvt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/xvt
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.8 2004/12/28 22:21:43 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.9 2006/12/04 23:05:20 taviso Exp $
+
+  04 Dec 2006; Tavis Ormandy <taviso@gentoo.org> xvt-2.1-r1.ebuild:
+  fixing #151081
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index 0dd5cb19dfc9..1fa0b2543e25 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -1,7 +1,38 @@
-MD5 cd410d0c83a58d1827f1070c5e4331f4 ChangeLog 936
-MD5 4f71b61cf1aadf01933a54eed5787e0c files/digest-xvt-2.1 116
-MD5 4f71b61cf1aadf01933a54eed5787e0c files/digest-xvt-2.1-r1 116
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xvt-ttyinit-svr4pty.diff 1380 RMD160 b120ebf9fe518596af5ac13c1e89f629e4d69b95 SHA1 c168c17923048300ceec7b362c815d2ba1de443f SHA256 9723dce5d6609a8fddaed166bf6143faeb1b84765bdd7818b4eec33bb8d2371c
 MD5 58ed6be7fe5214ba8025a652b45df904 files/xvt-ttyinit-svr4pty.diff 1380
+RMD160 b120ebf9fe518596af5ac13c1e89f629e4d69b95 files/xvt-ttyinit-svr4pty.diff 1380
+SHA256 9723dce5d6609a8fddaed166bf6143faeb1b84765bdd7818b4eec33bb8d2371c files/xvt-ttyinit-svr4pty.diff 1380
+DIST xvt-1.0.tar.Z 59445 RMD160 56fa0c779d178eccb222cd2d138d6fc4a18b800b SHA1 e8f616963f415c78a702938c9b03352714f4261a SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1
+DIST xvt-2.1.diff.gz 39941 RMD160 57c54e0fd200739c8c7bcfadc34cac5884b62606 SHA1 97bbf9d0ae61f36e508dc43d59f791d9f852b994 SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607
+EBUILD xvt-2.1-r1.ebuild 1206 RMD160 d1ecc7cb0db57895943767d31d162fca529a26f5 SHA1 b44e6c7cf890f59f9227b9ab6549367c17406b49 SHA256 44cdb0d0bcd00e17a488a84c2eb89f0422ea007de1fea50ddd7df329923cdf73
+MD5 4c29914fb01b7fe19ed93efad486e8c3 xvt-2.1-r1.ebuild 1206
+RMD160 d1ecc7cb0db57895943767d31d162fca529a26f5 xvt-2.1-r1.ebuild 1206
+SHA256 44cdb0d0bcd00e17a488a84c2eb89f0422ea007de1fea50ddd7df329923cdf73 xvt-2.1-r1.ebuild 1206
+EBUILD xvt-2.1.ebuild 1072 RMD160 e980b4c7cab4f72b001e244b011987730c0cb302 SHA1 bccf39269f53b159a64d4ae173ad22c20860b41b SHA256 3cff52b7efa4f9761e998924547ca73a1ffcad02d51cf3bcfd7f3d5a53c3d198
+MD5 3371caeff4ceea431fa693e77fef08cd xvt-2.1.ebuild 1072
+RMD160 e980b4c7cab4f72b001e244b011987730c0cb302 xvt-2.1.ebuild 1072
+SHA256 3cff52b7efa4f9761e998924547ca73a1ffcad02d51cf3bcfd7f3d5a53c3d198 xvt-2.1.ebuild 1072
+MISC ChangeLog 1021 RMD160 d7a987acfe68037c339ede1ce532cea2c9af61fb SHA1 8fab6fa86dc542ec7ef13ffa9e7bd98fe5aacd2a SHA256 cef39d79d18b4f9698d30403c3003f0bdbcbac3c4e8bf71928721d55f904355b
+MD5 565f874218333e0cbae9cf26fd62ebfb ChangeLog 1021
+RMD160 d7a987acfe68037c339ede1ce532cea2c9af61fb ChangeLog 1021
+SHA256 cef39d79d18b4f9698d30403c3003f0bdbcbac3c4e8bf71928721d55f904355b ChangeLog 1021
+MISC metadata.xml 326 RMD160 401ccda3dff204267af230126d74a473a42438d8 SHA1 aeb1de86baec5eb164fe6de13bc54c554835e718 SHA256 2bce0f59c0ba455804c0a4e67e3f11c947465315b9c8720f46dca89b2bbba6c9
 MD5 3ad0818ec98b13c8b0ea5e54fee8ef84 metadata.xml 326
-MD5 f9483ae6d1074c8d3a54819168317afc xvt-2.1-r1.ebuild 1142
-MD5 7c7475becc57b64d5231e254b1ed363f xvt-2.1.ebuild 1071
+RMD160 401ccda3dff204267af230126d74a473a42438d8 metadata.xml 326
+SHA256 2bce0f59c0ba455804c0a4e67e3f11c947465315b9c8720f46dca89b2bbba6c9 metadata.xml 326
+MD5 6eec02b7485feb2e6d89cf9ad063b358 files/digest-xvt-2.1 440
+RMD160 0d0f3f3c1bcec295d75fa273eb37e9b7c538ac0e files/digest-xvt-2.1 440
+SHA256 9ea656e7c1b08d82922266d2438eb35ca024743ced29043e65f8b98db46a55f9 files/digest-xvt-2.1 440
+MD5 6eec02b7485feb2e6d89cf9ad063b358 files/digest-xvt-2.1-r1 440
+RMD160 0d0f3f3c1bcec295d75fa273eb37e9b7c538ac0e files/digest-xvt-2.1-r1 440
+SHA256 9ea656e7c1b08d82922266d2438eb35ca024743ced29043e65f8b98db46a55f9 files/digest-xvt-2.1-r1 440
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iQBVAwUBRXSpzdommWwmkP1xAQIZywH+IRUqCr9ZFLn/DAnqthseZqfKT5GytI1h
+6ySaD0VxPJ75DAl/jMKn0Meen1CilO/0xSHNJcsmVTosymrLaoUP0A==
+=E8qZ
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/xvt/files/digest-xvt-2.1 b/x11-terms/xvt/files/digest-xvt-2.1
index fb444f0aab61..dada1e806233 100644
--- a/x11-terms/xvt/files/digest-xvt-2.1
+++ b/x11-terms/xvt/files/digest-xvt-2.1
@@ -1,2 +1,6 @@
 MD5 907c07376ea39f411cfddbd149366fef xvt-1.0.tar.Z 59445
+RMD160 56fa0c779d178eccb222cd2d138d6fc4a18b800b xvt-1.0.tar.Z 59445
+SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1 xvt-1.0.tar.Z 59445
 MD5 c9db9dce999411dc4a4183094b0c33d1 xvt-2.1.diff.gz 39941
+RMD160 57c54e0fd200739c8c7bcfadc34cac5884b62606 xvt-2.1.diff.gz 39941
+SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607 xvt-2.1.diff.gz 39941
diff --git a/x11-terms/xvt/files/digest-xvt-2.1-r1 b/x11-terms/xvt/files/digest-xvt-2.1-r1
index fb444f0aab61..dada1e806233 100644
--- a/x11-terms/xvt/files/digest-xvt-2.1-r1
+++ b/x11-terms/xvt/files/digest-xvt-2.1-r1
@@ -1,2 +1,6 @@
 MD5 907c07376ea39f411cfddbd149366fef xvt-1.0.tar.Z 59445
+RMD160 56fa0c779d178eccb222cd2d138d6fc4a18b800b xvt-1.0.tar.Z 59445
+SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1 xvt-1.0.tar.Z 59445
 MD5 c9db9dce999411dc4a4183094b0c33d1 xvt-2.1.diff.gz 39941
+RMD160 57c54e0fd200739c8c7bcfadc34cac5884b62606 xvt-2.1.diff.gz 39941
+SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607 xvt-2.1.diff.gz 39941
diff --git a/x11-terms/xvt/xvt-2.1-r1.ebuild b/x11-terms/xvt/xvt-2.1-r1.ebuild
index f993d6ecaa31..1ca6ac575636 100644
--- a/x11-terms/xvt/xvt-2.1-r1.ebuild
+++ b/x11-terms/xvt/xvt-2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r1.ebuild,v 1.3 2006/01/29 15:50:02 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r1.ebuild,v 1.4 2006/12/04 23:05:20 taviso Exp $
 
 inherit ccc eutils flag-o-matic
 
@@ -12,8 +12,9 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~ppc"
 IUSE=""
-DEPEND="virtual/x11
-	>=sys-apps/sed-4"
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 S=${WORKDIR}/${PN}-1.0
 
 src_unpack() {
diff --git a/x11-terms/xvt/xvt-2.1.ebuild b/x11-terms/xvt/xvt-2.1.ebuild
index 1a5b97a2945e..5534a50b4883 100644
--- a/x11-terms/xvt/xvt-2.1.ebuild
+++ b/x11-terms/xvt/xvt-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1.ebuild,v 1.8 2006/01/29 15:50:02 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1.ebuild,v 1.9 2006/12/04 23:05:20 taviso Exp $
 
 inherit ccc eutils flag-o-matic