Fix by Jaco Kroon to avoid spurious errors in the AMI ShowDialPlan application, closes bug #440278. Prevent pwlib configure hooks catching on ptlib, closes bug #440278 by Diego Elio "Flameeyes" Pettenò.

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

5 files changed, 25 insertions, 627 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 6ec0278d7d2d..ae2d85cf3d91 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.421 2012/11/13 14:44:48 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.422 2012/11/21 13:49:26 chainsaw Exp $
+
+*asterisk-11.0.1-r1 (21 Nov 2012)
+
+  21 Nov 2012; Tony Vroon <chainsaw@gentoo.org> -asterisk-10.9.0.ebuild,
+  -asterisk-11.0.0.ebuild, -asterisk-11.0.1.ebuild, +asterisk-11.0.1-r1.ebuild:
+  Fix by Jaco Kroon to avoid spurious errors in the AMI ShowDialPlan
+  application, closes bug #440278. Prevent pwlib configure hooks catching on
+  ptlib, closes bug #440278 by Diego Elio "Flameeyes" Pettenò.
 
 *asterisk-10.10.0 (13 Nov 2012)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 103fc433417f..e707342d9ce6 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.6.0/asterisk.confd 2204 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7 SHA512 4d8998be5032203d693096d7940b4aeca71345b23544ef3c645f47aa617cc775da7b013f364ef90fd0abdd86976235bb4fcd463a055250b8072efc181e325466 WHIRLPOOL dc423607cda205913e034f4b6c10b20463eff12bb0c1f41813deade9cd887e3abaafa6eeab6c39064c3da242e50859e293165a9818eee867ecf832d9d1f88a8d
 AUX 1.6.2/asterisk.logrotate3 436 SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 WHIRLPOOL 34606860de1f8d7f45165035a4d3c0ff8726843508f0664a77db90d90556166dd3d6909dfe0f1b616e239c182e3b97f2e9a224e76628312a5e0d2a6e6a1259e7
 AUX 1.6.2/call_data.txt 1120 SHA256 24a5b8dab0f46ffff6dddc50d4ab8d498ec90bc2a0977249f65471b3f0948a0b SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb WHIRLPOOL e28db9b7c11e9106edc3d00f611960ea3290c442607c14b0d30ba2ab773deea6b70ab37f88b60f559062b18364d7d142526d045280ff8559acf560163a9a04b7
@@ -15,21 +18,23 @@ DIST asterisk-1.8.16.0.tar.gz 25085895 SHA256 c45a8959b06bd789d27e616bcfbe504d48
 DIST asterisk-1.8.17.0.tar.gz 25136583 SHA256 065da84b8e65674356efa8d1f25d985490756d2a2d1a582660617f3eab144114 SHA512 4d939580a2331d378200477a9adf836c9be081b230ee039acccce54a839a9222db627db33ad339ef7ae4ad29b5e67c2815efbc5f66abd91328d0484747bbfdf1 WHIRLPOOL b6e02933c053037da69753f2e5cad0648a1899d26855922efc38540b9bc221a3831800c0934d0c35286d66ae4bf241ff7f75b0e1200bbd8c3de3699b485aa2d7
 DIST asterisk-1.8.18.0.tar.gz 25145207 SHA256 d322584639eb96568d0f68121a72eb127f81b3dd5ec4ff633c895b8ba6917c1d SHA512 6944e4770f9f457ac38123996f865c2ea68fe383cd6158a25d6a995b411cebd517e9a0350412232a8bd289d58da3c14832d9f65d55a92974f283fa07e485eb13 WHIRLPOOL da2a519d27bbb663d7d9bb33e960b601564ad04c1693a49b5a3c2194c5f166383849c700eca1982ab2e19252db0234ed4a5572209cd94e9d2a245facff07ed3e
 DIST asterisk-10.10.0.tar.gz 25077705 SHA256 9ee1bb6df0c472f19c210242045b6fc6cd091b91c5a6fc9db4726d3647f26b3c SHA512 8ff5a3b75c9bf5eefb2046af061a39f837bf27c46a7e127689c973b0cc32506281b1d672cf07552b58648d168038b7696495a0d36d876bd16ea18a85902e59f2 WHIRLPOOL b219b1b637fee811e920375714bc2328b1f1d1494585df9969be50d20fd60779ea2b042b81b8af3f504cbf915ec61e814b0c97b2e43cc61dda2bc8c65b10df43
-DIST asterisk-10.9.0.tar.gz 25060275 SHA256 fb5ba7c4e9c197843b7ccefe732ec6992a7f6d16065d6e7128d37b1049ef6eea SHA512 001b570e6dea023376df5b91dc778ad61abc3881edf50418e681eac1b812c42203c17237ffc1aac53c53b0201bce14a2bccc582f8642809b3d21b2f6a0aa9f36 WHIRLPOOL 16cbaf9faaa6d773681adc641b5a3682cfd743b3d1282ca7dfff3c6d8a6239f3b92c8ae6db92938ef0365e8f391f5c80d0af7a62460e8b5b91a40ba607a1d215
-DIST asterisk-11.0.0.tar.gz 29917907 SHA256 01db5f6c657ca3fa2b17bc9c4f935adaba3f51a2ea57d102048858ee792da8b7 SHA512 b67cf6dc184fc20cee6d47beaf623d170c836703150c41271668eb8c71b2bc14f51b295e8750020f6843db4ef5facab3d29ed3ba37f2f2bf71eb3662fc1a620b WHIRLPOOL 5c63870a964f72ea0db227477aca281def87231e7bff505f7373f72fd1cde609fdf7a2116fbb3e21dc236d19e6d9d6e65801ce6b7b81e38d493cba328b0c456f
 DIST asterisk-11.0.1.tar.gz 30392865 SHA256 8b3536429a28a4d7ba228010c8d389e8acd4d86cce6c93ccdd882cf9132eff05 SHA512 c963c4ef8031bc2cf86c968a65722052f6dd9443c54387f8e0a51e6f76ff4a423508427ba0caf68a4194bce103eab311af623f124488abe4d4c483dd321721de WHIRLPOOL dfb292f11e08757419170580dc23b654dd70f7f3602b651b01e28b3e274edbd7904879cdd435bb5e71499aaea547ab51d8a79f39b1f58e5023330af0f236338c
 DIST gentoo-asterisk-patchset-1.14.tar.bz2 31270 SHA256 d12e3950037113d68c496c3e92e38f747ac7486cd8609aadd05547d969b734d9 SHA512 b3e069043227dae52d3b3e73641540fbcfc16fe4a71d2d0a0d4cb18920b68d717ac5ab0734d6701953f7a54a27b7e778ec91064262bc7dacb6e28afe981d1d64 WHIRLPOOL c8b261819688ed1ebd15cbeafeec0f321db3d9efea1e966f5588b21e6e1430d189156a2166d31143489b1e0528492cec47ec73d64efce19c749a55e305ba37b9
 DIST gentoo-asterisk-patchset-1.15.tar.bz2 31482 SHA256 ad5f2dea6d0831660330759cc82711bd422851b29c762628abb09fdd80907eee SHA512 1be84dc35778c725506676ab68e8b71602a7dccfed25271949235e64cdf41379798df959beb7a69d9ead83555ef34aac41f9ee9b66608e2d0cc1419dc54d289b WHIRLPOOL 5b133f12b5ab9788299d585b50d596ffaa934ed523156e8f747e00a63a0ef9e4a8b54652ff678274370062ab640342360150b5cd56029e65eca11e99bd832972
-DIST gentoo-asterisk-patchset-2.6.tar.bz2 6819 SHA256 03f174f23234b23a1deb6ec5a25f6682e09d1e20bdc4e0eebd937450448bcd01 SHA512 49f85ab464ccb1da210b764fd8abd4aa6379d8aa4fadf087ac5ac44c924151b8d6de663a57e4381de5bea0ef90a6a82d4f17ca727863550cc3d489a38c489a22 WHIRLPOOL e55e62aa359b8faa461a8ea2d6232d0deb60d1b56ddffdfb54e366a21f35f46e69b1d627b5074c2a894ece6e576ec815ce63a93d931c52919eb9ee7904ae3ca5
 DIST gentoo-asterisk-patchset-2.7.tar.bz2 7147 SHA256 677058a585118acaa5581219a6cfe2bbb640c2a3bbfd2511d769d72d3ab73d3b SHA512 6d2eb88fc6a8937b550c099b3150d6dcfe2382f967868729fa2f81cfd3f34576b448fd8eff07b08777bd9bea534d4cec324818c1718e5a3251d6f8380a793992 WHIRLPOOL 82f5f275cbd5a7ee46f4ef3afa9836e3393bb782440857823158f34f3879e2f15d60820c3435e9828957dc2047420eb749a13c950cb99f766612a36f7bb54c01
-DIST gentoo-asterisk-patchset-3.0.tar.bz2 6039 SHA256 15f323a8d3382862bed81de07ec72b42a44308415f9d1564c9ff626cd5562883 SHA512 c53e30630306e97de2fbba8d340d5b4d85e6217e7a913b95d5e790d5bf0bb16227f652d783288f43d10ad35b9e90fb7c08018ef69b85e6215d526a561f4ced6a WHIRLPOOL 79a166cd716317e8a0c8825ea0f0ea6176c3804e3e7e731ea767b4789c642e3ab8fa7259b49a4e0cdc1cfd09821dbceb14884d921ef93c9f241c8f33971782fa
+DIST gentoo-asterisk-patchset-3.1.tar.bz2 6557 SHA256 9bb7e1dcd3469281291757366579f2504372356a862b906c32c7ba255b2087f5 SHA512 16caf58b69480b816c8605d83be5594eef102ef288df4150c43887efab0091d0775c1c99c6a3a1dfcc4b48a099cb3631a72b2cb98418d84979a80a5ea05ee0aa WHIRLPOOL 3a5376944d09582ea9e88cb435186748cc46f56e50eabb460bce6ce468cf7b65ae238fd3c2347121bc401d46efbc36c257f983ef037845e9d789aa21dea60946
 EBUILD asterisk-1.8.15.1.ebuild 9009 SHA256 341556b0a658f7f3da75844ca2066da614b70813364a29d4ac0c89a3f1a24eba SHA512 2f80343e61806f04001498b197000646b36c0bb9c06a84c0a69def433447ee65a6c1fd917c232688a8e45e22a9da638e033d3d0f43e42242a75aaf2255a846bf WHIRLPOOL 809181bd0811692821c5c91a70e258319405463872e6f7559da10866eecb9dded95e5db91f8d35834f7ade91dcd67f88d0aaf18dc05508175180029873cf94af
 EBUILD asterisk-1.8.16.0.ebuild 9009 SHA256 28f0e15c1ccfe0f20033c2aaf032de6682ed0edb97eba046be5f0b2bd8e34602 SHA512 8705b8339d73d0894412da4a4bb806498dd20d69dbc8ab66ea530ddc08b894ef0c3ec2cbcc5bde7a037e82be917eb601db56c7bfd00dcc2b2707faeab813fa0c WHIRLPOOL 9577352c293b1caf42d4a34140cee271bfccca830e9e10cac7fe69706d1b9d4ccd494fd929efb368dea37ce70398abe7f8f866fb558997340890a1571028a89c
 EBUILD asterisk-1.8.17.0.ebuild 9009 SHA256 6dd0af06ccfa2a574c02dc762351702d04a1b36a84e214a53c513629431ad97d SHA512 6f481324dfebc25dff2f9967703ac9b055a045ee9978da5de437d9f2c331cd11c840d52ebbf79892f20f2c814e701fbeeebffa67691c40e704c7e012dc61c73c WHIRLPOOL e0143fa545f3e5758af1f468de29f7013b2bd3c3b9adb98d8f373c8018f11f0f8ad4d0bd91c2f1fda745be30e4a6c9ce0be9dff34d5f8925ceb177e1063428d4
 EBUILD asterisk-1.8.18.0.ebuild 9009 SHA256 b386abbab0aae625f0fbd885bc4420daa6647e2dab7fa2aae1041b4bc366be6c SHA512 28de026d4dca2ecfef0b4858dbc75cf36118f057c7bf1fdaf1c97e4fa50ab6f650eea768457bc21036fa0c8d594dbccb006e598966265b62fa9eff4554ba57fd WHIRLPOOL 16e08fc93030060ae6ae14b9e35dc25eab9db20db26e22ebb5cf97c2d066b54b08a3eccd421317f955c836ab92b01cc5be8ea464e3fafef914f3e72ea0439c65
 EBUILD asterisk-10.10.0.ebuild 9071 SHA256 4f239b56356c9a578142c03c73f11d90d921edcc042a9348d00a6888c387a7e6 SHA512 bf50472ab0909d382838535cc403b533b70a53a35964762d3fc324d96fb7857fee54163bdd45d18d8efef7292be3be05ccf24ad33dff62b4dd9b3bd8e8b3ce0c WHIRLPOOL 7228063a40ca2e5c6124b3cd8ce66c144860fe8a1caebf3c72c674496f66305c8b06d49fa2ae0577ed9912779e3603492db31d67ecc59774dd39dfeab9f5d7df
-EBUILD asterisk-10.9.0.ebuild 9070 SHA256 9d90ed5b33e2d2237d96530144d01b645e9a005f30e47e408bdaa421503893ec SHA512 1afdb3600cd4caf7d050e1120bcc0710bf79afb7456b3042fc76b7928ef7da38e4dd7c0f718b2b453f635e95460dbb61d7dbf8b4c6ad8c64800960e1fb954a43 WHIRLPOOL c7f575d8dc14343738a3ebd229c997526b96b375c5e5492c6107fa1b513642c1740552370b7169fa90a734848e424456d7c516b13331fea3775cc2fab5c2fc21
-EBUILD asterisk-11.0.0.ebuild 9102 SHA256 96cd022cb5114a3d1abe3b69160334480987cea00fc12739b6168636677f117b SHA512 4141678d9b102786ab5e411235c2924e3e18ff13d0af4a21233fba342d0692886ef70dde2a9c0b4986fef58c5e98c3cf6fea012aed24b226bf5f062a680a1487 WHIRLPOOL 746ddd55b73459fffc0de233f0661aecd92758bb3e57e342ab84717c5fe9f8cc20093a946593c813a33c1223b52de7f2a390d37535bc7aebe1c6f62ac7a722c3
-EBUILD asterisk-11.0.1.ebuild 9102 SHA256 2393443bf3c145969ef9c6dd328f4cf420b30a30f9671f8945b4b01247235033 SHA512 c5cbbb7de886dd72c5a33b85c947210e14e3cdbedbdea2b0143a85277d3028315db005d4cb720d4d6eb86b40b14dcc764601b4484f20343b25b742a2882a1325 WHIRLPOOL 1778673163ecf76822d88e451102d6716ab6de4f126ad38e2818085aa53361ece6c7b5a1b1bf5c163de0cffc960831cd9cfcad78b3f33ab791d6d278342acadc
-MISC ChangeLog 110255 SHA256 62137d701439643ca924a106e46093929b89d00efc1bfe144f46c8a4fb84c307 SHA512 07d729f660ca0462b095f6ccc6a6322a7d2827cae557f4d31ae4ec7bbf3733aa9c791f9e59d0aa1e365955c71bc30dd965a2dbedebebb4277a30767b84443bf1 WHIRLPOOL d45e7aabf8e83d77413c2ecb08322ce1fd98d91596395e7f5cad58b827cb67f59f4cf7a63af1fa16c2d910853795940d42c277467940d9dfdac392e0269c6ebe
+EBUILD asterisk-11.0.1-r1.ebuild 9125 SHA256 8fdaab361106b96976308c310602c15b3e8972b3d6968f6b05acb77860c7adb6 SHA512 3ca9f506ed03c619276db1391e0952c3594119310dc48034816beda2c1feef7c836d295283418c273e160e8edbc234c831a7d31cadfd50f6a230fbf633d5933e WHIRLPOOL 9a0ee60db03bad70f13ee46f234ef025a4c36c8887dcb2e1a66b492b0790d26acb9995fa48f35585e7501a5949fe0439dbaa6f7f10b9437d26b1ee499168fab6
+MISC ChangeLog 110654 SHA256 63421c5ae9b9f392590febb717252cbe1b5acaa7ddf9990cd4e1f45345055fec SHA512 947313c73981b592ea2cb3da2e536bbb068eeb9a6aef87d733983483299e697db05bb28ab64b77b7b4a6d90e587db0cc8b2eb8dc4a1f8d429e0eac665d27b8e7 WHIRLPOOL 38fad13d9f841777ea24071712a906493bd71a2f04c19641eb4f00fa204a390cc31e82ceea22c7b3ad3abfc24fbc333d2a3c8988d350a61985e21d8c64520c64
 MISC metadata.xml 1203 SHA256 d5acdcd4f214e602c8d6b68258e4e7fa9071bd2fbda10d461f097d35d1f08c0a SHA512 4f65a7268834241af12d41b79da374cc65b977436ad182ea781b2677790da0d1573cc39fc2e9868a0acbaeceb529762cab385e16d9140a5246cafebd6e25e765 WHIRLPOOL d870297ef0b6f1f36a2f39cabb811c3a1845a305884ae7b2bc979cd35f96da04cc3030eb4593039aa0aaf206fe44845a37bbb5ac994085c1e67a422e2fdf0772
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCs3AkACgkQp5vW4rUFj5pD7ACfRGQUqwyYXuF3/ySomNpfxJNW
+0lAAoIBUv46IgAy8HdPwcUuB0l9xHuws
+=CWDF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-10.9.0.ebuild b/net-misc/asterisk/asterisk-10.9.0.ebuild
deleted file mode 100644
index efb453369e95..000000000000
--- a/net-misc/asterisk/asterisk-10.9.0.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.9.0.ebuild,v 1.1 2012/10/09 08:38:23 chainsaw Exp $
-
-EAPI=4
-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-2.6.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 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
-	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 )
-	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 \
-		$(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 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 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/run/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.initd3 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 "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-11.0.0.ebuild b/net-misc/asterisk/asterisk-11.0.1-r1.ebuild
index 3f503d09af77..29b267611dea 100644
--- a/net-misc/asterisk/asterisk-11.0.0.ebuild
+++ b/net-misc/asterisk/asterisk-11.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.0.0.ebuild,v 1.1 2012/10/30 00:30:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.0.1-r1.ebuild,v 1.1 2012/11/21 13:49:26 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -10,7 +10,7 @@ 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.0.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-3.1.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -111,6 +111,7 @@ src_configure() {
 		--with-popt \
 		--with-ssl \
 		--with-z \
+		--without-pwlib \
 		$(use_with caps cap) \
 		$(use_with http gmime) \
 		$(use_with newt) \
diff --git a/net-misc/asterisk/asterisk-11.0.1.ebuild b/net-misc/asterisk/asterisk-11.0.1.ebuild
deleted file mode 100644
index aec1858b29b8..000000000000
--- a/net-misc/asterisk/asterisk-11.0.1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.0.1.ebuild,v 1.1 2012/11/08 16:11:35 chainsaw Exp $
-
-EAPI=4
-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.0.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 \
-		$(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/run/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.initd3 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
-}