Relax version for dependency on net-libs/miniupnpc

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

3 files changed, 93 insertions, 16 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 7a44dac01386..023c11a8dd70 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.311 2011/12/27 00:31:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.312 2011/12/30 15:29:06 blueness Exp $
+
+*tor-0.2.3.10_alpha-r1 (30 Dec 2011)
+
+  30 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.3.10_alpha-r1.ebuild:
+  Relax version for dependency on net-libs/miniupnpc
 
   27 Dec 2011; Mark Loeser <halcy0n@gentoo.org> tor-0.2.2.35.ebuild:
   Stable for ppc/ppc64; bug #394969
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index db247d1ef98d..4e3d7aceaa0e 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
 AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
@@ -14,23 +14,14 @@ DIST tor-0.2.3.10-alpha.tar.gz 2950344 RMD160 26fd5a9388fb90c923d1b885c85651d411
 EBUILD tor-0.2.1.32.ebuild 1824 RMD160 bf35dbca3099ec1657646f4d8eaa8053a2a31ca7 SHA1 b70f0a9cab8fa9318e555f2bd620d89e5ae725b2 SHA256 92096e0c90cf502e2c326b3e23b0108934886f0271924c15f080f83c6c4d00b8
 EBUILD tor-0.2.2.34.ebuild 2184 RMD160 9accd89f4236d5e28b9f1b8589818da92a13b561 SHA1 66c6cbd57179923934f1f5b155be082954b59e06 SHA256 4f1b4527429de8050884edb17ff1557f5e61e9eae2a31166736fb5d2b93d75ee
 EBUILD tor-0.2.2.35.ebuild 2085 RMD160 38bce2cfba9b6e9be81bb641801c2699408da5ae SHA1 266b9f9a56357ee2a4bf3ace8df47da1c803c0d1 SHA256 9d1b721d5100b6a56e0d60de9a9c1e164f7516e5ce4fbca3c932c78e820fbe32
+EBUILD tor-0.2.3.10_alpha-r1.ebuild 2235 RMD160 201b677dda443a9835dadac774ede5eb100f89a4 SHA1 869e47596b1a136453af189e2416d45e37da632e SHA256 57760efeb5ac932fd9cc34f67ace47268819c3de7c32594ac91b2ba563a5dda3
 EBUILD tor-0.2.3.10_alpha.ebuild 2235 RMD160 c285bf6b77f26a07702b92cec2fa43f27bef8886 SHA1 3988a0a43376ae2225af616560cfba09f32ddc13 SHA256 4a1b65966109205874f569cd18886445bc9971552bc381d387b9e983f5ea22ca
-MISC ChangeLog 45983 RMD160 50f621067b3d086ce1c98dd1e16a02e4c7f4d208 SHA1 30922d1be8d62406badd3e99061dcef37289531d SHA256 32a4a58f4b648bb4e7859f1ab24c57b750b66f66c157224e89a821721a64cf13
+MISC ChangeLog 46164 RMD160 103c1d8533b0c5443db6cd6aef1cca2fb984fdcd SHA1 4698600ff38de70e81f47ac9f1f1bddb9ad89e01 SHA256 ea2d83627944f72b4ec5ed190a10ae0ffb8cb3de25e693ae941f5f69e0757ed6
 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO+RHWAAoJEPTTRK0uRVaN7DYQALlx9csCVPJe0b3t97PDt0Rl
-PXqhODAKX5A7QMGxRS7Cug/0CBNKUzODdL7k3f3WGg5uha8AYdWloC947Yqcxp1u
-gDWT3n77fiK0Q+g8WGk/x5l8LSLx4LCih1aAT/HUxC5bffN5B+IWd7mo65LNNPhE
-005d0FCyYd4XBdhFQE2Jbuq7ODbi8/MkC9k1pFqZnn0vyq7y5MixUML/yVRjHcO7
-79G+dEsCuL5/Fal/tiiUUvk6w7uu+nO4z/hPTOEa8Hs4CMqzsqIanTpBVwnp+J61
-PKLLgNkGQD2UpCJlqh5NPGuOKkffRU+oGhD2IfHKYMI4zJpzcerlsNVmKwZgHj+X
-h038MxHCGzzIVkjpT/vE1oD63Vl4we1J17RxSLP0/0EKssIN85r2fcYYokn5xPhp
-a1ijJbWjknPTD8KmrW+7G4gsLMppsWE7fiGkmujrxeRlY1aqpHrtTRWBlj1VocXf
-nSsVpx01selGkj3Pt6fIVzW3s7sYVUrmhUDjNhJULP/XyGjAGJGdjzXFeXlHzciP
-KL73RCG9zEE+TfaruLBnynRUqW3Xv6VdcRaefIgFeCl4SBIM1QlMMVpJnvR+BAzE
-IOZkwYpWiSVt6F9wk1Zo6ph58oxV6v4wjMPiXK0CEjuPCzyuYCWuV62Q/6Y+5W8l
-bLHwW2SeIHqnGOwcmm14
-=OwTX
+iEYEAREIAAYFAk792M0ACgkQl5yvQNBFVTXm+QCgh97IG0Hp1NDLbdO+kjOg2pxJ
+EDkAniqpoSmHTXqLBM+auB836V+FmSqE
+=PGQc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild
new file mode 100644
index 000000000000..1291dc4e0296
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild
@@ -0,0 +1,80 @@
+# 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.10_alpha-r1.ebuild,v 1.1 2011/12/30 15:29:06 blueness Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic 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="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-2.0.14
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( net-libs/miniupnpc )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+	econf --docdir=/usr/share/doc/${PF} \
+		$(use_enable bufferevents) \
+		$(use_enable doc asciidoc) \
+		$(use_enable nat-pmp) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable threads) \
+		$(use_enable upnp)
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/README
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	elog
+	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+	elog "change it according to your needs.  Use the torrc.sample that is in"
+	elog "that directory as a guide.  Also, to have privoxy work with tor"
+	elog "just add the following line"
+	elog
+	elog "forward-socks4a / localhost:9050 ."
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
+}