From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 16 Nov 2011 19:46:08 +0000 (+0000)
Subject: Adjust dependency to avoid pulling in freerdp-1.0.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=27205361b8c12b898c854da8a6452f7fbf857934;p=gentoo.git

Adjust dependency to avoid pulling in freerdp-1.0.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64
---

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/Manifest b/net-misc/remmina-plugins/Manifest
index 5dd96f80852f..07da57dd14df 100644
--- a/net-misc/remmina-plugins/Manifest
+++ b/net-misc/remmina-plugins/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST remmina-plugins-0.9.2.tar.gz 542221 RMD160 70cb47ed8ef59ea5835973f9b7920bd579973420 SHA1 be51a08b127496f6c81a319ee6ae4fa64d81b2e0 SHA256 f2df73a3a8f678f8c186755572072a744302b03b949a328ae1522f8bbb6da762
-EBUILD remmina-plugins-0.9.2-r1.ebuild 1653 RMD160 37054db8d081a81de24a7ca235a844bf878320ba SHA1 f19ac9cd4b228bfaf0a7db71ec78f4b1cd6525a2 SHA256 ece8a7ecc4893a82040586a011859bd6e41e0660d41fc73f350450dd1d86f6b1
+EBUILD remmina-plugins-0.9.2-r1.ebuild 1692 RMD160 f54d61eba1f4aa4bdec15bac4f45ee931caa9218 SHA1 30c70e1da73ff35b1dd81412672f7765f637c49b SHA256 eff1e4e9ef1eda9ab3646dc26e7faab084768c8d87b059af57aa0fae40bbb18f
 EBUILD remmina-plugins-9999.ebuild 1829 RMD160 e193407f44924dcade37187e4ff94fa064731618 SHA1 957178d7b5eab8f21d9b769adda35a7ddcda7c2a SHA256 7e19385c17f92cc739701e0e7074088b42834445dd26ac59491bcb06dda62be5
-MISC ChangeLog 1077 RMD160 dfe435224841863efec04dc6ea20319aa4f14eb7 SHA1 b8893dbae77a42addf295ce294a81bef53b0eed4 SHA256 bc89c36c0b0fd2a3650c82efda2b59acd12ee998e80b0b80824450dfb47a7544
+MISC ChangeLog 1214 RMD160 fdba57a32b3b4c312e98a26ff9957f4508c655b2 SHA1 061a89e281012e9b43679cea2162b70aa1071462 SHA256 8a854f95e98f6057f21c1ee023a680627d5a222c2c4431923c25188b75c0505a
 MISC metadata.xml 512 RMD160 46c7494315858038729ac6a2945b47ccdf77283a SHA1 ebb9bbd1ea33ea570ea1319068c2643a5072e320 SHA256 6efa3e4f93496619633fd7e0f1e45457805068e8dfb5a524879b84b2a607e67f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOhf7UAAoJEPqDWhW0r/LCa0sP/ieYzUXEIo0wgSN67ESbxMid
-9uVf6rBM2eE3mK2wMDN8ZCbhe9SFIBwXCijBvu8xdy5BgEM19SIM26t+IXhVA8G5
-QBO+/LJufDcUb4k9sU4KVk6lBDj9dNaB5asvt7b3fRgTEbJFhw8xN9R36skoSB06
-YhpYaIq5zAq7BtpfF1/8HoxUh1ejFrTmwkg2T/LQhteCE/RdWc7ofYhy49457kmW
-unWPTfNudeE6V3+BT5cw6jrihCvgQ5cybFW0+/XIgWcquwK7NmzSR7TPU29v3Jdv
-YH0VOyFaaSSzt4JQO4QzDvZDkbKiknEY2vzracMBZCwXUmymlv5I+CYRU/5SYvY8
-2bYJ65wLkNGu5QSfmPurDqudK7/EXu7/kh8IuntnYMxmvz5LiUCD0vTL53AWTkN0
-qPpJNiSlcayJFO2+WbEgjoJxSdmTEYOdlNwqYZ1Ag+i45uqmsTB9z5ObEG080bdG
-bJLQeTpRKYhKNjRe8nPDsHrktM367Y+LnMns5EKe08eapmIX0Cy2nDyCGMvEHJ3S
-ZtP44S9aJkmkd06mI0IKQemtEou/HGs2nM6sLLJHqCew9pI40CpWhJ/9+BsTBwit
-Gyicaks7BS2i4agzAutdz/vj/WmG3sjfpeWsMyBAA4F/BgvCj4/jk3RCCiN5BMfG
-C3nw1kooV1J+5WwWpjr0
-=zuJB
+iF4EAREIAAYFAk7EEwgACgkQC77qH+pIQ6T+/gEAmfceat2v77PlCYu1fDu4WD/k
+LY+poWNxpNTeFYerBXEA/0aF7XIxdyNkFhyf1YDbkZHm42780oKm+zn6v97rVEOf
+=xnPz
 -----END PGP SIGNATURE-----
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 )"