version bump, removing old versions.

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

7 files changed, 75 insertions, 168 deletions

diff --git a/net-misc/asterisk-chan_capi/ChangeLog b/net-misc/asterisk-chan_capi/ChangeLog
index 753063b1131e..74c6f346ec72 100644
--- a/net-misc/asterisk-chan_capi/ChangeLog
+++ b/net-misc/asterisk-chan_capi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk-chan_capi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/ChangeLog,v 1.9 2008/08/16 16:19:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/ChangeLog,v 1.10 2008/10/26 22:42:29 sbriesen Exp $
+
+*asterisk-chan_capi-1.1.1 (26 Oct 2008)
+
+  26 Oct 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  -files/chan_capi-0.3.5-gentoo.diff,
+  -files/chan_capi-0.4.0_pre1-fixstable.diff, metadata.xml,
+  -asterisk-chan_capi-0.3.5.ebuild, -asterisk-chan_capi-0.4.0_pre1.ebuild,
+  +asterisk-chan_capi-1.1.1.ebuild:
+  version bump, removing old versions.
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove stkn from metadata.xml (#27693)
diff --git a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild
deleted file mode 100644
index 3c4e767039c6..000000000000
--- a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild,v 1.4 2007/01/06 16:50:51 drizzt Exp $
-
-IUSE="fax"
-
-inherit eutils
-
-MY_PN="chan_capi"
-
-DESCRIPTION="CAPI2.0 channel module for Asterisk"
-HOMEPAGE="http://www.junghanns.net/asterisk/"
-SRC_URI="http://www.junghanns.net/asterisk/downloads/${MY_PN}.${PV}.tar.gz
-	 fax? ( http://mlkj.net/asterisk/${MY_PN}-${PV}-patch.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=net-misc/asterisk-1.0.5-r1
-	!>=net-misc/asterisk-1.1.0
-	net-dialup/capi4k-utils"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${MY_PN}-${PV}-gentoo.diff
-
-	if use fax; then
-		einfo "Enabling fax support"
-		epatch "${WORKDIR}"/chan_capi.diff
-		cp "${WORKDIR}"/app_capiFax.c "${S}"
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_PREFIX="${D}" install config || die "make install failed"
-
-	dodoc INSTALL LICENSE README capi.conf
-}
-
-pkg_postinst() {
-	elog "Please don't forget to enable chan_capi in your /etc/asterisk/modules.conf:"
-	echo
-	elog "load => chan_capi.so"
-	echo
-	elog "and in the global section:"
-	elog "chan_capi.so=yes"
-	echo
-	elog "(see /usr/share/doc/${PF} for more information)"
-}
diff --git a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild
deleted file mode 100644
index f5cf96797a85..000000000000
--- a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild,v 1.5 2007/01/06 16:50:51 drizzt Exp $
-
-IUSE=""
-
-inherit eutils
-
-MY_P="chan_capi-${PV/_pre/-PRE}"
-
-DESCRIPTION="CAPI2.0 channel module for Asterisk"
-HOMEPAGE="http://www.junghanns.net/asterisk/"
-SRC_URI="http://www.junghanns.net/asterisk/downloads/${MY_P}.tar.gz"
-#	 fax? ( http://mlkj.net/asterisk/${MY_P}-patch.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND=">=net-misc/asterisk-1.0.5-r1
-	!>=net-misc/asterisk-1.1.0
-	net-dialup/capi4k-utils"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/chan_capi-0.3.5-gentoo.diff
-	epatch "${FILESDIR}"/chan_capi-${PV}-fixstable.diff
-
-	# compile for asterisk-stable
-	sed -i -e "s:^\(CFLAGS+=-DCVS_HEAD\):#\1:" \
-		Makefile
-
-#	if use fax; then
-#		einfo "Enabling fax support"
-#		epatch "${WORKDIR}"/chan_capi.diff
-#		cp "${WORKDIR}"/app_capiFax.c "${S}"
-#	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_PREFIX="${D}" install config || die "make install failed"
-
-	dodoc INSTALL LICENSE README capi.conf
-}
-
-pkg_postinst() {
-	elog "Please don't forget to enable chan_capi in your /etc/asterisk/modules.conf:"
-	echo
-	elog "load => chan_capi.so"
-	echo
-	elog "and in the global section:"
-	elog "chan_capi.so=yes"
-	echo
-	elog "(see /usr/share/doc/${PF} for more information)"
-}
diff --git a/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.1.ebuild b/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.1.ebuild
new file mode 100644
index 000000000000..4d979a32f9f9
--- /dev/null
+++ b/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.1.ebuild,v 1.1 2008/10/26 22:42:29 sbriesen Exp $
+
+inherit eutils
+
+DESCRIPTION="CAPI 2.0 channel module for Asterisk"
+HOMEPAGE="http://www.melware.org/ChanCapi"
+SRC_URI="ftp://ftp.chan-capi.org/chan-capi/${P/asterisk-}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=net-misc/asterisk-1.2.0
+	net-dialup/capi4k-utils"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+S="${WORKDIR}/${P/asterisk-}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# patch locations and compile flags
+	sed -i \
+		-e "s:^\(CFLAGS.*-O6.*\):# \1:g" \
+		-e "s:^\(CFLAGS.*-march=.*\):# \1:g" \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
+		-e "s:\(-shared\):\$(LDFLAGS) \1:g" Makefile
+}
+
+src_compile() {
+	emake V="1" CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake AVERSION="" INSTALL_PREFIX="${D}" install install_config || die "emake install failed"
+	newdoc libcapi20/README README.capi20
+	dodoc CHANGES 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() {
+	elog
+	elog "Please don't forget to enable chan_capi in"
+	elog "your /etc/asterisk/modules.conf:"
+	elog
+	elog "  load => chan_capi.so"
+	elog
+	elog "and in the [global] section:"
+	elog
+	elog "  chan_capi.so=yes"
+	elog
+	elog "Don't forget a trailing newline at the end of modules.conf!"
+	elog "See /usr/share/doc/${PF} for more information."
+	elog
+}
diff --git a/net-misc/asterisk-chan_capi/files/chan_capi-0.3.5-gentoo.diff b/net-misc/asterisk-chan_capi/files/chan_capi-0.3.5-gentoo.diff
deleted file mode 100644
index 397d447099d6..000000000000
--- a/net-misc/asterisk-chan_capi/files/chan_capi-0.3.5-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- chan_capi-0.3.5/Makefile.orig	2005-01-30 00:02:33.258038984 +0000
-+++ chan_capi-0.3.5/Makefile	2005-01-30 00:08:34.078185984 +0000
-@@ -24,9 +24,7 @@
- 
- DEBUG=-g #-pg
- INCLUDE=-I$(ASTERISK_HEADER_DIR)
--CFLAGS=-pipe -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+=-fPIC -DPIC -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- 
- # uncomment the following line if you really never ever want early b3 connects,
-@@ -78,8 +76,10 @@
- 	$(CC) -shared -Xlinker -x -o $@ chan_capi.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/
- 
diff --git a/net-misc/asterisk-chan_capi/files/chan_capi-0.4.0_pre1-fixstable.diff b/net-misc/asterisk-chan_capi/files/chan_capi-0.4.0_pre1-fixstable.diff
deleted file mode 100644
index e658d19a9462..000000000000
--- a/net-misc/asterisk-chan_capi/files/chan_capi-0.4.0_pre1-fixstable.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- chan_capi-0.4.0-PRE1/chan_capi.c.orig	2005-05-07 19:55:01.000000000 +0200
-+++ chan_capi-0.4.0-PRE1/chan_capi.c	2005-05-07 19:55:28.000000000 +0200
-@@ -2643,6 +2643,7 @@ static int change_callingpres(struct ast
-     return 0;
- }
- 
-+#ifdef CVS_HEAD
- static const struct ast_channel_tech capi_tech = {
- 	.type = type,
- 	.description = tdesc,
-@@ -2665,7 +2666,7 @@ static const struct ast_channel_tech cap
- 	.fixup = capi_fixup,
- 	.setoption = NULL,
- };
--								
-+#endif
- 
- int load_module(void)
- {
diff --git a/net-misc/asterisk-chan_capi/metadata.xml b/net-misc/asterisk-chan_capi/metadata.xml
index 4235b01e2042..8d1e4dd4a5b8 100644
--- a/net-misc/asterisk-chan_capi/metadata.xml
+++ b/net-misc/asterisk-chan_capi/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>voip</herd>
-  <use>
-    <flag name="fax">Build chan_capi with fax support</flag>
-  </use>
 </pkgmetadata>