Version bump alpha

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

3 files changed, 109 insertions, 22 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 505a3dcff067..e10d5366c439 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.417 2014/06/14 09:55:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.418 2014/06/19 13:37:34 blueness Exp $
+
+*tor-0.2.5.5_alpha (19 Jun 2014)
+
+  19 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.5.5_alpha.ebuild:
+  Version bump alpha
 
   14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> tor-0.2.4.22.ebuild:
   x86 stable wrt bug #510564
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index c2bf4a64e6f7..c208f0a77039 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX README.gentoo 316 SHA256 bd1a5d6a0973d89d3c89e52d1046c202f52d59aa45ca60d2ee33551ac77de1b9 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660 WHIRLPOOL da7f4eaaccab8172dba2f8d264dc6d010b98fdb70ed60eff71175a24b423df3101c8a93d162b309b0a51441ca9b01dcf7257bbecc8fa83f1903a0577d28a47d6
 AUX tor-0.2.3.14_alpha-torrc.sample.patch 1365 SHA256 7f8d64e84590a62c4b5b1ef55ffbac32b770eaeb4252ef550e6130af918cf63b SHA512 8691db8957ab22e8619b4909faef0534a82faee78c685fef005372e0bc423f1b8d83e930a32a2b2dee239796a47b2147d2dd7fd53938161024fd1dfda0be8eec WHIRLPOOL 0531fb6393311ee88915f47862665606f96e94b27064701d35e9828a9f3547bf0db8710cdb4e539f515496607cffbd70a32098cd4f2e7ea90ac595e1c80ccb5f
 AUX tor-0.2.4.21-fix-unittest-disable-curve25519.patch 1210 SHA256 d0d58684ba33c0169380c2786e9a313148a6ca0d9333473e48f997329573649f SHA512 571aa3d13f770d9368f2f7553aecff129430dce4a12786c5ea1e7219b96854fe8d1259210d0e52ecb26d04aee042c93396eac51f5bfc5a0d7c85227b3bfe3bf0 WHIRLPOOL 5a05925e9b601525406be2d21434abc723e14c83370102e200a2d6db5fe3262aa06e3845acde3272e9f08f28c0295eb4193417359ec85277ecde876efbe8b289
@@ -14,26 +11,11 @@ DIST tor-0.2.4.20.tar.gz 2867180 SHA256 ccc51747cbcbf98f658c34d5c693ff8a868698da
 DIST tor-0.2.4.21.tar.gz 2909462 SHA256 a19df488c0c776c9f1e4c78bf93af115f67eefcffe6152a826fed07a1596f1ce SHA512 be055afa95c8e80b88ca46eaeb22da19a9b7e66af39697267597f6141ad4d6b6197fec55d9f1fb0caf349073740489331a3197cb97c737ae829d488e9cda73e7 WHIRLPOOL 6c26832e289cec219d474f11abf9ec03c48cc64d45fba75fbdd77d28654e185db3d177e13061bcb78887eca632ca2e82ffe754985dd9b28bb910a6198a574713
 DIST tor-0.2.4.22.tar.gz 2908812 SHA256 6bf7942e93b8919a7d01a601390c2a8e7c32d6d53713a73c02d734bad9bd694c SHA512 1d26ab4cca253fa89861ce1bc826c31d81e02e636574f039c87f6eb3e87e0e530701ae34982f6801292f0a290ba54ee096be8526717785b7b620829517743411 WHIRLPOOL e2dd09123e150597a79f9fa29dc811ba7431ed54ae2c131cfb1157137f4df71506d514e9737a7f6ba61d1a33591c7b57e0179f35f1d9b3c7f931d55743f54978
 DIST tor-0.2.5.4-alpha.tar.gz 3074918 SHA256 92ec86e009cc859a3e18fcf286d8699fa393fb08047aab37295e22ea62a5219d SHA512 fc875d519a7f59698146b5c9cabe8e3542e3172e3186483440b020d36b56aa7ef0793fdb0b3885da301735b73c3d1632f9824e2334b411eaeaf6ce509f9c9e7d WHIRLPOOL 6277a341d49ae86457c5a0dbc3e4142921a83bfefc420a1a4b8cfa5a3b9921dd3af57e7ae468376819251e5379135b5ea5ac045590a3aed2b56296375bbda200
+DIST tor-0.2.5.5-alpha.tar.gz 3153261 SHA256 783a81fb91cbe3d31d89f1f389e59e4d874467f085df982a5a5a0e3e8bceae64 SHA512 8e6669a47458ccfda1a447d62864234572ee3faad8dceb14dd51c2071afd0e0ab1818592aadf6d3850febb38af60354745752c6ba4f30d4d86a66d73537bdb13 WHIRLPOOL c40812b26e5831568b91fa33c3d5cd8c1b20faa2f0087be3a8f9c3b2558e4ce073593f928386971f22be71cd058a4cb3321a058b8ce5621c4fde122a7f318a2b
 EBUILD tor-0.2.4.20.ebuild 2596 SHA256 feb9d082e10b347b9046810bcfb5596a240075df492a93aa60917e63815799d4 SHA512 aa57ddff39e8daceb7555eba0e4d7ab81a08bd73f3558d6a161ed782941fbdf282e564bd08ce1e5ea68d2e725b847475326ad95c1281fd3272539c674ae609bf WHIRLPOOL a5f118a2309853939cd246c3a5327da5ff6fa5f6c4071c5838fc69ca38ea329672816693885a7a6ae18d3ea7aab60bb1216cb2819df71627a0f5f1e573a747e5
 EBUILD tor-0.2.4.21.ebuild 2672 SHA256 1628cba0af4c269c85405058caab1701f551cda4060048f183041802f6881206 SHA512 71167c29860e336460525d8bc817ccc0de5801b616cf348d6b73e7ba5a797b4288351496d6a854c20569f363f93bf22d65a43b9597d9e4e339174a5d8951ae75 WHIRLPOOL f085b4d0011be7df9f91f80340ab19aa36ba97287cafd99fe4082939d4e2140d779fb5c4743ba05009d55cf5928ea73d65dc721887743158e57a956f92181bd2
 EBUILD tor-0.2.4.22.ebuild 2605 SHA256 9bdebaa6e69e57d6de5c3d239997ec897757793f82e0f6963539a4beafa3ecf2 SHA512 044909b0ab5bfa23fbf149b7a4c1f311c4ffc675c07ba1018230dd9c383c148b333cf0070f05b5ec235fcd301369a8c15d7b11b6c94940b916629dc48235fbc4 WHIRLPOOL f101b76086bacb33b0a7d3163f8623e9b72c6ccbb0bd86c543a28178244050241c9427dfc1898353becfca43b78775c7531df99aae429409f322dff806b430cb
 EBUILD tor-0.2.5.4_alpha-r1.ebuild 2885 SHA256 e00861df7858529e23e21f27d3d1ef84c32a127ddcd883d9e8f7c40624f13ee9 SHA512 8bb335a732794b21fac87cf3ff67ab776b9927b13f174d6964de05f86ea2a34ec957bb6860f9b23cc5fef4cefe075ceb8a9b46fe9f001ddeb0c2a95a731cddf2 WHIRLPOOL 44cbf81c09e95f8af8c404d016989f9a81997c6a8afb94d54694fd6c4c2245b7a2dad173624028e305fed7885905caef9fc7de3252e526c4cb1dbfb85d239980
-MISC ChangeLog 62348 SHA256 4c88a80a981d36cb80934d6b466df02f075b07041901033e7bd7cdb857846efc SHA512 0a6244223e49025f30fff278d6d12363f26569b078ac6bf363b1388af31b4a541b38660991b274ca00b675dd2e289f6f0ef33a50768c6fc74009f8b4a8d8d3b9 WHIRLPOOL 87ad2f2f118c841b039e82a7d3b7bf3494d93acd64ff798c423585a48e4363ec1f058b3fa0598d3fe6e85143ce7351c4d7c4ffdd62ce5cfc92e7d80afec6dbc3
+EBUILD tor-0.2.5.5_alpha.ebuild 2809 SHA256 731b601eef1ab3d025e20ef6a8dac6b7a579a8a66a74731e00ad297fe459e991 SHA512 a60ed306d71a9d050490242fda26a4d459e5b58f5082acf2f9a73de843f6dac344f7daee03514b3117b1eade03a7b31eae7a5df18aa837bd2f82c07fc24ab2fe WHIRLPOOL 4b1e6c53c446ea49f121f3da3e3d7344fe8d45c8af3c4dcf5bf3561a02baff515e45f6b5b9a88e93fce5503883ecbdbd98588960f915024c8a627743828011a3
+MISC ChangeLog 62486 SHA256 477f26c38937988d50a0c5c7a216b2441751ae53423e03511dd045c1ea648269 SHA512 02e9e52c39a826e8ac2107ce841d90b2fb1a3485e2b04b1bc592fddd963f91bf603db0650e91e00251a8399ca6d92682fd4545e12fcb36104903dbc5f8d22a22 WHIRLPOOL 3c3d23c637797b5e48561b85c5dcf27ac4b1e024e7a7c1b1da0179b7a3d28eafd69c2c98a7dc3d1d7c23fa7e9e9ee8177d661eb0ba2acd9356f339cd3b5e50c7
 MISC metadata.xml 805 SHA256 b65e1d9314d9a0406c93a7bdf168cee5555a8b5af3c889768c555ecf9c518564 SHA512 b68a4b5c9ef9ec0cbb61f795a574c3111d0f7be6232868e698828db3a68273f109c2ddd559b4c9dec7a9200f5ea7b99cc5faff1ed23fe9247c6c120e856f7875 WHIRLPOOL b42a9dfb6a840451ec1fec757636055ba71a99dc1f1f1a348e7735058125688a62b2433307706fa8f75310a1ba887a75e3a3535b69c413b0a9621c633f52a8c0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTnBwJAAoJEE8aJVXqcZkdwlYP/2wxXF44qv3kgRjGOzL7seFX
-XlC+ViIHBQ9Yjtjc8Ap+Z7ghPW9JPjHHb5h5nxQruC06o4IzokltEsYN+YWn1J7M
-goGA4RuO1q2FdV7/Y12jI9JzMHSMWTh0ALW9qpXVbqPi1YZWWfw70McLqnoxU4gK
-CHEUk58VugI/rNgDskwdleCtergvDCrMxBYi4EurMQYI5xt49s+cB+VxyF5Elm5k
-LJmJ2Af58YZiL4LSnl0H1WnJeXa4od0bF/634aClMEYR450fygjcewFzt81z3Pck
-WqKRn8NeJJ47cWCvXdNY7sJHR2W/tyc73H1iTx7V+ZyFJVMS7uaAyi10lGtY6vaV
-PevD1Bqoaj3DLSv+9gIufjVLXwJkvNOrs2omNwx/WD+wtUbsr0nLytr8jZck8813
-UA6r082zMZvlUJa6+6aTJRgsSwCUZzNFNSQzRhJh7F7w+azz350OEMaOP0gxoucF
-6sCWs5/JFwUM7aw+GptfzLzKTqyon9LCxvMxpC1kOwXftn5illtAijxK8nmD1lUF
-UThxKmHlpYecZp6cB7MryWTNfLpVijjVkEoO0Lr/zXYrc9P6g/Jxg3xRr7UFONNw
-GPKXP78EQSq9lMLJul2dmB4S08g2geetFMADW/6DOOpusZVOu0IzovLRcKy85VXQ
-UCKWVBXjyGff1S5G49R/
-=6ANh
------END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.5.5_alpha.ebuild b/net-misc/tor/tor-0.2.5.5_alpha.ebuild
new file mode 100644
index 000000000000..3948b5108392
--- /dev/null
+++ b/net-misc/tor/tor-0.2.5.5_alpha.ebuild
@@ -0,0 +1,99 @@
+# 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.5.5_alpha.ebuild,v 1.1 2014/06/19 13:37:34 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="-bufferevents +ecc nat-pmp selinux stats tor-hardening transparent-proxy threads test upnp web"
+
+DEPEND="dev-libs/openssl
+	sys-libs/zlib
+	dev-libs/libevent
+	bufferevents? ( dev-libs/libevent[ssl] )
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( net-libs/miniupnpc )
+	selinux? ( sec-policy/selinux-tor )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-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 \
+		--disable-buf-freelists \
+		--enable-asciidoc \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable stats instrument-downloads) \
+		$(use_enable bufferevents) \
+		$(use_enable ecc curve25519) \
+		$(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) \
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes doc/HACKING
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+		ewarn "loop.  See:"
+		ewarn
+		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
+		ewarn "    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+		ewarn
+	fi
+}