Add patch for asterisk-1.2.x, submitted by Brad House in bug #119417

Package-Manager: portage-2.0.54

5 files changed, 69 insertions, 12 deletions

diff --git a/net-misc/asterisk-app_nv_faxdetect/ChangeLog b/net-misc/asterisk-app_nv_faxdetect/ChangeLog
index 24dbc18f7b5f..038058751560 100644
--- a/net-misc/asterisk-app_nv_faxdetect/ChangeLog
+++ b/net-misc/asterisk-app_nv_faxdetect/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-app_nv_faxdetect
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/ChangeLog,v 1.5 2005/09/19 18:30:06 stkn Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/ChangeLog,v 1.6 2006/04/15 23:41:18 stkn Exp $
+
+  15 Apr 2006; Stefan Knoblich <stkn@gentoo.org>
+  +files/app_nv_faxdetect-1.0.6-ast10.diff,
+  +files/app_nv_faxdetect-1.0.6-ast12.diff,
+  -files/app_nv_faxdetect-1.0.6-aststable.diff,
+  asterisk-app_nv_faxdetect-1.0.6.ebuild:
+  Add patch for asterisk-1.2.x, submitted by Brad House
+  <brad@mainstreetsoftworks.com> in bug #119417.
 
   19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
   asterisk-app_nv_faxdetect-1.0.6.ebuild:
diff --git a/net-misc/asterisk-app_nv_faxdetect/Manifest b/net-misc/asterisk-app_nv_faxdetect/Manifest
index f6c5df35639b..41e7bd4003c2 100644
--- a/net-misc/asterisk-app_nv_faxdetect/Manifest
+++ b/net-misc/asterisk-app_nv_faxdetect/Manifest
@@ -1,6 +1,7 @@
-MD5 56f78a41386fa9e15d7ec06b20cf00c3 metadata.xml 407
-MD5 54e86df334d2c0b47e7135e1ccd245f9 ChangeLog 1072
-MD5 2648636aa63c49f58d57e129f949f1fa asterisk-app_nv_faxdetect-1.0.6.ebuild 1304
-MD5 46236880a0a0dab5f08b8708bfbf08a5 files/digest-asterisk-app_nv_faxdetect-1.0.6 73
+MD5 ef3b55ac32b0bbfecc22fcb19a0830e8 ChangeLog 1405
+MD5 3cebeb3bffdbc402ee3af73347d89020 asterisk-app_nv_faxdetect-1.0.6.ebuild 1339
+MD5 bff6abdbd28ddbb349dacdd62f346851 files/app_nv_faxdetect-1.0.6-ast10.diff 1000
+MD5 3401c549bbe3e1a0c696daeea16710e7 files/app_nv_faxdetect-1.0.6-ast12.diff 1351
 MD5 2c6790a54c98bb042028e5ed2a6a4ad0 files/app_nv_faxdetect-1.0.6-astcfg.diff 988
-MD5 bff6abdbd28ddbb349dacdd62f346851 files/app_nv_faxdetect-1.0.6-aststable.diff 1000
+MD5 46236880a0a0dab5f08b8708bfbf08a5 files/digest-asterisk-app_nv_faxdetect-1.0.6 73
+MD5 56f78a41386fa9e15d7ec06b20cf00c3 metadata.xml 407
diff --git a/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild b/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild
index 569eaf653c82..63bf1a553740 100644
--- a/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild
+++ b/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild,v 1.5 2005/09/19 18:30:06 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild,v 1.6 2006/04/15 23:41:18 stkn Exp $
 
 inherit eutils
 
@@ -16,8 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
-DEPEND="sys-libs/glibc
-	>=net-misc/asterisk-1.0.5-r1"
+DEPEND=">=net-misc/asterisk-1.0.5-r1"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
@@ -31,9 +30,10 @@ src_unpack() {
 	if has_version "<net-misc/asterisk-1.1.0"; then
 		einfo "Building for Asterisk-1.0.x"
 		# change callerid to asterisk stable
-		epatch ${FILESDIR}/app_nv_faxdetect-${PV}-aststable.diff
+		epatch ${FILESDIR}/app_nv_faxdetect-${PV}-ast10.diff
 	else
 		einfo "Building for Asterisk-1.2.x"
+		epatch ${FILESDIR}/app_nv_faxdetect-${PV}-ast12.diff
 	fi
 }
 
diff --git a/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-aststable.diff b/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-ast10.diff
index f276d31fd101..f276d31fd101 100644
--- a/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-aststable.diff
+++ b/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-ast10.diff
diff --git a/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-ast12.diff b/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-ast12.diff
new file mode 100644
index 000000000000..6af1200812d6
--- /dev/null
+++ b/net-misc/asterisk-app_nv_faxdetect/files/app_nv_faxdetect-1.0.6-ast12.diff
@@ -0,0 +1,48 @@
+--- app_nv_faxdetect-1.0.6/app_nv_backgrounddetect.c.orig	2006-04-06 16:29:59 +0000
++++ app_nv_faxdetect-1.0.6/app_nv_backgrounddetect.c	2006-04-06 16:30:31 +0000
+@@ -22,7 +22,11 @@
+  * This program is free software, distributed under the terms of

+  * the GNU General Public License

+  */

+- 

++

++#include <stdio.h> 

++#include <string.h>

++#include <stdlib.h>

++

+ #include <asterisk/lock.h>

+ #include <asterisk/file.h>

+ #include <asterisk/logger.h>

+@@ -32,8 +36,6 @@
+ #include <asterisk/translate.h>

+ #include <asterisk/utils.h>

+ #include <asterisk/dsp.h>

+-#include <string.h>

+-#include <stdlib.h>

+ 

+ static char *tdesc = "Newman's playback with talk and fax detection";

+ 

+--- app_nv_faxdetect-1.0.6/app_nv_faxdetect.c.orig	2006-04-06 16:29:52 +0000
++++ app_nv_faxdetect-1.0.6/app_nv_faxdetect.c	2006-04-06 16:30:53 +0000
+@@ -22,7 +22,11 @@
+  * This program is free software, distributed under the terms of

+  * the GNU General Public License

+  */

+- 

++

++#include <stdio.h> 

++#include <string.h>

++#include <stdlib.h>

++

+ #include <asterisk/lock.h>

+ #include <asterisk/file.h>

+ #include <asterisk/logger.h>

+@@ -32,8 +36,6 @@
+ #include <asterisk/translate.h>

+ #include <asterisk/dsp.h>

+ #include <asterisk/utils.h>

+-#include <string.h>

+-#include <stdlib.h>

+ 

+ static char *tdesc = "Newman's fax detection application";

+