fix broken voicemail webapp (#46182)

3 files changed, 28 insertions, 18 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 8ee85a4a2dbf..d8933d2a29c6 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.13 2004/03/16 00:37:00 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.14 2004/04/16 22:12:51 stkn Exp $
+
+  17 Apr 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.7.2.ebuild:
+  Fix broken voicemail webapp (#46182)
 
   16 Mar 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.7.2.ebuild:
   asterisk-0.7.2 depends on zaptel/zapata >=0.8.1 now
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index b2dfba74528b..8df82d638da5 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,15 +1,15 @@
-MD5 00c1dd84bc743af5abd72133444730da files/0.5.0/asterisk-0.5.0-Makefile-samples.patch 1917
-MD5 e92ef5376479d0ef176b27725b7a0fc6 files/0.5.0/asterisk-0.5.0-makefile-fix.diff 1994
-MD5 f8969847d12690e8855fe6a65dd3a054 files/0.5.0/asterisk.confd 297
-MD5 3d3c27657402637b04cd657c16e2c088 files/0.5.0/asterisk.rc6 462
+MD5 60deb9e2f3ca655e2dddd708e727fa78 ChangeLog 2611
+MD5 4c759624cdabdb034eb440826d93705e asterisk-0.2.0.ebuild 841
+MD5 64f2142e036ec63e9e5fb9c4c0d85cdf asterisk-0.5.0.ebuild 3649
+MD5 b342b224978779d46e836f500ef74996 asterisk-0.7.2.ebuild 3215
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 MD5 64cd5e3855adff2b38f2f442004a47b1 files/digest-asterisk-0.2.0 67
 MD5 96927166e5c299f77d298e7f6d1bbe40 files/digest-asterisk-0.5.0 138
-MD5 e6a7ebdef8bffa78e821f7ec5be53bcc files/0.7.2/asterisk.confd 297
-MD5 8b7cb789a604b18018d1f4f5bddf47a9 files/0.7.2/asterisk.rc6 462
-MD5 e48751576f796b874c4903566ad52265 files/0.7.2/asterisk-0.7.2-makefile-fix.diff 684
 MD5 95f6f435e88db4775811d9d4787c2ea5 files/digest-asterisk-0.7.2 67
-MD5 df7b97eb7f0431f0711f5fc61ba52809 ChangeLog 2500
-MD5 1a0c3df820beaa75a154e1a0bf122d78 asterisk-0.2.0.ebuild 842
-MD5 46016909e68fa5a15d59a751b7612a55 asterisk-0.5.0.ebuild 3650
-MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 da6c262a03ca332ed66f41961ca02f94 asterisk-0.7.2.ebuild 3041
+MD5 00c1dd84bc743af5abd72133444730da files/0.5.0/asterisk-0.5.0-Makefile-samples.patch 1917
+MD5 e92ef5376479d0ef176b27725b7a0fc6 files/0.5.0/asterisk-0.5.0-makefile-fix.diff 1994
+MD5 a820d18b0c37c05e101726f437b727fb files/0.5.0/asterisk.confd 296
+MD5 113043c77a592525aa963c77822f4c6b files/0.5.0/asterisk.rc6 461
+MD5 e48751576f796b874c4903566ad52265 files/0.7.2/asterisk-0.7.2-makefile-fix.diff 684
+MD5 685f64ba672478a9fa76b9bef01f9b34 files/0.7.2/asterisk.confd 296
+MD5 8661c6785e07b6aba6b027ff9106229d files/0.7.2/asterisk.rc6 461
diff --git a/net-misc/asterisk/asterisk-0.7.2.ebuild b/net-misc/asterisk/asterisk-0.7.2.ebuild
index 1bf835a9ac78..8fbf14a209d4 100644
--- a/net-misc/asterisk/asterisk-0.7.2.ebuild
+++ b/net-misc/asterisk/asterisk-0.7.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-0.7.2.ebuild,v 1.5 2004/03/16 00:37:00 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-0.7.2.ebuild,v 1.6 2004/04/16 22:12:51 stkn Exp $
 
 IUSE="doc alsa mysql gtk mmx nopri nozaptel noiax vhosts"
 
-inherit eutils webapp
+inherit eutils webapp-apache
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
@@ -27,8 +27,15 @@ DEPEND="virtual/glibc
 		     >=net-libs/zapata-0.8.1 )"
 
 pkg_setup() {
-	webapp-pkg_setup
-	einfo "Voicemail webapp will be installed into: ${ROOT}${HTTPD_ROOT}"
+	NO_WEBSERVER=0
+
+	webapp-detect || NO_WEBSERVER=1
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	if [ $NO_WEBSERVER -eq 0 ]; then
+		einfo "Voicemail webapp will be installed into: ${ROOT}${HTTPD_ROOT}"
+	else
+		einfo "Skipping installation of Voicemail webapp"
+	fi
 }
 
 src_unpack() {
@@ -69,7 +76,7 @@ src_install() {
 		emake -j1 DESTDIR=${D} progdocs
 
 	# voicemail webapp
-	if [ -z $NO_WEBSERVER ]; then
+	if [ $NO_WEBSERVER -eq 0 ]; then
 	    einfo "Installing voicemail webapp"
 	    insinto ${HTTPD_CGIBIN}
 	    doins contrib/scripts/vmail.cgi