summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2011-11-16 19:46:08 +0000
committerMike Gilbert <floppym@gentoo.org>2011-11-16 19:46:08 +0000
commit1e3068294d9d72569b0e9b48a590aec48c6cb8a4 (patch)
treeadfc0382dd04c432217286797488e5a505d1b873 /net-misc/remmina-plugins
parentStable on amd64 wrt bug #390249 (diff)
downloadgentoo-2-1e3068294d9d72569b0e9b48a590aec48c6cb8a4.tar.gz
gentoo-2-1e3068294d9d72569b0e9b48a590aec48c6cb8a4.tar.bz2
gentoo-2-1e3068294d9d72569b0e9b48a590aec48c6cb8a4.zip
Adjust dependency to avoid pulling in freerdp-1.0.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/remmina-plugins')
-rw-r--r--net-misc/remmina-plugins/ChangeLog6
-rw-r--r--net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/remmina-plugins/ChangeLog b/net-misc/remmina-plugins/ChangeLog
index 6664488f7b68..2dd52595ff07 100644
--- a/net-misc/remmina-plugins/ChangeLog
+++ b/net-misc/remmina-plugins/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/remmina-plugins
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/ChangeLog,v 1.4 2011/09/30 17:39:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/ChangeLog,v 1.5 2011/11/16 19:46:08 floppym Exp $
+
+ 16 Nov 2011; Mike Gilbert <floppym@gentoo.org>
+ remmina-plugins-0.9.2-r1.ebuild:
+ Adjust dependency to avoid pulling in freerdp-1.0.
30 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
remmina-plugins-0.9.2-r1.ebuild, remmina-plugins-9999.ebuild:
diff --git a/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild b/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild
index 46f53a6d241e..e857874a12cc 100644
--- a/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild
+++ b/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild,v 1.2 2011/09/30 17:39:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild,v 1.3 2011/11/16 19:46:08 floppym Exp $
EAPI=2
inherit gnome2-utils
@@ -17,7 +17,7 @@ IUSE="nls nx rdesktop ssh telepathy vnc xdmcp"
RDEPEND=">=net-misc/remmina-0.8.0
nls? ( virtual/libintl )
nx? ( net-misc/nx )
- rdesktop? ( net-misc/freerdp )
+ rdesktop? ( || ( <net-misc/freerdp-1.0_beta =net-misc/freerdp-9999 ) )
xdmcp? ( x11-base/xorg-server[kdrive] )
ssh? ( net-libs/libssh[sftp] )
vnc? ( net-libs/libvncserver[jpeg,zlib] >=net-libs/gnutls-2.4.0 )"