Make our inability to co-exist with net-libs/pjsip explicit to avoid any build failures. Closes bug #47812 by Steven Lai. Removed older non-stable builds on both branches.

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

10 files changed, 34 insertions, 642 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index f2337ce6203d..6b421e57f648 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.454 2013/07/23 09:21:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.455 2013/07/31 14:29:40 chainsaw Exp $
+
+  31 Jul 2013; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.20.2.ebuild,
+  -asterisk-1.8.21.0.ebuild, asterisk-1.8.22.0.ebuild,
+  asterisk-1.8.23.0.ebuild, asterisk-11.2.2.ebuild, -asterisk-11.3.0.ebuild,
+  asterisk-11.4.0.ebuild, asterisk-11.5.0.ebuild:
+  Make our inability to co-exist with net-libs/pjsip explicit to avoid any
+  build failures. Closes bug #47812 by Steven Lai. Removed older non-stable
+  builds on both branches.
 
 *asterisk-11.5.0 (23 Jul 2013)
 *asterisk-1.8.23.0 (23 Jul 2013)
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index b7b1f012abf8..f46ce1dfdf07 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -14,32 +14,27 @@ AUX 1.8.0/asterisk.initd6 9237 SHA256 6b8deed78f84e1d7dc1a08d38a233921f4a3d24213
 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.20.2.tar.gz 25180212 SHA256 67d9cb7f569d49bfdbd94f6d81b13bac690abadaff79d68c242ed4e55426b59e SHA512 1be14aff557a6f59bf89d67c73e2b25d09946dce9787784ec3af007f9aa071c202caa2d362660b9667bb78d6abfe7ce7576626a3e80ebc640c30f3763914cb82 WHIRLPOOL 66843609a195ce5dff6dda05bf45508377e921433915b201e6a3a9bab3ca5db513a1dd6b3e839cab4b097692e84f4ed9e48c9acc74b2d7edc3127db7bce03e74
-DIST asterisk-1.8.21.0.tar.gz 25334905 SHA256 5f7ae7ac26eaedb6b7274281073a6b469157eaf4b8fd7e69bd0880125cea3380 SHA512 034b87c9adc24b5f6997d70f8a7279de5f15087d44af622630a148deeb1e74cc999ad171eb4ae4e551505ada02b6eea422ba0e29510a0f0ecc9fcb8e9c5d03b9 WHIRLPOOL f00b5eefc4ab7299d25314faa7527a6ce198e391615973c37e9eae54458b3c535a124da5594f0748c948cb2c8c69d6f1b654766f17402d1435dd1738332d6ca5
 DIST asterisk-1.8.22.0.tar.gz 25343979 SHA256 5e689b71dd4a6bd6b9947aec2c554b44a4f26ecde2e4d1c881eeb36a46a0057d SHA512 018e67915a35507400ff3b6673ff38e52ffc4322a0173f96281ed7d2030760578a4de420b2f6d9eaa7e4d0a539e3d624b0f056318c8771fb8e95f5e9caeff7b0 WHIRLPOOL f24d5afc489eb657df3eb3add39baac7f46ceabcfff0946e5c62ddbf765cc20c6df3b67c981b59af554661e20db72363f8ddfc32faab5d122a650239565f35f0
 DIST asterisk-1.8.23.0.tar.gz 25278124 SHA256 158af2d38f1a94645f47a12ee4edeeac952d5134d1b9c9f427c5b3eadac1dc76 SHA512 7704782d1d890ac0c89309fa42ba2ab4e3d0bd49dea80de862b8892983d851d8b1c12e6deb8f7258c646d5ec4a46f9cdb944c38af08d0891cbd7ba63f50047de WHIRLPOOL e1d9c795a8f6d3d9226d2c262d0c9b129828bbc79a3a55d4a20abda06c9ce3fef2ec274cea07dee79230c4e5c51510e40153ec898b74036042a3e07258b2c092
 DIST asterisk-11.2.2.tar.gz 30468125 SHA256 b470a27745735a49e83dc9842ec892c9b4ab186e5d44db68ea1db66e6c684c7b SHA512 3da0aaf03d4f172e8995021790b166a2182bc09cdd8d38777c4a8dcad7e105edde9a2cead511cd09504a7aac559c7b225aca69990bb9802d6eba70ff49dd0375 WHIRLPOOL e1a36fb7c5c6d6746e67c9cfd0db8eab829ee9c2770b5bc14f71f3686c3a8fb2f8aac3e2660ad455cf403e7f9d51d23a1a81042c44ced5f97f60ae8827c7740a
-DIST asterisk-11.3.0.tar.gz 30629838 SHA256 35b7dd5d21449384ebcab631915a844d631676ff6535a6c14bd2bac819808f09 SHA512 a617224db67c5d108d4edad5a8325cb6c1010104e820572a7100417f10def422981f181f50ef694f3ffacd8d3564d81daa9e07da342c8e03671de29a433a2238 WHIRLPOOL 1e2293a4e0a02cd2135a92eb55dfc4d15f76a832c663f3ed65cf44b4131ea923a7c77fabf26e216f354d88dc72181a632ccdf481d6edcf14ed430a3dd887d185
 DIST asterisk-11.4.0.tar.gz 30651949 SHA256 081ba8de5f349ff23de8e000d8cda38a2ca34858174e9379b2662a732557e9d4 SHA512 482ad6a252d8b660b01b5eb5d9cdff86289a8eb8bdc7f69f150441a612b6e0a3652ad237bfbbecc38602fa9b888d7dc8aa9011b23fbeb442ff93d3129eea773b WHIRLPOOL 645c391acfc87d6668f9bf1dcbd5182963c1da9c2c7d8fcd65d9f705225e703397315569017244662c15da5c5c12ecb10ce4fc4b1a6b3ce6cefd0ec4775b1b76
 DIST asterisk-11.5.0.tar.gz 30590657 SHA256 a82c1ddd9fb1d98f0dab6e0255a127fb7c7eaa687b3d515182458244062b4194 SHA512 595d6c2ecbbc9a057ff601c4337fff276eae089d58d97036f9a676686dfe3b2cbaf8739f2f788416bb947a97465100cbf261030c3d17175025eec25761f0cd58 WHIRLPOOL d47611d388729887635ed8db0fb9e9c40bf57784dd0a84a1c6df52bc3e2317c968ecd1b411d146fdee93a84842afc54b0ef4d98ca9af5b420cd4801059491699
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
 DIST gentoo-asterisk-patchset-3.4.tar.bz2 7600 SHA256 e2c1c84c7b1137ece368696d44a518ae58c877f51ae74d37aa76989fed1bb983 SHA512 62b196f7cda00318716dc09f8e8a895080721f362f6215062a564e66428aaeae987136ce84a1b82216d1ce51e77bf94c745f9e89579391ca2140eefc651de798 WHIRLPOOL d67aa57bea86524ec0f0caf9b720fef3d69eeba7e359f533dd48eee8ebb6a81f63ecdc7191b1ce05040a141e8a42059b1eb17f8a17966639eb2fe676ce129ff6
-DIST gentoo-asterisk-patchset-3.5.tar.bz2 7277 SHA256 2d0487d9dba92253f2424ef7ab8a78688b2cae5f956482178992426f82a72278 SHA512 2355059d9c2c904e28b9580bd13c4b1edb6b6a6fc055ee7cf3ccac38c2a3d386759bc8d1a13e5573e38fa740d4c24e11e04914a930f813e05ca9b506750c42b1 WHIRLPOOL 95e96a2c6c430256cb81589f30ed42f8becafaefad57d908a58438bb98bbff7035efb071eb26658d402a09adbc71bba7062876d1da11fb2f3f3a56f8d5da8cda
 DIST gentoo-asterisk-patchset-3.6.tar.bz2 5930 SHA256 79083bd4d52c3f741b133fa55c956941f11e1e9754f67739a02a8a50f4b47842 SHA512 f8aedcdaa17ae18da7f463737908df1c8f1bcc53fd65cddbbf48f525d60de1abb5f6ee195f0e4b74a69fb20f7391194409b0814efc947c1800b2a1cd36786aae WHIRLPOOL 0c07c942117ad9b92b83aac4a5bac6c1f72aa49006e3dd538cdd893a0b5312ee6f8bc5512160fdbc530ed642dd2e07608ae3e0f9a99d8a5cbabd52b85afc343b
-EBUILD asterisk-1.8.20.2.ebuild 8995 SHA256 c52bf38072f86306f04638453707d40170ddf787eb3f8f6e25cf9fd15081511c SHA512 d01fc10f4b13637e3ea7d069cebf6c614624d97190fdeed13a1dc3a7b62562609fb6f9409fe15a87c1f7e83648a587454bdafa081d1d18247780aafb3b29361c WHIRLPOOL 07c13e403ca4c66ebe933c0e4dc2d8bd4ec14247e7a53be8a20b60a17be1b37faa1c0c86ee1bbcd44dc68046b10b82ddc4e4573dcf1019409ed30b89c03ac11c
-EBUILD asterisk-1.8.21.0.ebuild 9002 SHA256 95cbab229cc5cf5a9ac2369be38d520496dd55c935225c69de59c172bdbe7b10 SHA512 77e44ef042dd5b9b1d1af73902eb18df06db7e3cf380f5eb7c77dc428947aaa6f2f42c572b58b851e23684f00da303dad2c669973505fa027b599dd1862fe862 WHIRLPOOL bf45ab1aec4e719921cb493aa0ac2cad9aa831f55a51f319d2c7584dbdea884b8a9681b5eb7b0f8af1a0c9e2408df343b9cb2b0b2d53d469dabc3dfec0e6bb6b
-EBUILD asterisk-1.8.22.0.ebuild 9002 SHA256 1374629431fa059283033a0a3ba97206b89bb316106998c4b5783f24ac1df4e6 SHA512 b2af254f68ba242cdcaf9d4c321bf1627f0cda4b841c523aa15c85885c02e399e761fad790f6d57d36ee630352273f915a849319886e1fb7f9a7aa87a16fdef7 WHIRLPOOL 1bae0166fd747b37cb66854e56889f860f468debfba5217f71126ada1187c82fd3b06840fa39e35bd94c8cc9ab4cda763886bd551d9081b4ddde2041293b1caf
-EBUILD asterisk-1.8.23.0.ebuild 9002 SHA256 cfede5094f6995ae252efcc5f1229030209c9ea4a894cdb6ce405083b6ee1c65 SHA512 f143f7ef5c2bd343c1baf3ecdb906ff415f41dbbdce6a877966c85e0ca980e2feb611f69dff09ed0f5b7a30b78aebb23ffa6a1bb0562b80c07ef6f942a2da194 WHIRLPOOL 2c11c51bebf1555dd8a3e3204098b8fb4602ca0afaa368006a01a6229f1bc4060f7ef505487e8fc2b54dbb6867f192ce4788f6d5505e9afc7a5c02ee60a5706f
-EBUILD asterisk-11.2.2.ebuild 9088 SHA256 7e5df8654ea5356989b7b3e841edb7e56cfaa1ee8111da845d5308a5d900fcc3 SHA512 aba89563dd61d1e97ac5aa576c16bddfe6bc0bd1790925cdffc23a9617bcf479dc5eaaafcb6af2bdbca878c62596bce7d95d6bad90d73051aa8c9f7e49d4eb5e WHIRLPOOL db6e5999a54a44cfeb8f8e716276912b0005c9656d259cc453fc487a1d6cd330527f15248bed64bc2c0508246764b38078469dfe72a4f7f4eb48d388a17d3112
-EBUILD asterisk-11.3.0.ebuild 9095 SHA256 10672f84cbf98b1bf57a3bba964a219f94fb52b67494e99a8ec41e82a42e6886 SHA512 85dc707c9387023b729283d10ff5bab289b26e7fd325b31bcf521f5900142fe6e724f82095187144c0b0e2f923cff43f53905a1f8874faa5038c01de03885911 WHIRLPOOL 88f928b39f65c436345920ec6a8c72a50544aa525a33a8da40320c2af844356c598503c80e5634c71bb2277e3b74f110044ae5accaf8f04e9f492ccc5dc77c94
-EBUILD asterisk-11.4.0.ebuild 9095 SHA256 e31800b3409d849d6b8d9f1afb5da0cebffd4125c9e21ad54a42e81d8738aeb1 SHA512 bca5e0d7e3acc3244f6b3b10d82be781636ca7b84a37ded2b0b546109cc1ccfc87fbd3f8309fe7c0e7a3d08e743405b67722343703549414935c14a85b156b3e WHIRLPOOL 378b8fc2889277859296ec0fa15f74214b2260dd9d7f72e8c5f40e2c7bd7a4e232d5ce1299103fd74b75209e38da12c5456fecb016f6d4d00f3deb2179f88586
-EBUILD asterisk-11.5.0.ebuild 9095 SHA256 d99c70c7d5a8d31f78021ec46d4b925f6e35b190cc4333884f81ba7713600118 SHA512 018a95070e38c8d5747f44f56a045855106d5046b64a41b1dfc0c8c192c935624ea746aeab99ecbb51c7f450fb66710defc3a8d94304349d964417ff5380bfc7 WHIRLPOOL 5a3d3e46b6eb71ca9c8753ff9e12751d338d0ae35399f76979c9d89435113ec627678c32169829f315e2f3852d63889789813405090d9281c82bf3e3299d542b
-MISC ChangeLog 6648 SHA256 b4db37adc37ace913698f682423d68fc1d776f233a4cccc898d774372f786f3d SHA512 6a78b117b2d5fb18d3b44f81c2266dc7aaa62323f25622fb1381dc4cd3a00789c09fe86aae599cc1a6672d2c6401d597b6a8a5b039935b7c1550461ba9277b42 WHIRLPOOL bc319a8a08c870338259d800599e8491456d10cfb42ab664e68e8a34d3ef78ec47524212bf7a09048c72ac1436617f6fae72e962ade185e28705f37c497f0f2c
+EBUILD asterisk-1.8.20.2.ebuild 9017 SHA256 f7bed673930c5adcaed7e7bb8c01198b88e8c05124fe99cbdeabf3db8cb38327 SHA512 891acb48b41fab4d9dc6ae1e5365d256b28c971e0182dbe1512c9c486eb9917724f24101cd77681a9bca37c27d1c55aaa40d7b81e181754a376b3a3363113496 WHIRLPOOL 7ce9956c490b0c3d0c4ff9532375fd6e0d8cec9516a5458d9aeadc55f8acab9b73d1722594efc8087b9580608b840a6278f1ee7ff1113a751ff0b3a84fcedb50
+EBUILD asterisk-1.8.22.0.ebuild 9019 SHA256 7b2d81af82a944c25a6aea3082c6168abe90cf9704173a085d15a4d269b20219 SHA512 099160de7ebe848d451e771ae12752eff4b58d9a2bf2da038a1c010d12465cd859f39dc1710416597cf4e25f08eea8a16aa778ba41ddaf5a7d0e619b431e7a44 WHIRLPOOL e1c419a7a0eb7a4eced55a113998e1ecd4d323d93ba6284e605014288c6242147eb78863f695ea9887876cef6333d7794afcc65a22a3351c5c5d55a5bcac21a3
+EBUILD asterisk-1.8.23.0.ebuild 9019 SHA256 5d7672d2b2a75fc4b70a19b9f847a4e25c7331a7a18ce8b27f74f25dc4f512c4 SHA512 00ebeb50a02561f413830fe7fe74ec7d6ef810747b1f45b498357b2d7484d898c3b4087c1f6d94d5818670018ff26148c392637b912a6435c1f3ea75dd734b55 WHIRLPOOL 00e21bcd0bd3671dc4fb85f06fbaada49afd4e2888a92a1019ca362b8bab3faeaad9dbf081f1a5ef457ef2d5c05eb26e74210fe560f7065459df241bd408a8cd
+EBUILD asterisk-11.2.2.ebuild 9110 SHA256 b496868eb8f8d935968309ac0cde322ec6c9c6b6fe88785b6ec31a6fdce63d77 SHA512 08754f8a7c62cb8594cf025f46facf753c71ca6509a68ad5b13e90392626a76badd9d62a7d3e68c971e17e773e6728b4efe2da4021fbdb3cb708a55ccdd6b45d WHIRLPOOL 3606d6e1d5ac5da8a8dd32cac9b4314945c2ed3a2547454ebff8058ea03701cc098e65598efec2e1483f0689c4dd9b4d8d53eb671dc5636ca0a095fb5e250285
+EBUILD asterisk-11.4.0.ebuild 9112 SHA256 cb5dc457ca63bad850b9f8c3ac6236ad890036fceefd07caed40956ef5365274 SHA512 8e9886415fba0e6fcb2644a2306802ca6022532babd9534af8da9b672b02748070ceecdea375bc0169208be34262619d4201a7da03b4515a68e8c5c19670bd9b WHIRLPOOL 73441d6d6c873c505d3133e3b96e0377e9c00e90a01b102234d0abd613a8d18bd8d4731499e831ed3bdb66f7b7a83d2efed9b78e600a13360dcdbb4bfbaafa56
+EBUILD asterisk-11.5.0.ebuild 9112 SHA256 cbd2effd04e55bdfd7fbd34bdbf9c359a11ec4ee19c07eed17e3b21c7890785c SHA512 77ec764aa2f34b914777f9ab9ae7857304e0d1be0d874ce4692aa872607b5732024e28733376128789209c87026bffb9dc854d067b9318c2d8309b4f33c3fe82 WHIRLPOOL f71ca0871a65b75dcd8136cd59e998d5df2683ad4ff873231a596076660fcbccf40efcb70a69af47cd4028825de41f711bd845c7b45b1820710dac8e2ef6aa3e
+MISC ChangeLog 7083 SHA256 6cd97b6eee8dddaa954ddfdad4d8ddfe01b5333544fbe1b8921988daf730220e SHA512 4007616e63e46133bbc6fdf63ac48470d98e67c818e8e81169b7961143dbe9d8749d7ae372f42665898e8c0f490aaf172bd065ed54920565eeb1a3061a8e6afd WHIRLPOOL c3692631d065294a33dea1442b0dfaab64b0fbed4048b9ddff429aaca12126f0f1ef6793355ad33b0fed54d98681c2aaabb43a425be61452c5f61e7ace3ee773
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
 MISC metadata.xml 1203 SHA256 d5acdcd4f214e602c8d6b68258e4e7fa9071bd2fbda10d461f097d35d1f08c0a SHA512 4f65a7268834241af12d41b79da374cc65b977436ad182ea781b2677790da0d1573cc39fc2e9868a0acbaeceb529762cab385e16d9140a5246cafebd6e25e765 WHIRLPOOL d870297ef0b6f1f36a2f39cabb811c3a1845a305884ae7b2bc979cd35f96da04cc3030eb4593039aa0aaf206fe44845a37bbb5ac994085c1e67a422e2fdf0772
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHuSwkACgkQp5vW4rUFj5ocOQCfchc7BWzGREI0Ly7cu351mzc5
-3UoAoKiYQBX7plx51qq9EYlX2SaXMnNU
-=MQ92
+iEYEAREIAAYFAlH5H1sACgkQp5vW4rUFj5r5eQCeJz4Ejv4IStT9CQ6Fq2cZU+K0
+EfQAnRbz7Us26vLb1XP7e7esrHIPY3qk
+=ATcf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.20.2.ebuild b/net-misc/asterisk/asterisk-1.8.20.2.ebuild
index 9cdf6e8b803c..6084b5e8bb39 100644
--- a/net-misc/asterisk/asterisk-1.8.20.2.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.20.2.ebuild,v 1.3 2013/03/30 12:09:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.20.2.ebuild,v 1.4 2013/07/31 14:29:40 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib
@@ -74,7 +74,8 @@ RDEPEND="dev-libs/popt
 
 DEPEND="${RDEPEND}
 	voicemail_storage_imap? ( virtual/imap-c-client )
-	!net-libs/openh323"
+	!net-libs/openh323
+	!net-libs/pjsip"
 
 RDEPEND="${RDEPEND}
 	syslog? ( virtual/logger )"
diff --git a/net-misc/asterisk/asterisk-1.8.21.0.ebuild b/net-misc/asterisk/asterisk-1.8.21.0.ebuild
deleted file mode 100644
index 7f9b7cc8b309..000000000000
--- a/net-misc/asterisk/asterisk-1.8.21.0.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.21.0.ebuild,v 1.1 2013/03/29 17:06:26 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib
-
-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-1.17.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} ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex sqlite sqlite3 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-libs/popt
-	dev-libs/libxml2
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/zlib
-	ais? ( sys-cluster/openais )
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	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 )
-	jabber? ( dev-libs/iksemel )
-	jingle? ( dev-libs/iksemel )
-	ldap? ( net-nds/openldap )
-	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 )
-	sqlite? ( dev-db/sqlite:0 )
-	sqlite3? ( dev-db/sqlite:3 )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	!net-libs/openh323"
-
-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
-
-	# 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
-
-	# 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 ais			res_ais
-	use_select alsa			chan_alsa
-	use_select bluetooth	chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	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_gtalk
-	use_select http			res_http_post
-	use_select iconv		func_iconv
-	use_select jabber		res_jabber
-	use_select jingle		chan_jingle
-	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 sqlite		cdr_sqlite
-	use_select sqlite3		{cdr,cel}_sqlite3_custom
-	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
-}
-
-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.initd5 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; bugs #300832 & #414585
-	#
-	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 "1.6 -> 1.8 changes that you may care about:"
-	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
-	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
-}
-
-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-1.8.22.0.ebuild b/net-misc/asterisk/asterisk-1.8.22.0.ebuild
index 5ab0eb054842..a07a8aa599d0 100644
--- a/net-misc/asterisk/asterisk-1.8.22.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.22.0.ebuild,v 1.1 2013/05/20 20:42:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.22.0.ebuild,v 1.2 2013/07/31 14:29:40 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib
@@ -74,7 +74,8 @@ RDEPEND="dev-libs/popt
 
 DEPEND="${RDEPEND}
 	voicemail_storage_imap? ( virtual/imap-c-client )
-	!net-libs/openh323"
+	!net-libs/openh323
+	!net-libs/pjsip"
 
 RDEPEND="${RDEPEND}
 	syslog? ( virtual/logger )"
diff --git a/net-misc/asterisk/asterisk-1.8.23.0.ebuild b/net-misc/asterisk/asterisk-1.8.23.0.ebuild
index 0c0e459eff89..9fde7b7b0288 100644
--- a/net-misc/asterisk/asterisk-1.8.23.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.23.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.23.0.ebuild,v 1.1 2013/07/23 09:21:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.23.0.ebuild,v 1.2 2013/07/31 14:29:40 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib
@@ -74,7 +74,8 @@ RDEPEND="dev-libs/popt
 
 DEPEND="${RDEPEND}
 	voicemail_storage_imap? ( virtual/imap-c-client )
-	!net-libs/openh323"
+	!net-libs/openh323
+	!net-libs/pjsip"
 
 RDEPEND="${RDEPEND}
 	syslog? ( virtual/logger )"
diff --git a/net-misc/asterisk/asterisk-11.2.2.ebuild b/net-misc/asterisk/asterisk-11.2.2.ebuild
index 9ed38bcb8727..2e33b679fc25 100644
--- a/net-misc/asterisk/asterisk-11.2.2.ebuild
+++ b/net-misc/asterisk/asterisk-11.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.2.2.ebuild,v 1.3 2013/03/30 12:09:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.2.2.ebuild,v 1.4 2013/07/31 14:29:40 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib
@@ -71,6 +71,7 @@ RDEPEND="dev-db/sqlite:3
 
 DEPEND="${RDEPEND}
 	!net-libs/openh323
+	!net-libs/pjsip
 	voicemail_storage_imap? ( virtual/imap-c-client )
 "
 
diff --git a/net-misc/asterisk/asterisk-11.3.0.ebuild b/net-misc/asterisk/asterisk-11.3.0.ebuild
deleted file mode 100644
index fef567f8affd..000000000000
--- a/net-misc/asterisk/asterisk-11.3.0.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.3.0.ebuild,v 1.1 2013/03/29 17:06:26 chainsaw Exp $
-
-EAPI=5
-inherit autotools base eutils linux-info multilib
-
-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.5.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
-	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
-
-	# 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
-}
-
-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.initd5 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.4.0.ebuild b/net-misc/asterisk/asterisk-11.4.0.ebuild
index 62cf0f5183fd..7627f1a62899 100644
--- a/net-misc/asterisk/asterisk-11.4.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.4.0.ebuild,v 1.1 2013/05/20 20:31:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.4.0.ebuild,v 1.2 2013/07/31 14:29:40 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib
@@ -71,6 +71,7 @@ RDEPEND="dev-db/sqlite:3
 
 DEPEND="${RDEPEND}
 	!net-libs/openh323
+	!net-libs/pjsip
 	voicemail_storage_imap? ( virtual/imap-c-client )
 "
 
diff --git a/net-misc/asterisk/asterisk-11.5.0.ebuild b/net-misc/asterisk/asterisk-11.5.0.ebuild
index f0c4c782768b..13f7a0b54262 100644
--- a/net-misc/asterisk/asterisk-11.5.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.5.0.ebuild,v 1.1 2013/07/23 09:21:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.5.0.ebuild,v 1.2 2013/07/31 14:29:40 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib
@@ -71,6 +71,7 @@ RDEPEND="dev-db/sqlite:3
 
 DEPEND="${RDEPEND}
 	!net-libs/openh323
+	!net-libs/pjsip
 	voicemail_storage_imap? ( virtual/imap-c-client )
 "