Hmm... 0.6.1 should really use the right tarball... (thanks jaervosz :)

(Portage version: 2.0.51.22-r2)

5 files changed, 42 insertions, 14 deletions

diff --git a/net-misc/asterisk-chan_capi-cm/ChangeLog b/net-misc/asterisk-chan_capi-cm/ChangeLog
index 66e988f8d038..112338d2e3fc 100644
--- a/net-misc/asterisk-chan_capi-cm/ChangeLog
+++ b/net-misc/asterisk-chan_capi-cm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/asterisk-chan_capi-cm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.12 2005/12/21 21:09:00 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.13 2005/12/21 22:21:41 stkn Exp $
+
+  22 Dec 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/chan_capi-cm-0.6.1-asterisk-1.2.diff,
+  +files/chan_capi-0.6.1-gentoo.diff, asterisk-chan_capi-cm-0.6.1.ebuild:
+  Hmm... 0.6.1 should really use the right tarball... (thanks jaervosz :)
 
   21 Dec 2005; Stefan Knoblich <stkn@gentoo.org>
   +files/chan_capi-cm-0.6.1-asterisk-1.2.diff,
diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild
index 60a1cd21a9bf..c63f7d418852 100644
--- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild
+++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild,v 1.2 2005/12/21 21:09:00 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild,v 1.3 2005/12/21 22:21:41 stkn Exp $
 
 IUSE=""
 
 inherit eutils
 
-MY_P="chan_capi-cm-${PV%.*}"
+MY_P="chan_capi-cm-${PV}"
 
 DESCRIPTION="Alternative CAPI2.0 channel module for Asterisk"
 HOMEPAGE="http://sourceforge.net/projects/chan-capi"
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/chan_capi-0.6.0-gentoo.diff
+	epatch ${FILESDIR}/chan_capi-0.6.1-gentoo.diff
 
 	# put system includes before asterisk ones, use ast_mutex_init instead
 	# of ast_pthread_mutex_init
diff --git a/net-misc/asterisk-chan_capi-cm/files/chan_capi-0.6.1-gentoo.diff b/net-misc/asterisk-chan_capi-cm/files/chan_capi-0.6.1-gentoo.diff
new file mode 100644
index 000000000000..9297edd28b9e
--- /dev/null
+++ b/net-misc/asterisk-chan_capi-cm/files/chan_capi-0.6.1-gentoo.diff
@@ -0,0 +1,32 @@
+--- chan_capi-cm-0.6.1/Makefile.orig	2005-10-01 13:32:58 +0000
++++ chan_capi-cm-0.6.1/Makefile	2005-12-22 00:16:56 +0000
+@@ -24,7 +24,9 @@
+ 
+ INSTALL_PREFIX=
+ 
++ifneq ($(ASTERISK_HEADER_DIR),/usr/include)
+ ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/include
++endif
+ 
+ ifeq (${OSNAME},FreeBSD)
+ ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/local/include
+@@ -59,7 +61,6 @@
+         echo -n -I/usr/include/i4b/include)
+ endif
+ CFLAGS=-pipe -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
+-CFLAGS+=-O6
+ CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ 
+@@ -90,9 +91,11 @@
+ 	$(CC) -shared -Xlinker -x -o $@ $^ -lcapi20
+ 
+ install: all
++	if [ ! -d $(MODULES_DIR) ]; then mkdir -p $(MODULES_DIR); fi
+ 	for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done
+ 
+ config: all
++	if [ ! -d $(INSTALL_PREFIX)/etc/asterisk ]; then mkdir -p $(INSTALL_PREFIX)/etc/asterisk; fi
+ 	cp capi.conf $(INSTALL_PREFIX)/etc/asterisk/
+ 
+ samples: config
diff --git a/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff b/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff
index 3a44d3b34319..9ed0de437504 100644
--- a/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff
+++ b/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff
@@ -35,12 +35,3 @@
  #include <asterisk/dsp.h>
  #include "xlaw.h"
  #include "chan_capi20.h"
-@@ -4011,7 +4012,7 @@
- 		}
- 		memset(tmp, 0, sizeof(struct ast_capi_pvt));
- 		
--		ast_pthread_mutex_init(&(tmp->lock),NULL);
-+		ast_mutex_init(&(tmp->lock));
- 		
- 		strncpy(tmp->name, conf->name, sizeof(tmp->name) - 1);
- 		strncpy(tmp->context, conf->context, sizeof(tmp->context) - 1);
diff --git a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.1 b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.1
index 1f33edbd65c2..dc03044ae4dc 100644
--- a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.1
+++ b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.1
@@ -1 +1 @@
-MD5 0eca2fbd0c6779b72ea9e4f4bfa0b93a chan_capi-cm-0.6.tar.gz 57333
+MD5 f6a49e4f3ec46c217ab359a6ecf30f97 chan_capi-cm-0.6.1.tar.gz 59025