Version bump to 1.6.2 branch. Clarify 1.6.1 branch dependencies. Remove old ebuild.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

6 files changed, 68 insertions, 44 deletions

diff --git a/net-misc/asterisk-addons/ChangeLog b/net-misc/asterisk-addons/ChangeLog
index bbb24f60a2f5..524d18d13857 100644
--- a/net-misc/asterisk-addons/ChangeLog
+++ b/net-misc/asterisk-addons/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/asterisk-addons
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.17 2009/12/02 18:45:27 chainsaw Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.18 2010/02/19 15:48:12 chainsaw Exp $
+
+*asterisk-addons-1.6.2.0 (19 Feb 2010)
+
+  19 Feb 2010; <chainsaw@gentoo.org> -asterisk-addons-1.6.1.1.ebuild,
+  -files/asterisk-addons-1.6.1.1-parallel-make.diff,
+  -files/asterisk-addons-1.6.1.1-uclibc.diff,
+  asterisk-addons-1.6.1.2.ebuild, +asterisk-addons-1.6.2.0.ebuild,
+  +files/asterisk-addons-1.6.2.0-parallel-make.diff,
+  +files/asterisk-addons-1.6.2.0-respect-destdir.diff,
+  +files/asterisk-addons-1.6.2.0-uclibc.diff:
+  Version bump to 1.6.2 branch. Clarify 1.6.1 branch dependencies. Remove
+  old ebuild.
 
 *asterisk-addons-1.6.1.2 (02 Dec 2009)
 
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild
index fb0568a12eed..837e5fd396d8 100644
--- a/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild
+++ b/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild,v 1.1 2009/12/02 18:45:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.6.1.2.ebuild,v 1.2 2010/02/19 15:48:12 chainsaw Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="bluetooth elibc_uclibc mysql"
 
-RDEPEND=">=net-misc/asterisk-1.6.1.11"
+RDEPEND="=net-misc/asterisk-1.6.1*"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.6.1.1.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.6.2.0.ebuild
index 2e082c769bdd..60fda4825070 100644
--- a/net-misc/asterisk-addons/asterisk-addons-1.6.1.1.ebuild
+++ b/net-misc/asterisk-addons/asterisk-addons-1.6.2.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.6.1.1.ebuild,v 1.2 2009/09/11 16:41:57 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.6.2.0.ebuild,v 1.1 2010/02/19 15:48:12 chainsaw Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
@@ -11,34 +12,45 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="bluetooth elibc_uclibc mysql"
+IUSE="bluetooth elibc_uclibc h323 mysql"
 
-RDEPEND=">=net-misc/asterisk-1.6.1.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND=">=net-misc/asterisk-1.6.2.0"
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-parallel-make.diff"
+	epatch "${FILESDIR}/${P}-respect-destdir.diff"
 
 	# forward-ported patch from jaervosz for uclibc
 	if use elibc_uclibc; then
 		epatch "${FILESDIR}/${P}-uclibc.diff"
 	fi
+
+	if ! use bluetooth; then
+		rm "${S}/doc/chan_mobile.txt"
+		rm "${S}/channels/chan_mobile.c"
+		rm "${S}/configs/mobile.conf.sample"
+	fi
+	if ! use h323; then
+		rm "${S}/doc/ChangeLog.chan_ooh323"
+		rm "${S}/doc/chan_ooh323.txt"
+		rm "${S}/channels/chan_ooh323.c"
+		rm -rf "${S}/channels/ooh323c"
+		rm "${S}/channels/chan_ooh323.h"
+		rm "${S}/channels/ooh323cDriver.c"
+		rm "${S}/configs/ooh323.conf.sample"
+	fi
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--libdir="/usr/$(get_libdir)" \
 		--localstatedir="/var" \
-		$(use_with bluetooth) \
 		$(use_with mysql mysqlclient) \
 		|| die "Failed to configure"
-
-	emake || die "Failed to compile"
 }
 
 src_install() {
 	dodoc configs/*
+	mkdir "${D}/var/lib/asterisk/documentation"
 	emake DESTDIR="${D}" install || die "Failed to install"
 }
diff --git a/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-parallel-make.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-parallel-make.diff
index 6f2b5ec89ec1..1d5bc2ec3fe4 100644
--- a/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-parallel-make.diff
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-parallel-make.diff
@@ -1,7 +1,7 @@
-diff -uNr asterisk-addons-1.6.1.1.ORIG/Makefile asterisk-addons-1.6.1.1/Makefile
---- asterisk-addons-1.6.1.1.ORIG/Makefile	2009-09-11 17:28:37.000000000 +0100
-+++ asterisk-addons-1.6.1.1/Makefile	2009-09-11 17:30:41.000000000 +0100
-@@ -136,8 +136,8 @@
+diff -uNr asterisk-addons-1.6.2.0.ORIG/Makefile asterisk-addons-1.6.2.0/Makefile
+--- asterisk-addons-1.6.2.0.ORIG/Makefile	2010-01-27 11:10:32.000000000 +0000
++++ asterisk-addons-1.6.2.0/Makefile	2010-01-27 11:10:53.000000000 +0000
+@@ -146,8 +146,8 @@
  	@echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
  
  $(MOD_SUBDIRS_MENUSELECT_TREE):
@@ -12,20 +12,7 @@ diff -uNr asterisk-addons-1.6.1.1.ORIG/Makefile asterisk-addons-1.6.1.1/Makefile
  
  makeopts.embed_rules: menuselect.makeopts
  	@echo "Generating embedded module rules ..."
-@@ -149,10 +149,10 @@
- $(SUBDIRS): makeopts.embed_rules
- 
- $(MOD_SUBDIRS):
--	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
-+	+@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- $(OTHER_SUBDIRS):
--	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
-+	+@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- config.status: configure
- 	@./configure
-@@ -269,27 +269,27 @@
+@@ -306,27 +306,27 @@
  MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
  
  menuselect/menuselect: menuselect/makeopts
@@ -59,4 +46,4 @@ diff -uNr asterisk-addons-1.6.1.1.ORIG/Makefile asterisk-addons-1.6.1.1/Makefile
 +	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
  	@echo "</menu>" >> $@
  
- .PHONY: menuselect clean dist-clean distclean all cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+ .PHONY: menuselect clean dist-clean distclean all cleantest install-xmldoc uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
diff --git a/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-respect-destdir.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-respect-destdir.diff
new file mode 100644
index 000000000000..dd1b6207c8ae
--- /dev/null
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-respect-destdir.diff
@@ -0,0 +1,13 @@
+diff -uNr asterisk-addons-1.6.2.0.ORIG//Makefile asterisk-addons-1.6.2.0/Makefile
+--- asterisk-addons-1.6.2.0.ORIG//Makefile	2010-02-19 15:06:46.000000000 +0000
++++ asterisk-addons-1.6.2.0/Makefile	2010-02-19 15:07:50.000000000 +0000
+@@ -185,7 +185,8 @@
+ 
+ install-xmldoc: doc/addons-en_US.xml
+ 	@echo "Installing XML documentation"
+-	@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
++	@mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
++	@$(INSTALL) -m 644 doc/addons-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+ 
+ cleantest:
+ 
diff --git a/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-uclibc.diff b/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-uclibc.diff
index 836fffa11587..82e0ba5dbfa5 100644
--- a/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.1-uclibc.diff
+++ b/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-uclibc.diff
@@ -1,6 +1,6 @@
-diff -uNr asterisk-addons-1.6.1.1.ORIG/cdr/cdr_addon_mysql.c asterisk-addons-1.6.1.1/cdr/cdr_addon_mysql.c
---- asterisk-addons-1.6.1.1.ORIG/cdr/cdr_addon_mysql.c	2009-09-11 17:14:31.000000000 +0100
-+++ asterisk-addons-1.6.1.1/cdr/cdr_addon_mysql.c	2009-09-11 17:16:18.000000000 +0100
+diff -uNr asterisk-addons-1.6.2.0.ORIG//cdr/cdr_addon_mysql.c asterisk-addons-1.6.2.0/cdr/cdr_addon_mysql.c
+--- asterisk-addons-1.6.2.0.ORIG//cdr/cdr_addon_mysql.c	2010-02-19 15:11:40.000000000 +0000
++++ asterisk-addons-1.6.2.0/cdr/cdr_addon_mysql.c	2010-02-19 15:12:01.000000000 +0000
 @@ -29,6 +29,13 @@
  
  #include <asterisk.h>
@@ -15,9 +15,9 @@ diff -uNr asterisk-addons-1.6.1.1.ORIG/cdr/cdr_addon_mysql.c asterisk-addons-1.6
  #include <sys/types.h>
  #include <asterisk/config.h>
  #include <asterisk/options.h>
-@@ -40,13 +47,6 @@
- #include <asterisk/strings.h>
+@@ -41,13 +48,6 @@
  #include <asterisk/linkedlists.h>
+ #include <asterisk/threadstorage.h>
  
 -#include <stdio.h>
 -#include <string.h>
@@ -29,9 +29,9 @@ diff -uNr asterisk-addons-1.6.1.1.ORIG/cdr/cdr_addon_mysql.c asterisk-addons-1.6
  #include <mysql/mysql.h>
  #include <mysql/errmsg.h>
  
-diff -uNr asterisk-addons-1.6.1.1.ORIG/res/res_config_mysql.c asterisk-addons-1.6.1.1/res/res_config_mysql.c
---- asterisk-addons-1.6.1.1.ORIG/res/res_config_mysql.c	2009-09-11 17:14:31.000000000 +0100
-+++ asterisk-addons-1.6.1.1/res/res_config_mysql.c	2009-09-11 17:18:27.000000000 +0100
+diff -uNr asterisk-addons-1.6.2.0.ORIG//res/res_config_mysql.c asterisk-addons-1.6.2.0/res/res_config_mysql.c
+--- asterisk-addons-1.6.2.0.ORIG//res/res_config_mysql.c	2010-02-19 15:11:40.000000000 +0000
++++ asterisk-addons-1.6.2.0/res/res_config_mysql.c	2010-02-19 15:12:01.000000000 +0000
 @@ -44,6 +44,9 @@
  
  #include <asterisk.h>