From: Anthony G. Basile <blueness@gentoo.org>
Date: Sat, 30 Jul 2011 10:28:35 +0000 (+0000)
Subject: DEPEND only on <net-libs/miniupnpc-1.6, bug #376621
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=51bc0492e0b84eaa548cf130fc425dbe4f1f0f19;p=gentoo.git

DEPEND only on <net-libs/miniupnpc-1.6, bug #376621

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

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 5067a2968348..9dd8151eec55 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.263 2011/07/22 20:01:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.264 2011/07/30 10:28:35 blueness Exp $
+
+  30 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.3.2_alpha-r2.ebuild:
+  DEPEND only on <net-libs/miniupnpc-1.6, bug #376621
 
 *tor-0.2.3.2_alpha-r2 (22 Jul 2011)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 50ddae7b58b3..70c6c046aa48 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -17,14 +17,14 @@ EBUILD tor-0.2.1.30-r2.ebuild 3008 RMD160 bce113cab2f227bf7437adb2b9723425845eca
 EBUILD tor-0.2.1.30.ebuild 2646 RMD160 507a8939e024a5c9829e4ad5b598945fb8f26014 SHA1 5b2246b1f1b7db206558157801fe58b72cf6165a SHA256 e3e386af1fb917b2da75f45e110176b4fc2cfc776df98fac45719f9827f028ff
 EBUILD tor-0.2.2.30_rc-r1.ebuild 2529 RMD160 d2b3f181132cb07622016499088e7d63ff6aea9d SHA1 246b32130e9391beae8792766d9920d3413ebff9 SHA256 f8f423a53cf84305c61a700000883d73fe4733ff3272be04abd515bfd17e0ecb
 EBUILD tor-0.2.2.30_rc.ebuild 2276 RMD160 08be078f18c4f56f49e9ca0a5d3a5f85b4033472 SHA1 3dddb58a8db41d3f37abeba15c5c7660549a54a8 SHA256 87df4451ab880514cc59b88a3f691a26642f59a4a28e801f17f583e3201e46ac
-EBUILD tor-0.2.3.2_alpha-r2.ebuild 2775 RMD160 b142eaaef864ffc77ef8d3c5d2e7592564523a3c SHA1 1e6a1f99b9e55ebd982e92f33d701483c123d6fd SHA256 f7905dca42be0fc3aee7543a86e080f59c7d239ae27d92dec5c2c9fee1fb6106
+EBUILD tor-0.2.3.2_alpha-r2.ebuild 2780 RMD160 60864e8594af4ca28877e0a9b208ac0564228545 SHA1 ec4772246ec7f51716480b853d85f3e95d01a2e4 SHA256 54057e7021db126865a71d8634d751d2b8c88de57f61dafd277320a01077d913
 EBUILD tor-0.2.3.2_alpha.ebuild 2278 RMD160 6790cc3b919f2e4d4c6c6f43fce61717929b6e96 SHA1 66a741da725045da1b8e27eb4887d5c722a592fc SHA256 6006f37703315df65c12e339f1e8e758811766986b3b87325127d4f6e99ac6d6
-MISC ChangeLog 38685 RMD160 7e9efeba5589f58f2f8633aab6b89dc9dca62e78 SHA1 31e7f6cbc3a9d7d09ff6360e8a1ddd3c3230425f SHA256 ddc9c5aac1e110839517513cec0c74cd2e79922df8486945a186f72afc1ee1ea
+MISC ChangeLog 38826 RMD160 e46e0fe4eea31c49ff0200203bb34202be1aaf80 SHA1 be4d0585585c86ce19220a6bea40d65fc4be2417 SHA256 ba3e549829bdc5a41ee4e28d9f90379ea33ae3d4784dd2fc0f9f680e58ad81d3
 MISC metadata.xml 712 RMD160 d8585c57fead7661b72e383528b6450a2ace05eb SHA1 d97b0d9479c817d5a2207fbfc0fa5b567943c8a5 SHA256 53402fd0dc16696d9504c66ffeb85f3d8583c8621151d2faced9b1ffedbb2dbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4p1yYACgkQl5yvQNBFVTVKJQCfQ4Xx1cwIbPukMZZ7ZfNHeWwI
-jCsAnjm8+YlTeD/hx3uS4YqKGrFzoWpg
-=vTCi
+iEYEAREIAAYFAk4z3N0ACgkQl5yvQNBFVTWp3wCbBPEq9uA7uS0soCDCaPWCWeBD
+02kAnjH1QjyubkQ6hhfNiTAWFFOjYjW+
+=3RWx
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild b/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild
index 26fbca378903..e4bd84691a21 100644
--- a/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild
+++ b/net-misc/tor/tor-0.2.3.2_alpha-r2.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/tor/tor-0.2.3.2_alpha-r2.ebuild,v 1.1 2011/07/22 20:01:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.2_alpha-r2.ebuild,v 1.2 2011/07/30 10:28:35 blueness Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
 DEPEND="dev-libs/openssl
 	>=dev-libs/libevent-2.0
 	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( net-libs/miniupnpc )"
+	upnp? ( <net-libs/miniupnpc-1.6 )"
 
 # The tordns patch for tsocks avoids some leakage of information thus raising anonymity
 RDEPEND="${DEPEND}