net-misc/asterisk-addons: version bumb

svn path=/trunk/; revision=693

5 files changed, 8 insertions, 54 deletions

diff --git a/net-misc/asterisk-addons/ChangeLog b/net-misc/asterisk-addons/ChangeLog
index 3d1919a..a2b4a6d 100644
--- a/net-misc/asterisk-addons/ChangeLog
+++ b/net-misc/asterisk-addons/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Apr 2008; Rambaldi <rambaldi@xs4all.nl>
+  -files/asterisk-addons-1.6.0_beta2-api-change.patch,
+  -files/install-1.6.0.patch, ++, -asterisk-addons-1.6.0_beta2-r1.ebuild:
+  net-misc/asterisk-addons: version bumb
+
   29 Mar 2008; Rambaldi <rambaldi@xs4all.nl> +metadata.xml,
   asterisk-addons-1.6.0_beta2-r1.ebuild:
   Fixed compile errors introduced by asterisk-1.6.0_beta7
diff --git a/net-misc/asterisk-addons/Manifest b/net-misc/asterisk-addons/Manifest
index 1b04907..6c24216 100644
--- a/net-misc/asterisk-addons/Manifest
+++ b/net-misc/asterisk-addons/Manifest
@@ -1,9 +1,7 @@
-AUX asterisk-addons-1.6.0_beta2-api-change.patch 1000 RMD160 8cb98a3a7a1f03bc7017aea7d428bddcc7fc9aec SHA1 f096b0b5d9d9b92284550f3a003a76fb6ca656eb SHA256 c3b3bf73d1ed24fb6bdd936ccdd62ea9379eb10bf80868053ef3a8179e7dfc9c
-AUX install-1.6.0.patch 383 RMD160 45d92826ea261a97289f455f33ad2b32cabcb691 SHA1 e4e6c13f55542fef9d4cbe2f8c2ab3400fe67af9 SHA256 36b732ad59e04c69ba854dfe6a5a302eb1a0538ff8e1eb5d1be4ea8796921e8b
 AUX install.patch 341 RMD160 2a8a543c9075ac8ef36898e9394a6993d7d23d1f SHA1 97e90105d7288d3d076e9879044e31b3891484e9 SHA256 4c7b45deb0ae2dbc588b1cfc850a7d3c8ee3b186182ec4e7b95876a74f57ade0
 DIST asterisk-addons-1.4.6.tar.gz 798869 RMD160 0bef2703aa989389123bbb86381c1533edac9ebb SHA1 0d8176b1aab5dba70e97e706e0a6d35037689a39 SHA256 af7c0258837a9f211ecbb58c47cd1a793e943577f37e8e47155e8d07b0c93a73
-DIST asterisk-addons-1.6.0-beta2.tar.gz 832303 RMD160 14299eef8c414731c0aad9a911c24bb39097b9e9 SHA1 5ed35e39fe5910490507d4aab88b0b804dc9450d SHA256 1af141e3d74b802e37bee75ef93f873b424363a287b6ca3d3f9e2e41dc2e88cf
+DIST asterisk-addons-1.6.0-beta3.tar.gz 846986 RMD160 9be4ab8608b0a400b6a6eb71508e9af4280df249 SHA1 5ead89e612c05e184fea4e9fb5ebd410b7c6928c SHA256 393a7e08740adeecdba9efa49ff59a960f3f280e4510d62f5779eb531e7bbb9c
 EBUILD asterisk-addons-1.4.6-r1.ebuild 4499 RMD160 7481280972fca858dfa61c144440c3da1f01ff81 SHA1 0aea401764e0d87897d0dbd0069facaa9b42892a SHA256 8b09e30d7a62fb7ffbe1565bf43ac53c3adc0af6bd3e40d7d2e8ac0a4928d7b6
-EBUILD asterisk-addons-1.6.0_beta2-r1.ebuild 5231 RMD160 c5adc5c69b6ec58dfedd96fe9fa6c88e4b7db01a SHA1 a9c137baea20ee5a3623bc498381daadba3f8c21 SHA256 4c0cde95837b27557056f521d5f13dd322e2d80a6bbfd1b97341f83255ac9342
-MISC ChangeLog 833 RMD160 2d95eb9e8285e1d371818e7187d133406118256c SHA1 760b08c4e53833eb3bd466d1501ccdc3ecae46c6 SHA256 c0201dbf72fd98012581f51769c75f484291545e46e9b4468695876d9008d3f5
+EBUILD asterisk-addons-1.6.0_beta3.ebuild 4733 RMD160 53f9b3d141149a4fe48ad206de5e66b325f7f45a SHA1 cb4632b89e13b409e099fd14a767e5938c9876ce SHA256 a1d41f98dcf9dd20f073318a7d9c272e72e3c62f1f0cd61fbe4c98d2a8d9b834
+MISC ChangeLog 1049 RMD160 bb0ee8ddf2fc8abb9150e0e3cb8a08ce29d09444 SHA1 3cd7a92e51ac39b99a3867bfb77fa20ac0a1a325 SHA256 d7dcf8af54b96809a70a5ae05acf91e4f1b5e1e73d4e760f64c96fd1bd4d4505
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.6.0_beta2-r1.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.6.0_beta3.ebuild
index 791ca37..185f71f 100644
--- a/net-misc/asterisk-addons/asterisk-addons-1.6.0_beta2-r1.ebuild
+++ b/net-misc/asterisk-addons/asterisk-addons-1.6.0_beta3.ebuild
@@ -64,21 +64,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# create install dir
-	#
-	epatch "${FILESDIR}"/install-1.6.0.patch || die "patch failed"
-
-	# introduced in asterisk-1.6.0_beta6
-	#
-	epatch "${FILESDIR}"/${P}-api-change.patch || die "patch failed"
-
-	# introduced in asterisk-1.6.0_beta7
-	#
-	sed -i -e "s:DSP_FEATURE_DTMF_DETECT:DSP_FEATURE_DIGIT_DETECT:g" \
-				channels/chan_mobile.c || die "sed chan_mobile.c failed"
-	sed -i -e "s:DSP_FEATURE_DTMF_DETECT:DSP_FEATURE_DIGIT_DETECT:g" \
-				channels/chan_ooh323.c || die "sed chan_ooh323.c failed"
-
 	econf
 }
 
diff --git a/net-misc/asterisk-addons/files/asterisk-addons-1.6.0_beta2-api-change.patch b/net-misc/asterisk-addons/files/asterisk-addons-1.6.0_beta2-api-change.patch
deleted file mode 100644
index b34d64a..0000000
--- a/net-misc/asterisk-addons/files/asterisk-addons-1.6.0_beta2-api-change.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: res/res_config_mysql.c
-===================================================================
---- res/res_config_mysql.c	(revision 545)
-+++ res/res_config_mysql.c	(working copy)
-@@ -535,7 +535,7 @@
- 	return (int)numrows;
- }
-  
--static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags config_flags, const char *unused)
-+static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags config_flags, const char *unused, const char *who_asked)
- {
- 	MYSQL_RES *result;
- 	MYSQL_ROW row;
-@@ -582,7 +582,7 @@
- 
- 		while ((row = mysql_fetch_row(result))) {
- 			if (!strcmp(row[1], "#include")) {
--				if (!ast_config_internal_load(row[2], cfg, config_flags, "")) {
-+				if (!ast_config_internal_load(row[2], cfg, config_flags, "", who_asked)) {
- 					mysql_free_result(result);
- 					ast_mutex_unlock(&dbread.lock);
- 					ast_config_destroy(cfg);
diff --git a/net-misc/asterisk-addons/files/install-1.6.0.patch b/net-misc/asterisk-addons/files/install-1.6.0.patch
deleted file mode 100644
index 745fda6..0000000
--- a/net-misc/asterisk-addons/files/install-1.6.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Makefile.moddir_rules.org	Sun Mar  9 15:46:10 2008
---- Makefile.moddir_rules	Sun Mar  9 15:46:35 2008
-***************
-*** 123,128 ****
---- 123,129 ----
-  
-  install:: all
-  	@echo "Installing modules from `basename $(CURDIR)`..."
-+ 	mkdir -p $(DESTDIR)$(MODULES_DIR)
-  	@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-  
-  uninstall::