Version bump, 0.9.2 verified to compile with asterisk-1.2.x, add blocks to DEPEND for unsupported version of asterisk.

(Portage version: 2.0.54)

8 files changed, 114 insertions, 15 deletions

diff --git a/net-misc/asterisk-app_iconv/ChangeLog b/net-misc/asterisk-app_iconv/ChangeLog
index faa87e11b8e8..43c2a332694a 100644
--- a/net-misc/asterisk-app_iconv/ChangeLog
+++ b/net-misc/asterisk-app_iconv/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk-app_iconv
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/ChangeLog,v 1.8 2005/08/27 21:41:04 stkn Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/ChangeLog,v 1.9 2006/04/15 23:14:56 stkn Exp $
+
+*asterisk-app_iconv-0.9.2 (15 Apr 2006)
+
+  15 Apr 2006; Stefan Knoblich <stkn@gentoo.org>
+  +files/app_iconv-0.9.2-ast12.diff, +files/app_iconv-0.9.2-gentoo.diff,
+  asterisk-app_iconv-0.9.ebuild, asterisk-app_iconv-0.9.1.ebuild,
+  +asterisk-app_iconv-0.9.2.ebuild:
+  Version bump, 0.9.2 verified to compile with asterisk-1.2.x, add blocks to
+  DEPEND for unsupported version of asterisk.
 
   27 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
   files/app_iconv-0.9.1-astcfg.diff:
diff --git a/net-misc/asterisk-app_iconv/Manifest b/net-misc/asterisk-app_iconv/Manifest
index 7cd4806cf484..2b4d32363af9 100644
--- a/net-misc/asterisk-app_iconv/Manifest
+++ b/net-misc/asterisk-app_iconv/Manifest
@@ -1,8 +1,12 @@
-MD5 9c5e425d178d16ad099cc5138c9d8025 asterisk-app_iconv-0.9.ebuild 849
-MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 da454eaa004f7e6f5884bb6de2fc01e4 ChangeLog 1207
-MD5 adffab823dcc3bcbca825dde9588d0b5 asterisk-app_iconv-0.9.1.ebuild 882
+MD5 28d8f8256ac0168de395c504f86eb1f8 ChangeLog 1596
+MD5 09630a86ff61c5db29b6642f419de6aa asterisk-app_iconv-0.9.1.ebuild 882
+MD5 4e57a46ea5a07218686f6f61e315f706 asterisk-app_iconv-0.9.2.ebuild 834
+MD5 8ff780e612dd4b2eb33ddc12952c2f66 asterisk-app_iconv-0.9.ebuild 877
 MD5 1d9290f7bf08909942aec614e4b8d2a8 files/app_iconv-0.8-astcfg.diff 717
-MD5 672a2a6e59ee633b14106e0c70c03086 files/digest-asterisk-app_iconv-0.9.1 62
 MD5 3ddff38ac2c0b6083278ceef48ee2d29 files/app_iconv-0.9.1-astcfg.diff 877
+MD5 a61988209d0c23b0e2e7b017726eacf9 files/app_iconv-0.9.2-ast12.diff 781
+MD5 54602ac1ab5dbd192632b5d3b23a0ff0 files/app_iconv-0.9.2-gentoo.diff 741
 MD5 875e728c24166472794e5a14e410c0ab files/digest-asterisk-app_iconv-0.9 60
+MD5 672a2a6e59ee633b14106e0c70c03086 files/digest-asterisk-app_iconv-0.9.1 62
+MD5 10732c0b6d5ba7174af289258ca570c4 files/digest-asterisk-app_iconv-0.9.2 232
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
diff --git a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild
index 38527fd6a0ce..e47112170d3b 100644
--- a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild
+++ b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.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_iconv/asterisk-app_iconv-0.9.1.ebuild,v 1.1 2005/08/27 20:58:57 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild,v 1.2 2006/04/15 23:14:56 stkn Exp $
 
 inherit eutils
 
@@ -12,14 +12,14 @@ SRC_URI="http://www.mezzo.net/asterisk/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 
 # depends on glibc's iconv support
 DEPEND="sys-libs/glibc
 	>=net-misc/asterisk-1.0.5-r1
-	!>=net-misc/asterisk-1.1.0"
+	!>=net-misc/asterisk-1.2.0"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.2.ebuild b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.2.ebuild
new file mode 100644
index 000000000000..01a8b49a68d0
--- /dev/null
+++ b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.2.ebuild
@@ -0,0 +1,40 @@
+# 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_iconv/asterisk-app_iconv-0.9.2.ebuild,v 1.1 2006/04/15 23:14:56 stkn Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PN="app_iconv"
+
+DESCRIPTION="Asterisk application plugin for character conversion"
+HOMEPAGE="http://www.mezzo.net/asterisk/"
+SRC_URI="http://www.mezzo.net/asterisk/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+DEPEND="sys-libs/glibc
+	>=net-misc/asterisk-1.0.5-r2"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${MY_PN}-0.9.2-gentoo.diff
+
+	# patch for asterisk-1.2.x callerid handling
+	has_version ">=net-misc/asterisk-1.2.0" && \
+		epatch ${FILESDIR}/${MY_PN}-${PV}-ast12.diff
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/asterisk/modules
+	doins app_iconv.so
+}
diff --git a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild
index 035e7b2de1ca..e8c687352cea 100644
--- a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild
+++ b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.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_iconv/asterisk-app_iconv-0.9.ebuild,v 1.2 2005/08/27 21:03:32 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild,v 1.3 2006/04/15 23:14:56 stkn Exp $
 
 inherit eutils
 
@@ -12,13 +12,14 @@ SRC_URI="http://www.mezzo.net/asterisk/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 IUSE=""
 
 # depends on glibc's iconv support
 DEPEND="sys-libs/glibc
-	>=net-misc/asterisk-1.0.5-r1"
+	>=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.2.0"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/net-misc/asterisk-app_iconv/files/app_iconv-0.9.2-ast12.diff b/net-misc/asterisk-app_iconv/files/app_iconv-0.9.2-ast12.diff
new file mode 100644
index 000000000000..464ff80c04cd
--- /dev/null
+++ b/net-misc/asterisk-app_iconv/files/app_iconv-0.9.2-ast12.diff
@@ -0,0 +1,17 @@
+--- app_iconv-0.9.2/app_iconv.c.orig	2005-11-27 11:03:40.000000000 +0000
++++ app_iconv-0.9.2/app_iconv.c	2006-04-15 22:22:23.000000000 +0000
+@@ -82,12 +82,9 @@
+   strconvert(convert_from, convert_to, string, result);
+ 
+   if(strcmp("CALLERIDNAME", varname)==0) {
+-    char *cidnum, *cidname, newcid[256] = "";
+-    ast_callerid_parse(chan->callerid, &cidname, &cidnum);
+-    snprintf(newcid, sizeof(newcid), "\"%s\" <%s>", result, cidnum);		
+     if(option_verbose > 2)
+-      ast_verbose (VERBOSE_PREFIX_3 "Iconv: set CID to %s\n", newcid);
+-    ast_set_callerid (chan, newcid, 0);
++      ast_verbose (VERBOSE_PREFIX_3 "Iconv: set CIDNAME to %s\n", result);
++    ast_set_callerid (chan, NULL, result, NULL);
+   } else {
+     pbx_builtin_setvar_helper(chan, varname, result);
+   }
diff --git a/net-misc/asterisk-app_iconv/files/app_iconv-0.9.2-gentoo.diff b/net-misc/asterisk-app_iconv/files/app_iconv-0.9.2-gentoo.diff
new file mode 100644
index 000000000000..4cd1375ec9d0
--- /dev/null
+++ b/net-misc/asterisk-app_iconv/files/app_iconv-0.9.2-gentoo.diff
@@ -0,0 +1,25 @@
+--- app_iconv-0.9.2/Makefile.orig	2006-04-15 23:02:21.000000000 +0000
++++ app_iconv-0.9.2/Makefile	2006-04-15 23:03:43.000000000 +0000
+@@ -8,9 +8,9 @@
+ 
+ NAME=app_iconv
+ 
+-CFLAGS=-g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC
++CFLAGS+=-g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC
+ LIBS=
+-RES=$(shell if [ -f /usr/include/asterisk/channel.h ]; then echo "$(NAME).so"; fi)
++RES=$(NAME).so
+ 
+ ifeq (${OSARCH},Darwin)
+ SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+@@ -29,9 +29,7 @@
+ 	rm -f $(NAME).o $(NAME).so
+ 
+ install: all
+-	if [ -f $(NAME).so ]; then \
+-		install -m 755 $(NAME).so $(MODULES_DIR) ; \
+-	fi
++	install -D -m 755 $(NAME).so $(DESTDIR)$(MODULES_DIR)/$(NAME).so ; \
+ 
+ reload: install
+ 	asterisk -rx "unload ${RES}"
diff --git a/net-misc/asterisk-app_iconv/files/digest-asterisk-app_iconv-0.9.2 b/net-misc/asterisk-app_iconv/files/digest-asterisk-app_iconv-0.9.2
new file mode 100644
index 000000000000..d9a9e8a289c5
--- /dev/null
+++ b/net-misc/asterisk-app_iconv/files/digest-asterisk-app_iconv-0.9.2
@@ -0,0 +1,3 @@
+MD5 2f9cd9fceb4dc5a42281fae634705709 app_iconv-0.9.2.tgz 2841
+RMD160 42ba3e773966fe304cc84f391523066955470f76 app_iconv-0.9.2.tgz 2841
+SHA256 392cc017cf71c3ba726472c6449aabef68e0c64db1ac0807123657120b47d5cc app_iconv-0.9.2.tgz 2841