Add USE=scrypt for tor-0.2.6.x

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

4 files changed, 27 insertions, 21 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index d7b4c9da0974..e3907a39df8c 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.441 2014/10/31 11:48:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.442 2014/10/31 15:41:05 blueness Exp $
+
+  31 Oct 2014; Anthony G. Basile <blueness@gentoo.org> metadata.xml,
+  tor-0.2.6.1_alpha.ebuild:
+  Add USE=scrypt for tor-0.2.6.x
 
 *tor-0.2.6.1_alpha (31 Oct 2014)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index a998541cd174..a5d61f83231a 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -16,23 +16,23 @@ DIST tor-0.2.6.1-alpha.tar.gz 3347886 SHA256 83154b8e5514978722add6c888d05042034
 EBUILD tor-0.2.4.23.ebuild 2561 SHA256 7fa0c96147cb0d7f0fd97f189b581809453529ac8b34cd912b811dc696012642 SHA512 0c71d01888ebcf04fd8f95ecef4318d6819be280150d02ccc73062174dc4acbed83ed2ef5eef99bdb133d3524b4745d13e5a9d1c0fea96ffe3bef2746e5519f6 WHIRLPOOL 2c93badc8dbaf8df752655396f04af32ca68a17ef5df421368344b1c026f2771b611a200d4406c8b03936a7eecefe118478a098743db77bec5dc5960a8fe4062
 EBUILD tor-0.2.4.25.ebuild 2602 SHA256 2074b49934f027135b0168408179440927fea84f92888ce98946c40e94655e98 SHA512 3a1fe539b738347db30a7af3dcadd20c9df60b2855da6b08c87397800dc1f269c5719b09f0ab12f09ca76d5e4a959d32debe009bf6991fa9ec53e67fcbaf1508 WHIRLPOOL 37453179c739ae305a2db3dca4d442957a3e2376d45deb5cda2aa017ad74c349757d7ef389260b60f41bef74485899ea97160eeba158fa4284b631e6db8b0016
 EBUILD tor-0.2.5.10.ebuild 2804 SHA256 e64004b7975ff49b4f832951cdbf7a65a5aabb4162d582c664fe3d478c3cf148 SHA512 83d9640bcb0bdaaa11fcd1f973ed8e29b7aac1b73b5358b11c50ce5201724527cd77cfed14f886f9c02bc6646194784c104c46686139527d8774734062bd54d4 WHIRLPOOL e3294c6a8581af66a919e887d1075fb4cb3c575eb4402375b6371d2db6562dc48d8872c518b2d2bf66c4e7c2c86bac8356b3e2c684beaebb5864081718cc35cf
-EBUILD tor-0.2.6.1_alpha.ebuild 2874 SHA256 0a3fd2b8e0657e52f23b4092efa022075707325bd91f7c79fb44ac857cf184a2 SHA512 e19e21c7346620b0acf214f7e3ccfd8d4d11fc0127c05c3dc00e54c8e6d7afc308c6f1c22a2a3f4172db630196b88990090566f4163d6a766c686d527b399915 WHIRLPOOL 5e6c489a974a678497fc68f70949ea1b9de58118921f31fd7bd700ab08439155db90bd1ea5aca3431233ba6ef356c5ed79aaa6b2686f082ed4518bb73a31ce4c
-MISC ChangeLog 65968 SHA256 82148ea316c8212442792e333404bf530c5484864ba495289e4cabb467beb519 SHA512 8cc9aaa5785763a71cd1b367bebafdc63f78d99a58ac9073a4d9b5792fab9b40813bfda150be3354177ca89b6a0e7ddbaf8d625622f800d7e14a89ed9b172a20 WHIRLPOOL f9fa15bc7d539b6786a36ef115d612bc33b7b7599be56e0cace1da2c0ae92ccbd89f1ec86b7434f46837cd125705cd90247c0eadc261913526b3a5291233da54
-MISC metadata.xml 871 SHA256 715696a494621f6875696c3f439198a72bc714437a2110578d192a412394d0f7 SHA512 8488e39843e59ff60c18f2ee132b9dceb793183c66a5de1a3d669c51c85626818ded05842d583db9b50956b8f2badf7c392d709ca3ed887d9b516a4ffa358c76 WHIRLPOOL 6176d3a647b59ec8276ba6086e1c8aff5b2e1fe12c3b07217e81ee7da6e56d0c4f6c988b230a75169ac1a2d7749511ccb8eef291746e780cea13995f356dd1c1
+EBUILD tor-0.2.6.1_alpha.ebuild 2880 SHA256 b6995efcf2eae18e44560bdb8b90d1ea6c02818df00001c947adbec7301dee2f SHA512 c48d2b2f7a69fda4a371c16f50c62acc0e68bfdeeada90095afcff58f6fb2cb4e88b41a39e8477c5ecef3fd8714eb029af1c8a40f5e95c66ea030f440618543e WHIRLPOOL 0a5bf78273299ad4cfcf8d6563aa7a841bab80e730aa631cc68f5f405ec14060eff3e01ccb5854c12cb66f0c9d0a7d87ba62a16db1b9545da6f42c9b30c84435
+MISC ChangeLog 66099 SHA256 9c6ea14a325f32e70b67cbde1a62d5e9e9937afe54f8c25c5d4af415271e2513 SHA512 a55e4d1d361e76a9f711fb0e8c0a321b29478ed61ef7c59b9ec69c87d47728cdcb2718457556c6fe40e2bcf5fc5fd191b35ebc0243251d0cf52db178907504f3 WHIRLPOOL 603c4ac207e821dc1fa9cabc12b75bd3aba3c43d8ce5a094d3bcbc8e01f208fbfcb9f61fef93c1e2adaa13564a03c028be808291a86b1ab26cdfdaab5b59f704
+MISC metadata.xml 939 SHA256 a9e688ee148c4085c372d147307e94acc492e411d407a18c378ee5106c7c02bf SHA512 1df24b1443316564d7cbd1d109e72126cc2959a9b2d995baad51fed10ad01a7ebb3a659f89032dfa652541f9653e176903dc7664a92c21187cdcda201dd87198 WHIRLPOOL 3545d336c2b7f3684270e48739fa027aec10bf2a09d1f5c1f7f331c8654d0d7baf729da89c5afbfe81647c2f9aa3f59a1ae0e71b89f7a43b59350f254702fb7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUU3d0AAoJEJOE+m71LUu6GlYP+QHTr9GzZEI7C6CsahHvhmI+
-5aDk4Sxu8XjTgLugT39EJBKWOOWPVXUzDEcqO06PawyFOZ5QV+FzXLEw/WBrSojY
-Nzq3VbcIDqlLC+CbR1q5FAAbKa8q+l4NJ4FTRPAv+obel0PVZENL+0eJW+gLWkcJ
-wqNWK5wIOrFZ+Ua0i90WXo1sjc6kQpjNRftKRxQ1BAYUPu/68byW57Bq41WMxLMa
-L6iuqUXpLKmR8QkNfr09ruXQSDvFb43GuFh8FQ36YX9Xe8FqTJ+ofIuHiBCoscuz
-BzobKO+kEo89HTIt36LUfNiJdbrBsMpG4IeaRjAnAFRFVE2FTymcECu6nZlW3kix
-TU1Om4/nmVgXwAP92rY2X5gn4kFwcsqlOVJTi/u7cJQezukXzVgV+O6B751MmB2N
-KwOio7K+bMV6Hqvz1mi5t3dJvLRmV5/etTlBgE2v9qfDkK792Q3MQc1/vc31VSqa
-b2LwxnH4dQoO7CJX4ob+TvM20qDbolyu7IeFzygCHPUEd+95WsmzMKJwXwJ5CIYC
-usMIIJHkJqMNhsAo0rfOK+hlb+zquoJEE1IZHLoaX534WkKXBgpljzoDYab8flDw
-CbcMc+n0WzMt/PZZx+nbK+muEb789KxK8GEKsxFzzrr+iMpT2FENWq2OaFYwPyRC
-6Hflu30Cqd65Hrx3P/NW
-=rOjH
+iQIcBAEBCAAGBQJUU63/AAoJEJOE+m71LUu6Ql8P/iBBIi+xXFForcZeMzPVHIvW
+Tg6uLa6VAMCzSbcAlT4Hc2q6vtVNASCWmQusDpDMxLjrGM1rede2fB5Pn+h3R7US
+1WNdf5hAVhhe8FMlP3zkLMO444NGWQekZq2CdCYa7UdwF/XvylrOP842aZBt5uEj
+rJsYn15ODMU0hvBoSPN4m05ohNOrFBjxMgu8J6sAWe1OevwrqqCiEYyrd1aMMQNK
+jdCg7BlxqwVo+HUaSpYoTG0yIz1rKvHon1subUyNCkLlLhKv9oZuBqg0GdCqiE/+
+bUktfXGsvSijQtjKE/tWe0Fql/ycFs4mnsGhOAyCSU+TaNv+qxcTKIrsRt4wzqJ/
+/yIK6LEDty7FTzUhx4MeVZ5zwcKFjnxWXY9YnmHC00b3TvzM4Kxa1XmCkORgkuo5
+28ti/Rr7zabmeZWlf2UwV/LyOUvllJPwPtXmrkKheTTYeMXvZ2rTsExS8bvoYsER
+W0IlxcAbfhwBGCVvhlNuu8CIihdx/ir7EcWqHenEGzegHZ19hmWlmaPokQ9QW8fS
+H0UguMZzTJ/slss/OVpMW2gIcYQxMeybjsH5tJgYHRUuKi2BN5yUVtxkguwD7qCM
+0q5u1NE7DJy7ziAhG/hbUK9kKx1RE/6M1p1eumuY0UxGjbQB7Is66y6jL+0JYLPx
+zQOfvSNPMoZuCnkjBqjh
+=BlZ4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index d05dc9c8ce05..709dd4847e3f 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name='ecc'>Enable Elliptical Curve Cyptography</flag>
 		<flag name='stats'>Enable tracking of how much of each kind of resource we download</flag>
 		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
+		<flag name='scrypt'>Use libscript for the scrypt algorithm</flag>
 		<flag name='seccomp'>Enable seccomp for system call filtering</flag>
 		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
 		<flag name='transparent-proxy'>Enable transparent proxying</flag>
diff --git a/net-misc/tor/tor-0.2.6.1_alpha.ebuild b/net-misc/tor/tor-0.2.6.1_alpha.ebuild
index 2923c203d806..1a69a0fad165 100644
--- a/net-misc/tor/tor-0.2.6.1_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.6.1_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.1_alpha.ebuild,v 1.1 2014/10/31 11:48:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.1_alpha.ebuild,v 1.2 2014/10/31 15:41:05 blueness Exp $
 
 EAPI="5"
 
@@ -16,14 +16,15 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="-bufferevents nat-pmp seccomp selinux stats tor-hardening transparent-proxy test upnp web"
+KEYWORDS="~amd64"
+IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats tor-hardening transparent-proxy test upnp web"
 
 DEPEND="dev-libs/openssl
 	sys-libs/zlib
 	dev-libs/libevent
 	bufferevents? ( dev-libs/libevent[ssl] )
 	nat-pmp? ( net-libs/libnatpmp )
+	scrypt? ( app-crypt/libscrypt )
 	seccomp? ( sys-libs/libseccomp )
 	upnp? ( net-libs/miniupnpc )
 	selinux? ( sec-policy/selinux-tor )"
@@ -47,13 +48,13 @@ src_configure() {
 	# We disable libscrypt until I get it in the tree
 	econf \
 		--disable-buf-freelists \
-		--disable-libscrypt \
 		--enable-asciidoc \
 		--enable-mempools \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable stats instrument-downloads) \
 		$(use_enable bufferevents) \
 		$(use_enable nat-pmp) \
+		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
 		$(use_enable tor-hardening gcc-hardening) \
 		$(use_enable tor-hardening linker-hardening) \