added alpha branch

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 80 insertions, 12 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 4b0aab46b938..391a7510aac8 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.225 2011/01/07 23:54:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.226 2011/01/10 17:47:00 blueness Exp $
+
+*tor-0.2.2.20_alpha (10 Jan 2011)
+
+  10 Jan 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.2.20_alpha.ebuild:
+  added alpha branch
 
   07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.1.25.ebuild,
   -tor-0.2.1.26.ebuild, -tor-0.2.1.27.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 30dcd61f01ff..39b3e1fd00bf 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.28.tar.gz 2471741 RMD160 71cf9f3cfb0cf89de573869a694bf31059331811 SHA1 31c6995314a7a205a5d685bffbe966a766c84d7b SHA256 fe9756bee3228bf01334f743b7c74dd1edc83e5489f032737ce24eb6bdb19cbf
+DIST tor-0.2.2.20-alpha.tar.gz 2589173 RMD160 128850d1cdaecf02b467f4646fe7ed4488a0ddd3 SHA1 a3825ab47b21b877f80387608d5f7773cb0d234d SHA256 e78c045c8d6e7bac68a0e6c2ff9831a461e6fe71b3b2cd5a41362d9555468eec
 EBUILD tor-0.2.1.28.ebuild 2503 RMD160 f3c32578599c4a886c048aa09db915631f736891 SHA1 6c46cda658c3b7835673c3d8cee218395764cf2d SHA256 cd547b5da42b5e2d7b6e3f2d76844837a863f4ed1e1db1ad8b6cf762e9bb8872
-MISC ChangeLog 32507 RMD160 a7b5f1b4862bdbaa2dc4a02d12a202ba4cbae910 SHA1 633ba00540fd14123dbc67e9109df842940babb4 SHA256 c251070cdde823c3ff0699deffaad53931a907dac9a23479d9630435409ef743
+EBUILD tor-0.2.2.20_alpha.ebuild 1952 RMD160 9ff24634db4f2e18cfec6b5ab7224f7057d3064e SHA1 26fa74d3a354ffa2b70877c18b78e00506cdb4ea SHA256 665289cf441453c09fd5d80e38c00c5546382ed4c8bcc48791a9863da0b047af
+MISC ChangeLog 32652 RMD160 52bb729fc390173363119f6487049be5de9f6684 SHA1 8ddaf128992879e2006ec94c39d8f84c6b3caeb2 SHA256 e49e08023c71dd908c9ea99d3c5c12695cfa34cc2c8d27b658c16e0ce061a78e
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0nqIoACgkQNQqtfCuFneO7UwCfRkLD0VQoBOmrNx23WVAIy2V1
-UA8An1OAVtFWlaY0pwiDiFaLqwtP4lIg
-=RwfV
------END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.2.20_alpha.ebuild b/net-misc/tor/tor-0.2.2.20_alpha.ebuild
new file mode 100644
index 000000000000..f82a88c219d0
--- /dev/null
+++ b/net-misc/tor/tor-0.2.2.20_alpha.ebuild
@@ -0,0 +1,70 @@
+# 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.2.20_alpha.ebuild,v 1.1 2011/01/10 17:47:00 blueness Exp $
+
+EAPI=3
+
+inherit eutils versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+# libevent-2.0 is masked but we still depend on it
+# See: bug #206969 and https://trac.torproject.org/projects/tor/ticket/920
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0"
+# The tordns patch for tsocks avoids some leakage of information thus raising anonymity
+RDEPEND="${DEPEND}
+	net-proxy/tsocks[tordns]"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+
+	# allow the tor user more open files to avoid errors, see bug 251171
+	insinto /etc/security/limits.d/
+	doins "${FILESDIR}"/tor.conf
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}