Remove unused patches.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

11 files changed, 13 insertions, 677 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index c505041a8e6c..22274aff1168 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.212 2009/09/08 08:59:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.213 2009/09/11 16:57:56 chainsaw Exp $
+
+  11 Sep 2009; <chainsaw@gentoo.org>
+  -files/1.6.0/asterisk-1.6.0.6-autoconf-263.patch,
+  -files/1.6.0/asterisk-1.6.0.6-imap-kerberos.patch,
+  -files/1.6.0/asterisk-1.6.0.6-parallelmake.patch,
+  -files/1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch,
+  -files/1.6.0/asterisk-1.6.0-gsm-pic.patch,
+  -files/1.6.0/asterisk-1.6.0-uclibc.patch,
+  -files/1.6.0/asterisk-1.6.0-var_rundir.patch,
+  -files/1.6.1/asterisk-1.6.1-parallelmake.patch, -files/1.6.0/asterisk.rc6,
+  -files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch:
+  Remove unused patches.
 
   08 Sep 2009; Christian Faulhammer <fauli@gentoo.org>
   asterisk-1.2.35.ebuild:
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-gsm-pic.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-gsm-pic.patch
deleted file mode 100644
index 1acca70b3a47..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-gsm-pic.patch
+++ /dev/null
@@ -1,54 +0,0 @@
----  codecs/gsm/Makefile.org	2008-03-29 11:33:09.000000000 +0100
-+++  codecs/gsm/Makefile	2008-03-29 11:44:40.000000000 +0100
-@@ -37,23 +37,6 @@
- ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
- ######### probably require gcc. 
- 
--ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
--ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
--ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
--
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
--#So we go lowest common available by gcc and go a step down, still a step up from
--#the default as we now have a better instruction set to work with. - Belgarath
--ifeq ($(PROC),ultrasparc)
--OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
--endif
--
- PG =
- #PG = -g -pg
- ######### Profiling flags.  If you don't know what that means, leave it blank.
-@@ -208,12 +191,10 @@
- # XXX Keep a space after each findstring argument
- # XXX should merge with GSM_OBJECTS
- ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
-+ifneq ($(K6OPT),)
- GSM_SOURCES+= $(SRC)/k6opt.s
- endif
- endif
--endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -260,12 +241,10 @@
- 		$(SRC)/table.o
- 
- ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
-+ifneq ($(K6OPT),)
- GSM_OBJECTS+= $(SRC)/k6opt.o
- endif
- endif
--endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-uclibc.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-uclibc.patch
deleted file mode 100644
index 36b49e60b19e..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.old	2008-03-22 11:51:39.000000000 +0100
-+++ Makefile	2008-03-22 11:51:49.000000000 +0100
-@@ -259,6 +259,10 @@
-   ASTCFLAGS+=-pthread
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  AST_LIBS+=-lpthread -ldl
-+endif
-+
- ifeq ($(OSARCH),SunOS)
-   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
- endif
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-var_rundir.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-var_rundir.patch
deleted file mode 100644
index 367dc7163f54..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0-var_rundir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.0/Makefile.orig	2006-12-24 03:07:19.000000000 +0000
-+++ asterisk-1.4.0/Makefile	2006-12-24 03:07:57.000000000 +0000
-@@ -109,7 +109,7 @@
-   ASTSBINDIR=$(sbindir)
-   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-   ASTLOGDIR=$(localstatedir)/log/asterisk
--  ASTVARRUNDIR=$(localstatedir)/run
-+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-   ASTMANDIR=$(mandir)
- ifeq ($(OSARCH),FreeBSD)
-   ASTVARLIBDIR=$(prefix)/share/asterisk
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-autoconf-263.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-autoconf-263.patch
deleted file mode 100644
index 7e91cb12b1d4..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-autoconf-263.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -uNr asterisk-1.6.0.6.ORIG/autoconf/ast_check_gnu_make.m4 asterisk-1.6.0.6/autoconf/ast_check_gnu_make.m4
---- asterisk-1.6.0.6.ORIG/autoconf/ast_check_gnu_make.m4	2009-03-10 22:45:49.000000000 +0000
-+++ asterisk-1.6.0.6/autoconf/ast_check_gnu_make.m4	2009-03-10 22:43:07.000000000 +0000
-@@ -1,20 +1,20 @@
--AC_DEFUN([AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
--   GNU_MAKE='Not Found' ;
--   GNU_MAKE_VERSION_MAJOR=0 ;
--   GNU_MAKE_VERSION_MINOR=0 ;
-+AC_DEFUN([AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK([for GNU make], [ac_cv_GNU_MAKE],
-+   ac_cv_GNU_MAKE='Not Found' ;
-+   ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
-+   ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
-    for a in make gmake gnumake ; do
-       if test -z "$a" ; then continue ; fi ;
-       if ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
--         GNU_MAKE=$a ;
--         GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
--         GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
-+         ac_cv_GNU_MAKE=$a ;
-+         ac_cv_GNU_MAKE_VERSION_MAJOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
-+         ac_cv_GNU_MAKE_VERSION_MINOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
-          break;
-       fi
-    done ;
- ) ;
--if test  "x$GNU_MAKE" = "xNot Found"  ; then
-+if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
-    AC_MSG_ERROR( *** Please install GNU make.  It is required to build Asterisk!)
-    exit 1
- fi
--AC_SUBST([GNU_MAKE])
-+AC_SUBST([GNU_MAKE], [$ac_cv_GNU_MAKE])
- ])
-diff -uNr asterisk-1.6.0.6.ORIG/autoconf/ast_prog_sed.m4 asterisk-1.6.0.6/autoconf/ast_prog_sed.m4
---- asterisk-1.6.0.6.ORIG/autoconf/ast_prog_sed.m4	2009-03-10 22:45:49.000000000 +0000
-+++ asterisk-1.6.0.6/autoconf/ast_prog_sed.m4	2009-03-10 22:44:17.000000000 +0000
-@@ -12,7 +12,7 @@
-      done
-      echo "$ac_script" | sed 99q >conftest.sed
-      $as_unset ac_script || ac_script=
--     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
-+     ifdef([_AC_PATH_PROGS_FEATURE_CHECK], [_AC_PATH_PROGS_FEATURE_CHECK], [_AC_PATH_PROG_FEATURE_CHECK])(SED, [sed gsed],
- 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
- 		["$ac_path_SED" -f conftest.sed])])])
-  SED="$ac_cv_path_SED"
-diff -uNr asterisk-1.6.0.6.ORIG/configure.ac asterisk-1.6.0.6/configure.ac
---- asterisk-1.6.0.6.ORIG/configure.ac	2009-03-10 22:45:52.000000000 +0000
-+++ asterisk-1.6.0.6/configure.ac	2009-03-10 22:43:07.000000000 +0000
-@@ -23,7 +23,6 @@
- AC_COPYRIGHT("Asterisk")
- AC_REVISION($Revision: 1.1 $)
- 
--AC_GNU_SOURCE
- AC_USE_SYSTEM_EXTENSIONS	# note- does not work on FreeBSD
- 
- case "${host_os}" in
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-imap-kerberos.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-imap-kerberos.patch
deleted file mode 100644
index 74fc91b9dd22..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-imap-kerberos.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr asterisk-1.6.0.6.ORIG/configure.ac asterisk-1.6.0.6/configure.ac
---- asterisk-1.6.0.6.ORIG/configure.ac	2009-03-10 23:00:03.000000000 +0000
-+++ asterisk-1.6.0.6/configure.ac	2009-03-10 22:58:59.000000000 +0000
-@@ -720,8 +720,11 @@
- 		fi
- 		imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
- 	  	imap_include="-I${IMAP_TK_DIR}/c-client"
--      	CPPFLAGS="${CPPFLAGS} ${imap_include}"
--	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
-+		CPPFLAGS="${CPPFLAGS} -I/usr/include/imap"
-+		LIBS="${LIBS} /usr/lib/c-client.a -lssl -lpam"
-+		if test -f /usr/bin/krb5-config; then
-+			LIBS="${LIBS} "`/usr/bin/krb5-config --libs krb5 gssapi kadm-client kadm-server`
-+		fi
- 	  	AC_LINK_IFELSE(
- 	    	AC_LANG_PROGRAM(
- 				[#include "c-client.h"
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-parallelmake.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-parallelmake.patch
deleted file mode 100644
index 761fb1fcdc2c..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-parallelmake.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: asterisk-1.6.0.6/Makefile
-===================================================================
---- asterisk-1.6.0.6.orig/Makefile
-+++ asterisk-1.6.0.6/Makefile
-@@ -369,15 +369,15 @@ $(MOD_SUBDIRS_EMBED_LIBS):
- 	@echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
- 
- $(MOD_SUBDIRS_MENUSELECT_TREE):
--	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
--	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
-+	+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
-+	+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
- 
- makeopts.embed_rules: menuselect.makeopts
- 	@echo "Generating embedded module rules ..."
- 	@rm -f $@
--	@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
--	@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
--	@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
-+	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
-+	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
-+	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
- 
- $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
- 
-@@ -400,10 +400,10 @@ res:	main
- endif
- 
- $(MOD_SUBDIRS):
--	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
-+	+@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- $(OTHER_SUBDIRS):
--	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
-+	+@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- defaults.h: makeopts
- 	@build_tools/make_defaults_h > $@.tmp
-@@ -431,10 +431,10 @@ include/asterisk/build.h:
- 	@rm -f $@.tmp
- 
- $(SUBDIRS_CLEAN):
--	@$(SUBMAKE) -C $(@:-clean=) clean
-+	+@$(SUBMAKE) -C $(@:-clean=) clean
- 
- $(SUBDIRS_DIST_CLEAN):
--	@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
-+	+@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
- 
- clean: $(SUBDIRS_CLEAN) _clean
- 
-@@ -547,7 +547,7 @@ bininstall: _all installdirs $(SUBDIRS_I
- 	fi
- 
- $(SUBDIRS_INSTALL):
--	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
-+	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
- 
- NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
- OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
-@@ -796,7 +796,7 @@ cleantest:
- 	@cmp -s .cleancount .lastclean || $(MAKE) clean
- 
- $(SUBDIRS_UNINSTALL):
--	@$(SUBMAKE) -C $(@:-uninstall=) uninstall
-+	+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
- 
- _uninstall: $(SUBDIRS_UNINSTALL)
- 	rm -f $(DESTDIR)$(MODULES_DIR)/*
-@@ -842,7 +842,7 @@ gmenuconfig: gmenuselect
- nmenuconfig: nmenuselect
- 
- menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
--	@if [ -x menuselect/nmenuselect ]; then \
-+	+@if [ -x menuselect/nmenuselect ]; then \
- 		$(MAKE) nmenuselect; \
- 	elif [ -x menuselect/cmenuselect ]; then \
- 		$(MAKE) cmenuselect; \
-@@ -867,27 +867,27 @@ nmenuselect: menuselect/nmenuselect menu
- MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
- 
- menuselect/menuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) menuselect
-+	+$(MAKE_MENUSELECT) menuselect
- 
- menuselect/cmenuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) cmenuselect
-+	+$(MAKE_MENUSELECT) cmenuselect
- 
- menuselect/gmenuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) gmenuselect
-+	+$(MAKE_MENUSELECT) gmenuselect
- 
- menuselect/nmenuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) nmenuselect
-+	+$(MAKE_MENUSELECT) nmenuselect
- 
- menuselect/makeopts: makeopts
--	$(MAKE_MENUSELECT) makeopts
-+	+$(MAKE_MENUSELECT) makeopts
- 
- menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure
- 	@echo "Generating input for menuselect ..."
- 	@echo "<?xml version=\"1.0\"?>" > $@
- 	@echo >> $@
- 	@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
--	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
--	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
-+	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
-+	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
- 	@cat build_tools/cflags.xml >> $@
- 	@if [ "${AST_DEVMODE}" = "yes" ]; then \
- 		cat build_tools/cflags-devmode.xml >> $@; \
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch
deleted file mode 100644
index 3900a5293073..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr asterisk-1.6.0.6.ORIG/autoconf/ast_ext_tool_check.m4 asterisk-1.6.0.6/autoconf/ast_ext_tool_check.m4
---- asterisk-1.6.0.6.ORIG/autoconf/ast_ext_tool_check.m4	2009-03-16 13:17:33.000000000 +0000
-+++ asterisk-1.6.0.6/autoconf/ast_ext_tool_check.m4	2009-03-16 13:18:26.000000000 +0000
-@@ -20,8 +20,8 @@
- 		fi
- 		CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
- 
--		saved_ldflags="${LDFLAGS}"
--		LDFLAGS="${$1_LIB}"
-+		saved_libs="${LIBS}"
-+		LIBS="${$1_LIB}"
- 
- 		AC_LINK_IFELSE(
- 		    [ AC_LANG_PROGRAM( [ $5 ],
-@@ -33,7 +33,7 @@
- 		    []
- 		)
- 		CPPFLAGS="${saved_cppflags}"
--		LDFLAGS="${saved_ldflags}"
-+		LIBS="${saved_libs}"
- 	    else
- 		PBX_$1=1
- 		AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
diff --git a/net-misc/asterisk/files/1.6.0/asterisk.rc6 b/net-misc/asterisk/files/1.6.0/asterisk.rc6
deleted file mode 100644
index e807706af506..000000000000
--- a/net-misc/asterisk/files/1.6.0/asterisk.rc6
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.6.0/asterisk.rc6,v 1.1 2009/03/10 23:33:27 chainsaw Exp $
-
-opts="${opts} forcestop reload"
-
-depend() {
-	need net
-	use nscd dns zaptel mysql postgresql slapd capi
-}
-
-is_running() {
-	if [ -z "$(pidof asterisk)" ]; then
-		return 1
-	else
-		PID="$(cat /var/run/asterisk/asterisk.pid)"
-		for x in $(pidof asterisk); do
-			if [ "${x}" = "${PID}" ]; then
-				return 0
-			fi	
-		done
-	fi
-
-	return 1
-}
-
-asterisk_run_loop() {
-	local OPTS ARGS MSG NICE=""
-	local result=0 signal=0
-
-	# default options
-	OPTS="-f"  # don't fork / detach breaks wrapper script...
-
-	# filter (redundant) arguments
-	ARGS="$(echo "${@}" | sed -e "s:-c\|-f::g")"
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		echo "   Core dump size            : ${ASTERISK_CORE_SIZE}"
-		echo "   Core dump location        : ${ASTERISK_CORE_DIR}"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		echo "   Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		echo "   Nice level                : ${ASTERISK_NICE}"
-		NICE="nice -n ${ASTERISK_NICE} --"
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			echo "   Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			echo "   Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			echo "   Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		echo "   Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	OPTS="${OPTS} ${ARGS}"
-
-	while :; do
-
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F ${TTY} sane
-			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk ${OPTS} &>/dev/null
-			result=$?
-		fi		
-
-		if [ $result -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ $result -gt 128 ]; then
-				signal=$((result -  128))
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-$(date "+%Y%m%d-%h%M%s")"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 $(pidof ${X});
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >${TTY} \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep 5
-		echo "Restarting Asterisk..."
-	done
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID
-	local tmp x
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			OPTS="--nicelevel ${ASTERISK_NICE}"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER=$(echo $ASTERISK_USER | sed 's/:.*//')
-		GROUP=$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')
-		if [ -n "${USER}" ]; then
-			ASTERISK_OPTS="${ASTERISK_OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			ASTERISK_OPTS="${ASTERISK_OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		ebegin "Starting asterisk PBX (as ${USER}${GROUP})"
-	else
-		ebegin "Starting asterisk PBX (as root)"
-	fi
-
-	if [ "$(echo ${ASTERISK_WRAPPER} | tr '[:upper:]' '[:lower:]')" != "yes" ]; then
-		start-stop-daemon --start --exec /usr/sbin/asterisk \
-			${OPTS} -- ${ASTERISK_OPTS}
-		result=$?
-	else
-		asterisk_run_loop ${ASTERISK_OPTS} 2>/dev/null &
-		result=$?
-	fi
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-	fi
-
-	eend $result
-}
-
-forcestop() {
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -r -x "stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt=`expr $cnt + 1`
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-parallelmake.patch b/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-parallelmake.patch
deleted file mode 100644
index 8cda663fbe25..000000000000
--- a/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-parallelmake.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -uNr asterisk-1.6.1.0.ORIG/Makefile asterisk-1.6.1.0/Makefile
---- asterisk-1.6.1.0.ORIG/Makefile	2009-05-11 14:40:21.000000000 +0100
-+++ asterisk-1.6.1.0/Makefile	2009-05-11 14:42:34.000000000 +0100
-@@ -377,15 +377,15 @@
- 	@echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
- 
- $(MOD_SUBDIRS_MENUSELECT_TREE):
--	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
--	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
-+	+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
-+	+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
- 
- makeopts.embed_rules: menuselect.makeopts
- 	@echo "Generating embedded module rules ..."
- 	@rm -f $@
--	@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
--	@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
--	@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
-+	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
-+	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
-+	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
- 
- $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
- 
-@@ -408,10 +408,10 @@
- endif
- 
- $(MOD_SUBDIRS):
--	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
-+	+@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- $(OTHER_SUBDIRS):
--	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
-+	+@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- defaults.h: makeopts
- 	@build_tools/make_defaults_h > $@.tmp
-@@ -439,10 +439,10 @@
- 	@rm -f $@.tmp
- 
- $(SUBDIRS_CLEAN):
--	@$(SUBMAKE) -C $(@:-clean=) clean
-+	+@$(SUBMAKE) -C $(@:-clean=) clean
- 
- $(SUBDIRS_DIST_CLEAN):
--	@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
-+	+@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
- 
- clean: $(SUBDIRS_CLEAN) _clean
- 
-@@ -555,7 +555,7 @@
- 	fi
- 
- $(SUBDIRS_INSTALL):
--	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
-+	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
- 
- NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
- OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
-@@ -804,7 +804,7 @@
- 	@cmp -s .cleancount .lastclean || $(MAKE) clean
- 
- $(SUBDIRS_UNINSTALL):
--	@$(SUBMAKE) -C $(@:-uninstall=) uninstall
-+	+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
- 
- _uninstall: $(SUBDIRS_UNINSTALL)
- 	rm -f $(DESTDIR)$(MODULES_DIR)/*
-@@ -850,7 +850,7 @@
- nmenuconfig: nmenuselect
- 
- menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
--	@if [ -x menuselect/nmenuselect ]; then \
-+	+@if [ -x menuselect/nmenuselect ]; then \
- 		$(MAKE) nmenuselect; \
- 	elif [ -x menuselect/cmenuselect ]; then \
- 		$(MAKE) cmenuselect; \
-@@ -875,28 +875,28 @@
- MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
- 
- menuselect/menuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) menuselect
-+	+$(MAKE_MENUSELECT) menuselect
- 
- menuselect/cmenuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) cmenuselect
-+	+$(MAKE_MENUSELECT) cmenuselect
- 
- menuselect/gmenuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) gmenuselect
-+	+$(MAKE_MENUSELECT) gmenuselect
- 
- menuselect/nmenuselect: menuselect/makeopts
--	$(MAKE_MENUSELECT) nmenuselect
-+	+$(MAKE_MENUSELECT) nmenuselect
- 
- menuselect/makeopts: makeopts
--	$(MAKE_MENUSELECT) makeopts
-+	+$(MAKE_MENUSELECT) makeopts
- 
- menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure
- 	@echo "Generating input for menuselect ..."
- 	@echo "<?xml version=\"1.0\"?>" > $@
- 	@echo >> $@
- 	@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
--	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
-+	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
- 	@cat build_tools/cflags.xml >> $@
--	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
-+	+@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
- 	@if [ "${AST_DEVMODE}" = "yes" ]; then \
- 		cat build_tools/cflags-devmode.xml >> $@; \
- 	fi
diff --git a/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch b/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch
deleted file mode 100644
index 3900a5293073..000000000000
--- a/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr asterisk-1.6.0.6.ORIG/autoconf/ast_ext_tool_check.m4 asterisk-1.6.0.6/autoconf/ast_ext_tool_check.m4
---- asterisk-1.6.0.6.ORIG/autoconf/ast_ext_tool_check.m4	2009-03-16 13:17:33.000000000 +0000
-+++ asterisk-1.6.0.6/autoconf/ast_ext_tool_check.m4	2009-03-16 13:18:26.000000000 +0000
-@@ -20,8 +20,8 @@
- 		fi
- 		CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
- 
--		saved_ldflags="${LDFLAGS}"
--		LDFLAGS="${$1_LIB}"
-+		saved_libs="${LIBS}"
-+		LIBS="${$1_LIB}"
- 
- 		AC_LINK_IFELSE(
- 		    [ AC_LANG_PROGRAM( [ $5 ],
-@@ -33,7 +33,7 @@
- 		    []
- 		)
- 		CPPFLAGS="${saved_cppflags}"
--		LDFLAGS="${saved_ldflags}"
-+		LIBS="${saved_libs}"
- 	    else
- 		PBX_$1=1
- 		AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])