net-misc/asterisk-1.[46]: version bump

(Portage version: 2.2_rc17/svn/Linux 2.6.27-gentoo-r7 x86_64)

svn path=/trunk/; revision=766

6 files changed, 63 insertions, 53 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index d69b26f..3cb2759 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-misc/asterisk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2006/02/22 02:08:04 hd_brummy Exp $
 
+  08 Jan 2009; Rambaldi <rambaldi@xs4all.nl>
+  -files/1.6/asterisk-1.6.0.2-sentinel.patch, ++, ++, metadata.xml,
+  -asterisk-1.4.22-r1.ebuild, -asterisk-1.6.0.2.ebuild:
+  net-misc/asterisk-1.[46]: version bump
+
   19 Dec 2008; Rambaldi <rambaldi@xs4all.nl> asterisk-1.4.22-r1.ebuild,
   asterisk-1.6.0.2.ebuild:
   net-misc/asterisk-1.6: added span use flag
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a54ad0a..1b3d6b8 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -11,12 +11,11 @@ AUX 1.6/asterisk-1.6.0-configure-gentoo.diff 749 RMD160 d09ab8eeb40105b06246bbbb
 AUX 1.6/asterisk-1.6.0-gsm-pic.patch 1990 RMD160 6e17a76a70938f8d371b7e6efe44d70d2b622cd3 SHA1 c5a3c2ae1af31e60a45a6069c00f432dcafaf1a7 SHA256 c0b774b95f785fb35e1cbc44945fc4debeeb3e338ec49501a7ac64a87307e4df
 AUX 1.6/asterisk-1.6.0-uclibc.patch 373 RMD160 08f18dd2af3736497995ebcbea84939ae4c4cc98 SHA1 b10884d4b9123800f62b4aabac5a93b1a110e3da SHA256 b6fe54def0ab3f90058c2ed7bd288dd21c96aaf88b9028f12d223fb31d7e41c5
 AUX 1.6/asterisk-1.6.0-var_rundir.patch 441 RMD160 55869a82a01be38e80da9a31faac6d2d03f0fc58 SHA1 5bf2a8ed9778623f611330fcc4ea75c50f642680 SHA256 f75156feb6a6e421fc83e2d518b4b9204e4ae11e802440576a54de226ffd8064
-AUX 1.6/asterisk-1.6.0.2-sentinel.patch 537 RMD160 50f7c4f4aad4f4852715e5189892930a69071911 SHA1 343e6159741506552502dfc0dac41b6fd63faf42 SHA256 1657e3f74768cf6514d7dd154d583f9a1a3e48ca2c244a13318a2e7dbaf380fa
 DIST asterisk-1.4.21.2.tar.gz 11528693 RMD160 938c618d17aeef45a17d2fbe5293fbc13c4efe0d SHA1 8c0dcf57f69ce27929f7836081316a2695eb76fa SHA256 27c3bb0e47c6f762c0ce701cd97b5f23fd3424984523bf353593b77a696ea8b5
-DIST asterisk-1.4.22.tar.gz 11598693 RMD160 4699c6963089fd196836f7f86f9827edc13c4397 SHA1 598d7fdf075a4e6154bc8910d3ed3995f39c9f23 SHA256 7a6d80ed8de3a1bfd7f2c3442ec5eb1da3eeaff6ace1a3c04578848181eee79a
-DIST asterisk-1.6.0.2.tar.gz 13240121 RMD160 1c6461e0555edfd08803764e39fb052c6125a2cd SHA1 7d7c63f5c8ad17cc7dfd1bdd0fd27eea4fcef2c1 SHA256 dcff8ab68a64728452fd1ffc80e884789ea30edf0526ff9ececa626ad88036e8
+DIST asterisk-1.4.22.1.tar.gz 11602819 RMD160 e085c651114be7273e0dabf5d695012bd8f0c05b SHA1 3d13cdeac27bd797f2ea03a4d5fa122f5518343c SHA256 aef8fd6d9dbf135fcd0259d73382bf8a485f378cc6572214fd92e718806209d6
+DIST asterisk-1.6.0.3.tar.gz 13253087 RMD160 1a9e4de0f202486706b3bc8528c64748ada5dd1d SHA1 bdede6d5113a5b0006b186a72e81c886d48ae4db SHA256 dd819d6d29fa9444b1d1738d800fce17db3f1e40328b5bba8a58d2548027169f
 EBUILD asterisk-1.4.21.2.ebuild 11269 RMD160 151426a64bfc64315f89ccd8d8617d86b6a7b254 SHA1 a549e825fb0b2a540c4228994539b9f981445844 SHA256 c648f2557d7a90dcfbb0b97bfbc23808f10f41a7450566b1ae7fc161b0a01eee
-EBUILD asterisk-1.4.22-r1.ebuild 11757 RMD160 671981345f19e0769399c1a10138f63e7656839e SHA1 65435757e356d59d0e2fdb3313377cf715eff27a SHA256 ceb6cda1a74c83e8d982eab4007ee718a0dbefef4e1b4f8b015633b44647aa16
-EBUILD asterisk-1.6.0.2.ebuild 11833 RMD160 4cfc660513189259466575a9c467a430aff314e6 SHA1 fa08fd2b51c09259234b79891cf1fbb37df5b2e9 SHA256 97caccd22abe416f5b303e781994df3d45d6b983f62afa9326a06995cd86fc4c
-MISC ChangeLog 5986 RMD160 03e68ff05ea15fa5c1cd685b05f602bd9f4f0e90 SHA1 1057755a9f0c34acbc3172f32e9a90ef6643adec SHA256 29f886156b865849f6acc2e1f05596ba9c93d61ac6f236f4a4adde2f1a271f5b
-MISC metadata.xml 139 RMD160 c84b2b78f85074cc5c7d26cb757d91c8384fa16a SHA1 00e3ae2ead875413d94aeafa5279646740c2c21d SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed
+EBUILD asterisk-1.4.22.1.ebuild 11755 RMD160 aa7f781eac9e247eb7ff2e2c905bb44babed0d33 SHA1 5033fc7f71c9f2a7b05df717083151b77c645d88 SHA256 f06359747ea4bd8378461d8859efff466557c6c59dfe99b8a1e234810e360aa2
+EBUILD asterisk-1.6.0.3.ebuild 11372 RMD160 0b4b6333194f3d1e4a988a54f2f8b907804c6989 SHA1 0ff5a9d1040fff09604e56810a56206ca2f574f1 SHA256 55c404d34b6a2c14567359dbc4c8edf3c9f581b0a987baa40d273bb69d5dd791
+MISC ChangeLog 6197 RMD160 7f1342a915f4524e4a24a3693386dcaf09209fff SHA1 bc7b4a38a0d2dddea48ef281f058232147c2092b SHA256 4837f5f575a542c3733ff9f68aadc3616af871615871b0d64999a7d166e002b4
+MISC metadata.xml 1280 RMD160 adb62807f85a4d56bf979722178b9a69f0160be2 SHA1 b401cfb569ca9a884c773b49ade8e19cdd34b689 SHA256 38c7447541ed2866785b1e824c752729b2bfd1b0999367228be0baf6e2a98495
diff --git a/net-misc/asterisk/asterisk-1.4.22-r1.ebuild b/net-misc/asterisk/asterisk-1.4.22.1.ebuild
index 966e6df..45de700 100644
--- a/net-misc/asterisk/asterisk-1.4.22-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.4.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -89,14 +89,14 @@ get_available_modules() {
 pkg_setup() {
 	local checkfailed=0 waitaftermsg=0
 
-	if use zaptel && use dahdi; then 
+	if use zaptel && use dahdi; then
 		eerror
 		eerror "Both zaptel and dahdi are requested, which are mutually exclusive."
 		eerror
 		die "Please remove the zaptel use flag."
 	fi
 
-	if use zaptel; then 
+	if use zaptel; then
 		ewarn "This is the last asterisk version with zaptel support."
 		ewarn "Zaptel is being replaced by dahdi. Please consider migrating to dahdi."
 		waitaftermsg=1
diff --git a/net-misc/asterisk/asterisk-1.6.0.2.ebuild b/net-misc/asterisk/asterisk-1.6.0.3.ebuild
index c45489a..83d8a95 100644
--- a/net-misc/asterisk/asterisk-1.6.0.2.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -187,7 +187,6 @@ src_unpack() {
 	# (TODO: patch configure.ac & run eautoreconf ?)
 	#
 	epatch "${FILESDIR}"/1.6/${PN}-1.6.0-configure-gentoo.diff || die "patch failed"
-	epatch "${FILESDIR}"/1.6/${P}-sentinel.patch || die "patch failed" 
 
 	# parse modules list
 	if [[ -n "${ASTERISK_MODULES}" ]]; then
@@ -227,35 +226,35 @@ src_compile() {
 		--with-gsm=internal \
 		--with-popt \
 		--with-z \
-                $(use_with alsa asound) \
-                $(use_with caps cap) \
-                $(use_with curl) \
-                $(use_with dahdi pri) \
-                $(use_with dahdi tonezone) \
-                $(use_with dahdi) \
-                $(use_with freetds tds) \
-                $(use_with h323 h323 "/usr/share/openh323") \
-                $(use_with h323 pwlib "/usr/share/pwlib") \
-                $(use_with iconv) \
-                $(use_with imap) \
-                $(use_with jabber iksemel) \
-                $(use_with misdn isdnnet) \
-                $(use_with misdn suppserv) \
-                $(use_with misdn) \
-                $(use_with newt) \
-                $(use_with odbc) \
-                $(use_with oss) \
-                $(use_with postgres) \
-                $(use_with radius) \
-                $(use_with snmp netsnmp) \
+		$(use_with alsa asound) \
+		$(use_with caps cap) \
+		$(use_with curl) \
+		$(use_with dahdi pri) \
+		$(use_with dahdi tonezone) \
+		$(use_with dahdi) \
+		$(use_with freetds tds) \
+		$(use_with h323 h323 "/usr/share/openh323") \
+		$(use_with h323 pwlib "/usr/share/pwlib") \
+		$(use_with iconv) \
+		$(use_with imap) \
+		$(use_with jabber iksemel) \
+		$(use_with misdn isdnnet) \
+		$(use_with misdn suppserv) \
+		$(use_with misdn) \
+		$(use_with newt) \
+		$(use_with odbc) \
+		$(use_with oss) \
+		$(use_with postgres) \
+		$(use_with radius) \
+		$(use_with snmp netsnmp) \
 		$(use_with span spandsp) \
-                $(use_with speex) \
-                $(use_with speex speexdsp) \
-                $(use_with sqlite sqlite3) \
-                $(use_with ssl crypto) \
-                $(use_with ssl) \
-                $(use_with vorbis ogg) \
-                $(use_with vorbis) || die "econf failed"
+		$(use_with speex) \
+		$(use_with speex speexdsp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl crypto) \
+		$(use_with ssl) \
+		$(use_with vorbis ogg) \
+		$(use_with vorbis) || die "econf failed"
 
 	#
 	# custom module filter
diff --git a/net-misc/asterisk/files/1.6/asterisk-1.6.0.2-sentinel.patch b/net-misc/asterisk/files/1.6/asterisk-1.6.0.2-sentinel.patch
deleted file mode 100644
index 4df6cca..0000000
--- a/net-misc/asterisk/files/1.6/asterisk-1.6.0.2-sentinel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/manager.c.org	2008-12-02 21:59:45.000000000 +0100
-+++ main/manager.c	2008-12-02 22:03:42.000000000 +0100
-@@ -1729,7 +1729,8 @@
- 
- 	if (varname[strlen(varname) - 1] == ')') {
- 		if (!c) {
--			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
-+			//c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
-+			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/manager");
- 			if (c) {
- 				ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
- 				ast_channel_free(c);
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 097975e..734c076 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>voip</herd>
+  <use>
+    <flag name="pri">Enables pri support</flag>
+    <flag name="ukcid">Enable UK callerid support</flag>
+    <flag name="zaptel">Enables zaptel support ( is beeing replaced by dahdi)</flag>
+    <flag name="bri">Enable ISDN BRI support (bristuff)</flag>
+    <flag name="genericjb">Enable experimental generic jitter buffer</flag>
+    <flag name="h323">Build the H.323 channel driver bundled with Asterisk</flag>
+    <flag name="lowmem">Build Asterisk for environments with low amounts of memory (embedded devices)</flag>
+    <flag name="nosamples">Don't install sample sound and configuration files</flag>
+    <flag name="osp">Enable support for the Open Settlement Protocol</flag>
+    <flag name="keepsrc">Install sources into /usr/src for custom patching</flag>
+    <flag name="misdn">Build with mISDN (chan_misdn) support for BRI ISDN cards</flag>
+    <flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
+    <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+    <flag name="span">Enable support for the spandsp codec</flag>
+  </use>
+
+
 </pkgmetadata>