Version bump and remove older alpha

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

3 files changed, 27 insertions, 28 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index bf264ed19434..9001e3546b5d 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.405 2014/02/13 21:53:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.406 2014/03/02 15:50:46 blueness Exp $
+
+*tor-0.2.4.21 (02 Mar 2014)
+
+  02 Mar 2014; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.4.21.ebuild,
+  -tor-0.2.5.1_alpha-r2.ebuild:
+  Version bump and remove older alpha
 
 *tor-0.2.5.2_alpha (13 Feb 2014)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 05feeaebbba9..14773d451e16 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -8,27 +8,27 @@ AUX tor.initd-r6 1627 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7
 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.20.tar.gz 2867180 SHA256 ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f SHA512 a1ca690a427698a99792ea7e9d0705ce5c783f6aa10f8a78673fad5cc70b5ed62bbe3a66f3b03f1c534af91783a4ba910ec90d40628d37d7912e97fb3d672da8 WHIRLPOOL 896d80d841e47f533cb24f8bff571ccda6d6c737da56f3fdc7833598afb280b6c740e0a37e29c164efa4415d4d503ad743346850392226366903ad446ef0c93b
-DIST tor-0.2.5.1-alpha.tar.gz 2904012 SHA256 3100d8f0ccb296e82f1d3602266d4dcde801daace82af74f5f27ee2fca7bb4a8 SHA512 962ee00022a45d90b7a92428929d9095a74b6e379a804fba5bf9ef8a0581cb5f3453c76ef76bdfc8124d8b83627a57ae5cfd5d74b89795d1233b057ac251c0d1 WHIRLPOOL e0847a2f196f2e258be4c92b58a4e000e7f2f1c709edfad1498fa6149bf5ad80399672830d3ece43268c961c3b2105de3cd5762796d9f90909b09b7ff221540e
+DIST tor-0.2.4.21.tar.gz 2909462 SHA256 a19df488c0c776c9f1e4c78bf93af115f67eefcffe6152a826fed07a1596f1ce SHA512 be055afa95c8e80b88ca46eaeb22da19a9b7e66af39697267597f6141ad4d6b6197fec55d9f1fb0caf349073740489331a3197cb97c737ae829d488e9cda73e7 WHIRLPOOL 6c26832e289cec219d474f11abf9ec03c48cc64d45fba75fbdd77d28654e185db3d177e13061bcb78887eca632ca2e82ffe754985dd9b28bb910a6198a574713
 DIST tor-0.2.5.2-alpha.tar.gz 2961889 SHA256 32a1d6dbfa4527fdaebfcb093f1d35cf464877b83b717a2ee0031e4f1f85b805 SHA512 d3af1bf5d0b0a4ad6ed79392b4d6f53aadb4aa1880165784b3a342b3827002d40bc0ba9123985829bb9a17c20b8e257ae123e43f6891a869378eebdcbb5ccf27 WHIRLPOOL 99f08c7a9cd298ea32ebaa9f31aba3aff115ae19a2ac4d4bdc091d574175247cca0b29c0c23a760696e7aca3f91d4d84030a44e22507ce4ab94fd3a1742ca202
 EBUILD tor-0.2.4.20.ebuild 2596 SHA256 feb9d082e10b347b9046810bcfb5596a240075df492a93aa60917e63815799d4 SHA512 aa57ddff39e8daceb7555eba0e4d7ab81a08bd73f3558d6a161ed782941fbdf282e564bd08ce1e5ea68d2e725b847475326ad95c1281fd3272539c674ae609bf WHIRLPOOL a5f118a2309853939cd246c3a5327da5ff6fa5f6c4071c5838fc69ca38ea329672816693885a7a6ae18d3ea7aab60bb1216cb2819df71627a0f5f1e573a747e5
-EBUILD tor-0.2.5.1_alpha-r2.ebuild 2764 SHA256 c33b849e55534e897b508a181f051f24b6a667a50b7cd086ba373ed297ea34d0 SHA512 b687f3cb30293a37091ec33fff33a872724d1158c54bcf4da762526877dcd1e9ac578a09490cf62d44ce2e614b1d93085c263dd3ecdbe679e92bb8efd4766017 WHIRLPOOL 237e49d8da89d0f977e5a90807205b4a9adb6e4b560cef8e84d3169f02bceff199e0a09140f96253bea244ada0f03e93be1c32a10d159e2e811a9d7a63dd8665
+EBUILD tor-0.2.4.21.ebuild 2607 SHA256 0638c102d766b008cf3d1b3bde5ccfaf35c293d2401e3f568c587f2caa149aad SHA512 ba67c189bfccc3b965311b94127eb7b5050dd3c23e29e3819bd6b86f840250942bd5ccd1e85e722936b011e54c682757da100da3547b71445c33703a30f98a60 WHIRLPOOL eabfe5279ea6bef40b8afef9a7fb647d539cd85cf12373da6820ae0b545c99e7a6f422bfc726219911c6a951e6be106128208156272e85c423cceaf499208c92
 EBUILD tor-0.2.5.2_alpha.ebuild 2763 SHA256 b2df9481ee18219ed6aa41de82b1cf6b2916d62517681e7554c15b98ecccae17 SHA512 160476f7b2eebe77e14b39680357b1c0fd760d8d1568d92eb7cb3a45ce3931ff3185b453794073ff3f606d6e6f50214aaa82a31670592747d12871de83e74900 WHIRLPOOL cd222126a8933140ca05078d2371588f8d1944d958771f53c3418222e299d8553ed582bc91a3074ea46c9781ef6941d8da6022a5d2875f177e303235c853fd7c
-MISC ChangeLog 60749 SHA256 e777498c7570b0af98759fe1428a42bc84e71d6b9894cd648dd054dbae60455f SHA512 592cbac6736aa82330391fb48b3fa690ba68186bcb47f6e6a2efcec216567f26d1e9832c30dc0138fad88f4035932f574d90b1b91ef5d6913ae34313dd100cab WHIRLPOOL 0721055ae54fc0f496af628fcefa0bb11572175a3be686ba2f69620e245416129048bc1052bb3fcf8a0228e0e521e6e810725ec0785372ebbbd950c4a41c6b7c
+MISC ChangeLog 60926 SHA256 f257b1c6fd275197c00b062649ec9f5196a1f0570854a49b0666b7d5d17be86e SHA512 3ce1be166ef416cd32497d94bd7340e39127a05fd3ecb9de5dfbbf023ec349db2275716577720d3b4a2f058e5a03e87d31397a91f2b796c9092e0919f195f7c5 WHIRLPOOL 17c28bc7913823d07204e5c832f08baf104cb3c018c23f20f52ff46c520f4b114154face7451d1c456ac111122507e040512c0404e1095a337f90ac4152a41a4
 MISC metadata.xml 747 SHA256 e59e5cc5a3a79a74cfbe218bd2378c219edd7b6de840129fba578bfb8b05b163 SHA512 c2bfa165d4057b6a32043e1ad7881d8652db4fc10093f8e0d1403c08966793cf179b288da72a70251282a6f8d0787dfc817c305c520abaf11d65b183f171d6ef WHIRLPOOL 53b8d90806c613c03c3b4a2d0498b4b0a55d7aed01aa0af0cbaa82d79ceccfbc91f0e9328b0a12620472254ce97849d330f090f585498b7fdab5431c3ebc5308
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS/T87AAoJEJOE+m71LUu6p+oQAJkF/jk+ZQ2h8f44JaHVneRJ
-xppOGQ86hfx+Bz6F/bTupHYCqfrxkYI0Mj/EkbgqCk62fj4EVrgx5abd9NpIz2ZO
-sjCZ984uKlV3tNE/+G+SoLlvaYh4sZVFgeIK1u+TW1qQdz8nauY6l2StL2Zk26Sx
-SgDxNMWnSk/yWg7FHtm2eLPhNVjIaHDUuAqsIzD5RrjZTdJEqGE9zZZp4ZMChaRy
-IIa/Bb/FyU8JAp3ns5IIO0y1KoBd79UVoV77LfMfNIfkYg+c26O0wSrdEvtD3IAi
-IXk0HrO8lPr4zuPjqo8IlNhr8gDs9p2Ra/HgGtxYSbhmkwdg5itzJKBPrzVe9PLD
-jJ/dVWp0tiuaNjznlxN22GHdwN6gYhVHhJiL5038z6sbx/0ULzTm2pMSjB7QOpXx
-Ht+imMMRKZ/KbM5/Qdi1b77hBLI11FbfLpeCT8KRzAK7Y2HpsMP263WErX/8wx22
-pC+6eAHZUi0CMGlxzYMDqjN1Q5hMtATNyA1ZfxAt7enSfoF4/ulfpEkJGRsjYTlz
-U5UFWgZAZRCQGySPlON8Mc/b8bKF29NK7CFZQzr22ifnxWb8CwphX55BOFJHrYPf
-xGIFEw3W5hY+T2VrhPBuOr2G+KbhP4DGPWa5y5St67jAHUT79O2f+k8VPrXENkIA
-vmoWzX3iO/+fw3xwAfZh
-=siX/
+iQIcBAEBCAAGBQJTE1POAAoJEJOE+m71LUu6mSUP/iuKR8P/DjuHbvIp15u3RS2H
+nvTCf+6nxAUFclTqY731j+12JLq++PIzaeg2J51rJR0SwPxCXcj3MUuh8et7bSVb
+AZaw5P+YjN+s1xsuwZOKPFKBN66neQj46iFhLqtg3G7tuGsNIRsz+/++saT9nkV0
+TElFDE0sHUG3Zaqw3xBCyIMl2IE8EjRNFr3NwKCpLRE+nvNfuXS/gnJ7mpJBSLtc
+BWqPztojNEdZu2Mz6XkqG8qQmBBZcj8obXFc2kjdfIeM6d8vCl8E9yEVqQlRyrdV
+QQ9Cyi2S3nqzpT+5HHNh/KsH2RSqOOzVqibZXElGiRu69bX74YDIG57R3Hbb/uRd
+LJvDzzETCeYZpgbfLrMmbvjUrpoTZrGlIB7+JHgFaj6Uczy/nBhTmmgBrVki8wEA
+xrJmuomWSZFhP+yToBOwWFgl3rWtO8mWfbi8xxIlmbMi9Ut2DDprUFxeqz3zE9rB
+SUfn37iVSm5C3JNqWW/uuzL6aE8Lly4wF95OiMEfxbGGFQo3N4lEU9AY4uYVPBLR
+JgO+40GS4sigV1Lr7P0lXEDP1pqMyGgnjJ/VbNCUCNneddH8KiZB4CKBNpDsgheq
+D9tr+HjAxgC9Nqo6YIKXduh+dlhb5oNfiRPrbDcerrL0WxOZzGiqNLI9DQwMFwNR
+DqCOTeQyeC2LSKBK4byG
+=4jna
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild b/net-misc/tor/tor-0.2.4.21.ebuild
index 8c2f5678f8d3..431a77408ddc 100644
--- a/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild
+++ b/net-misc/tor/tor-0.2.4.21.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.1_alpha-r2.ebuild,v 1.4 2014/01/08 06:31:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.21.ebuild,v 1.1 2014/03/02 15:50:46 blueness Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs user
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -17,7 +17,7 @@ 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"
+IUSE="-bufferevents +ecc nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web"
 
 DEPEND="dev-libs/openssl
 	sys-libs/zlib
@@ -55,13 +55,7 @@ src_configure() {
 		$(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
+		$(use_enable web tor2web-mode)
 }
 
 src_install() {
@@ -69,7 +63,6 @@ src_install() {
 
 	newconfd "${FILESDIR}"/tor.confd tor
 	newinitd "${FILESDIR}"/tor.initd-r6 tor
-	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	emake DESTDIR="${D}" install