Bugfix releases on both branches. Native RTP bridging is no longer attempted if packetisation differs, this helps to prevent fax failures. Improved locking to prevent deadlocks.

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

4 files changed, 636 insertions, 5 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 5a3e8ab5f7be..a5b1eacf91c8 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.447 2013/03/28 17:17:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.448 2013/03/29 17:06:26 chainsaw Exp $
+
+*asterisk-11.3.0 (29 Mar 2013)
+*asterisk-1.8.21.0 (29 Mar 2013)
+
+  29 Mar 2013; Tony Vroon <chainsaw@gentoo.org> +asterisk-1.8.21.0.ebuild,
+  +asterisk-11.3.0.ebuild:
+  Bugfix releases on both branches. Native RTP bridging is no longer attempted
+  if packetisation differs, this helps to prevent fax failures. Improved
+  locking to prevent deadlocks.
 
 *asterisk-11.2.2 (28 Mar 2013)
 *asterisk-1.8.20.2 (28 Mar 2013)
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 5e6578bf0edb..e4f0ff50923b 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -14,22 +14,27 @@ AUX 1.8.0/find_call_ids.sh 1078 SHA256 185d0f55f54d044eb4b4dc64954e5191f8b993d13
 AUX 1.8.0/find_call_sip_trace.sh 1115 SHA256 e1ebeb1dab05f552f89f380719d319cdf579cb6aeb86a9010e13e14c57f55985 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a WHIRLPOOL 8c30be245556b37dd45dd5ff5cf5c3141050f60c3e286631520f8114e167c6bd4f7930be21e57e93fd183ab65dfbd3b95b8e342808870979b67977f3ce189ebf
 DIST asterisk-1.8.20.1.tar.gz 25176713 SHA256 da36c54a865303388fffc4f8b9636c22eedf8f9dc2ebf26d3cce0679a2354ef8 SHA512 99495a91df09fbeef4d507ee95190fbd50fccc16d9c791e591036abe938e5de05e39792f2f51f72f1b43f0056038e21348771ff758bffe333e5bf6abc420aed2 WHIRLPOOL aec924350b34ecb7632b306809853cbc5f7e4620f3e2e0e3d62fb4a872104e7ec68da723c3ce52cc1fe0064c95e852a32535ffb67a027c6cc80068523dbea7df
 DIST asterisk-1.8.20.2.tar.gz 25180212 SHA256 67d9cb7f569d49bfdbd94f6d81b13bac690abadaff79d68c242ed4e55426b59e SHA512 1be14aff557a6f59bf89d67c73e2b25d09946dce9787784ec3af007f9aa071c202caa2d362660b9667bb78d6abfe7ce7576626a3e80ebc640c30f3763914cb82 WHIRLPOOL 66843609a195ce5dff6dda05bf45508377e921433915b201e6a3a9bab3ca5db513a1dd6b3e839cab4b097692e84f4ed9e48c9acc74b2d7edc3127db7bce03e74
+DIST asterisk-1.8.21.0.tar.gz 25334905 SHA256 5f7ae7ac26eaedb6b7274281073a6b469157eaf4b8fd7e69bd0880125cea3380 SHA512 034b87c9adc24b5f6997d70f8a7279de5f15087d44af622630a148deeb1e74cc999ad171eb4ae4e551505ada02b6eea422ba0e29510a0f0ecc9fcb8e9c5d03b9 WHIRLPOOL f00b5eefc4ab7299d25314faa7527a6ce198e391615973c37e9eae54458b3c535a124da5594f0748c948cb2c8c69d6f1b654766f17402d1435dd1738332d6ca5
 DIST asterisk-11.2.1.tar.gz 30465933 SHA256 239f42037f8eb43d6cd69b286a4de3da5d9491806ef29211e0f074f63b130825 SHA512 82238f5b88e03e02e938a4c68bccb02b543b21809fd7cc2a08fecb165a9dce3faa8e111ea115944490c812b84697d33d755003f12b32758d7d3264fe55c88741 WHIRLPOOL 6f887d3cc0dfbf4a8f18d38e0ff7bf6bbc15900a520abf2996520c5d4ab91b58e30c1c92ad4bc45a48a59a34399fc826ee98efb60ace789e1a43f497b5a1bb5e
 DIST asterisk-11.2.2.tar.gz 30468125 SHA256 b470a27745735a49e83dc9842ec892c9b4ab186e5d44db68ea1db66e6c684c7b SHA512 3da0aaf03d4f172e8995021790b166a2182bc09cdd8d38777c4a8dcad7e105edde9a2cead511cd09504a7aac559c7b225aca69990bb9802d6eba70ff49dd0375 WHIRLPOOL e1a36fb7c5c6d6746e67c9cfd0db8eab829ee9c2770b5bc14f71f3686c3a8fb2f8aac3e2660ad455cf403e7f9d51d23a1a81042c44ced5f97f60ae8827c7740a
+DIST asterisk-11.3.0.tar.gz 30629838 SHA256 35b7dd5d21449384ebcab631915a844d631676ff6535a6c14bd2bac819808f09 SHA512 a617224db67c5d108d4edad5a8325cb6c1010104e820572a7100417f10def422981f181f50ef694f3ffacd8d3564d81daa9e07da342c8e03671de29a433a2238 WHIRLPOOL 1e2293a4e0a02cd2135a92eb55dfc4d15f76a832c663f3ed65cf44b4131ea923a7c77fabf26e216f354d88dc72181a632ccdf481d6edcf14ed430a3dd887d185
 DIST gentoo-asterisk-patchset-1.17.tar.bz2 31552 SHA256 fa1c202a42a9b2b3c8e1f90df05f8c8e818688347ad62d38c1bd2daa69d58af4 SHA512 84d5cd12894f452a4f17f95531321f2e15f745391965f6351de5af52e2ac3b580c50552cf04d656f91fdc7db69c0ebd9e2cf210143f57c8a9fb0d2745477ce00 WHIRLPOOL 54c98f94acd95519087c4a6c62269c5f1c41a250eea4f9def40c01e968be6bc2b4e85cc18a16367a8af02c217a5088718e0bc0f55e03aebc29aa5247a2d03274
 DIST gentoo-asterisk-patchset-3.2.tar.bz2 6038 SHA256 f6cf6e900b459d163ea2be18426c333739f65075260faa41fed5fe448a4705a4 SHA512 4fa5e445faff9bb870619193335b7d71fc5d3cfd3e1ccd8d704a49f66bc0bd4587eda63b0e5f985bded0259ae1deb7d2cd74d5139fa5c48eba6ea7c748f0283d WHIRLPOOL 78d308c89fd940830f293e339e4be555be80bc377a1d4cb043b3f4dde8af4390c5f2be78d2380ad3851cb5cf375fc2580110a079bb2f925883bc3602197f67bd
 DIST gentoo-asterisk-patchset-3.4.tar.bz2 7600 SHA256 e2c1c84c7b1137ece368696d44a518ae58c877f51ae74d37aa76989fed1bb983 SHA512 62b196f7cda00318716dc09f8e8a895080721f362f6215062a564e66428aaeae987136ce84a1b82216d1ce51e77bf94c745f9e89579391ca2140eefc651de798 WHIRLPOOL d67aa57bea86524ec0f0caf9b720fef3d69eeba7e359f533dd48eee8ebb6a81f63ecdc7191b1ce05040a141e8a42059b1eb17f8a17966639eb2fe676ce129ff6
+DIST gentoo-asterisk-patchset-3.5.tar.bz2 7277 SHA256 2d0487d9dba92253f2424ef7ab8a78688b2cae5f956482178992426f82a72278 SHA512 2355059d9c2c904e28b9580bd13c4b1edb6b6a6fc055ee7cf3ccac38c2a3d386759bc8d1a13e5573e38fa740d4c24e11e04914a930f813e05ca9b506750c42b1 WHIRLPOOL 95e96a2c6c430256cb81589f30ed42f8becafaefad57d908a58438bb98bbff7035efb071eb26658d402a09adbc71bba7062876d1da11fb2f3f3a56f8d5da8cda
 EBUILD asterisk-1.8.20.1.ebuild 8995 SHA256 762021d887488d3f969e8f0abdd89a0421b52c5f5cacb83754a4d6588fc10b05 SHA512 d9cc44b1c2e9ad70dede2f279a9587608483b225244419e3965e05ac26bfe3dcf698996683d6d3e2d57b48133db543e98ba8a9f246e0af6472564c0fd579dfbb WHIRLPOOL 6f489265884c85a35ea6b2489086b7eab775a5f4f353ccaf6bf49e6293ce57f310acf0c59af63f035acd38797b4fe7fb4ee42d4fb3210a6ced008f7629ee9392
 EBUILD asterisk-1.8.20.2.ebuild 9002 SHA256 6dda45c12d0fdfd6e4551ceaebb2398c7efae88cfd7fd6e29d59dfaf8bed7e2e SHA512 3326e387fbf52f5782fa8a969b0dc9a5a91bae0ac3665a1f4527f3255f219d4d432facd34e1225d6a922ba5493f5b3d7b59cd698cbdfc6ba98f4676811eb86db WHIRLPOOL 5f8289cc5ebb5d3219a5cdd305928514daa118344155d71f9077ac01f5397d0cdf8c69746df117222df4285507ca72813183ea50269437c7ba5e3203c38a9c99
+EBUILD asterisk-1.8.21.0.ebuild 9002 SHA256 95cbab229cc5cf5a9ac2369be38d520496dd55c935225c69de59c172bdbe7b10 SHA512 77e44ef042dd5b9b1d1af73902eb18df06db7e3cf380f5eb7c77dc428947aaa6f2f42c572b58b851e23684f00da303dad2c669973505fa027b599dd1862fe862 WHIRLPOOL bf45ab1aec4e719921cb493aa0ac2cad9aa831f55a51f319d2c7584dbdea884b8a9681b5eb7b0f8af1a0c9e2408df343b9cb2b0b2d53d469dabc3dfec0e6bb6b
 EBUILD asterisk-11.2.1.ebuild 9088 SHA256 f7c2090dcd522e694653a6d4180346680a0c68bb06615f98e3267f3f4fea49e0 SHA512 40623b8fc4a104089db9a3aa2f3c42bb63cdb2a432b27a229d1602d7b7f398274245bf5038967052c04090d7b5d970f1d4a25ae103448278664ba1495d275989 WHIRLPOOL 76125ce53c1a6759874eb4e95985deb0729d037a787f280ca0da323a7c02b7213173fa304724f88e95aa44e4764aa02015d52aab3091b9fdccb642cfbf274d55
 EBUILD asterisk-11.2.2.ebuild 9095 SHA256 b3882ed49602cc683be07aaab5b89401a24340af06bee81dc48d31f6133c2597 SHA512 c543a92326f7d3172735895133f4ba86ac0a049dadf74a4ad8459752fcf0e3c36bc5548c62e04b6d28a2d326dbbfd038becbc4c010a0f3f2405acc0f07370eba WHIRLPOOL 9e7010e5ea0e883bbd954a361365c8f7801d2f81c3279a816fc07d5315fdceefa16ffb7cd2cd731064976be0c762449e7d0db595b992e00c4231a3ca43ed79d8
-MISC ChangeLog 4927 SHA256 d8fb8865b5b26b2a1677b7452c5718d100e8031eef9596a40140381efc888d4f SHA512 c30fc31b02fb7020effd1a5f130559f87a7da5e37d1f0c219599327b5ab5c519af17ecff20c1bd2c496951ab94f936044ba5c775a536a12b11a90d953ee911b8 WHIRLPOOL d20cefe569fdf116a884cfd2b1fd22880751d01b5050599956966dcfb0f869118852bccb4a7028e61da6abc7ae3eb6e04416022e42152a54181aee13d4737ac3
+EBUILD asterisk-11.3.0.ebuild 9095 SHA256 10672f84cbf98b1bf57a3bba964a219f94fb52b67494e99a8ec41e82a42e6886 SHA512 85dc707c9387023b729283d10ff5bab289b26e7fd325b31bcf521f5900142fe6e724f82095187144c0b0e2f923cff43f53905a1f8874faa5038c01de03885911 WHIRLPOOL 88f928b39f65c436345920ec6a8c72a50544aa525a33a8da40320c2af844356c598503c80e5634c71bb2277e3b74f110044ae5accaf8f04e9f492ccc5dc77c94
+MISC ChangeLog 5279 SHA256 3c5a933f79ae058b735d3e5366bcf231faa786bcd9c7b0c824fa219f097a1186 SHA512 2a4dcf1c00a43e2fcfeda85af036d4c7a5bed761c8eae15564bd662c1681269ca2bdf2461a309ff98a50706bdc09aaf599a8e573382baf6dd175f592246937c6 WHIRLPOOL ca2c136d2bbf0a8e99b4551217be2cc866a022d06eabd28707c9041799ea929c9fb9bafbfd0c359ea72af462ff6373c78c9fd68c25444231391974900f453d85
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
 MISC metadata.xml 1203 SHA256 d5acdcd4f214e602c8d6b68258e4e7fa9071bd2fbda10d461f097d35d1f08c0a SHA512 4f65a7268834241af12d41b79da374cc65b977436ad182ea781b2677790da0d1573cc39fc2e9868a0acbaeceb529762cab385e16d9140a5246cafebd6e25e765 WHIRLPOOL d870297ef0b6f1f36a2f39cabb811c3a1845a305884ae7b2bc979cd35f96da04cc3030eb4593039aa0aaf206fe44845a37bbb5ac994085c1e67a422e2fdf0772
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUe08ACgkQp5vW4rUFj5r4fgCeICO6raC+Habf3M/Jq0gGgnoP
-W9EAn2SJKgXu9LlfJel+hfrp4i7msjUg
-=6OC/
+iEYEAREIAAYFAlFVyiAACgkQp5vW4rUFj5rY3ACgwnc9bP/AVdoMRvhkgSIkkb8D
+MUEAoJsyiP3v96mZGW+HBPyJwqqCBfAQ
+=dljf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.21.0.ebuild b/net-misc/asterisk/asterisk-1.8.21.0.ebuild
new file mode 100644
index 000000000000..7f9b7cc8b309
--- /dev/null
+++ b/net-misc/asterisk/asterisk-1.8.21.0.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.21.0.ebuild,v 1.1 2013/03/29 17:06:26 chainsaw Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-1.17.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex sqlite sqlite3 srtp static syslog vorbis"
+
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+
+REQUIRED_USE="
+	gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	ais? ( sys-cluster/openais )
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.4 )
+	iconv? ( virtual/libiconv )
+	jabber? ( dev-libs/iksemel )
+	jingle? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	sqlite? ( dev-db/sqlite:0 )
+	sqlite3? ( dev-db/sqlite:3 )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	!net-libs/openh323"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select ais			res_ais
+	use_select alsa			chan_alsa
+	use_select bluetooth	chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_gtalk
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_jabber
+	use_select jingle		chan_jingle
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup	app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select sqlite		cdr_sqlite
+	use_select sqlite3		{cdr,cel}_sqlite3_custom
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd5 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bugs #300832 & #414585
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "1.6 -> 1.8 changes that you may care about:"
+	elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+	elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-11.3.0.ebuild b/net-misc/asterisk/asterisk-11.3.0.ebuild
new file mode 100644
index 000000000000..fef567f8affd
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.3.0.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-11.3.0.ebuild,v 1.1 2013/03/29 17:06:26 chainsaw Exp $
+
+EAPI=5
+inherit autotools base eutils linux-info multilib
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.5.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc jabber ldap libedit lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( jabber )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.4 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	jabber? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql-base )
+	radius? ( net-dialup/radiusclient-ng )
+	selinux? ( sec-policy/selinux-asterisk )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+	!net-libs/openh323
+	voicemail_storage_imap? ( virtual/imap-c-client )
+"
+
+RDEPEND="${RDEPEND}
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select jabber		res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd5 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}