A useful response to the debug USE-flag, as suggested by Kerin Millar and implemented by Jaco Kroon. Closes bug #346959.

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

3 files changed, 327 insertions, 5 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index dce6d9ec1bbc..35003da363eb 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.462 2013/10/27 09:49:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.463 2013/10/30 10:35:05 chainsaw Exp $
+
+*asterisk-11.6.0-r1 (30 Oct 2013)
+
+  30 Oct 2013; Tony Vroon <chainsaw@gentoo.org> +asterisk-11.6.0-r1.ebuild:
+  A useful response to the debug USE-flag, as suggested by Kerin Millar and
+  implemented by Jaco Kroon. Closes bug #346959.
 
   27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Voip herd is removed: http://article.gmane.org/gmane.linux.gentoo.devel/88434
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4b6093ce0a53..8aa78a62b9e7 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -23,14 +23,15 @@ DIST gentoo-asterisk-patchset-3.7.tar.bz2 7068 SHA256 7633a3ea22cab8aa83da8499b7
 EBUILD asterisk-1.8.23.1.ebuild 9012 SHA256 3d9a410282d748d7bef7290deb350b15b8e5542aa12f4d13c839e1ec00dc3c12 SHA512 b21d50ec520dbd52f53f76bbacdd7de002f8cfd303d05655da72115d3ea91674c8e68203e440f340af17204abbecde5c9e34ed1e6fc4dcb52e529bd860715383 WHIRLPOOL 704cf6a4e8f405ec1d783dcf7522b537b6d017af15247b42e2b2a2c445fe7dd2ad97efd44d41cd14534a5beaf32a914a17436ca5d8563c7c500e037e3bbcf4e1
 EBUILD asterisk-1.8.24.0.ebuild 9019 SHA256 3be03b3a9c226f9540e9fe00d774b3c7254e57dd0b08661aaf7d50af37fb4ba4 SHA512 de7c7d05bb6f0e91019dbd0d849a57fd7a60f7fef6eff8de8d7b8b386656ac1ddcd1146ef90506558c202181a8e681ae39a929dfde9b36da11eb5616c48c9f33 WHIRLPOOL d618da10a673f2c9c05fc0db208e240c8e750a80efb51a952fa65c1ca006dfa25b7e42e76ac8b2e54b9f0045b49ec481084b056ecd9655da9aa67f74ecd609e5
 EBUILD asterisk-11.5.1.ebuild 9105 SHA256 fa1d30efa27dd156c79fc7c4c9d9411648886e1eb80ad8abf632cf15c0770f86 SHA512 fa02137f4031d8f972688929610e5958e3c462a4f0c5187ef2bea5737c22af8671757289cdba41da085ddafe9cb33dffea7f0b8f64afb2e3d1d02d9e2840d443 WHIRLPOOL 03503c04f9394d7b4ee7506015e5335335e6ecefdc3c1752e9d60b815e07ee4a878980f2822efcabe5710d83edb35aa7648cde73f7b3484ca50d857c67cab3c5
+EBUILD asterisk-11.6.0-r1.ebuild 9265 SHA256 e9c7b75284824d6a8edcebc155e9b1562ab3788d7f927c1f69fad287554f2639 SHA512 1c6f99952e32b9452aaddb2693bc2a206e96134577c44357a6fd9066b31e3a7105143dde4fbdc07955d813eb9320a1952ab48694988f2da02a18432165f58504 WHIRLPOOL 9e1c6b9fc9253238b16700dc7b0407e931d280c95a36feee6e59694979d0fae1949392212acaccfa099c512fe6ddc6698d6ace6116a7696152e2c1571f02fff7
 EBUILD asterisk-11.6.0.ebuild 9112 SHA256 e5e414d39aefe40f3ca8ba5d3ad2e31fe518e877339611570e2d7bff3e7d1a17 SHA512 28150aa7790a4fdacfecb76af697be97f492570d44023d4914b7fba7fb83c6d022899edef16b5c78e1851a286905105b30ad7c533bd35622175c3c81be84715b WHIRLPOOL 5b141ada7bd02c4f8755f214003de2fc044650360068104faca0c9b49b4a92fa86d2994b5a4ed46fbf20210bf4aaced7e22e9f5da7a9932d4535b8a9c11fd479
-MISC ChangeLog 8496 SHA256 90acbd77ed5194bb4871eb7bfa90ccb882e1f2921d33c9913ce34cc0a94ede4e SHA512 a3cf28e7abb3c464ad9679571b99d5b5405109df1a4721b448ec200de20792697270b322cae564682dcea8d39cd6d310360f3f07971c96a32ff55d7897494eb6 WHIRLPOOL 2a3105c30b8abf0a2d8580ea79790396021d898cdacce7a955d23870ab301394f3e4b46f8ef44753785227c881d7db1d3edd7403b22eae63c69caef4b0992664
+MISC ChangeLog 8736 SHA256 e578c9fb62838a47430f9532134c3696204b65de21bc908c9bd68666ab65ef0a SHA512 2f8a8cf31f6e072a4973363768f035f0f13efcf718b5f5cf40d238764e4f6d580840eaf92c6befcaca333fa4e66dbcce788e37af497f17cfed6f055fd38e0863 WHIRLPOOL 475f2f160a7ea163da5221bbfb8b833f8163099f38cd31bd43526bfd30ab7e3226de16c28e5f77fa7c766d821c82a6a81698c6db4039c3e878c4084805caa701
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
 MISC metadata.xml 1183 SHA256 f92828f92cf3e0ce3581e031e3ecdc26336481db45fe6ea7b91e79fc3e58032c SHA512 9b00df0793f68988b4b7b2da778b05cd183e663a96c92b5f96ac1e09ba34a96a5155deb0639638e499701e5cf76de6cc6736f757a48608c2accf14e3ff633c14 WHIRLPOOL d5e4bd47714fa34285733f9c3ed2dff0fa65f33daeda7276428e7eaf0cd44ef59351f67f590ecab38305e77b9c3683c368ad764f323f3d9891b3414600aa4211
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJs4aMACgkQCaWpQKGI+9RmdgCdHD+rUYAfpYb5hzte5uMbG5iC
-6FIAmwRaBIEtJZMGJdEPbyfG36bL2vU+
-=mX/R
+iEYEAREIAAYFAlJw4NcACgkQp5vW4rUFj5qaKACgvBnDxH9M524kPT5ehGxvEAVF
+aa8AmwZ9scg6xMtLW1DJf9oVD1KT9czA
+=+Yq8
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-11.6.0-r1.ebuild b/net-misc/asterisk/asterisk-11.6.0-r1.ebuild
new file mode 100644
index 000000000000..8c2c6efc1a4e
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.6.0-r1.ebuild
@@ -0,0 +1,315 @@
+# 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.6.0-r1.ebuild,v 1.1 2013/10/30 10:35:05 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.7.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
+	!net-libs/pjsip
+	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
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient-ng/
+		doins contrib/dictionary.digium
+	fi
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown asterisk:asterisk $conffile
+			chmod 0660 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk -g asterisk
+	keepdir	/etc/asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}