Add modular X dependencies (Mauricio L. Pilla, bug #124168).

Package-Manager: portage-2.1_pre5-r4

diff --git a/net-misc/ssh/ChangeLog b/net-misc/ssh/ChangeLog
index 2d88a66f0b380ddd3c59f83045898a4a3860f074..0b97aa3ab0a8b3ce0a989c13da7dad5a509680e0 100644 (file)
--- a/net-misc/ssh/ChangeLog
+++ b/net-misc/ssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ssh
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.11 2005/02/14 16:33:37 humpback Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.12 2006/03/11 00:09:19 joshuabaergen Exp $
+
+  11 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  ssh-3.2.9.1-r1.ebuild:
+  Add modular X dependencies (Mauricio L. Pilla, bug #124168).
 
   14 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; -ssh-3.2.5.ebuild,
   -ssh-3.2.9.1.ebuild:

diff --git a/net-misc/ssh/Manifest b/net-misc/ssh/Manifest
index ed5e4b342d05fb1f5401f67a5bc21dd9b9b3ca6d..4c1e0d6e2f18800e082610fc0e2c5998a7267fa7 100644 (file)
--- a/net-misc/ssh/Manifest
+++ b/net-misc/ssh/Manifest
@@ -1,17 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b2857d10cedc50e23008a1664762b1f6 metadata.xml 321
-MD5 c52341cd26208a538ee85c06d076ad7a ssh-3.2.9.1-r1.ebuild 1517
-MD5 15747d918c5a2f9815c9e9df1a4909eb ChangeLog 1668
+MD5 38e8b303350d1c20daabd2e572b5756d ChangeLog 1819
+RMD160 d4e915a610abaed06a5697ac2c1e437f32d167f7 ChangeLog 1819
+SHA256 587801c926268dc237ccd2f040a8a2420c45843c0bcf4810068fb05b580d062d ChangeLog 1819
 MD5 1a0c708380931effd610c9567fac4303 files/digest-ssh-3.2.9.1-r1 64
-MD5 7a42cfc98810322e8999339df7dcd61b files/sshd2 733
-MD5 161466fa829f8dc1ed1e67f5cd3f20d5 files/patch-readline.diff 1054
+RMD160 ef69d5a677787d984cbf63906887360c0853fadc files/digest-ssh-3.2.9.1-r1 64
+SHA256 3c80408d4b8396f7465a29bfcbca7df5ef6d8eb79fa8d4658b2c9469aa3985c9 files/digest-ssh-3.2.9.1-r1 64
 MD5 5da2716771a56ddd869bed98e9164cc4 files/pamd.sshd2 425
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGpGQgIKl8Uu19MoRAqP/AJ4vk0iHCDLZtZELWICW5L3BCcxDWACff0ZQ
-a4ryjFXo3WbK6U4mDXIq/vw=
-=Vj3d
------END PGP SIGNATURE-----
+RMD160 8aa7636f451535503e8c2d2f3884075c13587471 files/pamd.sshd2 425
+SHA256 9a7666ea500a647b0e07d29e3ea2acddbdb2fc731584ab3ff3eb43d3f98e9a4f files/pamd.sshd2 425
+MD5 161466fa829f8dc1ed1e67f5cd3f20d5 files/patch-readline.diff 1054
+RMD160 8144ff9cd13992dfb3ea9caa0bf1e9bd3d3b66a3 files/patch-readline.diff 1054
+SHA256 8d2ab1749e9b74ddb6b1494616ac462ae4812e4e2c855defcf5efbf796a62695 files/patch-readline.diff 1054
+MD5 7a42cfc98810322e8999339df7dcd61b files/sshd2 733
+RMD160 da9216635810513e4f8fd8a7fcc4efabf06e91d6 files/sshd2 733
+SHA256 bce4b85be75b102c5fbad72163848a27370d770788aef193257e3da626c2ea7f files/sshd2 733
+MD5 b2857d10cedc50e23008a1664762b1f6 metadata.xml 321
+RMD160 e5495b69634f33752e0817567e4828728e662714 metadata.xml 321
+SHA256 81b7bd1850131f49c25a788fc103a057b57da54904aa80bd06653ea144e97a5a metadata.xml 321
+MD5 2d66ee34f588f430744eeaa9f0e73355 ssh-3.2.9.1-r1.ebuild 1644
+RMD160 f13e635d02cbf53a7ac93e251949eb323865c37c ssh-3.2.9.1-r1.ebuild 1644
+SHA256 205b7ad1c7d0b99aa615a465a1b645caa615d8c4570d1d5e9c1111e26c73c72e ssh-3.2.9.1-r1.ebuild 1644

diff --git a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
index d6f45bf39bc514ca8bbd32dace831de37879f1b1..e8214d80ef0bdcf713a700a80db1bab9c9387b0d 100644 (file)
--- a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
+++ b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.2 2005/09/04 06:17:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.3 2006/03/11 00:09:19 joshuabaergen Exp $
 
 inherit eutils
 
@@ -13,8 +13,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="X ipv6 crypt openssh"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( || ( ( x11-libs/libSM
+                                       x11-libs/libXext )
+                               virtual/x11 ) )
        !openssh? ( !virtual/ssh )"
+DEPEND="${RDEPEND}
+       X? ( || ( x11-proto/xextproto virtual/x11 ) )"
 PROVIDE="virtual/ssh"
 
 pkg_setup() {