Stable on arm, ppc and ppc64. Remove older versions. Drop keywords on insecure version where possible. Bug #545940.

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

8 files changed, 30 insertions, 327 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 3cc6899c331f..230f187a87d9 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.474 2015/04/09 07:32:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.475 2015/04/09 17:03:04 blueness Exp $
+
+  09 Apr 2015; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.5.10-r3.ebuild,
+  -tor-0.2.6.5_rc.ebuild, -tor-0.2.6.6.ebuild, tor-0.2.5.11.ebuild,
+  tor-0.2.5.12.ebuild, tor-0.2.6.7.ebuild:
+  Stable on arm, ppc and ppc64.  Remove older versions.  Drop keywords on
+  insecure version where possible.  Bug #545940.
 
   09 Apr 2015; Agostino Sarubbo <ago@gentoo.org> tor-0.2.5.12.ebuild:
   Stable for x86, wrt bug #545940
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index e3eb9c86b975..b63a46d0002f 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -8,34 +8,28 @@ AUX tor.confd 44 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b7
 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.5.10.tar.gz 3166480 SHA256 b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b SHA512 0e6522964ac84231f7753ebe80239ce8c906c62bd35e5bd65ae5f85f246d488e32fbf121c58e501cbf0b8271468f6c10bef756080a7120479240486d6af22a8f WHIRLPOOL e92d2805d134e3fd45e5bc0a1832b793555dc185a6bd6418d622adf447a430bd9932a4bbbbade1b0aa8c19ae05f0e8ea04b1100e3cdba22b2dc2260f2e5f9ec1
 DIST tor-0.2.5.11.tar.gz 3310350 SHA256 aee0faee9c3f1bb265ee8e94b4bb93967413f3c56e65f954db16b09451546769 SHA512 2f752c089e4e85273729dedc849b17f1009c0348370faecd22ff77b125a2afadcb31f6ef2f2b83201a53b9f663deaaf052e07eb8742707b16e14d757c2a74f2c WHIRLPOOL 450153c8b60a8fb48c727186c5c250c803253155e19d066d62687a15274dbd0204bb729d2881597275b06620cbbdec9c20a73d93af00c927529dfb929bc45cea
 DIST tor-0.2.5.12.tar.gz 3311423 SHA256 550fdafffeb4c1e3035bb8cc42e6e49d5af17ad79563bd118af22c1107f72b49 SHA512 67f78a9bb07987b311bd25548ea96cfc91d89dc8bfd29f284b77ab97b9dcb7d9a0f6e6cc0d1e4a2517653c42b3064aa7506227ebf339f56ad3d8f2ebad9258a0 WHIRLPOOL bd217c21318cf775bbf57c7df11b58c48f273d11db2057bb6071971aaa2744c3a910024011141f63cc3d99f7fc1b616e810d348709b5de6f3a84d8926e3f8b36
-DIST tor-0.2.6.5-rc.tar.gz 3593796 SHA256 1a78bc971078c8aee1d0927bf6629610efef2cce31219580b2a73cc268d4103e SHA512 7f56455a7d7f5d5a3d462a04cf80de1812e814f26cb29aa5413c68966ff6135c46442a2397e1350c11debbc8d8c40c7767654a360a43f45ab671cc1ed6faee1e WHIRLPOOL d39c4887d2ea75622a2679b6519c9d874e3cea0bbe214865a92ad9beb42841a4210202d2bef5bf27623f6de793816a6d3f36512faf53fc52d79ef10a5c20bfd3
-DIST tor-0.2.6.6.tar.gz 3594452 SHA256 c3349e457c71b8e5c138c656927b2bbca0bfa03539ffee8579b0e568ffb10283 SHA512 46e7a832a5690d92664bd746431e2b0f35acd349d13cf4ea48157fbdaec852042501467a4c1a8ac5e76506bb388c0b7feb1e8292d6d4f7dbf7040f16407fb7ea WHIRLPOOL ea0a8afa71c25edfc3428ba8535b5679c7f203f5d4984d93bc14091bcb9bdd275d96cd177da61b4df267d049cd1d121e32abc889a6267b7f076f69033d3fac0e
 DIST tor-0.2.6.7.tar.gz 3595669 SHA256 8c2be88a542ed1b22a8d3d595ec0acd0e28191de273dbcaefc64fdce92b89e6c SHA512 96e3cb5bcafddb1655663091ecf08f708213e47529d9701d67256e88d5fc2e70acffc6c062df6b8f0f4a4e3ef3d0dda76b5127ef9eeee06371ce0a66e53815b0 WHIRLPOOL 5da1f3e2ed1c12a1efba3eee91016beeaa5c40434831e684bb33670ae301e1661096c4a4231cd345c5dd833e8547f71f0c28d22c6d4b51a43bd0d6603160973c
-EBUILD tor-0.2.5.10-r3.ebuild 2836 SHA256 655ec36da0b6abc88060d5c62af20ff62edd97503c10a00e7812e5b4be992288 SHA512 c4b2d9f4050a48f5a3ed051b7c9d2f03c1cf5b03de58bf8a93f8b032323bd78373457de203fb86a9ed037e8e7abc744abbdc1813f785b9c3b5b6acb40142e8ad WHIRLPOOL a36c8abc6a7708f3b51b1bf271d086b882c2a49b980a10a3de2bac11b4afbf3aa5c12827c522a35ababb7654e34a00c31c00bfc5e2bbce338c1e0540214360ac
-EBUILD tor-0.2.5.11.ebuild 2833 SHA256 2c55fb57b7dcf142fd8bd1006d800909f752069f287eccd375f913dfc7380ab8 SHA512 97a981323806ce47b78f72ae4d0aa3a4f7b5391c829157ea1353450e1a821b42d98d731d91a480320f29f785742147b5c5616bd56e953d8bf36a70ebc06d5b5a WHIRLPOOL c8defc976b22ab5da934d02f5127f287fbcc358c115fde7b737ea309162e80ed2104f6b61306c33ca7dcd57c4a20540a294b89b0e87e255dc7eb1a7ba35e771c
-EBUILD tor-0.2.5.12.ebuild 2837 SHA256 39dbc03a5b8d16fa4e115be65cd649aac957a7ce3c434f075e5d0c1cec184885 SHA512 bc38eb349e74801963e6c316a0b0fdf8ccf20b68f6d64d819f671c20a6554865c0df0f2eafc89ff5f8b3d5b7f78c59fc732f8a25e4953e33a0f8fcfff1e47540 WHIRLPOOL 906cb5ddade298a12ca5ba6dd12dd2d382b3573956045668f850413dcf6cb27b71a5baef01727e000c3ee6028a695bb061e958db892ab13cae9cdeb430e60831
-EBUILD tor-0.2.6.5_rc.ebuild 2851 SHA256 95d6cc27f21aa995555e2b022c50fba3661e92ee125199dcb08df9bef03da0a0 SHA512 1cb064a7802d2278114a270315df3f2e3a96ecbd3070713ab045e04eb9e27964ed6643b4c2770524dfbcf0e51d4679e10b8d3f4119ba499e838fcfd7cab86373 WHIRLPOOL c2e24d080f98fe6856776a6f0bb074c2fbc1a9269da5d6bf8f2509dfad1577feb945492ee4a2d99d950c44d3512c449e5b7e52eb000d8335f70feaf8c381e6c1
-EBUILD tor-0.2.6.6.ebuild 2874 SHA256 5c0c4e3691e411e3bb4e4763a59f713c1ec8d92d2336cc297a6cd4a390f7ed25 SHA512 82a16ffad16ae7061ecd02c7c5119f032a957be10efdcb75c578eb0eff49751daa307bc4c8f22274b4b11dda811e1db24103a4abf1c971c7760410e2be47d999 WHIRLPOOL 3decdd3b53297a30264c3cf95dcd2c5dec40d63c8a2711bdf3a62dde03e2a6cd252fd653c7671ea2feaa0bcdce27af0ad9607cf1e08b2cfd6342a9072fc325b5
-EBUILD tor-0.2.6.7.ebuild 2874 SHA256 ec78a8259dca0b024591b05456190bee6817a394bc07b8ae5508417e25826b0c SHA512 f4ae26074324abd0e370fb214006520ddc14506eaa4f04255e6c0fa6720871a659de65ad59ef17b35aed89b3e52addb61df4c3a17c4d4ae5412ba2de154a2889 WHIRLPOOL 508caeeaa86377fd1ca7d6f33a461b73da70659a57b1e6d2fd2f5b76c380c57bc9a3ed5309b66c9e4d7156d59afb813ca595749d4e8444a52c3df163de207a0d
-MISC ChangeLog 70829 SHA256 0237f7000175ca137eefc66da9c9d937a6e699f9b68a709b7123afd6ee474a60 SHA512 67a14f71f53b47e71828b8790c4825624ad0b6a13e9d7dee3fe70740a92f3912229fe4ff8b366b947cc462d3d97d648509cf2a5501346b4a89fc72af53a48b00 WHIRLPOOL fddf721ebf0c5a6038111fbf8fdbe3a5eb4402cf15ae2d288d9c52f333c5109bbe91cd6ef132f378af44b2cc0382b88f9b624ec94a5a0b57d74c021896315ac5
+EBUILD tor-0.2.5.11.ebuild 2798 SHA256 1d783856994399019dae40b7fef069600c01c0ce86c7ea0381057a74f1b700ce SHA512 d5c1220e543d340fbe8bce436d939a562becbd413da640466652459ba63c996292cd35226f3cf44ef59a847390f33fdfafc55b5c78bfef2f9e731663c3e2999d WHIRLPOOL 118fcdd6e366f30fb8478a18f5a8413fe2f103d30f33eed138d1275bdf45d03ee9cb1312de86b5ae371032f12481bf470e25a25de24bb7be4eb7162567d36b35
+EBUILD tor-0.2.5.12.ebuild 2839 SHA256 ad12b6e44bf3d101390d2be70281a069240e4779ee5b047376fbb1347734d66c SHA512 827fbe4dfcaaa1408b71f813c99f055949769b4a340fdfc3bcd0672ee05689ae2b40a0bb8c729df911a7bffec6bd53ec1b2a142ae49856d7e515227dd19eccbb WHIRLPOOL f3ef333d51352ee479f9723d6c09475c756af7681a0834e19238c1bd172e63131925a0a66e18cb0ef7a33927c3919a045a125e5e9c2675494379d8db902a54fd
+EBUILD tor-0.2.6.7.ebuild 2871 SHA256 79540f5154a7ac8fd2688442806131ca4b6d9bbcc4574fa974ebfc4aaed588f7 SHA512 4cdb366a91749b1a6f65c85780d3feb66034b1dc44d010d05f78f98fbfc82c310008bd43ab3aca6dfddb671bcca71a48946873f40140ae38a3281362bb9c2bb4 WHIRLPOOL c5b5e28a8f943608091b7d6caa189a98b5f1533cc72dca2814a6c64f184cd706484e967621272a8f882278564bd321da5a26a4aad3649d292553c3766c794bdf
+MISC ChangeLog 71149 SHA256 4e87f3d428730b9eac0acebcce99a0cea4ab79d684e5437be7289d560231a5d5 SHA512 7fce0ade72e3ec80ddee7087e7074ae61e11699018b88db610bcb8320c2482cf0b0fdd7fc07dfe60b4b3a55f7c24aef3d3e9d3754ef1679d613573f7b1eb4ae7 WHIRLPOOL 6f79454d39abc827630e77812a5f20dbe3e6f0467b8bc60668870d49f816642af226ec796557ef9d18bdec3b5a7a5caa8c6a4a81384f63257b5b8bfe1abd47fd
 MISC metadata.xml 889 SHA256 9467f665011b14aa6f8069e25d9093f6391df5f712114ce8e77ba21c3506b176 SHA512 9540206e53c4bc6a26cc0b7bda614c3d2a783935a7bb62e9ee378e8fe781feb4bba974ce986ef4112eb8cf85964749208d7cb6dc91baaae8f39120829a6ad6a6 WHIRLPOOL b0535e8563f7ed43bf35eead29fdcc89b1cd639e21a059019de6545c3e5117d92328b0def15f1515b0a6d90579bccb21de64d051d71d4c52d77c6869f7efa31e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJismAAoJELp701BxlEWfilQQAIKVl8wX2DpW54S2YqPtIbEV
-94QDEqXVZ+y+MahVd+mS4lNv5V4T9s3Z1keoz9XaavIp6NDdSIMMU4UVGT0CFoLm
-rl4CADGyZU846406N594y7SVdgLXePH7rxPIkYbi89Nh27FQAQ/jVxbgEzvyhNX1
-0dsRZ7FMqQSmO8JINNn6Q2NxstrYLkyte2n7qk9/S5+aL8ffwFeiDNeUIitUbtiL
-0zBe251jqQJER94OD7Faq8lPE5005hSSfA7c9H9JVUguOjCjYdxlp93kEcQUpSpP
-dDfcOdzN2CVeAmEc0tzFR9iUhQ4hZLU3D0A2DxMgNdCywVMBEFqkQE3FtZ70r/y2
-rrnYRE/z7PDzQOVG0Df6xNIheZbV2Ufn5wfAHeIVFUC2QzM2eiQZoQ3xC0Q+k6YY
-Ja4TbJMUhMuI4BdLuYS1S51zGdnyXtA8Kof55qnaR6oCQ3TCFflG4pa6ze3mzRCA
-cS+5ruiV3THV6VNoASuIOBDCPLG0x4Cb6B2GXZky7kIXpjic1dEfWsD1FC9t6Pzp
-sqwYMUcu8O5ayeuUQO28NLkAOBQjOoaO8nEoL5da1Ofq7rRjqHqk9JkcFzuyMWvQ
-TNfXVX/UG+HTkVVv3saYRylv9QRmskGnqvYK8Z1xd1fZlTOq/Oomda/xKx16IYP8
-IpL1J2TTBWKaMVLB9PCc
-=GqDD
+iQIcBAEBCAAGBQJVJrFLAAoJEJOE+m71LUu6oJQP/jtFEHa2SrKlJCGO7ScXOvJp
+h7V7IYAEH32f63t0/t9YfHJPMgby0KycBY04Mtf9SI23qtnvftSbKU92PmYv8DpW
+nf/igQaI77u1fMm0krKUL9FbZvdTZ0ZvKuxEU5YtXzTuwXT1EVBi0u8CtU3QOItX
+xnG+LGyonr1ypr91lsIkwn/bdP6gwepWZblmcPFGrU3Hio3fxA8PXjNDg2wwVMXs
+cTEvPKf3/Az3zUFZMvMXMua6ntc8YmVX/2dOFY2RgD4ZhjsGmEuXwdm9u28OcnSb
+fK1+fZnY/KvENV8oKXoHyx7rCA75ZaT6UFtiihyWyaAuUs6TVudmNvPO6/v4AdpS
+JDcEUccslJV04g0rFJF+Ki3zlozRVaWLUY0Kzghoe1J2hp7fguDkg9e3Cp7nAFMD
+ymjCZnFK5v4CVWqpcbUTT1RwPlYitJ6mBVBaDbRcBI+U0xV+CHUWpkWD6rYLNAGk
+iMA1IJ+XfcANq3ZwAcMQhE7MesAGF8nqnqeWcd39I8Frs0iV5zBCHxCGBQZbhzu6
+FJS5rfvYLc7tUrNqBA8+sq0zDQNcI/fq381sg9/eczj2oTJZw9LOugPD/HElQTSg
+GFvUoXjRIwWC/VTGsZ7JyJXHHTMFoIh2rb7KuxkrabqOQKuiGHLWkfoxJR6D8yKl
+9D2C0v8+VsKWBZaNC1fx
+=Hfxt
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.5.10-r3.ebuild b/net-misc/tor/tor-0.2.5.10-r3.ebuild
deleted file mode 100644
index 5ef9a746ee32..000000000000
--- a/net-misc/tor/tor-0.2.5.10-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.5.10-r3.ebuild,v 1.7 2015/01/02 12:40:18 ago 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 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 )"
-
-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 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 test unittests) \
-		$(use_enable test coverage)
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r7 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
-}
diff --git a/net-misc/tor/tor-0.2.5.11.ebuild b/net-misc/tor/tor-0.2.5.11.ebuild
index 8c55a45cec78..8e6e78cd31f2 100644
--- a/net-misc/tor/tor-0.2.5.11.ebuild
+++ b/net-misc/tor/tor-0.2.5.11.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.5.11.ebuild,v 1.5 2015/03/30 09:49:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.11.ebuild,v 1.6 2015/04/09 17:03:04 blueness Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="sparc"
 IUSE="-bufferevents +ecc nat-pmp seccomp selinux stats tor-hardening transparent-proxy threads test upnp web"
 
 DEPEND="dev-libs/openssl
diff --git a/net-misc/tor/tor-0.2.5.12.ebuild b/net-misc/tor/tor-0.2.5.12.ebuild
index f6840797233d..e6c4fca7abe9 100644
--- a/net-misc/tor/tor-0.2.5.12.ebuild
+++ b/net-misc/tor/tor-0.2.5.12.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.5.12.ebuild,v 1.3 2015/04/09 07:32:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.12.ebuild,v 1.4 2015/04/09 17:03:04 blueness Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+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
diff --git a/net-misc/tor/tor-0.2.6.5_rc.ebuild b/net-misc/tor/tor-0.2.6.5_rc.ebuild
deleted file mode 100644
index 458b3b844afc..000000000000
--- a/net-misc/tor/tor-0.2.6.5_rc.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.5_rc.ebuild,v 1.1 2015/03/20 12:46:12 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 ~x86"
-IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	dev-libs/libevent
-	bufferevents? ( dev-libs/libevent[ssl] )
-	nat-pmp? ( net-libs/libnatpmp )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	upnp? ( net-libs/miniupnpc )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-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
-	epatch_user
-}
-
-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 \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable nat-pmp) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upnp) \
-		$(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-r7 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
-}
diff --git a/net-misc/tor/tor-0.2.6.6.ebuild b/net-misc/tor/tor-0.2.6.6.ebuild
deleted file mode 100644
index 3a2c0eb6c2e0..000000000000
--- a/net-misc/tor/tor-0.2.6.6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.6.ebuild,v 1.1 2015/03/25 00:24:39 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 ~x86"
-IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	dev-libs/libevent
-	bufferevents? ( dev-libs/libevent[ssl] )
-	nat-pmp? ( net-libs/libnatpmp )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	upnp? ( net-libs/miniupnpc )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-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
-	epatch_user
-}
-
-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 \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable nat-pmp) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upnp) \
-		$(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-r7 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
-}
diff --git a/net-misc/tor/tor-0.2.6.7.ebuild b/net-misc/tor/tor-0.2.6.7.ebuild
index baf4693428a8..4c4926fa080d 100644
--- a/net-misc/tor/tor-0.2.6.7.ebuild
+++ b/net-misc/tor/tor-0.2.6.7.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.7.ebuild,v 1.1 2015/04/07 23:15:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.7.ebuild,v 1.2 2015/04/09 17:03:04 blueness Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~mips ppc ppc64 ~x86"
 IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
 
 DEPEND="dev-libs/openssl