Version bump 2.6 branch.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 25 insertions, 18 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 29ad7a0abc75..26e6751b47b7 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.468 2015/03/24 08:52:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.469 2015/03/25 00:24:39 blueness Exp $
+
+*tor-0.2.6.6 (25 Mar 2015)
+
+  25 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.6.6.ebuild,
+  -tor-0.2.6.3_alpha.ebuild:
+  Version bump 2.6 branch.
 
   24 Mar 2015; Agostino Sarubbo <ago@gentoo.org> tor-0.2.5.11.ebuild:
   Stable for x86, wrt bug #544226
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 7bfc80ee3841..7bd45a0b34b4 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -10,28 +10,28 @@ AUX tor.service 479 SHA256 647572301c444896c6958af4481f443e39f7232f0ad919e4a154a
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.2.5.10.tar.gz 3166480 SHA256 b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b SHA512 0e6522964ac84231f7753ebe80239ce8c906c62bd35e5bd65ae5f85f246d488e32fbf121c58e501cbf0b8271468f6c10bef756080a7120479240486d6af22a8f WHIRLPOOL e92d2805d134e3fd45e5bc0a1832b793555dc185a6bd6418d622adf447a430bd9932a4bbbbade1b0aa8c19ae05f0e8ea04b1100e3cdba22b2dc2260f2e5f9ec1
 DIST tor-0.2.5.11.tar.gz 3310350 SHA256 aee0faee9c3f1bb265ee8e94b4bb93967413f3c56e65f954db16b09451546769 SHA512 2f752c089e4e85273729dedc849b17f1009c0348370faecd22ff77b125a2afadcb31f6ef2f2b83201a53b9f663deaaf052e07eb8742707b16e14d757c2a74f2c WHIRLPOOL 450153c8b60a8fb48c727186c5c250c803253155e19d066d62687a15274dbd0204bb729d2881597275b06620cbbdec9c20a73d93af00c927529dfb929bc45cea
-DIST tor-0.2.6.3-alpha.tar.gz 3526195 SHA256 5e31a0ccbb1fbe9ac6fc64d157c5c3db9b478908ea09bbe15adea2f1fd11d670 SHA512 541931f16c98b3100fd0f5368115d84e76f0f0bbffb6079099d76dfff43bec10883e625595133f0f0f280b8e6cae0c1a9a6cc248ac0d9076d5430ae8b150e157 WHIRLPOOL c60668f609e40a89a741672f51d7e7112c569b2f7d81ae4d5e9968b20acc0fb6dbd0cfffb32485b4c7dd800d384a701556064dd622ff10abca639984d9a6fc6b
 DIST tor-0.2.6.5-rc.tar.gz 3593796 SHA256 1a78bc971078c8aee1d0927bf6629610efef2cce31219580b2a73cc268d4103e SHA512 7f56455a7d7f5d5a3d462a04cf80de1812e814f26cb29aa5413c68966ff6135c46442a2397e1350c11debbc8d8c40c7767654a360a43f45ab671cc1ed6faee1e WHIRLPOOL d39c4887d2ea75622a2679b6519c9d874e3cea0bbe214865a92ad9beb42841a4210202d2bef5bf27623f6de793816a6d3f36512faf53fc52d79ef10a5c20bfd3
+DIST tor-0.2.6.6.tar.gz 3594452 SHA256 c3349e457c71b8e5c138c656927b2bbca0bfa03539ffee8579b0e568ffb10283 SHA512 46e7a832a5690d92664bd746431e2b0f35acd349d13cf4ea48157fbdaec852042501467a4c1a8ac5e76506bb388c0b7feb1e8292d6d4f7dbf7040f16407fb7ea WHIRLPOOL ea0a8afa71c25edfc3428ba8535b5679c7f203f5d4984d93bc14091bcb9bdd275d96cd177da61b4df267d049cd1d121e32abc889a6267b7f076f69033d3fac0e
 EBUILD tor-0.2.5.10-r3.ebuild 2836 SHA256 655ec36da0b6abc88060d5c62af20ff62edd97503c10a00e7812e5b4be992288 SHA512 c4b2d9f4050a48f5a3ed051b7c9d2f03c1cf5b03de58bf8a93f8b032323bd78373457de203fb86a9ed037e8e7abc744abbdc1813f785b9c3b5b6acb40142e8ad WHIRLPOOL a36c8abc6a7708f3b51b1bf271d086b882c2a49b980a10a3de2bac11b4afbf3aa5c12827c522a35ababb7654e34a00c31c00bfc5e2bbce338c1e0540214360ac
 EBUILD tor-0.2.5.11.ebuild 2837 SHA256 8b2c8312d1f6fd82bc8c5f1d0fe50afd842fd7bb9f35de4fa9f7acc34c6cfdcc SHA512 411f9e654415012e2e153b62b3cd4968d967879f1962b556b895320f8f2bf01918f52c5b2153531a1a51a7e1934f7c2ed5396870003798fa8c40c67fef82899c WHIRLPOOL d467c2334c13138ea738bec8f959d5e545bc948c9bdb3b6685c274a76ffedd23d4e0fb0b75fe5817a4a57d4de9f54845c0ca5a7c6f473883ca5f77ceba40f89a
-EBUILD tor-0.2.6.3_alpha.ebuild 2854 SHA256 f4fa789ffe7ed538a08b61262ee3846f306138d2eba2f15c1f2ad51ef07465bc SHA512 8812c9a6266d78a50779ae9d17aa984c123be9fb08872a23806c61c15d7af98fb11691a2eb28954767303cfdbf7818c016ac2d1626928c77b09008a703c5afe2 WHIRLPOOL 8e9fc2d7935c18453fbc341c5b1810eab6b22c0d61c9567d1ba0c18f0ea46b973a2f3582e4cf2817977ae6ea08169a7347ba546a33d3228cce31fd8f340a60d9
 EBUILD tor-0.2.6.5_rc.ebuild 2851 SHA256 95d6cc27f21aa995555e2b022c50fba3661e92ee125199dcb08df9bef03da0a0 SHA512 1cb064a7802d2278114a270315df3f2e3a96ecbd3070713ab045e04eb9e27964ed6643b4c2770524dfbcf0e51d4679e10b8d3f4119ba499e838fcfd7cab86373 WHIRLPOOL c2e24d080f98fe6856776a6f0bb074c2fbc1a9269da5d6bf8f2509dfad1577feb945492ee4a2d99d950c44d3512c449e5b7e52eb000d8335f70feaf8c381e6c1
-MISC ChangeLog 70052 SHA256 19df1a2ad6b9b36e5b5ece11be6b559cff0ae3c92445c0f56acea094fb0144d1 SHA512 ae82ab510453b61a2be7ee58005d916ccc7ad713e6bec3fc20252391e4fa47777d0f6f939aea0590be9a7551194163af1f9d7d4ee9ef756769e5c71eca7248f8 WHIRLPOOL 3abaa00842e640e6de62f102ebd8ebcdeb240576c6958bbe307a1d8034de96710db407fee5f329a6781db02bdeaba726b1ef5da72248ff7ff6b0c73db6f5fa38
+EBUILD tor-0.2.6.6.ebuild 2874 SHA256 5c0c4e3691e411e3bb4e4763a59f713c1ec8d92d2336cc297a6cd4a390f7ed25 SHA512 82a16ffad16ae7061ecd02c7c5119f032a957be10efdcb75c578eb0eff49751daa307bc4c8f22274b4b11dda811e1db24103a4abf1c971c7760410e2be47d999 WHIRLPOOL 3decdd3b53297a30264c3cf95dcd2c5dec40d63c8a2711bdf3a62dde03e2a6cd252fd653c7671ea2feaa0bcdce27af0ad9607cf1e08b2cfd6342a9072fc325b5
+MISC ChangeLog 70218 SHA256 e547cef69b07a66023fd33c0ec3aa41196f8c0963f71049402d99ca7f2b8481a SHA512 d33d7eeac26438f807dfad76e29c02743773df81c17d331cf2df1823baac97f36156274dcc09e1c0c309ec0ad940697f5a7a6dbe193dfe92f4e33f46e7c3f880 WHIRLPOOL 8e34afcdafc3aad28296ef6ef7447bfefc32fa14caf2f375f53c60ffb17fe288ec21e733cf7a145cd8adfab09827b768e534ab20d858aa8c51970d7dcde32a82
 MISC metadata.xml 889 SHA256 9467f665011b14aa6f8069e25d9093f6391df5f712114ce8e77ba21c3506b176 SHA512 9540206e53c4bc6a26cc0b7bda614c3d2a783935a7bb62e9ee378e8fe781feb4bba974ce986ef4112eb8cf85964749208d7cb6dc91baaae8f39120829a6ad6a6 WHIRLPOOL b0535e8563f7ed43bf35eead29fdcc89b1cd639e21a059019de6545c3e5117d92328b0def15f1515b0a6d90579bccb21de64d051d71d4c52d77c6869f7efa31e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVESXLAAoJELp701BxlEWf3n4P/it83nfcebS2J2J5cgibeFDy
-XXis66+A5nHx7HbADqWRlHyPifO18I+EaWMICwc3vS7ZvQkG6PY78NqYmo9KaPcq
-Oewicj0tpESsWDZEKH9DxgIkX8QSOcB8O8In3rgpJabiuNM70dEuSkLqfHl+jT0H
-AChwQSjQIJYvfkTCrez42P30jXeFgt29X+7tfvB4udtZ+p66HmCl3C9EYhJOnsAG
-kqZqsNuL4Zs47PdfgpWZl8dEyNgKfmyvortcSpFRSahHmFmlUMeum01oqhAbSZnn
-f238/SEgznYok0gY85FljHsgZOzWDswOFbj2fiBpB7GrrqBg4uQRMrL0HgwXsA5y
-eEPxp+qi4ndffayBQrQOTiPZ9+U52G7ik6Uj0OinMLYds9OozyN4Zj1TkmHK5i7m
-ytiizvx5lBgpwMOJs6/8qncw+5kUHlhFE2NBU7bMpyPTn9iqZ6PE0B/3sNwyLM1M
-+Oq+fwkNSQG7A3C8hGB2TYZtH5eGxE/q5sdOleeMzzhZxAfb3gJLTz6Ifb1pRvQm
-VKKJcl4xjdVJmjLA3+t481kLEmT8xGHLZPKozA+WzueBbdhtoAX9C2bqqlqCKi5f
-n/cqpGJ9wMcOjUY6HLZxkreY/pEU9sDCsv2Zkj175En/HuAMiEVeurldQwBIo4hJ
-+wcxGAEWwdytufr4MgRC
-=BSd1
+iQIcBAEBCAAGBQJVEgCgAAoJEJOE+m71LUu6AHEP/AiUjD8kDVn25/3TwJXLfmhC
+px3ToYMl2KGWDY5gprMjLNHPMjfwhnhoM//XMMQA+ruKddbvRGr044ucybx22vvo
+8elOt2IyS+aI5XmQTvxGqR84SQxkqrf9OQZxwuMKM60pXVdl5SjoUH7wwNehkq/3
+Ybu+sAsQ9uFcFCycISSY0/KTnRiUOKMMPLItBUqLn0t9cEmeVuNUfefVTx92clOp
+zf0JGlcbPOAf6of41Z7wn7Sb2uOxalc3e3+yso+zlMNLZ+tbGjPYtgeP51YcMQgf
+bomPYFQefD/qVGM/GAVSI/sCsqoPBEJPSPbA8TfNkToej/1j1zlbdvq/iPwUpZZt
+nRSng867LWkKHMyHNvYN7uLLBVuPwXF4cIVuDSs+S76Tu6Oq/7P4OksS/hNpQ5/M
+pSzr+fPEjbLdNBt8ietSxKPuTZq3dK2VaOi+5pbNhx2sLgo5tBt+kI4CDZL8sXxn
+xESQxahuBqmOAbPakZPPvDkzgGOL61zVkGJeC4+47mMOCb8ITe7d7xDIdOJY/FgZ
+ofQ4feDb+cUdECnJelttgD/Ifr59XA1LGTWISbVikjz3WYW1+zATYmVsICtoCAuS
+I8+Lm2n+GkaHpzfW6iZhYk27eNfFA1F8M/qgP3nXnyz50bvt2o1TbwsGpT7eIdsW
+YlP6nTxeb5RCW2p/uWPp
+=kW22
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.6.3_alpha.ebuild b/net-misc/tor/tor-0.2.6.6.ebuild
index e979cebcb942..3a2c0eb6c2e0 100644
--- a/net-misc/tor/tor-0.2.6.3_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.3_alpha.ebuild,v 1.1 2015/03/08 00:04:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.6.ebuild,v 1.1 2015/03/25 00:24:39 blueness Exp $
 
 EAPI="5"
 
@@ -47,6 +47,7 @@ src_configure() {
 	filter-flags -fstrict-aliasing
 
 	econf \
+		--enable-system-torrc \
 		--enable-asciidoc \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable stats instrument-downloads) \