Version bump, remove older alpha

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

6 files changed, 123 insertions, 77 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 421af3235cb3..91dde889324e 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,16 @@
 # 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.424 2014/06/29 12:14:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.425 2014/07/29 15:29:39 blueness Exp $
+
+*tor-0.2.4.23 (29 Jul 2014)
+*tor-0.2.5.6_alpha (29 Jul 2014)
+
+  29 Jul 2014; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.4.23.ebuild,
+  +tor-0.2.5.6_alpha.ebuild,
+  -files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch,
+  -files/tor-0.2.5.5_alpha-fix-bufferevent-build.patch,
+  -tor-0.2.5.5_alpha.ebuild:
+  Version bump, remove older alpha
 
   29 Jun 2014; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.4.20.ebuild:
   Remove 0.2.4.20, sparc is up to date
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 3c7c1cdadc6a..fce4029b2722 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -3,33 +3,33 @@ 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
-AUX tor-0.2.5.5_alpha-fix-bufferevent-build.patch 437 SHA256 8fb3dcf296c631c9e8b39fc9a68bc5bb21bebb558d4b11d62764156836961d1f SHA512 f6a4b5f08b13fd7392c757c47c81ce3d3a03b9f7a02d314d4c5c275da0f74309291b34438f82d10fa4124b0ca494d1a739de40879b6717e25cdafd1dc26430d6 WHIRLPOOL 9e382d00abfaa86262bb8d7fb6e328b6bd416366d325a1717f9dab541b73b96257cc37f465487dff9384afd976c2923fbe003a9305b985690aea0cf517bc2e94
 AUX tor.conf 62 SHA256 809f5f09758c1eec5fd3cef94536ec83358dc380f3ece0bc4890b1c2e49f9293 SHA512 e81517218bc036b42559f2dee5b09ff8873d7944bdf8375b6721a842990a29a21da1a524fb6b8e912da57f3cc6d3330663d78be3458833fc77692ce30386fbbc WHIRLPOOL 88aea378baeeafb7a6b95de011fff58da40d9894245e3b001320cfeab176453ef5736e02805b09da2d28193beb2c14fe4b4e6bbd4bf90ed1a23e402eab1227ce
 AUX tor.confd 44 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660 WHIRLPOOL d3060208cf59c2de5839e7358fae37db883899f715a7411c7ba4c9e09926b6098aca7bfcaa269ea51b47b9f197ccd509f0c1e19909a87b1e087a88b30915a1cf
 AUX tor.initd-r6 1627 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7aea0a9e7c4c4f SHA512 09aea50280fe0efee605e9235ce43d171efdf4cf6c2ccef272e797bac7277940e08155c5f294d9901507112a25a9be3aec5e40466caba4a54dfdb1e48683ab12 WHIRLPOOL 8c7fe6e6f53daa47676e040afceb716308bd836df6db35ddafd9a35d9c7ea2ef2d9c4e10ab971b882ae8b84ad4106a7b3f6a68791f9eefd3977c178b745f96b0
 AUX tor.service 316 SHA256 22293c36ae4043cb351ff7e5b18ab392de5ac431683dd03de658bf3627fe5c3d SHA512 cee692525037ff1ed466863058bfa06e6cf17917f0d5546ab9a53e27f89228feecb20eb13be616e901584e73851022be68aa03c67aa8c12824998ed2533d2571 WHIRLPOOL d4ab37f1e8c4de6e38613c6d2e53500e2bab73e31f13bdf594ae5c8ff13e40bbf9eccc3b56e776e64d847cce0d36f61b0a1de3f72f1858cf1d2e0f1e68c2e7e7
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.2.4.22.tar.gz 2908812 SHA256 6bf7942e93b8919a7d01a601390c2a8e7c32d6d53713a73c02d734bad9bd694c SHA512 1d26ab4cca253fa89861ce1bc826c31d81e02e636574f039c87f6eb3e87e0e530701ae34982f6801292f0a290ba54ee096be8526717785b7b620829517743411 WHIRLPOOL e2dd09123e150597a79f9fa29dc811ba7431ed54ae2c131cfb1157137f4df71506d514e9737a7f6ba61d1a33591c7b57e0179f35f1d9b3c7f931d55743f54978
-DIST tor-0.2.5.5-alpha.tar.gz 3153261 SHA256 783a81fb91cbe3d31d89f1f389e59e4d874467f085df982a5a5a0e3e8bceae64 SHA512 8e6669a47458ccfda1a447d62864234572ee3faad8dceb14dd51c2071afd0e0ab1818592aadf6d3850febb38af60354745752c6ba4f30d4d86a66d73537bdb13 WHIRLPOOL c40812b26e5831568b91fa33c3d5cd8c1b20faa2f0087be3a8f9c3b2558e4ce073593f928386971f22be71cd058a4cb3321a058b8ce5621c4fde122a7f318a2b
+DIST tor-0.2.4.23.tar.gz 2977006 SHA256 05a3793cfb66b694cb5b1c8d81226d0f7655031b0d5e6a8f5d9c4c2850331429 SHA512 8941a296c613ae30e98933ec05810cb655f3fe345ed9942f7c76799e00b893aa17a5e023b020aeca0b730834e6df4fb86927fc4e3d66ebd0cb26a36e6d94103b WHIRLPOOL 2b461eee1d31a338167f6a8267e63f2b6b1999668a82d2d9db3fc99f83cd6e959c922d2102e356815b776c0fc15780f46ed2bf0b7afcb9d0d95aee88979c0bd8
+DIST tor-0.2.5.6-alpha.tar.gz 3134258 SHA256 ec8edfd824a65bec19c7b79bacfc73c5df76909477ab6dac0d6e8ede7fa337c1 SHA512 c0bfb2d60c51308b00ff590bdcf2285bcfb97a535edb3b8d9d746babdfb0dfadc5607fa3f67ab79c1c74840e7bd035db06c7efcd8ab0aefd5c567ab9efda9eb0 WHIRLPOOL 8e920dfd1882aeafee4e1dd11e40368a26936aa85ecc2093c3b63db767210345b77f041a6442067633d42de7fa71f2dec41e2fcf31a287aaf33c4c49d1d663ba
 EBUILD tor-0.2.4.22.ebuild 2600 SHA256 015961f2ed1b1bb13051a694d09b1b8fe661a400f7b8ad116c0887982b824d2d SHA512 d2fb9ff0f4725a03d49647da043ed4224dc5b6b359ae927ef52bc936f2035d9873c1b740e0c2882cb766b3a7aba37266bf32f8bb351e01c8d22b38478b0df457 WHIRLPOOL 24cd724cb851a82934bd4da26b778ad13be570a55a5e37964255932ab9bd017c44d3a213cc24f9c72a71ed76a19134f8f8da0211ebb20ad0cef03bd47fb20e60
-EBUILD tor-0.2.5.5_alpha.ebuild 2887 SHA256 fa21f8284531db47f3e0754ca80edcade0fccf88967a249cc94eec975bab4b9a SHA512 d1f54ca726fd9ae6a7f0271764c8be29c34d1d2359c47a78ef0172a6079e3d5c7196a81facfdab1833b3cd9b79e516540baf8d6af379a5fac1e99772ff86102e WHIRLPOOL 10dc183c36ff665d8e254acdc550cd8315b0b8e2643810fd4a93122d00f45e47981b38449da2a849bce0ab105a639145d914dcb3aeef1faf9cdafbfc2d64fc60
-MISC ChangeLog 63308 SHA256 7600d2fe603c7293bd2736268862448bf0e5960ac666f2beafc9baa0171c9c8b SHA512 f76ae2c0f58047646701f68bc4c509d42df14665554abb6d18d47e0874625b34eb5446f06174834184b1cc23c6d4a32ccbfb955d5266cfbd92bd862d2817f711 WHIRLPOOL 8b18ede6d6d18ef5217bd31979e1f8473ad683cac9f741839f31035833d47e53a9a40eb2d31be01ed7fced3bfa939a08323f1721da198650c1ab1ffbb10fdc4f
+EBUILD tor-0.2.4.23.ebuild 2607 SHA256 aed5cd21c7d5c2c256af2e70cea5fabad158dec8daadf2fc605484878312f404 SHA512 20915e6e0c1dca799b53e0ecc744a3c6475614c8fb73f646f7ddb472595b134860135974124cd01ac443a6b9f693798a061c7ad051e5bc9e4d08b8c62ae2bb0d WHIRLPOOL 356fdfcff2998645d715d74a8fb120638531e416f2cc4a94155120e8f1bd94117d76a3af83f14ef729f98d93a6ce710ce14dd420d6ff703a535eab3ca35ee201
+EBUILD tor-0.2.5.6_alpha.ebuild 2809 SHA256 f305240ab6d6d98725fe9d29885abeb176837922c896ed41b1d87bb5c293b307 SHA512 6caf2ac9e74af6d33eb0623e7c81e870be94eb0da14236e5dfd1592c18e25d8c0838d968bd9dbef3372b8c12eab51899b93ef580a24a906dfca8f8ed1ee40890 WHIRLPOOL cba295d235d3b9ed19e45c79af04f8037f0cf908816933d61c11aaa947a0d2d1b6a6faab85b6e421b87df32db1816dc13d47bacaf9710601a6b90ed381137b38
+MISC ChangeLog 63658 SHA256 16fa90b4e4607826a2b7402933e8456896018826ae162abd63cc443e51759326 SHA512 d383d6286f9b220c76bd2d501b995a2aa33f5e001aadc7928a66cae117491d4c3df8527925d3487f6a6049fa659b82e1de647920817b9f6c7c73801332c3f8b1 WHIRLPOOL 3c9b5323cb44c9ae045eb4c6e041460dcde32d8d620fda785fed1bdf6fa3c96fe29b0d96a3299590c14dc9744e0425d339f7f9f783a0e7d308346fed247bbdbe
 MISC metadata.xml 805 SHA256 b65e1d9314d9a0406c93a7bdf168cee5555a8b5af3c889768c555ecf9c518564 SHA512 b68a4b5c9ef9ec0cbb61f795a574c3111d0f7be6232868e698828db3a68273f109c2ddd559b4c9dec7a9200f5ea7b99cc5faff1ed23fe9247c6c120e856f7875 WHIRLPOOL b42a9dfb6a840451ec1fec757636055ba71a99dc1f1f1a348e7735058125688a62b2433307706fa8f75310a1ba887a75e3a3535b69c413b0a9621c633f52a8c0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTsANfAAoJEJOE+m71LUu6VckP/R8Bkz+PSsQcdy9RKuiRRVaJ
-mMzCnuIxfXMofZ5yB4AN2mFcviCPt8vwLE+CwDWEBzxwBaPcmWTUcEv/feHfhTnN
-wdWvcHy6+X//TA0RNG02J6K7vVJ0KVCR/ix4XCiTO/jOp2jUIvfoyUTW40vrzM41
-C6fl21u55q1k859ugCTYL1Q18TRw1IL21qasSisI4T/TIdFyaH4haoPh1pZtuBEl
-efLbgNfrSyag68gMI1rJxizv2tlv+gXcJWr+mukSt8u1DCSc8d8gqyAXetqMXnsU
-8wL6PpDnR9Z6v4n4ab5LaAapBK98ywsFzcckm8HzP2nPOCrCbLEixiqWf/dJ0BBG
-k4doRbv0PEA0g2R28VE7uVsr5UqWK9lC+LueCPXzi6tHtlSwlmVOS8EeJ7RJ7Rk1
-tDJbdWbqTlkvZk//uXQKG3jVPGjYUKjX2geYvXqB5zW49I53u7g4fwhBYyRgq9cu
-Nt6wHKUOBrwhIAgsEr2ylILIQzCysbnTRqapOsTJezvb9VWqwxcaRvP9RZIZNsHT
-JtbRJF6RntJfxOK4a+Omnt+sjkoyXxVSEao+5hDF2T/Cs9sdN4Ljn6aGcsEq9M+u
-21Wgob9v7mUs15uELnADoYNSRSRyzECDNkHgDoWmAqcXPr2akH9014T+jjJOmLSa
-IKkLSrn0d+gDNG06vQso
-=LEjP
+iQIcBAEBCAAGBQJT175FAAoJEJOE+m71LUu6s0gQAKGk0n9Fh3SE4eNavTZeiMux
+IzJQmo0T1yoghREdjRaBj66zt/t3TpSnpKmygBPhB/8rUm2xP48zsnKO25v8rT8x
+LZtDwOx/8/Rg2XqcDc29Z7ULcm1bHDHkETmK77aivrk5yx0+GypAMt62h0WT5ANc
+unXrNenEwu/tkIZcMiepvnFfiuzTbY9hSreCBP+eWSlC4VeXt+2+qM7dbP4laMvT
+td1iw5IlC2WNfQaKnQaBxdsaWfl6WxHsAqiLit2mUt0bBViU9Kgyg/mUZuUK1sHr
+zZZgqk7N8eP2eBaEUFv+bVaSdNBNChOFePiGlauLiu7OSnd/7NC8KQLGbyJ6xlcS
+KATkgy4z1uZ3lnfmHmSvJfqDjHJkXA95jNjcgfExqiVPWMSjdSpkcw2kRXH47/hu
+6IY+Ub+npxJrcH09Kiz2O1ZeqUqQQGglirbexEU4oeetqESmHMHhPtC2oQ+dXo87
+RxMSZFAOYS4IbQIMlj246w49hqkWWQF7G0kYs0PuoeUIJwEguuNnIIAexpBIKATC
+8N3WMakdu8DjO7JkBXaSE/hAFBPFSKsU2fdafRHYEtzvdQ/OwCe/3+ukfBTjM7jS
+VM+aMI2/B/oxXMdTLFsWcZY4Sfwwnm+neArzuSwIzRUmWC7KKLNaJWmw75qG+xsv
+8o+u6nvS9/FlKG0nt5bQ
+=XHgk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch b/net-misc/tor/files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch
deleted file mode 100644
index 5c8f34bfa491..000000000000
--- a/net-misc/tor/files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Nick Mathewson <nickm@torproject.org>
-Date: Thu, 20 Mar 2014 17:52:50 +0000 (-0400)
-Subject: Fix unittest compilation with --disable-curve25519
-X-Git-Tag: tor-0.2.5.3-alpha~3^2
-X-Git-Url: https://gitweb.torproject.org?hp=9077118ee27e275d495b89a810ee28882c74cf62
-
-Fix unittest compilation with --disable-curve25519
-
-This is a fix for 9700, which we already fixed in 0.2.5.x, but which
-got left in 0.2.4.x.
-
-This is a partial backport of a0a855d586d99540277014ccd3
----
-
-diff --git a/changes/bug9700 b/changes/bug9700
-new file mode 100644
-index 0000000..f59f54c
---- /dev/null
-+++ b/changes/bug9700
-@@ -0,0 +1,3 @@
-+  o Minor bugfixes (compilation):
-+    - Fix a compilation error when compiling with --disable-cuve25519.
-+      Fixes bug 9700; bugfix on 0.2.4.17-rc.
-diff --git a/src/test/test.c b/src/test/test.c
-index 4ec8792..c2911d8 100644
---- a/src/test/test.c
-+++ b/src/test/test.c
-@@ -56,12 +56,12 @@ double fabs(double x);
- #include "memarea.h"
- #include "onion.h"
- #include "onion_tap.h"
-+#include "onion_ntor.h"
- #include "policies.h"
- #include "rephist.h"
- #include "routerparse.h"
- #ifdef CURVE25519_ENABLED
- #include "crypto_curve25519.h"
--#include "onion_ntor.h"
- #endif
- 
- #ifdef USE_DMALLOC
diff --git a/net-misc/tor/files/tor-0.2.5.5_alpha-fix-bufferevent-build.patch b/net-misc/tor/files/tor-0.2.5.5_alpha-fix-bufferevent-build.patch
deleted file mode 100644
index 106112a063e7..000000000000
--- a/net-misc/tor/files/tor-0.2.5.5_alpha-fix-bufferevent-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tor-0.2.5.5-alpha.orig/configure.ac tor-0.2.5.5-alpha/configure.ac
---- tor-0.2.5.5-alpha.orig/configure.ac	2014-06-16 15:44:02.000000000 -0400
-+++ tor-0.2.5.5-alpha/configure.ac	2014-06-20 08:33:39.178082858 -0400
-@@ -454,7 +454,7 @@
- [#include <event.h>
- ])
- 
--AC_CHECK_HEADERS(event2/event.h event2/dns.h)
-+AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h)
- 
- LIBS="$save_LIBS"
- LDFLAGS="$save_LDFLAGS"
diff --git a/net-misc/tor/tor-0.2.4.23.ebuild b/net-misc/tor/tor-0.2.4.23.ebuild
new file mode 100644
index 000000000000..0ed5c4a1d437
--- /dev/null
+++ b/net-misc/tor/tor-0.2.4.23.ebuild
@@ -0,0 +1,91 @@
+# 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.4.23.ebuild,v 1.1 2014/07/29 15:29:39 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs 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 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)
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	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
+
+	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
+}
diff --git a/net-misc/tor/tor-0.2.5.5_alpha.ebuild b/net-misc/tor/tor-0.2.5.6_alpha.ebuild
index 65b6678ac9a5..39855c21c96e 100644
--- a/net-misc/tor/tor-0.2.5.5_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.5.6_alpha.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2014/06/20 12:57:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.6_alpha.ebuild,v 1.1 2014/07/29 15:29:39 blueness Exp $
 
 EAPI="5"
 
-inherit autotools eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -35,8 +35,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
-	epatch "${FILESDIR}"/${P}-fix-bufferevent-build.patch
-	eautoreconf
 }
 
 src_configure() {