Re-enabled bri support.

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index b04ee9652af38e9aa3bc1538f3c4c4e92e585546..15588e02aa8c8364e1bf1c4e00d8bc039f0d6f20 100644 (file)
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.90 2005/11/18 17:46:09 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.91 2005/11/20 21:55:37 stkn Exp $
+
+  20 Nov 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.2.0.ebuild:
+  Re-enabled bri support.
 
   18 Nov 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.9-r2.ebuild:
   Fix #112733, typo in the version check.

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index cd40e08ea6c6d8d5d05158af4e4f90e565eddd9f..1fc92ad3ca67b32b55d8b54da772cafb1c677e98 100644 (file)
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -4,11 +4,11 @@ MD5 e6a6e09e3a4074c7eb81a173b182cda0 asterisk-1.0.5-r3.ebuild 12290
 MD5 5e8e6634d9536fa7e7c83e500204aeea asterisk-1.0.9-r2.ebuild 13815
 MD5 7f0f66b9fdad604ce8a945bc560ab97c asterisk-1.0.6-r2.ebuild 14062
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 d8b908398b46e77e1279057cf82bbfe5 ChangeLog 18458
-MD5 3b25858e72f1fec72dc22ea4ca89b7b4 asterisk-1.2.0.ebuild 8273
+MD5 24d7a53ec19f300eddb37d3fff2f5757 ChangeLog 18557
+MD5 1bf616022cc96b91842354c40b942cf2 asterisk-1.2.0.ebuild 8455
 MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r2 210
 MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r2 210
-MD5 fc8f9ac9d99f05b403f155625553e057 files/digest-asterisk-1.2.0 145
+MD5 53b837a5288c895f13fa7f5da5d9b19d files/digest-asterisk-1.2.0 217
 MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r3 139
 MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8-r1 210
 MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r2 210

diff --git a/net-misc/asterisk/asterisk-1.2.0.ebuild b/net-misc/asterisk/asterisk-1.2.0.ebuild
index 2c5722d1dc18451fd73cad01b17883526cc62ae4..ede45e1bd0d58a4fa486a89589af54e14bb7b3fd 100644 (file)
--- a/net-misc/asterisk/asterisk-1.2.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.0.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0.ebuild,v 1.1 2005/11/18 16:42:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0.ebuild,v 1.2 2005/11/20 21:55:37 stkn Exp $
 
 inherit eutils
 
-IUSE="alsa curl debug doc gtk h323 hardened lowmem mmx mysql \
+IUSE="alsa bri curl debug doc gtk h323 hardened lowmem mmx mysql \
        nosamples odbc postgres pri speex sqlite ssl ukcid zaptel"
 
-#BRI_VERSION="0.2.0-RC8f-CVS"
+BRI_VERSION="0.3.0-PRE-1"
 AST_PATCHES="1.2.0-patches-1.0"
 
 ## TODO:
 #
 # - uclibc patch still needed? (still applies)
-# - bristuff (waiting...)
 # - test nosamples
 # - add some more use flags...
 #      recent additions: osp, lowmem, curl, ukcid
 # - cleanup
-#
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/asterisk/${MY_P}.tar.gz
-        http://www.netdomination.org/pub/asterisk/${PN}-${AST_PATCHES}.tar.bz2"
-#       bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+        http://www.netdomination.org/pub/asterisk/${PN}-${AST_PATCHES}.tar.bz2
+        bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -49,12 +49,12 @@ RDEPEND="dev-libs/newt
        speex? ( media-libs/speex )
        sqlite? ( <dev-db/sqlite-3.0.0 )
        zaptel? ( >=net-misc/zaptel-1.1.0 )
-       postgres? ( dev-db/postgresql )"
+       postgres? ( dev-db/postgresql )
+       bri? (  >=net-libs/libpri-1.1.0
+               >=net-misc/zaptel-1.1.0 )"
 
 #      osp? ( >=net-libs/osptoolkit-3.3.4 )
 
-#      bri? ( >=net-libs/libpri-1.1.0
-#              >=net-misc/zaptel-1.1.0 )
 
 DEPEND="${RDEPEND}
        sys-devel/flex
@@ -85,17 +85,17 @@ pkg_setup() {
        einfo "Running some pre-flight checks..."
 
        # check if zaptel and libpri have been built with bri enabled
-#      if use bri; then
-#              if ! built_with_use net-misc/zaptel bri; then
-#                      eerror "Re-emerge zaptel with bri use-flag enabled!"
-#                      die "Zaptel without bri support detected"
-#              fi
-#
-#              if ! built_with_use net-libs/libpri bri; then
-#                      eerror "Re-emerge libpri with bri use-flag enabled!"
-#                      die "Libpri without bri support detected"
-#              fi
-#      fi
+       if use bri; then
+               if ! built_with_use net-misc/zaptel bri; then
+                       eerror "Re-emerge zaptel with bri use-flag enabled!"
+                       die "Zaptel without bri support detected"
+               fi
+
+               if ! built_with_use net-libs/libpri bri; then
+                       eerror "Re-emerge libpri with bri use-flag enabled!"
+                       die "Libpri without bri support detected"
+               fi
+       fi
 
 }
 
@@ -151,11 +151,10 @@ src_unpack() {
        #
        # BRI patches
        #
-#      if use bri; then
-#              cd ${S}
-#              einfo "Patching asterisk w/ BRI stuff"
-#              epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
-#      fi
+       if use bri; then
+               einfo "Patching asterisk w/ BRI stuff"
+               epatch ${S_BRI}/patches/asterisk.patch
+       fi
 }
 
 src_compile() {
@@ -184,6 +183,10 @@ src_compile() {
        # create api docs
        use doc && \
                make progdocs
+
+       # build bristuff's ISDNguard
+       use bri && \
+               make -C ${S_BRI}/ISDNguard
 }
 
 src_install() {
@@ -263,6 +266,17 @@ src_install() {
                doins doc/api/html/*
        fi
 
+       # install ISDNguard
+       if use bri; then
+               cd ${S_BRI}/ISDNguard
+               dosbin ISDNguard
+
+               docinto ISDNguard
+               dodoc INSTALL.ISDNguard
+
+               cd ${S}
+       fi
+
        insinto /usr/share/doc/${PF}/cgi
        doins contrib/scripts/vmail.cgi
        doins images/*.gif

diff --git a/net-misc/asterisk/files/digest-asterisk-1.2.0 b/net-misc/asterisk/files/digest-asterisk-1.2.0
index 8990081faf686a424830d75931c6c30609650eb1..6fc674b8b45496316d7143daaa2886d5db97aed0 100644 (file)
--- a/net-misc/asterisk/files/digest-asterisk-1.2.0
+++ b/net-misc/asterisk/files/digest-asterisk-1.2.0
@@ -1,2 +1,3 @@
-MD5 61d7f29b586ba9b9b5fbb67f952fd3ca asterisk-1.2.0.tar.gz 10464039
 MD5 0eeb5317bde267141c33ee5051e3b494 asterisk-1.2.0-patches-1.0.tar.bz2 7197
+MD5 61d7f29b586ba9b9b5fbb67f952fd3ca asterisk-1.2.0.tar.gz 10464039
+MD5 884979fbfb75e6cdf7d8bdb66841e728 bristuff-0.3.0-PRE-1.tar.gz 159742