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ò. Remove older ebuilds up to last stable. Contrary to earlier news, this -r1 ebuild is the new stable candidate.

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

5 files changed, 21 insertions, 631 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 30f4f3e8be7c..104f8c29f40a 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,17 @@
 # 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.423 2012/11/21 14:07:09 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.424 2012/11/21 16:08:54 chainsaw Exp $
+
+*asterisk-1.8.18.0-r1 (21 Nov 2012)
+
+  21 Nov 2012; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.16.0.ebuild,
+  -asterisk-1.8.17.0.ebuild, -asterisk-1.8.18.0.ebuild,
+  +asterisk-1.8.18.0-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ò. Remove older
+  ebuilds up to last stable. Contrary to earlier news, this -r1 ebuild is the
+  new stable candidate.
 
 *asterisk-10.10.0-r1 (21 Nov 2012)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6ba09622ea92..3a7b0e3abb17 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -14,27 +14,23 @@ AUX 1.8.0/asterisk.initd3 6484 SHA256 3b341051320a3e4c7ac60c73d233f3c8553268b6b8
 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.15.1.tar.gz 25077347 SHA256 993ea4b8a52242dd1884a5b0efb0076780fdb3367431ff74ac8937e6a6ae755e SHA512 28af1f5a92dfe025babd86d3354a417e6585fcd67d103a66bf977fd3d90a66b4b709441ba3616b27ed682a32a2bd739b7f8a3b5cee095117c561395fa61e2a4e WHIRLPOOL 931060ef883570e61cdd97cbe1ec3dc1c416b7f2f888001f21fab4fab2e297b545c4ae7e120f6a8ad65b4ed3c928543c46c383fb56305221349d6f3306513a70
-DIST asterisk-1.8.16.0.tar.gz 25085895 SHA256 c45a8959b06bd789d27e616bcfbe504d48e3f2d37993c45b3c8bc9cb3624d2dc SHA512 683e46de39f127a5eb0abfaf2a2d0fcc6d49d060a150e0d0188292c7b5d8f1b85c98f942d772f12cd1e16b50d606e388335b141e35899eadd79b4e322fbfa4e9 WHIRLPOOL 1d5811daf52706257ba6143b1c2eb5d3bf7b088b6df1e9f96d375c70d34e62f91f3c87381df2a41ff30df946694c2bde4e861b158420beb74599824ff869b985
-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-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-1.16.tar.bz2 31997 SHA256 dfc097d8f4cd497dd970ff64bc6af716af456ce7f777a5536a112513a64bf132 SHA512 643c7b9151d3290e0494b76d08319e676fea8d053024c7abe658dc54f0611690cf95b67e25620ec2e0d4b36a4f91c3930acb1f4cd0e82083f5f718120d0949c4 WHIRLPOOL 9d7c61d96d3f3f67e74fa5aa2e233aece67240b783a948c90884235e3eaeb6754513cd4bc6be501043f4991c0cb2a0d15ea65c6f1a6a9adab750b793693a76e5
 DIST gentoo-asterisk-patchset-2.8.tar.bz2 7614 SHA256 17b6df0bc86b122cad6cb82a8268ebd30b249e0be1ec7f2febb2ac8ec1deaafc SHA512 6887971be82b66cd3181e76cc37e1788cadec3c1fa10d062a28a95670bcdad86643f6fa39979c186c6c4e6c5ffe9ac2999cdd4f38d3fff0e5eae2f3a2cf01415 WHIRLPOOL 8370f7d3182785d36f27b6254d2f06ff48af2ababa1ac3a05011e0c6f19fcafde04ffc334561eeee0c854379932fcc25d01ed075a13051e98f1d58acf52337ce
 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-1.8.18.0-r1.ebuild 9032 SHA256 edece47e34a6ec1e224720ff295dec26472db6ece1631600e9042252d3967ea5 SHA512 d4d1d083978bbf2bb2ea215f417927fd19de8aa3371bf12f436f57f8cb6f387c03650925711abd1990596e88ef4c28d172edad760edccb096727c9103a0a4773 WHIRLPOOL 01b004dccbceec7936d0017097e9300a1d1e3f06942ea366325294231565e21472f6ef4e00b3092edce7012e018cd6bdfc3b224700b51c4b3044fd7e698585ff
 EBUILD asterisk-10.10.0-r1.ebuild 9094 SHA256 c38dc40defbe1d8c0e4eb99ebbe246829af58d806184792e9c0f4b1c23273504 SHA512 5b8b98ec543a944481934c481bf03d601d0bfab9e98b5ed00db28b16b7848a225921198e23e4b8bae53781eb236b99be884e5f309e0c1e6a683320821369560d WHIRLPOOL b6f059cf7f1984d7eb355ec6f65c9511ef5ff3276191d0464c5acb4c8f207d8b75c74bab0217eab8d78c30af10ea206cb373574e9bfa4731ea5e0b7e0ee6e4d1
 EBUILD asterisk-11.0.1-r1.ebuild 9125 SHA256 8fdaab361106b96976308c310602c15b3e8972b3d6968f6b05acb77860c7adb6 SHA512 3ca9f506ed03c619276db1391e0952c3594119310dc48034816beda2c1feef7c836d295283418c273e160e8edbc234c831a7d31cadfd50f6a230fbf633d5933e WHIRLPOOL 9a0ee60db03bad70f13ee46f234ef025a4c36c8887dcb2e1a66b492b0790d26acb9995fa48f35585e7501a5949fe0439dbaa6f7f10b9437d26b1ee499168fab6
-MISC ChangeLog 111006 SHA256 4a8c7affbd3248dd430e1969d124adaaf7dcca923c75202d84432ffc215bac5f SHA512 26d31212220963c75649224f1351571d134595bb7dd9f8a606884ae9f04ea619ced90b680b9cada3912e89ab169e744c89aa99615227c70595c2d41f026bb133 WHIRLPOOL c998370e4af3a661eb05582cf7f969e04ec64e8a920667aa975d19ab6c284d6b3b2a94645c766184df7a32407c4aa5506b53e9ae58ff6d76fb57ea4ba1f1be9a
+MISC ChangeLog 111532 SHA256 6ffa70008259ca2707efdd99c0d38bc4fe54f0d7139cc11507d191c5c82527c0 SHA512 c6d267750e19ddafbffbbb63b1389c82c3d88e6907b0b9c3fd7de0d10425e173f9fb02cbdde6cf25cc4d0a3fb092212f65c0cd0e5f077aa64b7e230e6afb3554 WHIRLPOOL 161e05daf0d64449512af64191a2b4ae86e9874647b0ca4b4aa8fdeb34f3ec271a9ce7b0e917eb3dc1447b1c0a66a10433d26ab87b48b4ee8137de0b6a8735dd
 MISC metadata.xml 1203 SHA256 d5acdcd4f214e602c8d6b68258e4e7fa9071bd2fbda10d461f097d35d1f08c0a SHA512 4f65a7268834241af12d41b79da374cc65b977436ad182ea781b2677790da0d1573cc39fc2e9868a0acbaeceb529762cab385e16d9140a5246cafebd6e25e765 WHIRLPOOL d870297ef0b6f1f36a2f39cabb811c3a1845a305884ae7b2bc979cd35f96da04cc3030eb4593039aa0aaf206fe44845a37bbb5ac994085c1e67a422e2fdf0772
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCs4C8ACgkQp5vW4rUFj5qEYgCdHLunmiyzhi4z9gPg3UdgqXbe
-u8AAoMFFrP2f/opR+xB3iBKhfX1S9Me1
-=uKcY
+iEYEAREIAAYFAlCs/LgACgkQp5vW4rUFj5oe+ACeJIYokCBfGc8G/hwRxUIJdIaO
+pCkAmwSIpVDuEoB98zM9C8t6EcCjC4wl
+=lgxi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.17.0.ebuild b/net-misc/asterisk/asterisk-1.8.17.0.ebuild
deleted file mode 100644
index d9c9b35f90d4..000000000000
--- a/net-misc/asterisk/asterisk-1.8.17.0.ebuild
+++ /dev/null
@@ -1,309 +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-1.8.17.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-1.14.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 \
-		$(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/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; 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.16.0.ebuild b/net-misc/asterisk/asterisk-1.8.18.0-r1.ebuild
index fb88d0f96b58..48d448793197 100644
--- a/net-misc/asterisk/asterisk-1.8.16.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.18.0-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-1.8.16.0.ebuild,v 1.1 2012/09/18 09:42:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.18.0-r1.ebuild,v 1.1 2012/11/21 16:08:54 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-1.14.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-1.16.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -113,6 +113,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-1.8.18.0.ebuild b/net-misc/asterisk/asterisk-1.8.18.0.ebuild
deleted file mode 100644
index 321d2eccd3b9..000000000000
--- a/net-misc/asterisk/asterisk-1.8.18.0.ebuild
+++ /dev/null
@@ -1,309 +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-1.8.18.0.ebuild,v 1.1 2012/11/13 13:58:42 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-1.15.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 \
-		$(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/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; 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
-}