summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2009-07-23 08:20:03 +0000
committerAlin Năstac <mrness@gentoo.org>2009-07-23 08:20:03 +0000
commit2b2f5890e378e7f36a42a91e01fd11fdcddffbfa (patch)
tree6a1fd1ce30df1f63e8a941d516f1a6a772143952 /net-misc
parentAvoid conflicts with net-misc/putty and x11-terms/pssh by renaming pscp and p... (diff)
downloadhistorical-2b2f5890e378e7f36a42a91e01fd11fdcddffbfa.tar.gz
historical-2b2f5890e378e7f36a42a91e01fd11fdcddffbfa.tar.bz2
historical-2b2f5890e378e7f36a42a91e01fd11fdcddffbfa.zip
Remove net-proxy/sshproxy blocker (#248193).
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/putty/ChangeLog5
-rw-r--r--net-misc/putty/Manifest12
-rw-r--r--net-misc/putty/putty-0.60.ebuild5
3 files changed, 12 insertions, 10 deletions
diff --git a/net-misc/putty/ChangeLog b/net-misc/putty/ChangeLog
index 264c55880cb1..cb8119a4c838 100644
--- a/net-misc/putty/ChangeLog
+++ b/net-misc/putty/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/putty
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/ChangeLog,v 1.42 2009/04/17 14:55:50 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/ChangeLog,v 1.43 2009/07/23 08:20:03 mrness Exp $
+
+ 23 Jul 2009; Alin Năstac <mrness@gentoo.org> putty-0.60.ebuild:
+ Remove net-proxy/sshproxy blocker (#248193).
17 Apr 2009; Justin Bronder <jsbronder@gentoo.org> putty-0.60.ebuild:
Add blocker against x11-terms/pssh, #211995
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index d01967b5081c..27e25667b82e 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
AUX putty.xpm 1301 RMD160 b0df1b3d975981391fb7713cb62b6546ab5226cd SHA1 b9a3998fdebba527554d9ef840ec999496438e50 SHA256 7cd656cb2d5e1d4d55624a3992f9e57366c38204633aea197a5efc8a3e84bd75
DIST putty-0.60.tar.gz 1743711 RMD160 9c56ee4d2d05f5b1079c65f19a5d9d06b596aba3 SHA1 8d99f8f1077b7ab25f014126b5d812a1ad55ce37 SHA256 b2bbaaf9324997e85cf15d44ed41e8e89539c8215dceac9d6d7272a37dbc2849
-EBUILD putty-0.60.ebuild 1562 RMD160 7a8c1de3b4e68b6c9b7cca5a80d4aa40104146f3 SHA1 2eae5b5914364ae126e5299285db45463dd163ac SHA256 860a3a721fa4164c965488f4f7a5e629631185209e363621bd4d911e56df5674
-MISC ChangeLog 5485 RMD160 b4328c1b8cd5d1cbb64f27ff226b3955a6888c86 SHA1 0d72a359c1bbea552c5513150ef0e4554b25a8d0 SHA256 d1e1d130e0864df71fb66259f25a4cbab893a2344011666c89f1e80cd751543e
+EBUILD putty-0.60.ebuild 1538 RMD160 76f01bcc4ecbc56fa4700149d27e759fc5083743 SHA1 7e223c5d2a559bad25f5e3fc768774fdb78cdf97 SHA256 1c9fcabad61b8e1249a4580d05adee91f59c1ba9907a1411136151560107ab8c
+MISC ChangeLog 5597 RMD160 04037b22700aa28327ddf1999569594e43254324 SHA1 0783284e1f6010d50e90472edc64fe13e83ed681 SHA256 8d63c5460efdf316eb90b0b4651df1d3548926c9b29b82b16ed0b07d4310d482
MISC metadata.xml 554 RMD160 8418938a6bbf9c88b5a96d9541c1a6efd2c6b7d1 SHA1 00319b37814b1fa5f9080aa044e6a48bed5529d1 SHA256 9939628b0319a6b8e55bc8f76602685f6dec27896ca4c74ced0f77937d428c91
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAknomHsACgkQ4MrvBE1wQ8kL5wCeMVQFMSlAlxH4+1tkem0tskvL
-IxYAnR9przpNUQB1wra4kJlfqi5kEsZB
-=17sT
+iEYEARECAAYFAkpoHTkACgkQ9A5kJBGSrsvkpQCgkR8W8/ZK8gb8xpI/3zODfxU+
+UU8AnR2NpD0MDyiD+wtI8hmNA6ce6LNt
+=iFOV
-----END PGP SIGNATURE-----
diff --git a/net-misc/putty/putty-0.60.ebuild b/net-misc/putty/putty-0.60.ebuild
index 724cf652a8c3..b07b60377dbc 100644
--- a/net-misc/putty/putty-0.60.ebuild
+++ b/net-misc/putty/putty-0.60.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.60.ebuild,v 1.7 2009/04/17 14:55:50 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.60.ebuild,v 1.8 2009/07/23 08:20:03 mrness Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -13,8 +13,7 @@ SLOT="0"
KEYWORDS="alpha amd64 ppc sparc x86"
IUSE="doc gtk ipv6"
-RDEPEND="!net-proxy/sshproxy
- gtk? ( =x11-libs/gtk+-1.2* )
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
!x11-terms/pssh"
DEPEND="${RDEPEND} dev-lang/perl"