Version bump, remove older broken ones wrt bug #298872. Tested using Asterisk 1.6.1.6 and a Dialogic Diva V-PRI/E1-30 PCI v3 card.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 19 insertions, 75 deletions

diff --git a/net-misc/asterisk-chan_capi/ChangeLog b/net-misc/asterisk-chan_capi/ChangeLog
index 74c6f346ec72..f1d823183407 100644
--- a/net-misc/asterisk-chan_capi/ChangeLog
+++ b/net-misc/asterisk-chan_capi/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2008/10/26 22:42:29 sbriesen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/ChangeLog,v 1.11 2009/12/31 18:59:28 tgurr Exp $
+
+*asterisk-chan_capi-1.1.4 (31 Dec 2009)
+
+  31 Dec 2009; Timo Gurr <tgurr@gentoo.org>
+  -asterisk-chan_capi-0.7.1.ebuild, -asterisk-chan_capi-1.1.1.ebuild,
+  +asterisk-chan_capi-1.1.4.ebuild:
+  Version bump, remove older broken ones wrt bug #298872. Tested using
+  Asterisk 1.6.1.6 and a Dialogic Diva V-PRI/E1-30 PCI v3 card.
 
 *asterisk-chan_capi-1.1.1 (26 Oct 2008)
 
diff --git a/net-misc/asterisk-chan_capi/Manifest b/net-misc/asterisk-chan_capi/Manifest
index 156e22c46a2f..16e386473ae7 100644
--- a/net-misc/asterisk-chan_capi/Manifest
+++ b/net-misc/asterisk-chan_capi/Manifest
@@ -1,6 +1,4 @@
-DIST chan_capi-0.7.1.tar.gz 258576 RMD160 ba6c5e97aec5d82e84f9dee2167f7debd7bbdc1d SHA1 6bf566671bf0df8472a508d4bf6abd30d65fbdf3 SHA256 3656e449b1d81024f3484b5980209cbc1acd12afe326957b14e241baeba8de60
-DIST chan_capi-1.1.1.tar.gz 138075 RMD160 98e85238b42f2b6f07e6a060cab8a731bfa71051 SHA1 e5c18782c62a21e800def73eb27bed5aad722b45 SHA256 4e190e5a38fe56c60c980fafba80d57c9e6993fae25030928cf77cad9cbd3dfc
-EBUILD asterisk-chan_capi-0.7.1.ebuild 1705 RMD160 bfdb7933dbcc73e532d727460d0ba00cbf41a85f SHA1 e23054d6778f4df386d3c3776a943704ffa53fa6 SHA256 062ee6f5d4697f13a894dde2bfbb37ccc7026cdce1e0f29012cc266c658a8f8a
-EBUILD asterisk-chan_capi-1.1.1.ebuild 1680 RMD160 a329c33ca5d74142889283814cd064f1d6909135 SHA1 8f4a0f4de9f4c95624f8cb3dbc68c8af1b9e9ca7 SHA256 3d141919f07e4ddf76e40427a73e038d09ddf9d5b34765e5d80e5b2a6e2e3a5b
-MISC ChangeLog 2156 RMD160 156945810b34b9169a8685692e5002018d2d9619 SHA1 a69a07bc20083c448b1366a666f01849b8437feb SHA256 a6b5c13457f016f2b9f31eca5563a23d168301f83ad487cbb5e1ae2a817f5fac
+DIST chan_capi-1.1.4.tar.gz 178788 RMD160 585162810946be663b5fe2d418eb5f71b7da8b74 SHA1 aa2fbe2f2c4fe9a1e510e81332ff50054de70228 SHA256 514ada5d942066174ba319037c6b4a7e61c96dcbe89cc4b074994de7ce301067
+EBUILD asterisk-chan_capi-1.1.4.ebuild 1750 RMD160 27b238e3e6c69363dbc2535c257ed6ea5fe48097 SHA1 05ecf2d94582b32bdf406701d33dd93f1e145cb8 SHA256 45ab32f5d66904737f97850775f8466c1b08e8a92d3ff3b5b3a9bd130042d7f4
+MISC ChangeLog 2480 RMD160 9822d3cd0db1baf31c5ab9bf6a1215b8ab4bfb17 SHA1 3c13d4a70d1435dd1a3381ab57e7f9e4d25b9140 SHA256 2a94e3eddd4bca657082a4f3710baaf10aafa50a427199112e7a78ff7ada8fb3
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
diff --git a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.7.1.ebuild b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.7.1.ebuild
deleted file mode 100644
index b56313b2a9d1..000000000000
--- a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.7.1.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.7.1.ebuild,v 1.2 2007/01/06 16:50:51 drizzt Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/asterisk-}"
-
-DESCRIPTION="CAPI 2.0 channel module for Asterisk"
-HOMEPAGE="http://www.melware.org/ChanCapi"
-SRC_URI="ftp://ftp.chan-capi.org/chan-capi/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="!net-misc/asterisk-chan_capi-cm
-	>=net-misc/asterisk-1.2.0
-	net-dialup/capi4k-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch locations and compile flags
-	sed -i -e "s:^\(CFLAGS.*-march=.*\):# \1:g" -e "s:^\(CFLAGS.*-O6.*\):# \1:g" \
-		-e "s:^\(MODULES_DIR=[^/]*\).*:\1/usr/$(get_libdir)/asterisk/modules:g" \
-		-e "s:^\(ASTERISK_HEADER_DIR=[^/]*\).*:\1/usr/include:g" \
-		-e "s:^\(CONFIG_DIR=[^/]*\).*:\1/etc/asterisk:g" \
-		-e "s:\(-shared\):\$(LDFLAGS) \1:g" Makefile
-}
-
-src_compile() {
-	emake OPTIMIZE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_PREFIX="${D}" install install_config || die "make install failed"
-	dodoc CHANGES INSTALL 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() {
-	echo
-	elog "Please don't forget to enable chan_capi in"
-	elog "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)"
-	echo
-}
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.4.ebuild
index 4d979a32f9f9..5cf3dcf934ff 100644
--- a/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.1.ebuild
+++ b/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-1.1.4.ebuild,v 1.1 2009/12/31 18:59:28 tgurr Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="ftp://ftp.chan-capi.org/chan-capi/${P/asterisk-}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
 RDEPEND=">=net-misc/asterisk-1.2.0
 	net-dialup/capi4k-utils"
@@ -29,7 +30,7 @@ src_unpack() {
 		-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
+		-e "s:\(-shared\):\$(LDFLAGS) \1:g" Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -38,8 +39,8 @@ src_compile() {
 
 src_install() {
 	emake AVERSION="" INSTALL_PREFIX="${D}" install install_config || die "emake install failed"
-	newdoc libcapi20/README README.capi20
-	dodoc CHANGES README* capi.conf
+	newdoc libcapi20/README README.capi20 || die "newdoc failed"
+	dodoc CHANGES README* capi.conf || die "dodoc failed"
 
 	# fix permissions
 	if [ -n "$(egetent group asterisk)" ]; then