net-misc/asterisk: Version bump to 13.9.1 with full PJPROJECT support.

3 files changed, 4 insertions, 330 deletions

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9295979f3b85..5a0c5974ef17 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -2,7 +2,7 @@ DIST asterisk-11.21.1.tar.gz 34867941 SHA256 d02afbdda172a6bb98883350d64f83ce865
 DIST asterisk-11.21.2.tar.gz 34867025 SHA256 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac SHA512 9147a35bee22550a06cb05c553d9b9c8dc48e8a1f41f48473b098128ff1d2a09d1c05ad71d30a60f542813fa02ddc91b7f56980879670460e3e427bc0a14d4d1 WHIRLPOOL 9e57a68338e25879e30b625baab2581bf9c9fe944d87be7ea44d78288dca313cbe4ac22be4e2650815a0c009866dbfb831ba7b70b9fd847d58356fecf50f074a
 DIST asterisk-11.22.0.tar.gz 35101090 SHA256 590c361f8926e08eeaf320a35985cd39a2ea651ec3e94fb62484a7179c32f527 SHA512 98085053fc8d2aaf1c3305ef1900287bc1ee9d1e421a073cb0e1b56d379fd7803fdbfaab16143be24bdd41a7b28305dce7b91763564e750697ac2b2d9e8ad719 WHIRLPOOL f531ae8be5db9071c1809149523883cf0b7e65d2e8cecbc70d585d1881cd36a206de8cbc0edd2c4805d326427bb67a87cf2e079bed464fcc0cce376cb1098d59
 DIST asterisk-13.7.2.tar.gz 32176731 SHA256 8a22856f0cff22b6f1d901eb0a91d459cd73f3ab1f71e9738b947428947fb232 SHA512 5a0cd2c83e8f3191105fc20f54eb7fbf2fcb015af1fcfd980221aa205fdaf288835c4b76093f15e2abff2b1672f46a383efc2a89b5ae8afdc92353d7fd91d693 WHIRLPOOL 35af8a264f9f1381e1510b23401e02a336c1c555a42ef4c243bd9987c550f9df4e42f880efce219ca64b02eeeb6f1d667a9d10af7b5e4c5a798c8ea4f0319b0b
-DIST asterisk-13.8.2.tar.gz 32488570 SHA256 79d097bf1a2c3fb8613b9db2504856742797acd5682fab845632972a9ab66e33 SHA512 20737656b0e30e9d11bf5cf37ceb4891a1d36fb4d552e3e2c13f425b2e938f3b31cf571e5aa5b0028cbb9f9188a4ca21d625a3c1cccf115ea02001df5b9691ad WHIRLPOOL b053c3c8fb1560e930ea7a24af59f9cac183bd513dd78da0aa6474c32240cfdfc5dfdaee156f4046f4411a111fa00cef826c5df2fa2721cb09a6122226c87e6b
+DIST asterisk-13.9.1.tar.gz 32537561 SHA256 00e51aeaf077b54e610ebb5ebe64097f3d64da2cc2aecab25306dd74de96a236 SHA512 a30635930a8b98b5ff5a132897de16b80cfff182e7dcae5d9507ced95a388fff97c624f75b787ebe6775cf6085a043c152d8854e8f0562528a0e01d2ac295d81 WHIRLPOOL ee35a5e3da483c5db36c08dde13bd50f03e875b96e0fcd8ac5ca83db11d303f861e20fbbaba7d5bbe08b05907cad01d453773ea7064e2d6fddfe602f46d41cd9
 DIST gentoo-asterisk-patchset-3.16.tar.bz2 5018 SHA256 9c393aba3272b19ae7c7d79302c288ddb6d6b0368c72fbbeda11569ab751be6d SHA512 83d0be42f935068afd130ecf6768355d6f9702238c829e1482135d320f99e6a2ad9dd39814ea139e8a8e9009ecb99a6b3d5ed5f2cc778353d03a09183d7a06a0 WHIRLPOOL cc6a032aaa781a4eb29f913578bd10245775d9915f5a934f7c2982f44cf063cf3030b764e628b6e17f4f023558fb50e73116a19c77738ae5e8de85c0c672dfd9
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 SHA256 2af864f0b40b42c55f3c3ac737856942c9393adddd47ebf6d982d9214b85a2ad SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d WHIRLPOOL 79017eeb3737953515286db6386bfd848f7501b6f2abbc1ba6b6865a75495ce999d555e3112336abae23371a21a2d64a10f1d173e285314bb5bab22bfe2d4c1a
 DIST gentoo-asterisk-patchset-4.02.tar.bz2 5945 SHA256 91797fe6d2e543180b80ec02d4b00bd3bcb95b4108f7e21b559f76554ab506b4 SHA512 3a25359b11b9c4e5aa2542be9d5421beb25301443b056ba9173963c6a671da092ef1200b891857e182eda3be8819564f814f81e2b39e8647a60be04973849c2b WHIRLPOOL 9d2fb75646bef18b56fbe554a447e2b3d43f82dd9a06f219fcf841b1c3360fa37e24f2cf92f41526de224844384824765192bf2508c457eb6d7e7983be09f6d1
diff --git a/net-misc/asterisk/asterisk-13.7.2.ebuild b/net-misc/asterisk/asterisk-13.7.2.ebuild
deleted file mode 100644
index 07fb572297c5..000000000000
--- a/net-misc/asterisk/asterisk-13.7.2.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools base eutils linux-info multilib user systemd
-
-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-4.02.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 xmpp ldap libedit libressl 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? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${WORKDIR}/asterisk-patchset" )
-
-CDEPEND="dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/ncurses:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	calendar? ( net-libs/neon
-		 dev-libs/libical
-		 dev-libs/iksemel )
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? ( >=net-libs/libpri-1.4.12_beta2
-		net-misc/dahdi-tools )
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	xmpp? ( 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:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp )
-	span? ( media-libs/spandsp )
-	speex? ( media-libs/speex )
-	srtp? ( net-libs/libsrtp )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-PDEPEND="net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	enewgroup asterisk
-	enewgroup dialout 20
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
-src_prepare() {
-	base_src_prepare
-	AT_M4DIR=autoconf eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-ssl \
-		--with-z \
-		--without-pwlib \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with portaudio)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect/menuselect --disable chan_misdn menuselect.makeopts
-	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect/menuselect --enable smsq menuselect.makeopts
-	menuselect/menuselect --enable streamplayer menuselect.makeopts
-	menuselect/menuselect --enable aelparse menuselect.makeopts
-	menuselect/menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect/menuselect --enable func_aes menuselect.makeopts
-	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect/menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa			chan_alsa
-	use_select bluetooth		chan_mobile
-	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster		res_corosync
-	use_select curl			func_curl res_config_curl res_curl
-	use_select dahdi		app_dahdibarge app_dahdiras app_meetme 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 xmpp			res_xmpp
-	use_select ilbc                 codec_ilbc format_ilbc
-	use_select ldap			res_config_ldap
-	use_select lua			pbx_lua
-	use_select mysql		app_mysql cdr_mysql res_config_mysql
-	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup		app_osplookup
-	use_select oss			chan_oss
-	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
-	use_select radius		{cdr,cel}_radius
-	use_select snmp			res_snmp
-	use_select span			res_fax_spandsp
-	use_select speex		{codec,func}_speex
-	use_select srtp			res_srtp
-	use_select syslog		cdr_syslog
-	use_select vorbis		format_ogg_vorbis
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect/menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	ASTLDFLAGS="${LDFLAGS}" emake
-}
-
-src_install() {
-	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
-	emake DESTDIR="${D}" installdirs
-	emake DESTDIR="${D}" install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake DESTDIR="${D}" samples
-		for conffile in "${D}"etc/asterisk/*.*
-		do
-			chown root:root $conffile
-			chmod 0644 $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 asterisk
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
-	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# 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.logrotate4" 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 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
-
-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-13.8.2.ebuild b/net-misc/asterisk/asterisk-13.9.1.ebuild
index cd1ea67ca413..42a721d0a433 100644
--- a/net-misc/asterisk/asterisk-13.8.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.9.1.ebuild
@@ -75,7 +75,7 @@ DEPEND="${CDEPEND}
 	!net-libs/pjsip
 	voicemail_storage_imap? ( virtual/imap-c-client )
 	virtual/pkgconfig
-	pjproject? ( net-libs/pjproject[srtp,ext-sound] )
+	pjproject? ( net-libs/pjproject )
 "
 
 RDEPEND="${CDEPEND}
@@ -102,7 +102,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	AT_M4DIR=autoconf eautoreconf
+	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
 }
 
 src_configure() {
@@ -174,7 +174,7 @@ src_configure() {
 	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 app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
 	use_select freetds		{cdr,cel}_tds
 	use_select gtalk		chan_motif
 	use_select http			res_http_post