Version bump, 0.6.4 is asterisk-1.2.x only, 0.6.5 verified to compile with 1.0.x and 1.2.x, block unsupported versions in DEPEND. 0.6.5 adds support for uclibc environment. Fix parallel make problems reported by jaervosz in 0.6.x ebuilds.

(Portage version: 2.1_pre10)

13 files changed, 139 insertions, 14 deletions

diff --git a/net-misc/asterisk-chan_capi-cm/ChangeLog b/net-misc/asterisk-chan_capi-cm/ChangeLog
index a7c23ace5e6a..58e8259b22f1 100644
--- a/net-misc/asterisk-chan_capi-cm/ChangeLog
+++ b/net-misc/asterisk-chan_capi-cm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/asterisk-chan_capi-cm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.16 2006/03/02 00:31:33 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.17 2006/05/06 15:11:36 stkn Exp $
+
+*asterisk-chan_capi-cm-0.6.5 (06 May 2006)
+
+  06 May 2006; Stefan Knoblich <stkn@gentoo.org>
+  +files/chan_capi-0.6.4-uclibc.diff, asterisk-chan_capi-cm-0.5.3.ebuild,
+  asterisk-chan_capi-cm-0.5.4.ebuild, asterisk-chan_capi-cm-0.6.0.ebuild,
+  asterisk-chan_capi-cm-0.6.1.ebuild, asterisk-chan_capi-cm-0.6.4.ebuild,
+  +asterisk-chan_capi-cm-0.6.5.ebuild:
+  Version bump, 0.6.4 is asterisk-1.2.x only, 0.6.5 verified to compile with
+  1.0.x and 1.2.x, block unsupported versions in DEPEND. 0.6.5 adds support
+  for uclibc environment. Fix parallel make problems reported by jaervosz.
 
 *asterisk-chan_capi-cm-0.6.4 (02 Mar 2006)
 
diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.3.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.3.ebuild
index 71a43977d21b..4c6846bab6a4 100644
--- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.3.ebuild
+++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.3.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-chan_capi-cm/asterisk-chan_capi-cm-0.5.3.ebuild,v 1.3 2005/08/16 16:27:31 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.3.ebuild,v 1.4 2006/05/06 15:11:36 stkn Exp $
 
 IUSE=""
 
@@ -18,6 +18,7 @@ KEYWORDS="~ppc x86"
 
 DEPEND="!net-misc/asterisk-chan_capi
 	>=net-misc/asterisk-1.0.5-r2
+	!>=net-misc/asterisk-1.2.0
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.4.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.4.ebuild
index 16fa3d2addeb..a7a797b47a12 100644
--- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.4.ebuild
+++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.4.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-chan_capi-cm/asterisk-chan_capi-cm-0.5.4.ebuild,v 1.4 2005/09/19 18:27:31 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.5.4.ebuild,v 1.5 2006/05/06 15:11:36 stkn Exp $
 
 IUSE=""
 
@@ -18,6 +18,7 @@ KEYWORDS="~ppc x86"
 
 DEPEND="!net-misc/asterisk-chan_capi
 	>=net-misc/asterisk-1.0.5-r2
+	!>=net-misc/asterisk-1.2.0
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/chan_capi-${PV}
diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild
index 7b095cd200b0..c4d24f9662a9 100644
--- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild
+++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.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-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild,v 1.3 2005/12/21 22:28:48 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild,v 1.4 2006/05/06 15:11:36 stkn Exp $
 
 IUSE=""
 
@@ -18,6 +18,7 @@ KEYWORDS="~ppc ~x86"
 
 DEPEND="!net-misc/asterisk-chan_capi
 	>=net-misc/asterisk-1.0.5-r2
+	!>=net-misc/asterisk-1.2.0
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/${MY_P}
@@ -36,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
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 c63f7d418852..936edc513a2c 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,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-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild,v 1.3 2005/12/21 22:21:41 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild,v 1.4 2006/05/06 15:11:36 stkn Exp $
 
 IUSE=""
 
@@ -18,6 +18,7 @@ KEYWORDS="~ppc ~x86"
 
 DEPEND="!net-misc/asterisk-chan_capi
 	>=net-misc/asterisk-1.0.5-r2
+	!>=net-misc/asterisk-1.2.0
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/${MY_P}
@@ -36,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.4.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.4.ebuild
index 8f5335d22314..edc99527e106 100644
--- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.4.ebuild
+++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4.ebuild,v 1.1 2006/03/02 00:31:33 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.4.ebuild,v 1.2 2006/05/06 15:11:36 stkn Exp $
 
 IUSE=""
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 
 DEPEND="!net-misc/asterisk-chan_capi
-	>=net-misc/asterisk-1.0.5-r2
+	>=net-misc/asterisk-1.2.0
+	!=net-misc/asterisk-1.0*
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/${MY_P}
@@ -30,7 +31,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake OPTIMIZE="${CFLAGS}" || die "emake failed"
+	emake -j1 OPTIMIZE="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.5.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.5.ebuild
new file mode 100644
index 000000000000..e0c8d4daec08
--- /dev/null
+++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 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.5.ebuild,v 1.1 2006/05/06 15:11:36 stkn Exp $
+
+IUSE=""
+
+inherit eutils
+
+MY_P="chan_capi-cm-${PV}"
+
+DESCRIPTION="Alternative CAPI2.0 channel module for Asterisk"
+HOMEPAGE="http://www.chan-capi.org/"
+SRC_URI="ftp://ftp.chan-capi.org/chan-capi/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+DEPEND="!net-misc/asterisk-chan_capi
+	>=net-misc/asterisk-1.0.5-r2
+	net-dialup/capi4k-utils"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/chan_capi-0.6.3-gentoo.diff
+
+	use elibc_uclibc && \
+		epatch "${FILESDIR}/chan_capi-0.6.4-uclibc.diff"
+}
+
+src_compile() {
+	emake -j1 OPTIMIZE="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} install install_config || die "make install failed"
+
+	dodoc INSTALL LICENSE README capi.conf
+
+	# fix permissions
+	if [[ -n "$(egetent group asterisk)" ]]; then
+		chown -R root:asterisk ${D}/etc/asterisk/capi.conf
+		chmod -R u=rwX,g=rX,o= ${D}/etc/asterisk/capi.conf
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please don't forget to enable chan_capi in your /etc/asterisk/modules.conf:"
+	einfo ""
+	einfo "load => chan_capi.so"
+	einfo ""
+	einfo "and in the [global] section:"
+	einfo "chan_capi.so=yes"
+	einfo ""
+	einfo "(see /usr/share/doc/${PF} for more information)"
+}
diff --git a/net-misc/asterisk-chan_capi-cm/files/chan_capi-0.6.4-uclibc.diff b/net-misc/asterisk-chan_capi-cm/files/chan_capi-0.6.4-uclibc.diff
new file mode 100644
index 000000000000..cb1532719dcf
--- /dev/null
+++ b/net-misc/asterisk-chan_capi-cm/files/chan_capi-0.6.4-uclibc.diff
@@ -0,0 +1,38 @@
+--- chan_capi-cm-0.6.4/chan_capi.c.orig	2006-03-28 16:14:18 +0000
++++ chan_capi-cm-0.6.4/chan_capi.c	2006-03-28 16:27:58 +0000
+@@ -18,6 +18,17 @@
+ 
+ #include "config.h"
+ 
++#include <sys/time.h>
++#include <sys/signal.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <ctype.h>
++#include <errno.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <sys/types.h>
++
+ #include <asterisk/lock.h>
+ #include <asterisk/frame.h> 
+ #include <asterisk/channel.h>
+@@ -37,16 +48,7 @@
+ #ifndef CC_AST_NO_DEVICESTATE
+ #include <asterisk/devicestate.h>
+ #endif
+-#include <sys/time.h>
+-#include <sys/signal.h>
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <string.h>
+-#include <ctype.h>
+-#include <errno.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-#include <sys/types.h>
++
+ #include <asterisk/dsp.h>
+ #include "xlaw.h"
+ #include "chan_capi20.h"
diff --git a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.3 b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.3
index 732e70996462..8e8d2206fa8f 100644
--- a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.3
+++ b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.3
@@ -1 +1,3 @@
 MD5 13f6c8e951d088d677a93f0690c3bf94 chan_capi-cm-0.5.3.tar.gz 47658
+RMD160 ef4ce37d5ae73d468f2e7765d8e2707d7a810565 chan_capi-cm-0.5.3.tar.gz 47658
+SHA256 992cad662bb9a2ed4c4f61187877efbdbd9f3fff76526516d242c1207c7210b9 chan_capi-cm-0.5.3.tar.gz 47658
diff --git a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.4 b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.4
index 4bca0ffdcabc..cdedb60a7938 100644
--- a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.4
+++ b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.5.4
@@ -1 +1,3 @@
 MD5 a7a9c0f90395909ee06528f17fc608d2 chan_capi-cm-0.5.4.tar.gz 47714
+RMD160 61b8d887da37179cc81ad6cf293817f9b42ac1ff chan_capi-cm-0.5.4.tar.gz 47714
+SHA256 0e3a645e30af1cd6d0a18a1361ad05008c34b4fc73feb820266d557e1648c475 chan_capi-cm-0.5.4.tar.gz 47714
diff --git a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.0 b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.0
index 1f33edbd65c2..f1c4e8c796b5 100644
--- a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.0
+++ b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.0
@@ -1 +1,3 @@
 MD5 0eca2fbd0c6779b72ea9e4f4bfa0b93a chan_capi-cm-0.6.tar.gz 57333
+RMD160 87c8b8ab90155294a4a83673f0d8c1e34cec3764 chan_capi-cm-0.6.tar.gz 57333
+SHA256 37eec5bb3b9151d4d16f3b2eef684b39e17b7a2a0ae73b2d6274e25d77a1b3ed chan_capi-cm-0.6.tar.gz 57333
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 dc03044ae4dc..f30e22664f93 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,3 @@
 MD5 f6a49e4f3ec46c217ab359a6ecf30f97 chan_capi-cm-0.6.1.tar.gz 59025
+RMD160 4094b0173b39b47dbfb2aa106d984aedcc94ce9a chan_capi-cm-0.6.1.tar.gz 59025
+SHA256 db55ac6b637a5c60bf4cf7f38b37ab9a7c1fd661a18146cad84cd0859b27db82 chan_capi-cm-0.6.1.tar.gz 59025
diff --git a/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.5 b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.5
new file mode 100644
index 000000000000..53c341427ee6
--- /dev/null
+++ b/net-misc/asterisk-chan_capi-cm/files/digest-asterisk-chan_capi-cm-0.6.5
@@ -0,0 +1,3 @@
+MD5 06d04caf36255faa1824909156c5e7b1 chan_capi-cm-0.6.5.tar.gz 60521
+RMD160 bb90bcd360ddfe634c575fd2fb2de3d02b3f42c4 chan_capi-cm-0.6.5.tar.gz 60521
+SHA256 d1685bed3c9059d5a44eba02c1f32ba3b512d5322ad7ede807d2c53d4923d04d chan_capi-cm-0.6.5.tar.gz 60521