Version bump. ast_streamfile no longer unconditionally seeks, allowing playback of more formats. Music on hold no longer runs at the same priority as its timing source, fixing obscure reload bugs. Blind transfers no longer fail if a h extension is present. An RTP reference leak was plugged. Distribution patchset unchanged.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 31 insertions, 21 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 845507a4b979..c60516c9c3c4 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,16 @@
 # 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.368 2012/01/23 15:02:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.369 2012/02/03 10:49:47 chainsaw Exp $
+
+*asterisk-10.1.0 (03 Feb 2012)
+
+  03 Feb 2012; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.7.2.ebuild,
+  +asterisk-10.1.0.ebuild:
+  Version bump. ast_streamfile no longer unconditionally seeks, allowing
+  playback of more formats. Music on hold no longer runs at the same priority
+  as its timing source, fixing obscure reload bugs. Blind transfers no longer
+  fail if a h extension is present. An RTP reference leak was plugged.
+  Distribution patchset unchanged.
 
   23 Jan 2012; Thomas Kahle <tomka@gentoo.org> asterisk-1.8.8.2.ebuild:
   x86 stable per bug 399507
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e324180324c8..cdd45a940196 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.6.0/asterisk.confd 2204 RMD160 31bceebfa535e97cb2634e313678cc42186d4750 SHA1 748c623cea238cd9b322672d5ebcfe214a4f0463 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7
 AUX 1.6.2/asterisk.logrotate3 436 RMD160 06a98d2a908464a951e3386a2681f5829dcb0220 SHA1 31331f8fabc643f722a1c12cee0557e0268019ea SHA256 675705506d1adf7ec8c278581412a7ed69eed2735fea6c5f2faf368fb4ad9a26
@@ -10,21 +10,20 @@ AUX 1.6.2/sip_calc_auth 493 RMD160 1813bd5aecbb60b38c20752050e6be44cca10f47 SHA1
 AUX 1.8.0/asterisk.confd 2203 RMD160 00d92671d00ff495d1651ec064fec8c790f94f6c SHA1 3da25f263e8bdeda7130ed03f9aced379591875f SHA256 32f60bc5ff42edb1ecda236f6e87d67fd723533658bd1efb6085e87736536969
 AUX 1.8.0/asterisk.initd 6511 RMD160 183128f493953a1dc9241e2966398c6e5f3e1365 SHA1 13ff4c28dc86d5bd534b43b2b08763f8ec19baa1 SHA256 88028e2c8cf78414725697c2121bbb861a18869f7675d4b814fcb8fecfe71586
 AUX 1.8.0/asterisk.initd2 6522 RMD160 7c472eff7ee817dd3d8b3d228f66b27f2341fb91 SHA1 aa30a4b18e0952f68263493f25947caeff6aa514 SHA256 77db24b411744ea7897c3609c116315b3c71c24281012eea4f79f996df58e747
-DIST asterisk-1.8.7.2.tar.gz 28870981 RMD160 14bde4270f62852ce4d7dec5028af9824341e98b SHA1 55eb86a453ba8f0ae81ac36c26b145c5b67499b3 SHA256 5d7d3e35051d39c6a5551196a40955542fda331eea82c95cba528b7e2366a448
 DIST asterisk-1.8.8.2.tar.gz 24776534 RMD160 140d2bafdeeb259469b1514c3c6a4d09eb17aa17 SHA1 4046350bc9143882db6569d1fa8df90a63c53f26 SHA256 8dae66785d2b3c991a04ae096ee6d85053e2ca0b7d5874075de7433b8ccf9171
 DIST asterisk-10.0.1.tar.gz 24866828 RMD160 289731127e45351047f565acd0f6372cb48cb7d1 SHA1 7a700c3c5b9af28f433f20d4267d5fc71ca32341 SHA256 f60ed688e2c8959d82e521e30dd1c2225d78bf079b5886d9cde7a86f5f55a802
-DIST gentoo-asterisk-patchset-1.5.tar.bz2 32182 RMD160 38081074d9814b8d3bc7130c37debf34f19a53c5 SHA1 8d3a5bda76ed1d32feda1e109e8affc75ffd7917 SHA256 458f03fef712166fc5e983f24fa6a53befbb1910d1e63cc7e79a3c83872f39ab
+DIST asterisk-10.1.0.tar.gz 24745392 RMD160 8c08392d67c407cbb17eae84d8509daf7176808e SHA1 a2123563d37a1f1bc4222798065ec88f2943712b SHA256 6642e558fa2dc64749a209c2878536e7ec3e9672981ac41ceee794f58b7f7af0
 DIST gentoo-asterisk-patchset-1.7.tar.bz2 30115 RMD160 78a9a74f0346339d63badec8e6cb001135eedde9 SHA1 81b5cfea40616d047baf866c741738f0a8037f36 SHA256 0eff0193130f5a08a0e04cc1c4ab52c535dfeea21d9894a3461b143f40c8add2
 DIST gentoo-asterisk-patchset-2.0.tar.bz2 6125 RMD160 75fa8bf76e11ee12025ed3f38ab06998a752ad59 SHA1 f38a963c8d479a248b151f089fe172a701d6b505 SHA256 b02fb7e7e1d281a653fd98d7389a0a1777376398572c06ecb912fe7ed0b6c9e2
-EBUILD asterisk-1.8.7.2.ebuild 8434 RMD160 bc5257483979aba285e3641de6f0903a5be4e8c6 SHA1 20c6e356d74df7b11d73c97a5c677d7b92c0c1a0 SHA256 0527dbc877456f284ac70465d4eb051826f2f5fc826b0f9d35c0e9e881de89fa
 EBUILD asterisk-1.8.8.2.ebuild 8434 RMD160 799807f7e04f37363178ea38ef9a840e2675fe81 SHA1 9ee6ef108fe04dc811794451f5b89d43d2f79cb2 SHA256 e7aaa7d16303f8aab427fb454d49b67cdb6095e82b099de85542eab65df6b44b
 EBUILD asterisk-10.0.1.ebuild 8516 RMD160 567c13c2930ec60c3c6fffdd974befa3c63829fc SHA1 6ffcbeb48b5bf1aae66300ece4a92c896fb49ef9 SHA256 b6fe7d8cdd4a603a49fb70ec57856fe61e42b6d5e365357c23677c5109bdf802
-MISC ChangeLog 93239 RMD160 1185e312e1baaece687838ec880023de92b4f6c5 SHA1 1856d19af01394371b54f3e80ab2ce0fb2add5ca SHA256 3a8e02e3c6224c446c7e4ab6078f832e15d50ea28cb335c09f3942daeaaac387
+EBUILD asterisk-10.1.0.ebuild 8516 RMD160 082fa1b0bd8564667b4cbeba20e1dcc60dc4f588 SHA1 c6b27dabf0ed052f71dc2b9eba7011354bb7063f SHA256 de983d1b559a6db89998f272c934e1a124217876c61d58d530ac8b233737c0ad
+MISC ChangeLog 93711 RMD160 20f99e2a3610aed0cb9c1cafb60ed965ec8981d3 SHA1 ecab5f065fad84606fb2210cf76d2b8f4c453bad SHA256 385033b18593db396c57897cc5306651aba519a395f9b99a3b1d1bce56aa38d6
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8ddnIACgkQodBTJSDyo64s4AD/XTfNk1b1/EwsIh47Vei20j2e
-/rl+WRDiKjZrt7gGm0UA/2zPozyjwDKR/xFBsU56tOXnEvT/feed/tNvGFshrtUC
-=jRws
+iEYEARECAAYFAk8ru9AACgkQp5vW4rUFj5qpdwCgi3HjS9udQV3jmd/rnN8TLF7q
+4rIAoJz1hX0vaOMOO8kCwEF8EeHkjbvX
+=5RD0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.8.7.2.ebuild b/net-misc/asterisk/asterisk-10.1.0.ebuild
index 63268250ff52..ae497954a409 100644
--- a/net-misc/asterisk/asterisk-1.8.7.2.ebuild
+++ b/net-misc/asterisk/asterisk-10.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.7.2.ebuild,v 1.3 2011/12/26 14:31:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.1.0.ebuild,v 1.1 2012/02/03 10:49:47 chainsaw Exp $
 
 EAPI=4
 inherit autotools base eutils linux-info multilib
@@ -10,17 +10,18 @@ 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/${MY_P}.tar.gz
-	 mirror://gentoo/gentoo-asterisk-patchset-1.5.tar.bz2"
+	 mirror://gentoo/gentoo-asterisk-patchset-2.0.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="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 snmp span speex sqlite sqlite3 srtp static syslog usb vorbis"
+IUSE="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 snmp span speex srtp static syslog usb vorbis"
 
 EPATCH_SUFFIX="patch"
 PATCHES=( "${WORKDIR}/asterisk-patchset" )
 
-RDEPEND="dev-libs/popt
+RDEPEND="dev-db/sqlite:3
+	dev-libs/popt
 	dev-libs/libxml2
 	dev-libs/openssl
 	ais? ( sys-cluster/openais )
@@ -51,8 +52,6 @@ RDEPEND="dev-libs/popt
 	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 )
 	usb? ( dev-libs/libusb
 		media-libs/alsa-lib )
@@ -129,6 +128,10 @@ src_configure() {
 	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)
@@ -163,8 +166,6 @@ src_configure() {
 	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 usb			chan_usbradio
@@ -211,7 +212,7 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/1.8.0/asterisk.initd asterisk
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd2 asterisk
 	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
 
 	# install the upgrade documentation