Fix dep on net-tools[old-output] to work around bug 391397

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 661e9925379a0272774b64c90ad157a05cfd8815..88174d04a3dc6517ff730a4311144ee30d758d0e 100644 (file)
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.97 2011/10/27 21:04:41 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.98 2011/11/22 19:32:58 tomka Exp $
+
+  22 Nov 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.1_beta2-r7.ebuild:
+  Fix dep on net-tools[old-output] to work around bug 391397
 
   27 Oct 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.0.ebuild,
   wicd-1.7.0-r1.ebuild, wicd-1.7.1_beta2-r3.ebuild, wicd-1.7.1_beta2-r4.ebuild,

diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index d124162db6e58543c69cc88f0cc5b991d8b5f312..93f7ad52d69e6c1f4b59eb097fbd7e1a26b947a9 100644 (file)
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -14,13 +14,13 @@ EBUILD wicd-1.7.0.ebuild 2868 RMD160 98708bc1168ac9ddbc5ba5eee597caadabbeffa4 SH
 EBUILD wicd-1.7.1_beta2-r3.ebuild 3189 RMD160 43882aa0a12763d365b129f0b41d60183a84a150 SHA1 13254c65cba4103a45ca03f7ae0f36e4aab18ea3 SHA256 f7ad63ec02f69ebbc563c500c9487b9e80d926a1a55147466f4482870140ab78
 EBUILD wicd-1.7.1_beta2-r4.ebuild 3421 RMD160 d891106aac02d2ee7d522d282228f303a5ded42d SHA1 a9357a7e76c6aeddccfc734dfe2e1d8b815997a3 SHA256 4c96591a81bb214784bee57204a536c686d7994455caa2661d0037b847a2e6e8
 EBUILD wicd-1.7.1_beta2-r6.ebuild 3708 RMD160 ba67bba58b735fbe9e94c647daa7e1c5fcb1dcd0 SHA1 1e4e02b5fe5c9afe70193ec8abc115aa188b105f SHA256 992380f2c2eda1626ad776775789cb5d26339f0c13f8b7f23ed76d9d4d7d06bd
-EBUILD wicd-1.7.1_beta2-r7.ebuild 3742 RMD160 30476cd19b3d028ff066cb71848a3cca3b225ac9 SHA1 9c8166350e5dbd15dd5ab69b5a4842f192750dfe SHA256 74885336d2b203ee0b916088cd653956163361d885baddb72fa887084f011725
-MISC ChangeLog 17405 RMD160 e6bce3ee7c402d12a78bf37478a0585a0700c24c SHA1 2237f7139d12b20e7c3bb6b9dde232f3bfdf3aeb SHA256 46d6f0116bbef139957900e562b2cef10b05d206b066e18304a526bc03e64bfe
+EBUILD wicd-1.7.1_beta2-r7.ebuild 3828 RMD160 b25508635ea8126dc4342a83c3882143e4d852a3 SHA1 a76487ba54593685086aa41501a378c938ceb8a9 SHA256 9fb851ad613e00933d0ab40c45660e534b5ed5cc84df97b6c6be1bc4d080320b
+MISC ChangeLog 17542 RMD160 3f9f59b4735b1dd09c15706060f53066455056c8 SHA1 f24a561865fd4b1205248405848f1f43910428f2 SHA256 a02aa0981a032d34bfc388efa381ff490460053dd38aae89310063f552f71cd8
 MISC metadata.xml 774 RMD160 20237c33867c0fd2a430f1e276ea1bdc861641d6 SHA1 9e87afff653f6d56d05d4630d2077b18327e6404 SHA256 9e9acf67db6ee267b658c1c6952ab60f5b1896b528511c46039210f83c6a06f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6px50ACgkQodBTJSDyo643nAD/S5GdUBzwyTedung94sDThE8g
-EPJUAol/sFNBdedbE70A/i0NB+Lh0ppqV3Ra1IT8L6nHXZmtA0hn1gxqwoZSHphV
-=tqBQ
+iF4EAREIAAYFAk7L+PsACgkQodBTJSDyo668hAD+J4sdYiGnTrPrLETobYpD+mdj
+sfbhXLPhXq6KsU5E2bwA/irhUa1TYOKhpUVetxFa5HmiLI2dYa4xFFl+ZdqHbNIW
+=li0B
 -----END PGP SIGNATURE-----

diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
index 0b3d6d4ba7f5a38c3cebb916ed587941b86dab95..2d83d1067b6bbdef5981e352980d6035bee632de 100644 (file)
--- a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r7.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/wicd/wicd-1.7.1_beta2-r7.ebuild,v 1.3 2011/10/27 21:04:41 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild,v 1.4 2011/11/22 19:32:58 tomka Exp $
 
 EAPI=3
 
@@ -45,7 +45,8 @@ RDEPEND="
        net-wireless/wireless-tools
        net-wireless/wpa_supplicant
        || (
-               sys-apps/net-tools
+               <sys-apps/net-tools-1.60_p201111202031570500
+               >=sys-apps/net-tools-1.60_p201111202031570500[old-output]
                sys-apps/ethtool
        )
        !gtk? ( dev-python/pygobject:2 )