Version bump upstream stable. Bump alpha to new rc. Remove older unstables.

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

5 files changed, 43 insertions, 92 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index d9300bf2bc35..bdfd4d5bccd9 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.465 2015/03/08 00:04:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.466 2015/03/20 12:46:12 blueness Exp $
+
+*tor-0.2.5.11 (20 Mar 2015)
+*tor-0.2.6.5_rc (20 Mar 2015)
+
+  20 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.5.11.ebuild,
+  +tor-0.2.6.5_rc.ebuild, -files/tor.initd-r6, -tor-0.2.4.25.ebuild,
+  -tor-0.2.6.2_alpha-r1.ebuild:
+  Version bump upstream stable.  Bump alpha to new rc.  Remove older unstables.
 
 *tor-0.2.6.3_alpha (08 Mar 2015)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 29e3eea128f6..67fb05062053 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -5,34 +5,33 @@ AUX README.gentoo 316 SHA256 bd1a5d6a0973d89d3c89e52d1046c202f52d59aa45ca60d2ee3
 AUX tor-0.2.3.14_alpha-torrc.sample.patch 1363 SHA256 f7c1e9470dd84034a959b5bea4e4c0f7f57980da0fb3381c902acaff7a5e1013 SHA512 523b004c2ca0020620a5970208f7e0782663ad5ab6f333130be9071e858fd04454d53424b2ffc59bdb5c72600132357144ac9cd9639b55b2a6b979efa2d32bae WHIRLPOOL 384ef4094126b8ee420e58457a669626cf942bbb62a7e89c9dc11c5a002ea34e395a9f1eb5f6d1b87cb6012958ec37eac27741d240df8e4901da4c71eb55815d
 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.initd-r7 2421 SHA256 666b0cacc53515fb8409ada05d7e92b1de4d9a4814ba145f4982ffd164958aae SHA512 291e72eb07f013e1c3c271772232a00d27d8b2252ddac072a8df0a1878d2ff1d660c8600663e072f19b205eae56344fa58989f6dafaa34bc4967212a252659d6 WHIRLPOOL ec1c02cd6ba6dc830b378bcc352f4d0056416ccc70b2bc793f3141f19abf51c300cfaeb569307ca2e457a369420c15fa95cc4594680a50502fce5149ed456917
 AUX tor.service 479 SHA256 647572301c444896c6958af4481f443e39f7232f0ad919e4a154a27733aae709 SHA512 5eab6d99bc9210546b750596e6b660904a098868a07d4df41e14e39586a12965cbed94e7bda2bf315472fd40b4df4f68f1a8393c12e085524b80e02e26de9c14 WHIRLPOOL bf23275b4a847e5a806d7052b17ac9bbbc6c16e23a9add351bc6f7ee3afde844914ed0505fcadd3b15bcf2519fc7a352cb09d2e46cebec19b88ba7ece3c3835d
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
-DIST tor-0.2.4.25.tar.gz 2987749 SHA256 84693bf5875857bf1aef3a8ff8109da4cc10e64269208054bbcf94fb615da627 SHA512 0b89628be737087078fc4955ffb1824da4c5a8d614ccb39052ea65b2926b8a381bc3accb394a3b84fcea68170f23e163d147ace3683a946fb23b27960b32228b WHIRLPOOL 35668c31070a4f6dcd1a95d43986088e6f4e3fe59565e3a0abc19c0716b5bb3dd95937b7de249d7e80f9505f6ea77769582d37449e464d9acf9bffb57d20ca92
 DIST tor-0.2.5.10.tar.gz 3166480 SHA256 b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b SHA512 0e6522964ac84231f7753ebe80239ce8c906c62bd35e5bd65ae5f85f246d488e32fbf121c58e501cbf0b8271468f6c10bef756080a7120479240486d6af22a8f WHIRLPOOL e92d2805d134e3fd45e5bc0a1832b793555dc185a6bd6418d622adf447a430bd9932a4bbbbade1b0aa8c19ae05f0e8ea04b1100e3cdba22b2dc2260f2e5f9ec1
-DIST tor-0.2.6.2-alpha.tar.gz 3486176 SHA256 b0e765736b17b91088a2016e7f09e4fafee81282f8bc8647987f975b6a583379 SHA512 70f562060e42e67a650c341df391298473654e677a58d65128cff133f905e1ffa8770c77b5c9998d56593fcc658d703766ebd6c49b3b225f4d94b133bd8c7412 WHIRLPOOL 6e314fcd4157d8b8640e52c4e58045b4133d313359750a80167075e21b4978bf62b47907b167b14b3bd8d3421fa9adf3dbdb3e26a1c2510062ce94b61d1a11d3
+DIST tor-0.2.5.11.tar.gz 3310350 SHA256 aee0faee9c3f1bb265ee8e94b4bb93967413f3c56e65f954db16b09451546769 SHA512 2f752c089e4e85273729dedc849b17f1009c0348370faecd22ff77b125a2afadcb31f6ef2f2b83201a53b9f663deaaf052e07eb8742707b16e14d757c2a74f2c WHIRLPOOL 450153c8b60a8fb48c727186c5c250c803253155e19d066d62687a15274dbd0204bb729d2881597275b06620cbbdec9c20a73d93af00c927529dfb929bc45cea
 DIST tor-0.2.6.3-alpha.tar.gz 3526195 SHA256 5e31a0ccbb1fbe9ac6fc64d157c5c3db9b478908ea09bbe15adea2f1fd11d670 SHA512 541931f16c98b3100fd0f5368115d84e76f0f0bbffb6079099d76dfff43bec10883e625595133f0f0f280b8e6cae0c1a9a6cc248ac0d9076d5430ae8b150e157 WHIRLPOOL c60668f609e40a89a741672f51d7e7112c569b2f7d81ae4d5e9968b20acc0fb6dbd0cfffb32485b4c7dd800d384a701556064dd622ff10abca639984d9a6fc6b
-EBUILD tor-0.2.4.25.ebuild 2600 SHA256 c26cfe2a4b741476a4a7ff2c5e8a8c88ed34a4f693504c2afa3a7deb70b1240d SHA512 e074662aba9a49eb67e2b7121ffd40aa5d332c7f280e52fa8238d81e5c0fe946e5c5b5037b4acb6f1c32b43ae6f99ea2e77be157b87c597736e6108af3ae8542 WHIRLPOOL 5be7ddd6dba912fcfcb6eb2cdb98d065380df2880b103af2857fb0f4ac41a72b57e757705f68e63ea4eb4a11e553a95858bf59155f7e4ff05a45825e37f80d70
+DIST tor-0.2.6.5-rc.tar.gz 3593796 SHA256 1a78bc971078c8aee1d0927bf6629610efef2cce31219580b2a73cc268d4103e SHA512 7f56455a7d7f5d5a3d462a04cf80de1812e814f26cb29aa5413c68966ff6135c46442a2397e1350c11debbc8d8c40c7767654a360a43f45ab671cc1ed6faee1e WHIRLPOOL d39c4887d2ea75622a2679b6519c9d874e3cea0bbe214865a92ad9beb42841a4210202d2bef5bf27623f6de793816a6d3f36512faf53fc52d79ef10a5c20bfd3
 EBUILD tor-0.2.5.10-r3.ebuild 2836 SHA256 655ec36da0b6abc88060d5c62af20ff62edd97503c10a00e7812e5b4be992288 SHA512 c4b2d9f4050a48f5a3ed051b7c9d2f03c1cf5b03de58bf8a93f8b032323bd78373457de203fb86a9ed037e8e7abc744abbdc1813f785b9c3b5b6acb40142e8ad WHIRLPOOL a36c8abc6a7708f3b51b1bf271d086b882c2a49b980a10a3de2bac11b4afbf3aa5c12827c522a35ababb7654e34a00c31c00bfc5e2bbce338c1e0540214360ac
-EBUILD tor-0.2.6.2_alpha-r1.ebuild 2907 SHA256 e11fb997aed14d775e170338815a31d62419d0425fc674da2b6c4195f7f8443f SHA512 ac5f819b40630f40e24d2c7f6299f80a18e39b5101e4723040290a2d94b3f078eb76c20e23b3be1c2fb6bd49f68e9fb5844ec88f305cea7534205e27533d30eb WHIRLPOOL 0c10aa339117350256cdd7bf01e380ce0293cfef5a3e2018c677f376cb25a107ab19df9583e128d8992a2688ec8ed20cda1bfb98a9c2efc816d591bd7add663f
+EBUILD tor-0.2.5.11.ebuild 2844 SHA256 e115373da6e9991a9965791aaaff4ae0ccdbd31d4d250276cd355eecc8ada9ec SHA512 efb768ef64183eed85e4bee727a8ddebb7a33c0636a30b23af973516f69f3604f95aa3bd638644698765b3feabf2b89b9c849fb7cc121bf204a9b3c5858cddcf WHIRLPOOL f061951e85f42c8bcc4b954d82607fddd008116e94c9ca5686215c126582f850b0a099392df2ebeffbc22a72dcf935670412d4bd7f19b97aa4f0728d059677d0
 EBUILD tor-0.2.6.3_alpha.ebuild 2854 SHA256 f4fa789ffe7ed538a08b61262ee3846f306138d2eba2f15c1f2ad51ef07465bc SHA512 8812c9a6266d78a50779ae9d17aa984c123be9fb08872a23806c61c15d7af98fb11691a2eb28954767303cfdbf7818c016ac2d1626928c77b09008a703c5afe2 WHIRLPOOL 8e9fc2d7935c18453fbc341c5b1810eab6b22c0d61c9567d1ba0c18f0ea46b973a2f3582e4cf2817977ae6ea08169a7347ba546a33d3228cce31fd8f340a60d9
-MISC ChangeLog 69527 SHA256 d93e9adc5c166bb8c75ed5a36f5702dc209dff9ede5104223fbe37ec2dc0b935 SHA512 e72437f842494f8937945b166cf7151d217267aeeb07874ddbff57c9a3a4d0272113518cadcb5c75ad1a09bd78dc21744b38c74a04823093ba56b8183a414f09 WHIRLPOOL c3e55caf08b35a73ede49c43ad494b476b224832f3d04bcaa46a839295c0aac64022ba82f7c1109ab6611642dc203a00c070dcd4eee286bc84a7e41936f09352
+EBUILD tor-0.2.6.5_rc.ebuild 2851 SHA256 95d6cc27f21aa995555e2b022c50fba3661e92ee125199dcb08df9bef03da0a0 SHA512 1cb064a7802d2278114a270315df3f2e3a96ecbd3070713ab045e04eb9e27964ed6643b4c2770524dfbcf0e51d4679e10b8d3f4119ba499e838fcfd7cab86373 WHIRLPOOL c2e24d080f98fe6856776a6f0bb074c2fbc1a9269da5d6bf8f2509dfad1577feb945492ee4a2d99d950c44d3512c449e5b7e52eb000d8335f70feaf8c381e6c1
+MISC ChangeLog 69845 SHA256 2823aa2f36c682ca0883133bec66f6af90c8633bd1acd985ec17fa558d6ac498 SHA512 80c773b6dbebe956986e83b856533b337cf7ac548cfd0eb0370c1521c76a58a0e23e6fab7db2dd2a1f816ddb8c0426be8d01880d40573c429ad3d35a64156c4e WHIRLPOOL 82853296cf21543002324edeed3ddd8fd1bc7a2859402ae76f2e0978fb64a6a8aa2d3d1323485bf72a0e3784fc43db87afd1c212409835d09a7e6e482ef7fb13
 MISC metadata.xml 889 SHA256 9467f665011b14aa6f8069e25d9093f6391df5f712114ce8e77ba21c3506b176 SHA512 9540206e53c4bc6a26cc0b7bda614c3d2a783935a7bb62e9ee378e8fe781feb4bba974ce986ef4112eb8cf85964749208d7cb6dc91baaae8f39120829a6ad6a6 WHIRLPOOL b0535e8563f7ed43bf35eead29fdcc89b1cd639e21a059019de6545c3e5117d92328b0def15f1515b0a6d90579bccb21de64d051d71d4c52d77c6869f7efa31e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU+5K5AAoJEJOE+m71LUu6l9UP/1K+QY8EW+/OIGxA8L09FKi/
-ffZs7JnGqZec0HyX2xAfPnoDLzjitYOEm0htNhVbeMlfyYNOaWg7NtAbn4ENUZpb
-m0FKjs+7ZjMv2RPLcl9ko+daBNo057jWveQgybOUeyntujNc5PU4+5U0+zz6b69Z
-pGJIv7Lvwvh56WBLcjpuG5JjYjwA/PAkEfyA9gWN3Hmh4Vu1cFnJNxZdMT12/dE4
-LBT2V0ZIISFsioJjjxdhFUzxpI5tukN6zjIsSiJs2viNeKVrFTpfD/S9slIkERzU
-6db4mvTPUtVwx0YXsXMhsumFiRs1My/IGGuUz4erp5Akkk6umozhbvfiWwRho1/9
-/yetooFLbaN4FMzl/tvMbHuk4dmzDQ6pOmBC/5mAeeC1hQ0UJ2djXLHAXZ9cnMxy
-zDv4iO4+yLJfdn8I9B9j7CeGmDmLDxrw/2Fg+cCG7jl4O4pk48cblrOdLk8fWRsW
-IeTeyVRDuZ5/dm6+IMKdPL70SjlE29K2GLUfnHBCxxp/oIZljkEMamEJur7teuKE
-7fOHQp1ullsfuUPuDWzLY8p+kAmJTahNqk2K440tJhmNaAtnNez1/QiBLF1yACjs
-N9HuN204JtyBlfmf+/VUTAaigOltkqOPXdcLXCxkpzvSo4eGruU4lheUc76GUHeP
-3WGT0tcBLa+gbl1XcAR2
-=B6bF
+iQIcBAEBCAAGBQJVDBbyAAoJEJOE+m71LUu6HnQQAJ3sPOvfnnfdstI7+gzLPJSt
+68peALAPPmzWlOt1hHejHDy1AsE6KPII7io0F2nb6P9Dr84P05SRyThHW9ovNQ83
+B+P7iARv3MxsrYZGO27z+m9sDik8+Vw6/AvHxTQy810hG2r/t48AoD9Ld4kF+4NI
+nDHuEP8cNd3w8DC8mDcqbIQiXMC834M7XEbvv4rVtCX1GulQ2rv50n2Trx1G0P0B
+4pv3p3J7Q1rz3TGOfzGRyfF0RxDAwB++Ed0XlddSCTJFO/yUd3AQKS1uAgscgnRQ
+8zqYA6WUmV3XpE7O851zuJH9GHiPsK1T+C7+0ux6RX3QSjYlvNMTndohIU6SR1nV
+tAoJULp9AM9y4lXSuZMOcMZY7NkoD0KAAbRNXCzuoB4wVR+YMm4hcCzsNsjFSQfB
+is4pLSAlQDmKC77bNlr/t1ytkpkoJmRZf7ndgBmWRYDXf9cka5S1WTpNF5kABF+A
+Xy5dqf7BytsA5i4vCFU7dfTHVJ2rjEICIquCjP8OjHGZGw6nQGqtsR7P4xnpw9sn
+Q2F4kX4MWMyVNemVxtnbjPa2I2cOjVjhalMG3W+q1fLXQVaETMOlEC5GVvsW4xtp
+cBnSTZGmKvjWj6fQzfsJVgj+dVCWfW9s/IqqNUkDjMbg5IKTWt2yyBQ4GpxDlbxa
+YC5LLqhEk6u/FiDUbBgD
+=wjDN
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r6
deleted file mode 100644
index 658b77874425..000000000000
--- a/net-misc/tor/files/tor.initd-r6
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.6 2011/12/04 10:31:39 swegener Exp $
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -d -m 0755 -o tor:tor /var/run/tor
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/tor/tor-0.2.4.25.ebuild b/net-misc/tor/tor-0.2.5.11.ebuild
index a71caa97aa15..a18a26e3c438 100644
--- a/net-misc/tor/tor-0.2.4.25.ebuild
+++ b/net-misc/tor/tor-0.2.5.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.25.ebuild,v 1.4 2014/11/02 09:18:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.11.ebuild,v 1.1 2015/03/20 12:46:12 blueness Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs user
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -16,18 +16,18 @@ 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"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="-bufferevents +ecc nat-pmp seccomp 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 )
+	seccomp? ( sys-libs/libseccomp )
 	upnp? ( net-libs/miniupnpc )"
 RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )
-"
+	selinux? ( sec-policy/selinux-tor )"
 
 pkg_setup() {
 	enewgroup tor
@@ -43,6 +43,7 @@ src_configure() {
 	# 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 \
@@ -51,19 +52,24 @@ src_configure() {
 		$(use_enable bufferevents) \
 		$(use_enable ecc curve25519) \
 		$(use_enable nat-pmp) \
+		$(use_enable seccomp) \
 		$(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 web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
 }
 
 src_install() {
 	readme.gentoo_create_doc
 
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	newinitd "${FILESDIR}"/tor.initd-r7 tor
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
 
 	emake DESTDIR="${D}" install
 
diff --git a/net-misc/tor/tor-0.2.6.2_alpha-r1.ebuild b/net-misc/tor/tor-0.2.6.5_rc.ebuild
index cafade20ca0b..458b3b844afc 100644
--- a/net-misc/tor/tor-0.2.6.2_alpha-r1.ebuild
+++ b/net-misc/tor/tor-0.2.6.5_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.2_alpha-r1.ebuild,v 1.3 2015/01/09 20:43:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.5_rc.ebuild,v 1.1 2015/03/20 12:46:12 blueness Exp $
 
 EAPI="5"
 
@@ -47,9 +47,7 @@ src_configure() {
 	filter-flags -fstrict-aliasing
 
 	econf \
-		--disable-buf-freelists \
 		--enable-asciidoc \
-		--enable-mempools \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable stats instrument-downloads) \
 		$(use_enable bufferevents) \