fixed bug #37212, fixed broken DEPEND use handling

4 files changed, 39 insertions, 9 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index a655f3956d5a..219de2658983 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header
 
+  09 Jan 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.5.0.ebuild,
+  files/0.5.0/asterisk-0.5.0-makefile-fix.diff:
+  fixed bug #37212, fixed broken DEPEND use handling
+
 *asterisk-0.5.0 (04 Jan 2004)
 
   04 Jan 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.2.0.ebuild,
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9adfffdd2e0e..17a0797f2e7f 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,10 +1,10 @@
-MD5 5dda37c180bece5bbbb073bc7f7c2a5c ChangeLog 1359
+MD5 e550547c8ef6feccb9bb9d9888f9c17b ChangeLog 1533
 MD5 752f1e72696453119b5e34472bec5057 asterisk-0.2.0.ebuild 819
-MD5 0b524f309efb652f554b6cec45ca26cc asterisk-0.5.0.ebuild 3225
+MD5 703c49aeca4b05ef76e593ce26cea764 asterisk-0.5.0.ebuild 3536
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 MD5 64cd5e3855adff2b38f2f442004a47b1 files/digest-asterisk-0.2.0 67
 MD5 96927166e5c299f77d298e7f6d1bbe40 files/digest-asterisk-0.5.0 138
 MD5 2c5c6842abfaf0af6201de5b7b18deac files/0.5.0/asterisk.rc6 471
 MD5 43b161bf6508962388306ae05b43b694 files/0.5.0/asterisk.confd 306
-MD5 7801f13ed410e5b329a527dcaf26a46c files/0.5.0/asterisk-0.5.0-makefile-fix.diff 1063
+MD5 e92ef5376479d0ef176b27725b7a0fc6 files/0.5.0/asterisk-0.5.0-makefile-fix.diff 1994
 MD5 00c1dd84bc743af5abd72133444730da files/0.5.0/asterisk-0.5.0-Makefile-samples.patch 1917
diff --git a/net-misc/asterisk/asterisk-0.5.0.ebuild b/net-misc/asterisk/asterisk-0.5.0.ebuild
index bcde81b01fbb..b4ddee68275c 100644
--- a/net-misc/asterisk/asterisk-0.5.0.ebuild
+++ b/net-misc/asterisk/asterisk-0.5.0.ebuild
@@ -20,9 +20,10 @@ DEPEND="virtual/glibc
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
 	gtk? ( =x11-libs/gtk+-1.2* )
-	!noiax ( >=net-libs/iax-0.2.2 )
-	!nopri ( >=net-libs/libpri-0.4 )
-	!nozaptel ( >=net-libs/zapata-0.7 )"
+	!noiax? ( >=net-libs/iax-0.2.2 )
+	!nopri? ( >=net-libs/libpri-0.4 )
+	!nozaptel? ( >=net-misc/zaptel-0.7
+		     >=net-libs/zapata-0.7 )"
 
 webapp-detect || NO_WEBSERVER=1
 
@@ -130,5 +131,12 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Asterisk has been installed"
+	einfo ""
 	einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
+	einfo ""
+	einfo "If you want to know more about asterisk, visit these sites:"
+	einfo "http://www.automated.it/guidetoasterisk.htm"
+	einfo "http://asterisk.xvoip.com/"
+	einfo "http://www.voip-info.org/wiki-Asterisk"
+	einfo "http://ns1.jnetdns.de/jn/relaunch/asterisk/"
 }
diff --git a/net-misc/asterisk/files/0.5.0/asterisk-0.5.0-makefile-fix.diff b/net-misc/asterisk/files/0.5.0/asterisk-0.5.0-makefile-fix.diff
index 81bee126d71e..4049d7fefb82 100644
--- a/net-misc/asterisk/files/0.5.0/asterisk-0.5.0-makefile-fix.diff
+++ b/net-misc/asterisk/files/0.5.0/asterisk-0.5.0-makefile-fix.diff
@@ -1,6 +1,6 @@
---- Makefile.orig	2003-11-18 06:23:35.000000000 +0100
-+++ Makefile	2003-11-18 06:25:21.000000000 +0100
-@@ -280,15 +280,15 @@
+--- Makefile.orig	2003-09-02 02:33:42.000000000 +0200
++++ Makefile	2004-01-09 03:08:03.490328624 +0100
+@@ -269,15 +280,15 @@
  		mkdir -p $(ASTSPOOLDIR)/voicemail/default; \
  		rm -f $(ASTSPOOLDIR)/vm; \
  	fi
@@ -19,3 +19,21 @@
  	@echo " +---- Asterisk Installation Complete -------+"  
  	@echo " +                                           +"
  	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
+@@ -340,13 +344,13 @@
+ 		install $$x $(ASTVARLIBDIR)/mohmp3 ; \
+ 	done
+ 	mkdir -p $(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+-	:> $(ASTVARLIBDIR)/sounds/voicemail/default/1234/unavail.gsm
++	:> $(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
+ 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
+-		cat $(ASTVARLIBDIR)/sounds/$$x.gsm >> $(ASTVARLIBDIR)/sounds/voicemail/default/1234/unavail.gsm ; \
++		cat $(ASTVARLIBDIR)/sounds/$$x.gsm >> $(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+ 	done
+-	:> $(ASTVARLIBDIR)/sounds/voicemail/default/1234/busy.gsm
++	:> $(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
+ 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
+-		cat $(ASTVARLIBDIR)/sounds/$$x.gsm >> $(ASTVARLIBDIR)/sounds/voicemail/default/1234/busy.gsm ; \
++		cat $(ASTVARLIBDIR)/sounds/$$x.gsm >> $(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
+ 	done
+ 
+ webvmail: