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
commit9a6d5ecaf203274c8091cec47628936b054e2576 (patch)
tree2ff502b48333dcbaf24c363ce5cf4ae773aba60a /net-misc/putty
parentAvoid conflicts with net-misc/putty and x11-terms/pssh by renaming pscp and p... (diff)
downloadgentoo-2-9a6d5ecaf203274c8091cec47628936b054e2576.tar.gz
gentoo-2-9a6d5ecaf203274c8091cec47628936b054e2576.tar.bz2
gentoo-2-9a6d5ecaf203274c8091cec47628936b054e2576.zip
Remove net-proxy/sshproxy blocker (#248193).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/putty')
-rw-r--r--net-misc/putty/ChangeLog5
-rw-r--r--net-misc/putty/putty-0.60.ebuild5
2 files changed, 6 insertions, 4 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/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"