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

(Portage version: 2.0.54)

4 files changed, 63 insertions, 7 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/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";

+