New releases in all three branches to address a stack overflow in HTTP cookie header processing, a file descriptor exhaustion through session timers in chan_sip and two remote crashes in PJSIP (12 branch only). Removed all vulnerable non-stable ebuilds. Upstream vulnerability reports AST-2014-001, 002, 003 & 004.

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

7 files changed, 28 insertions, 655 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index f3dd8ef5b929..11b1707d3eee 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.473 2014/03/04 10:15:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.474 2014/03/11 09:05:12 chainsaw Exp $
+
+*asterisk-12.1.1 (11 Mar 2014)
+*asterisk-11.8.1 (11 Mar 2014)
+*asterisk-1.8.26.1 (11 Mar 2014)
+
+  11 Mar 2014; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.26.0.ebuild,
+  +asterisk-1.8.26.1.ebuild, -asterisk-11.7.0-r1.ebuild,
+  -asterisk-11.8.0.ebuild, +asterisk-11.8.1.ebuild, -asterisk-12.0.0.ebuild,
+  -asterisk-12.1.0.ebuild, +asterisk-12.1.1.ebuild:
+  New releases in all three branches to address a stack overflow in HTTP cookie
+  header processing, a file descriptor exhaustion through session timers in
+  chan_sip and two remote crashes in PJSIP (12 branch only). Removed all
+  vulnerable non-stable ebuilds. Upstream vulnerability reports AST-2014-001,
+  002, 003 & 004.
 
 *asterisk-12.1.0 (04 Mar 2014)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index cb00f1914647..0f1f325c5fe2 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -15,29 +15,25 @@ AUX 1.8.0/asterisk.initd7 9382 SHA256 7951901371035da2cb958d029ddbd8af276a5de7be
 AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d139749bfe869e34f3ecff9d09 SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 WHIRLPOOL f123f60557066707d0c276451af32f5561abb8db7e8d4eeb3a2da871ae0245108e42d28c7ff77d228a963e5f5326f7382b0ac54f92fc1bfeec2c085b9b237a15
 AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
 DIST asterisk-1.8.25.0.tar.gz 29473304 SHA256 b218de8a7db9af370890b12c63863343f5459ae7a4ce23d386ec159c10241670 SHA512 5922ba50b4587bd376d553a6c4d63ff0e27dac515eda233b7a986dcd7ffde1a4c9548a52fb8f38d19592ff510fa5ec5456a4bdff18ab2c2d60d5540a47756cba WHIRLPOOL 46366557afb516cde5f65f90c58b6708942cdc5f570c1b0cea13a0083306e40a033213db52d8f44b63ab9c70a75df9e15e304918f9760503d0e95667e98e53bd
-DIST asterisk-1.8.26.0.tar.gz 29488509 SHA256 dcc9865cc0d6798daacd41cc68c1e33329490f1461963b23dd2a61f0ebc3d388 SHA512 3cbd9e2c7d7f90a11b2d84ef00f2ab6c19228451c21b10bae175e16d2926271b48bb56f0b699f3057aa1edf4c4d626a8ca5c72e2e32d7c9bd5383c0089041df2 WHIRLPOOL af0f3008c741fe0e63029e7abe55f54eb4926b560118b5f19dffc777b345d9fe10f2b6d2835567af828974c5d41dc54933d7662e2be34f098e9e244fd4f35a04
+DIST asterisk-1.8.26.1.tar.gz 29484354 SHA256 f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb SHA512 7ceab17ab1e819aba8c7012448f22d2c53305a6c3c961371655d177e0df415495d0a05ad7c2bd85587b2ff1ef540ece4fb9ab673dc04903514c4273006535653 WHIRLPOOL f3a3afc04290fd2243d8a238094766446e4c5b1fe1a7f3a14757ebcbce865d2ad8d3bf91623c0011ad9ea499669a938395b006bc5f085e199bda1d94bf567a75
 DIST asterisk-11.7.0.tar.gz 34779538 SHA256 4fb283b96447f5d871632a14069f35643c8c34d08d6ec5fedf0ae3df30e0c397 SHA512 cd7ee59f9133fbd088b30c0495ac4d94cb0ca273015681340eeb4192ee1c510b59c8290255fc2df81f070369ff2ca56073fdee3f39e0b0186d95bb85f9ad1bd6 WHIRLPOOL b22d05bbcbcc9ef9045a684f7e9a7fc3937f25b5940e3f15b285b9ea3eb319d1d093a818b3eadaf3665ac6c4c578d97fc639c699062522ee6c20554e9b51fee1
-DIST asterisk-11.8.0.tar.gz 34804028 SHA256 daa299cd682ef1bc53b601cfdc244b903ccc9fbc52c2acfa15458e3dab6ffa47 SHA512 2f29375cd31436457b12d2a88b2357c958436bd3ae5978397fdfebe003d77db36d5e14b8cf46e801966871ece1099ebfd395c777ab0bfa1115b24612f7557236 WHIRLPOOL 44109d98c79f6ccb113a0899e3fa16c714ebb349ecd5bb26b13bbc4da646ff4e5c56748ba03ae25ef86dc2a4e951624c5bc2e7a285f22124c8385e5ca9efa2c2
-DIST asterisk-12.0.0.tar.gz 56595630 SHA256 0efc4507d5384447011fd1148eaaae2d06f70b04c736b4c73fbb9941a9440a2b SHA512 9d421597c8e33ce47c527143e9804347a63f8bd63dd8e12087cee1eaec8b7f52f2ab19d781be2b97d6db2c63f4537a61582e1bbd2f2decc3fcab901b1580af45 WHIRLPOOL 2b9b6ee258448dffcc070b7466e67b4fa3be5289be3fb96d970d95cea29bb3feaf904f6fc59ea3fa1dfe2d1cbc29afc18531f914d14193aaef22dd392ae85d4f
-DIST asterisk-12.1.0.tar.gz 56502020 SHA256 879bbd2bbf68ef76eb77406ba3309b8515db0a662408af991d694fbba99c0b9e SHA512 690b952b9685220cd53419b5fdcf7aad96f01f8d66144fe53aa4a0456c1b000d71981a446e21187c13dc68dd067f540e169e59dcb2626741ac9de7837980e50d WHIRLPOOL 19f71900a4b630f00d2bad88f7ed8e52ed98663147b555f32d54f6cb3621c0847d4a95ec4372f92b5331c5e1d789249a369eaf420358267d022e537c6684d2f4
+DIST asterisk-11.8.1.tar.gz 34794750 SHA256 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 SHA512 f0c44126d9a31b5943d4da20dbf92cbe75a29fbb9dc9390ae8d39a4bd046268b245c852cd990c3db0f1690b95bd7f13b07978e1d08ee7a837ba6b04d988ccf86 WHIRLPOOL 33801f7d9fff2fdf7b9df370a61f80bf4023b64de5f79226f805f01b26f3ec2dd362ba7af4b214ef5a1729d4bae2ad1dd8893fed5a8a39adbe744194364456f3
+DIST asterisk-12.1.1.tar.gz 56483961 SHA256 c53f51b2dea22ca5b2f042562cfc9e021f9dbda64293ef3652f569f86f65b4ba SHA512 7308db6537b1eb9e97276a46862b65c28f715fcba05c1b1ed15c76984165ad10d4747c00731d9435cdab38111ad97a115d8c05ca85d5283443f351c9b2324c62 WHIRLPOOL 6e83c6ceee01f6d01bbced6264e22b88ba3d2431156e8456ef7cc0c48db96b10639d50cfc10047ae15f7b6326a2cb0328cd54952b43f656be2e4d830d87e6ace
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
 DIST gentoo-asterisk-patchset-3.7.tar.bz2 7068 SHA256 7633a3ea22cab8aa83da8499b7eb9d2703ee6c4a4e4fd9f135bd39d313a33cda SHA512 f45753e1f065a78040344a2006ef1f6c14efc6b0187fe4ccf71ed8f30b1f20a1fec58cb14751a5806f06e7ae9269344e267121865b04af146388f9acdbfbd4e7 WHIRLPOOL a6ba6682411c6cf0344c0919441a4b2259769cbc101e39ada748540668aa4e42794008c9d3917452bf30242abe232f44b6ce7fc7f91ef1c8889c6664512d04f9
-DIST gentoo-asterisk-patchset-3.8.tar.bz2 7855 SHA256 26240af183a5c673ec42291c1ebc526a656f9abb422eefb9d666e2d6f7512b64 SHA512 b265aceb9a0489fde5a18795a7594d330402ac5c9f2cafbb4b5486c649968cb67341cc5ef93e2de46e2e926df286dd423ffc4227ff2e86d39e9ed18e1de40619 WHIRLPOOL 39df58d3f14797d2853d72be9ac29d593f3ba2f5923f6ce3f1bfdaf6ff8df5ca658b8309bad0b03d4c4b4d51e684ddd7d7748a6fe813a7ed5ecb6202a0401766
 DIST gentoo-asterisk-patchset-3.9.tar.bz2 7857 SHA256 d41b2c47a56040e3eb55b9354f05df6857f6efc60b35c081b8cdf50a8f6eed50 SHA512 97c49fdfb874e89a07abc0b129c9db0113a77feecd6bb1fea9b00a1f82161a9799f7a280fd2f6fc11c5e1e6984fc8374354967307f8e1b2d3a9fa713d350453c WHIRLPOOL ce7367cca3e6516d0e1fdb758f3463670b1cc2dad5a82abb3c3b1b3dc25ef07bc917ac0184e58674a02e88ffc6ac0b770f217a6870011791758e6612febf09f6
 EBUILD asterisk-1.8.25.0.ebuild 9190 SHA256 5294b37c14c3c0c18960a523e51d962ada04c373027121ec119796bc17a4c299 SHA512 98304f69d7146635e2cf7599bdbf1f57fae8d79b016f6747a74cc83315ddd7d858ae3339396bf1708f72565ebe7264796be547658b4e4cecd3d89cb0ea4d5c3f WHIRLPOOL 5261a953c89ccc6251b340ec54ea28d497254422d554bad97113a847bd4a3a6cf9d98ff1baecfc4d4ed420d789f2127aa9e08cec831269e36fbf8ea317d4b27e
-EBUILD asterisk-1.8.26.0.ebuild 9194 SHA256 10b94d7a96e6df044006e80585db6a2308af62eac44a753b806c42d95e29e84e SHA512 77f6b3eddd40c6dfd54fc26e6eb20511904b66eede667c69c9173cb8a2a145ad1e94ca5eb6320fe7a6d7b42e9b80c46a12394c37ad69b613de30c341ee37c1d0 WHIRLPOOL c35a5707eceb767bb41e8202512156f6e29a2641c35e7612abc30c8e620decb23eec051c343540985c6bc3414a656d5ff0f13e6a00bd6ac02798c4eb519b9933
-EBUILD asterisk-11.7.0-r1.ebuild 9440 SHA256 131ac66898df515897096a92898c3048c20417279e53f683197b612a0254984c SHA512 1fade9b264f2b6351b9f20095a9ec88600b1ee23715b8755ec16cd4b4d993e04976f901a6b7c59c3939a05f8abad55d92730a699146ec513641ec7eec06f7e8d WHIRLPOOL 072876f06ad7c5dd183a324a11e93b976465ab8f8a465549a41b8f5a020094104913b5370ff884c4613aae9aa561b714c74708504dc5d6a3439e193d8f2c61ab
+EBUILD asterisk-1.8.26.1.ebuild 9194 SHA256 a2e643ac71a853cc73cdd2a8ab620f640f032da15029d586ba8b6fd830b537a0 SHA512 1ac13e074f56705b80043c488c6e8f76ce5356a34d258790c6dcde11d52db7144ded8b0e8e0a582ba06d0c1502c9e37fe9ec408948901b37df487a3a9923b867 WHIRLPOOL 937ab7adef882b6ab938294e85d78f7a7f0de857848a3599631004e0c7f9fa1d7f0f589f1c747280fcf5af0c29b845d8a2e41a5c79e978b95d9c785dc661f6d9
 EBUILD asterisk-11.7.0.ebuild 9433 SHA256 32986326ff2a5c0c5042076194058a4cc1b7fe67bb2ca6e821ab4a177f70c264 SHA512 6eae25fce777e00b3efe49c33cc76ef8b7d7373b892b81f3280ebdc55071be87bff1465a19a99579ad1b28796d74eb6f46424a345e00ca6367d45b29e451e4a5 WHIRLPOOL d6fac40d2b4896bbfc60ad861d6d06047965f48bab04b0ce36252a02f8e8f841fd87a4de0e40e4a3440e4721ddbb7a27eed76d9cec80ba08acb834dfbc3069cb
-EBUILD asterisk-11.8.0.ebuild 9437 SHA256 7f80ecee85112898a477890ac563545193ceeb60a201d83210547e76b7d3bdee SHA512 52d72c58fe418a4d0b8ebd0e846a2d94cd78ef2490bd09c8c87457709183313b3c34962376543cfdf7b5846dbf0c21fb34b62e155fcef29ea5b4c949fed40e56 WHIRLPOOL a29c332866963550426dc73b072b5e57fc973326cc2f63876db211be753e6e11ef91526a4c6df2ec6782fd7c202a7dd202ca60f9de04993ca8744cf2f96088a6
-EBUILD asterisk-12.0.0.ebuild 9455 SHA256 872f569b7c3185d2bf2782d1f6534843944dd3b9009ec6f54732da06becb9ec1 SHA512 91303575018105d5d45131deafdf62a1bbefaf19fe2179f0bfaa47bbe8879efc964452e44d932269a32a56d0cda335a7d2bd51f272431b435a2508074f05d194 WHIRLPOOL 44840b411ebd53d2929a3c00dbc9253c77c7871e2657c33a05eaab67af486504f19b04e9852297ca6b72bb98db2a51ea3f787d26f7275ef0cc8dd6a9e221a110
-EBUILD asterisk-12.1.0.ebuild 9514 SHA256 189d56e14cc92f88b5f1350acf2430317d395d55f884caa73d3fda54a47b25ce SHA512 cd7ffab3ecb3670dd1e1027f62192c385c5d5bbbe84b5905e7ecca05461128afb39dbb24971db32fd99275c53262306c024131ae250bcdc8f3c81557e8c0e3f8 WHIRLPOOL 0fb6b982eb9d1debba0b354118b325bfe61b36d4b3a93738b701d705a33feaebf0e207986385df6f6245e6bab97e30fe0b1621b97e75a1e4329669c48899118a
-MISC ChangeLog 11187 SHA256 eb93a042a682234dfd1fee624af237232c1437d665d13bc761c94291ea15b05a SHA512 15da8ca0ed0b3b97f53137b634c50201e623e3787898d6d2beb6ee2233876071add8b88287cb6f4ff326f221fe1ce1290ce25da16799dd4836c67ce26d46f534 WHIRLPOOL baa57a80eb72cfa19097ca5fb2cc0fb9f52bf3ce57a060de73e467a8a890390d26d2b941dd69d5e3197d842a5b1c228e9d722230d6159ee78d08b3abf5d91a96
+EBUILD asterisk-11.8.1.ebuild 9437 SHA256 625ec39225560b8edb54464bc30bd5f04688482d86328e27807e89b7982c36a5 SHA512 5a6a08d2bba635e7851b56985aea790e9d73ce33f85f7458580b30142dc99fe11038b9f43e7bd0ae044770c1c13a7467c71ba91b20dfdc83876b26f1cdd34073 WHIRLPOOL 90b10f23419a6214a7ff34aba9ffb1d6a13e98bfbcbcbfbf41f0f10bd2251468882a1377dc8cbbb31df1d15af6d6619b29ff66b124e3e52203e394cedc74998d
+EBUILD asterisk-12.1.1.ebuild 9514 SHA256 e11bed06c0477675bf223cf8d8987653b72c2a1ddad5d780d4662316feabe8c4 SHA512 6b2a45ce1914774fd60fc4088c95235803f8a3d7df0bc7d90f8cea97103c315bddef2cc82ede6bd1ea59609b9f182a3db32c01036fb287c42bff5bf0217a6c90 WHIRLPOOL 36ed75a1e076ac1514dac28767a330ff10049ce146bf76d5dbf45942b1937286dddb9f73671bc6a4f45f7f423b0f115aed477eb3c0f71e595367e4568e4626ee
+MISC ChangeLog 11870 SHA256 feec5486436ada03c9b9f4aedbe6d690305df1ccc1f7df69e9653ba3d3842dfd SHA512 de8cd10fdc6cbe5df31d35ebe808765fd9eafda19694b982a5df3612a7a94e75950cf12f827b11315aa268b5d3eb3dd429d806b94fc3d0c9131f8c2ca6ec8212 WHIRLPOOL 9ef0f8e640dd347a89ac84bdfad40c1d3abce24ef8a3c9d70a4e455f7da884d348d781a5f4faff9e27cc7040a072f135d4c40856d6f6649173a9415484415cc0
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
 MISC metadata.xml 1183 SHA256 f92828f92cf3e0ce3581e031e3ecdc26336481db45fe6ea7b91e79fc3e58032c SHA512 9b00df0793f68988b4b7b2da778b05cd183e663a96c92b5f96ac1e09ba34a96a5155deb0639638e499701e5cf76de6cc6736f757a48608c2accf14e3ff633c14 WHIRLPOOL d5e4bd47714fa34285733f9c3ed2dff0fa65f33daeda7276428e7eaf0cd44ef59351f67f590ecab38305e77b9c3683c368ad764f323f3d9891b3414600aa4211
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMVp6AACgkQp5vW4rUFj5oddgCfebkkkHnHQXL5Xx2iOFyawlNA
-BDwAnjKcEvMFOE3c62ZuGcSbu4VvqjO0
-=PUOE
+iEYEAREIAAYFAlMe0bIACgkQp5vW4rUFj5qb3ACeMhcAvq1QeyTSWytHpctT5Wqg
+eq8AnR5BLZeI9ezcJKuziLsjMdWaw8IG
+=uU+T
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.26.0.ebuild b/net-misc/asterisk/asterisk-1.8.26.1.ebuild
index 2c57bbfa79dd..82af2e4f8d24 100644
--- a/net-misc/asterisk/asterisk-1.8.26.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.26.0.ebuild,v 1.1 2014/03/04 09:36:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.26.1.ebuild,v 1.1 2014/03/11 09:05:12 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib user
diff --git a/net-misc/asterisk/asterisk-11.7.0-r1.ebuild b/net-misc/asterisk/asterisk-11.7.0-r1.ebuild
deleted file mode 100644
index 572077372d7e..000000000000
--- a/net-misc/asterisk/asterisk-11.7.0-r1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.7.0-r1.ebuild,v 1.1 2014/02/06 16:48:19 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.8.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( jabber )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.4 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	jabber? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	selinux? ( sec-policy/selinux-asterisk )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 11 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-11.8.0.ebuild b/net-misc/asterisk/asterisk-11.8.1.ebuild
index 923c72aa61a2..980ce5615b20 100644
--- a/net-misc/asterisk/asterisk-11.8.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.0.ebuild,v 1.1 2014/03/04 09:22:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.8.1.ebuild,v 1.1 2014/03/11 09:05:12 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib user
diff --git a/net-misc/asterisk/asterisk-12.0.0.ebuild b/net-misc/asterisk/asterisk-12.0.0.ebuild
deleted file mode 100644
index 97f34c4c0757..000000000000
--- a/net-misc/asterisk/asterisk-12.0.0.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-12.0.0.ebuild,v 1.1 2014/01/13 10:22:34 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-3.7.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( jabber )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.4 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	jabber? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql-base )
-	radius? ( net-dialup/radiusclient-ng )
-	selinux? ( sec-policy/selinux-asterisk )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-"
-
-RDEPEND="${RDEPEND}
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds		{cdr,cel}_tds
-	use_select gtalk		chan_motif
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient-ng/
-		doins contrib/dictionary.digium
-	fi
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown asterisk:asterisk $conffile
-			chmod 0660 $conffile
-		done
-		einfo "Sample files have been installed"
-	else
-		einfo "Skipping installation of sample files..."
-		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
-		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
-		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
-		rm -f  "${D}"etc/asterisk/* || die
-	fi
-	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
-
-	# keep directories
-	diropts -m 0770 -o asterisk -g asterisk
-	keepdir	/etc/asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	# install the upgrade documentation
-	#
-	dodoc README UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	#
-	if use doc
-	then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 12 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+12"
-}
-
-pkg_config() {
-	einfo "Do you want to reset file permissions and ownerships (y/N)?"
-
-	read tmp
-	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
-
-	if [[ "$tmp" = "y" ]] ||\
-		[[ "$tmp" = "yes" ]]
-	then
-		einfo "Resetting permissions to defaults..."
-
-		for x in spool run lib log; do
-			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
-			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
-		done
-
-		chown -R root:asterisk  "${ROOT}"etc/asterisk
-		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
-
-		einfo "done"
-	else
-		einfo "skipping"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-12.1.0.ebuild b/net-misc/asterisk/asterisk-12.1.1.ebuild
index 7379d815522a..471fbc82a034 100644
--- a/net-misc/asterisk/asterisk-12.1.0.ebuild
+++ b/net-misc/asterisk/asterisk-12.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-12.1.0.ebuild,v 1.1 2014/03/04 10:15:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-12.1.1.ebuild,v 1.1 2014/03/11 09:05:12 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib user