Upstream fix to fully respect SpanDSP API and avoid a potential null pointer dereference. On the 12 branch, additional input validation for the PubSub framework in PJSIP. Remove older non-stable ebuilds.

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

7 files changed, 21 insertions, 979 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index c9ae24382485..5dfa5ad25cd3 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,16 @@
 # 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.492 2014/09/18 10:29:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.493 2014/09/19 10:14:30 chainsaw Exp $
+
+*asterisk-12.5.1 (19 Sep 2014)
+*asterisk-11.12.1 (19 Sep 2014)
+
+  19 Sep 2014; Tony Vroon <chainsaw@gentoo.org> -asterisk-11.11.0.ebuild,
+  -asterisk-11.12.0.ebuild, +asterisk-11.12.1.ebuild, -asterisk-12.3.2.ebuild,
+  -asterisk-12.4.0.ebuild, -asterisk-12.5.0.ebuild, +asterisk-12.5.1.ebuild:
+  Upstream fix to fully respect SpanDSP API and avoid a potential null pointer
+  dereference. On the 12 branch, additional input validation for the PubSub
+  framework in PJSIP. Remove older non-stable ebuilds.
 
   18 Sep 2014; Tony Vroon <chainsaw@gentoo.org> asterisk-1.8.28.2.ebuild,
   asterisk-1.8.29.0.ebuild, asterisk-11.10.2.ebuild, asterisk-11.11.0.ebuild,
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index ce181c4618ac..7347e162bae7 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,29 +17,23 @@ AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf57
 DIST asterisk-1.8.28.2.tar.gz 29521616 SHA256 7b3d84a3403fce590377808eaa4b08b6320666ca0e37eba0ad578b66211b13c8 SHA512 e5c47215657060a5c7f358d709f2f136bd60ffd4bf336546119456a5f70d6c1446a9ac29980e6f8a8aff700d3e4b4b196570405d5427cd493fbdf08cd85d455b WHIRLPOOL 95dcfff716161e2ed35cd9bc294480d5fafb607bd2f636ec631f07127c5783656d97904fe8154dd949bb1c9ce135c7874ba9f27b4f16727003b8fbf712eb1d93
 DIST asterisk-1.8.29.0.tar.gz 29538404 SHA256 ab172919adfa94fcf211ea5e9b587aff61d0f507ff958219a9ab777d5cf8ebea SHA512 278acf4ce4046ad48e574e755158510f1855dfe468a116d70af85e6fa37ea80dbefaf8a3e1c810d016d51addd9c6f65cd11287fdc6b05f5f2cd714f58bdecd41 WHIRLPOOL 620d02811e991587b5064a31a1c1a63728a33ccc231a7c2844453b8b14c73ab2f962b9cc23173148bfccdf25a54b0e011cf47f212d071e0c0dc5040109777b04
 DIST asterisk-11.10.2.tar.gz 34846584 SHA256 c86975b00c81898b0500742a59f69e97bd970e657198f95b273ca2dc25431e9e SHA512 5b74902a36dc6abf69c641708442eb25e7ed35e3ef0958acc62db7dc77ee72e1d24c57503439d9bd65fca152268cd43b621e5cbc9aa5800d55619f4d82aad5fd WHIRLPOOL 5fa26f1f8eeba7d077fb83703015547a54cf7b69e5e4417738a109aa702499016a4f02733118d9212eaeadf97ffe375efd843ac7572a5839616250120cbdd4ae
-DIST asterisk-11.11.0.tar.gz 34867274 SHA256 568c9558005e686b020d596556c700ecec910a0c4f81fe54141851d049e222a6 SHA512 fa8a169787e0e427863fe7458d5773649ea5e21cc75b16ad79389aea52d2d416d304cb41374bf1cf8f59cf15125b25ff4743827500d4261ffbac8c68b8a59a73 WHIRLPOOL 907d42a8dc6ce36ee42ca40e9b25b69f93d1e3c10d1dc8c8d98b011e2a067b594daba5a6a9468525b23506a739b9f877ee0831da94056c88485d18118de645a6
-DIST asterisk-11.12.0.tar.gz 34870073 SHA256 56187cf715820a21e8fc4d37ab48b88f4428bd8189ba949148aa9a206be5eec6 SHA512 88ffbf1839a6e1ccb6b42b9506e0f13d63d3962b39e1afac63a648f51b0e05a2e7d3902af012b1deb62046a2baf9b67d7127ca0d3edc6066964dafc8fead6e47 WHIRLPOOL f7fb1c5576bbcf9988c5d1de8375d5aafa3270fc99ecf24620b7b1209a6783005fe490f599120d01a621980e0126b2fc8d9b9198afd5086325a6427f8324b54c
-DIST asterisk-12.3.2.tar.gz 56618036 SHA256 0724ab25ba6e9334d69b7dd3866c046cb09b8c08a7b42ce4281a5f00393d5576 SHA512 ecbc53303d0a06e00d5ecaf2bf440336b7614a842cdd03ab22ef0fdab3483cc9544b5da3be9c5f5b1fdd8f774eaba63850369e3784312a4116e9090f687362e2 WHIRLPOOL 459f6dd4ef81b621652114b52fb1d9183fd3863622ef55156a3573d09e8306ceda22c8eb4910773a3b93083b6f0db409cdbf82f6afb302e34510657c3efaa06e
-DIST asterisk-12.4.0.tar.gz 56683580 SHA256 6c72d0060d1ce7a7d09f510d91d588f269aac0032de6a4464d5449b0d5600a72 SHA512 f1a58b42422efe7bca5bf39f400309d062b1f10c2918029e9b7db84dbffe38cef1712ce87537a22e4d7dcd32b3b768f057b6903d937d68593baeb5a56390f649 WHIRLPOOL 14c902452ed91b9f989f2802b11a95ea842d33f809bc931e50d9eb4e2f8901fb0373c90bb497e1394449315771da6ecfc98e5194a077e5b0d37e831fe63e401d
-DIST asterisk-12.5.0.tar.gz 31403750 SHA256 8355ccd815f2715ff49bf70c2480b5ea895e0a75250d0f111b1cae5af5acf06f SHA512 b94379038f102afec656a6c0097e094bd68c18e3ccd0d88cf541f40fafe1d209c0fb4c4bd0dfcf741c4f6b4021e41e2708ffc9b3b5e17d268c76dd6ea8e8e95a WHIRLPOOL 22bea6f3f3fb095238358038405527b1a3857485e4ea91f89b5138c4824c240e205c5d1291be2cfdda431a649243fb192b9f652b292d79dbcbcbdaf32d8c7da2
+DIST asterisk-11.12.1.tar.gz 34862194 SHA256 4369a2827cfcf72b32b176206d09ecdfaa4f96e9c5f9306506305591fa61ee60 SHA512 1b899a37d9a8576b68a2832f691289f06a7452a5d198363d4b994a6f9d7b4e54e968a9aa628deeb05f8f723dfbf4a37a0ccc594db39c9e54fcf1b2c700d4a0c0 WHIRLPOOL 764a5e94c4ead54e2f31225137b9e4a8b0fbc05469781c5d4e3b052b1f824a03650fb44b969f96c7009b06a9134f230cb05990329eca07ae81efe0b70e8c5bf9
+DIST asterisk-12.5.1.tar.gz 56708899 SHA256 e9ed82e6573d7a38892e61bd99d06e40dc93b6e82ec14077f085a07b5cf55651 SHA512 33d82921c1c1c4648bac943c55be148feddf1119e2eff9aa8c832607387222a7aa9624f240bf2161f0a0bc62a79c81cc5b03c82e98256c9969547517c0a89bc3 WHIRLPOOL 7ca710e155e6e0f095d6ffb89a6842fb2b453a3dd581cc46b5ea2e1e03c8a5d7288d32aff79e44848206e3af154dabc78ade84b576eee9839f7cf32d0fc16ed3
 DIST gentoo-asterisk-patchset-1.20.tar.bz2 30799 SHA256 0dec59f2fd19da61eec5b157ca458d2cbe4e77c43e0db62c6e4a58ed51557f9b SHA512 62ae929570129f4046b773a76c763840711771b859aedf7e5c2b1937b34b5a9005230c27ef4fa2f3c7094979206ec4b890c1b6459d18cfae1620b2d7a49fe15d WHIRLPOOL eeaf23f6dfe3b3b2141c9c57e312b8a1c943e78efd5b6ad2e3fdecd9aad68f02e87d0333a7289b20541e2fbecf7afc5b87b1b566db32767323bba8d680313e75
 DIST gentoo-asterisk-patchset-3.11.tar.bz2 6319 SHA256 7f11dc8a8d07c8985fa5ddf6b075f14c91268305aa992f609c6c575d656a6f59 SHA512 ec36b8c3e1b20269da17685127a15d7a701cf81c94d38aab272e2a55eba6caa9df1d5dff059427cfdab494c436f827ccf638634c370b34544677f4c4ce995149 WHIRLPOOL 168ff24881d8fa9002a8a68b37379f69efa42002afb22a8545169ebf351796e623ea345f097ca8a42ec4b9ca6e87f63c9ac114010730f034b6147f8e549c9d92
 DIST gentoo-asterisk-patchset-3.12.tar.bz2 6968 SHA256 6319bedec8709b7d4c14f7546dc92669902916a17548ca4613476e744f4c0d08 SHA512 647dad1b5ef2212e65d6e98c1a1de6571f74c21ed510b2e86b46e84e33a9c7466b08abb0920fbcbce961822682e3a9f8cec83ad137be26ee286911650a3c980d WHIRLPOOL 661a15e1b0ee963c714f86558002178f6783fc906670100377c3cdfa7c352f4aed2669241a78689d12b06297f27d623bbeaa33d4b9bf3256bc4eb340ee312334
 EBUILD asterisk-1.8.28.2.ebuild 9211 SHA256 2332e7c712fd88d8029646f9c074902205d90cde6cd021a78eb70a4d21555aed SHA512 b9005bfe7905dbfe4ec36d8b3bb750f18c99df0d3a7ac886ee1f27d91776e1fe1925a814d92c9f562031cdd3b4aa47847ebe43a369ffb80fb0efa22422231a30 WHIRLPOOL daca7ffb4a93a84c2ce6a23ae1338e9cfc8f03fa4472d75046b31d63e4ae4920d8e95d825e92a358a75dfdf3b9ba17eba757fbcbc9b5bf87aef747e9a60ed34f
 EBUILD asterisk-1.8.29.0.ebuild 9213 SHA256 006c698aa190f38918c1d3129b73448c1ef83f509e40fc40389e867ea967e6d6 SHA512 e83bb18a859b3151520fb437d8c1939a12ea01c88249808173880e7f0a7495c620cc1a97716b90f5ae4b03bff0e68dc69d1f27f6d7c34bf0fe5267e3c68a02a4 WHIRLPOOL 44e6f31f89a8244a33d44b1275d77dbb5ab73dbc70d76520eb4bda0c9108c60927ed2959d3defaec23130cca1e09153b5cb60f9b95842389990ec6bfb6bfad6a
 EBUILD asterisk-11.10.2.ebuild 9457 SHA256 6ad05ef0b56a00fd36c37e41ccc11f68afa2d200852352c1859ef06c3b2e998d SHA512 165562fbf39d3c301bf75eca594b28dfcedbd635b2a2801401c3a4648777f8a5ace4d7ead981f4ba377517e763a98f618057e12b511df0fb96ee83a52aa7f42f WHIRLPOOL 36bc3e745e9265da5a90b5bd6a2e6559bcd5ff4cb95dd1a83038afa557b1c2880e4d576896070237087fca2fe30945141f431dd83bae0fa82c9e142cd94dcd24
-EBUILD asterisk-11.11.0.ebuild 9459 SHA256 f34b41e02b07f41a51fc8b46ce1d5a3d7cbeeeee05fc2a2e8d1a35eddf12c7a8 SHA512 9850bde7fa234e0e1b593bc1c6ac4330efc5c14fd969287b5e0fbf23484b278c17f41291136565179b8837b22a24f34e6cd7076cb20faa1e7eedf8f677ead371 WHIRLPOOL 78db6b7c866f2d672e04925effad49a4681027b1e0b1b4326e252e56e6c39ca5e63d62d298c9d78ddbdf49121929d48be5d757152bc9f729fa7bab2e00c9df21
-EBUILD asterisk-11.12.0.ebuild 9458 SHA256 b8559014ee5861b6d5f1a4e316b90082834ee81aef8631ba1562120cade5f860 SHA512 4f5b3e03fe6bef6f321ecb61abc6941813fe25b59cdd86f8098d15b1e4d7cdff50d8a86cccdf521e803b3fca1a252edc09619fe0c2ccbb16bec2418766a5af7e WHIRLPOOL eee64bc8b9d7485124f59e7337311e9dac0bfffcd2e2f8c816cd70df4e293265ba08bdc58ee6a607664634e2f8f7fa05f61e774808cea4d83b18364703b722c3
-EBUILD asterisk-12.3.2.ebuild 9534 SHA256 b5e32f06d635aa26ac59775da31bcdab7f0ecda48aefecdc0efcdc10acf73179 SHA512 316936faf5b820bd909568ebd14c59a2f2d4862d0ce329b4795ae89e8b4d78642af308b69122d4185d9ea89c2c822a898e55fa7a4cc36fe56447d9a6739cc1a7 WHIRLPOOL 09e03ccce29799a856baabc2e242c8910b908a301f91aa25dd6a480f743168602af3ff981432786afd7b677c61b7cd1fae67f9c2939a7469033d437c7c61253e
-EBUILD asterisk-12.4.0.ebuild 9534 SHA256 b7fbc227c04a779ab8505e8dd7931ca2de261a6aad741c2442db29fe85289fa1 SHA512 9a5748f881b7e75b4622664fe34ca90e6742278672260f476ecf8793f833c1839915df4607e993f25c9160b0fd4956a5a98e3c1224223b51eb38d27dafcf6ce9 WHIRLPOOL d16bb5e6a023d446f30991e3f3bf5acf93c84d943874b2c6dcdbb0ae8a16a31d4b8ac917f481c3cbdc5806c5329b4348c5906f44b229b0655c5d8b2c9e37c6ca
-EBUILD asterisk-12.5.0.ebuild 9534 SHA256 ffa3525092572c07d5e4f268e92e0501fbe17f5c745d8d744b16e33060e76fd6 SHA512 ea48584abff3b6ae482d5bed2e4c0833e11717130605d90d8ef14da2f72cbee554ef5b7268895ef272a39591f29a7a9b38933285dee86a48f4bac09fa2d13289 WHIRLPOOL 0040c7db552f7bb166679b51069e610a5fabf947599e16c54490c94c8b4a1891a28237fc8aee6032ce3e03449513e11355e59d20af4bd7011f56d6e13b304dfd
-MISC ChangeLog 18126 SHA256 d9e6581df5639d6ffec4930141d1965a0c6b86533b1d5a85c3b58696624f6171 SHA512 f2aec41cd22c2ac18a7f9ed2fd8e1e039c1c1097b7672382ae3de9a0d31ca7940d02e2bc5bae8117909ea66f0329ce04da45eab2e390d1c4a6a79cd07c699a15 WHIRLPOOL 93af506064eff8019717bed4e725e53db1c8cca9264bc09c709d853ca348be6fdfdeebd0013f4d6bbd1d2ab7b4b93ac7085bf19582e72f10a5fa4bb9e7523a9f
+EBUILD asterisk-11.12.1.ebuild 9458 SHA256 8419c0c4b6c17b9bc8183b11d6910fffa5c1171bcbe16d98e818a48dfa456bd8 SHA512 c74367246cd246f4201c9dea47c21eff245a15c1a553e70fcab6c1592d6919c4cde6768028934ed8354e37ede994db0d94063560e25e89d1b0b65c2a68ac7c5d WHIRLPOOL 39eb21a6234380e42b03980e0095224036591fdc2c4164b4d4c404671aa5f2af45937e9dc2ef938094fbefa69411d5d4597f9656606845e38f1bbc09e6a3c527
+EBUILD asterisk-12.5.1.ebuild 9534 SHA256 421b283375bcffd34666a2808b5eccd240515b6347ea7a930263f2213c74ee92 SHA512 eae7f53472606d7b19e64c1330791777cfe1d48166a45f1090eab63baf24ee8829d1b3d94e2d5036279bc8db2e4647a529eac440a4dcaf3d2f683edfad25812b WHIRLPOOL 9dd159ce23f348c795c439b379678b8cade2f77c8ef5958c5d522522e01a092932f0bbca8927563627d663f941d3dc7cc565e344273e73a3d6f74ef4442c1f6c
+MISC ChangeLog 18631 SHA256 98455e18eb98a566ce5c2e54ab18a39cfbc98e512080ae81484b641772d7f417 SHA512 6a0970c9bdb2640d867665ca7a83ef0c39905c6b7693e512a2c3a2a3b85eee8257e70149c9226709b1cf0f3b23456e5195f2925fddc25dc67bc55110c2176a95 WHIRLPOOL a2f49a9f2239103013a7e96c10d2610e205a3367eee26c2e27558d2828b354d2d6c53aa2ea34b6669f378b881e3413249de50ceb96ea0ee64cfb436d2ab50ecd
 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
 
-iEYEAREIAAYFAlQatCoACgkQp5vW4rUFj5p/FQCgrUBbCQqseS/MClkLh/tjF/9c
-9mYAoIvSF7bG8YYVwgbEdoKCIJdyWhuu
-=kYjz
+iEYEAREIAAYFAlQcAhQACgkQp5vW4rUFj5r/FgCcCq8EQLXgpVDT8utLgbScznbl
+EvcAn2aKPrKpAcf5MvMbtbMszrfgBj4N
+=xsRl
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-11.11.0.ebuild b/net-misc/asterisk/asterisk-11.11.0.ebuild
deleted file mode 100644
index e3244faf9028..000000000000
--- a/net-misc/asterisk/asterisk-11.11.0.ebuild
+++ /dev/null
@@ -1,320 +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.11.0.ebuild,v 1.2 2014/09/18 10:29:46 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.11.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.6 )
-	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 )
-	virtual/pkgconfig
-"
-
-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.12.0.ebuild b/net-misc/asterisk/asterisk-11.12.1.ebuild
index b577f2dea4aa..474036024f36 100644
--- a/net-misc/asterisk/asterisk-11.12.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.12.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.12.0.ebuild,v 1.2 2014/09/18 10:29:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.12.1.ebuild,v 1.1 2014/09/19 10:14:30 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib user
diff --git a/net-misc/asterisk/asterisk-12.3.2.ebuild b/net-misc/asterisk/asterisk-12.3.2.ebuild
deleted file mode 100644
index 822aaffe2fa4..000000000000
--- a/net-misc/asterisk/asterisk-12.3.2.ebuild
+++ /dev/null
@@ -1,321 +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.3.2.ebuild,v 1.2 2014/09/18 10:29:46 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.11.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"
-EPATCH_EXCLUDE="08-tls-certificate-chaining-support.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.6 )
-	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 )
-	virtual/pkgconfig
-"
-
-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.4.0.ebuild b/net-misc/asterisk/asterisk-12.4.0.ebuild
deleted file mode 100644
index 17036e792b4f..000000000000
--- a/net-misc/asterisk/asterisk-12.4.0.ebuild
+++ /dev/null
@@ -1,321 +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.4.0.ebuild,v 1.2 2014/09/18 10:29:46 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.11.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"
-EPATCH_EXCLUDE="08-tls-certificate-chaining-support.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.6 )
-	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 )
-	virtual/pkgconfig
-"
-
-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.5.0.ebuild b/net-misc/asterisk/asterisk-12.5.1.ebuild
index 98e6b248ddce..a1663927d6cc 100644
--- a/net-misc/asterisk/asterisk-12.5.0.ebuild
+++ b/net-misc/asterisk/asterisk-12.5.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.5.0.ebuild,v 1.2 2014/09/18 10:29:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-12.5.1.ebuild,v 1.1 2014/09/19 10:14:30 chainsaw Exp $
 
 EAPI=5
 inherit autotools base eutils linux-info multilib user