Remove net-misc/asterisk-app_conference which fails to build against recent Asterisk.
authorTony Vroon <chainsaw@gentoo.org>
Thu, 1 Sep 2011 14:47:43 +0000 (14:47 +0000)
committerTony Vroon <chainsaw@gentoo.org>
Thu, 1 Sep 2011 14:47:43 +0000 (14:47 +0000)
net-misc/asterisk-app_conference/ChangeLog [deleted file]
net-misc/asterisk-app_conference/Manifest [deleted file]
net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild [deleted file]
net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild [deleted file]
net-misc/asterisk-app_conference/files/app_conference-20050506-astcfg.diff [deleted file]
net-misc/asterisk-app_conference/files/app_conference-20050506-compile.patch [deleted file]
net-misc/asterisk-app_conference/files/app_conference-20060210-astcfg.diff [deleted file]
net-misc/asterisk-app_conference/metadata.xml [deleted file]

diff --git a/net-misc/asterisk-app_conference/ChangeLog b/net-misc/asterisk-app_conference/ChangeLog
deleted file mode 100644 (file)
index 2b1d935..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# ChangeLog for net-misc/asterisk-app_conference
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/ChangeLog,v 1.9 2011/05/01 00:39:08 halcy0n Exp $
-
-  01 May 2011; Mark Loeser <halcy0n@gentoo.org>
-  asterisk-app_conference-0.0.1_pre20050506.ebuild,
-  asterisk-app_conference-0.0.1_pre20060210.ebuild:
-  Dropping ppc since there is no asterisk keyworded anymore
-
-  16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Remove stkn from metadata.xml (#27693)
-
-  12 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  asterisk-app_conference-0.0.1_pre20060210.ebuild:
-  stable x86, bug 152507
-
-  22 Feb 2007; Piotr JaroszyƄski <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-*asterisk-app_conference-0.0.1_pre20060210 (06 May 2006)
-
-  06 May 2006; Stefan Knoblich <stkn@gentoo.org>
-  +files/app_conference-20060210-astcfg.diff,
-  asterisk-app_conference-0.0.1_pre20050506.ebuild,
-  +asterisk-app_conference-0.0.1_pre20060210.ebuild:
-  Version bump, 20060120 verified to compile with asterisk-1.2.x, block
-  unsupported versions in DEPEND.
-
-  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
-  asterisk-app_conference-0.0.1_pre20050506.ebuild:
-  Stable on x86.
-
-  27 Aug 2005; <stkn@gentoo.org>
-  asterisk-app_conference-0.0.1_pre20050506.ebuild:
-  Added blocker for >=1.1.0 (does not work with 1.2.0
-  at the moment).
-
-  08 Jul 2005; David Holm <dholm@gentoo.org>
-  asterisk-app_conference-0.0.1_pre20050506.ebuild:
-  Added to ~ppc.
-
-*asterisk-app_conference-0.0.1_pre20050506 (06 May 2005)
-
-  06 May 2005; Stefan Knoblich <stkn@gentoo.org> +metadata.xml,
-  +files/app_conference-20050506-astcfg.diff,
-  +files/app_conference-20050506-compile.patch,
-  +asterisk-app_conference-0.0.1_pre20050506.ebuild:
-  Initial import.
-
diff --git a/net-misc/asterisk-app_conference/Manifest b/net-misc/asterisk-app_conference/Manifest
deleted file mode 100644 (file)
index 25cedb5..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX app_conference-20050506-astcfg.diff 3042 RMD160 4984a760c1809a0a41bb7f089e1b978335c51a8e SHA1 9534a8577823856e4e93252496488a276a073e9e SHA256 a9b7d2495269ee6bd1e70a123a3074ff8cefef893846639ef717c82f2bf881b5
-AUX app_conference-20050506-compile.patch 1771 RMD160 e39c1da93a60a6354e6aaf1d150593c742ffc3e7 SHA1 702f12aa8a7f3174f2a705ac3a597d85b6c79c40 SHA256 15c74bac960dc91e6143ed66f5af953866eb23c49050340edf244e98e66ecff9
-AUX app_conference-20060210-astcfg.diff 2931 RMD160 6d47b6626939154ac77edd75701f8fcfa3d80cd8 SHA1 a98bd4b1bf9712223bf49eb35b9ccbf3e3ec9290 SHA256 010e29c4e9dfdaf82c696d072837a8b7d8d3b538f39c41fdf0eb9e908c8fc97b
-DIST app_conference-0.0.1_pre20050506.tar.bz2 45738 RMD160 21b8db200398e88f0660063b43ec083976280575 SHA1 de6f0774f6617cb972acc9821b158ac83feeb97e SHA256 f83d6d48342fa1a0c2305dc1194ad283093f29fa7a9a442c19faa35691e7eccd
-DIST app_conference-20060210.tar.bz2 47454 RMD160 1bb11d0baf6ab58fb7e60da40879012c7c7044d1 SHA1 57294bd3d2e1ead51bfe11bb9a0904789750199a SHA256 e7f99eb6786baf70ed416e3f1a7c2ed7c916971bc5c85367a08fdbc590f24b82
-EBUILD asterisk-app_conference-0.0.1_pre20050506.ebuild 987 RMD160 71ee05b7fef296694c725e05538549dfb0ed817e SHA1 58b931e65c69e9e859e78219c7830ed8127e1791 SHA256 2b110cb37f56ebc6be80581ba822c6fa12c494e3161b705f271d3eb58b258993
-EBUILD asterisk-app_conference-0.0.1_pre20060210.ebuild 912 RMD160 9f3b0fda759b3153fe7ff8c2b58449451c85ca53 SHA1 4069fa10233551ed0ad2dd3e584c51690af93920 SHA256 c4855ecef62f1454431cf0146963ec8d097a66b1c6fcaaf73f8cfe1fbd27dcbb
-MISC ChangeLog 1825 RMD160 b52dd0dd475988a20311cb5ce4f07dc64e6f4f1b SHA1 cbee1b1818e224293947efa6f86297aafc91ffbf SHA256 5e5135f0cd88fbcf196a6d6ef51c5417fa5b2c53839fe14b27fe251db269cad7
-MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk28q7EACgkQCRZPokWLroQTMgCgvHI2DikrquJHb5OszJq2h7Rj
-9CAAnjSIDZprlk9Rmje4StuySRo8hv8O
-=bJUp
------END PGP SIGNATURE-----
diff --git a/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild b/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild
deleted file mode 100644 (file)
index 8122bd2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild,v 1.7 2011/05/01 00:39:08 halcy0n Exp $
-
-inherit eutils
-
-MY_PN="app_conference"
-MY_P="${MY_PN}-${PV/0.0.1_pre/}"
-
-DESCRIPTION="Asterisk application plugin for conferences"
-HOMEPAGE="http://iaxclient.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE=""
-
-# depends on glibc's iconv support
-DEPEND=">=net-misc/asterisk-1.0.5-r1
-       !>=net-misc/asterisk-1.2.0"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-       unpack ${A}
-
-       cd "${S}"
-       # use asterisk-config...
-       epatch "${FILESDIR}"/${MY_P}-astcfg.diff
-
-       # compile fixes for asterisk-stable
-       epatch "${FILESDIR}"/${MY_P}-compile.patch
-}
-
-src_compile() {
-       emake -j1 || die "emake failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-
-       dodoc README
-}
diff --git a/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild b/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild
deleted file mode 100644 (file)
index f3e17cb..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild,v 1.4 2011/05/01 00:39:08 halcy0n Exp $
-
-inherit eutils
-
-MY_PN="app_conference"
-MY_P="${MY_PN}-${PV/0.0.1_pre/}"
-
-DESCRIPTION="Asterisk application plugin for conferences"
-HOMEPAGE="http://iaxclient.sourceforge.net/"
-SRC_URI="http://www.netdomination.org/pub/asterisk/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE=""
-
-# depends on glibc's iconv support
-DEPEND=">=net-misc/asterisk-1.2.0
-       !=net-misc/asterisk-1.0*"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       # use asterisk-config...
-       epatch "${FILESDIR}"/${MY_PN}-20060210-astcfg.diff
-}
-
-src_compile() {
-       emake -j1 || die
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc README
-}
diff --git a/net-misc/asterisk-app_conference/files/app_conference-20050506-astcfg.diff b/net-misc/asterisk-app_conference/files/app_conference-20050506-astcfg.diff
deleted file mode 100644 (file)
index 09bf615..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
---- app_conference/Makefile.orig       2005-05-06 15:43:47.736537144 +0200
-+++ app_conference/Makefile    2005-05-06 16:15:45.455999472 +0200
-@@ -17,10 +17,11 @@
- # app_conference defines which can be passed on the command-line
- #
--INSTALL_PREFIX := /opt/horizon
--INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
-+DESTDIR :=
-+INSTALL_MODULES_DIR := $(shell /usr/bin/asterisk-config --modulesdir)
-+INSTALL_CONFIG_DIR  := $(shell /usr/bin/asterisk-config --sysconfdir)
--ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include
-+ASTERISK_INCLUDE_DIR := $(shell /usr/bin/asterisk-config --includedir)
- # turn app_conference debugging on or off ( 0 == OFF, 1 == ON )
- APP_CONFERENCE_DEBUG := 1
-@@ -43,30 +44,17 @@
- INSTALL = install
- CC = gcc
--INCLUDE = -I$(ASTERISK_INCLUDE_DIR) 
-+# skip asterisk includes if they are in /usr/include/asterisk
-+ifneq ($(shell dirname $(ASTERISK_INCLUDE_DIR)), /usr/include)
-+INCLUDE = -I$(ASTERISK_INCLUDE_DIR)
-+endif
-+
- LIBS = -ldl -lpthread -lm
- DEBUG := -g 
--CFLAGS = -pipe -std=c99 -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
--#CFLAGS += -O2
--#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math 
--# PERF: below is 10% faster than -O2 or -O3 alone.
--#CFLAGS += -O3 -ffast-math -funroll-loops
--# below is another 5% faster or so.
--CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant
--
--# this is fun for PPC
--#CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic
--
--# this is fun for x86
--CFLAGS += -march=pentium3 -msse -mfpmath=sse,387
--
--
--# adding -msse -mfpmath=sse has little effect.
--#CFLAGS += -O3 -msse -mfpmath=sse
--#CFLAGS += $(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+CFLAGS += -pipe -std=c99 -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS += $(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
--CFLAGS += -DCRYPTO
-+CFLAGS += -DCRYPTO -fPIC -DPIC
- ifeq ($(APP_CONFERENCE_DEBUG), 1)
- CFLAGS += -DAPP_CONFERENCE_DEBUG
-@@ -102,16 +90,22 @@
-       rm -f *.so *.o $(OBJS)
- app_conference.so : $(OBJS)
--      $(CC) -pg -shared -Xlinker -x -o $@ $(OBJS)
-+      $(CC) -shared -Xlinker -x -o $@ $(OBJS)
- vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o
-       $(CC) $(PROFILE) -o $@ $^ -lm
- install: all
--      for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(INSTALL_MODULES_DIR) ; done
--      /var/horizon/mojo/lib/horizoncmd restart asterisk
--
--# config: all
--#     cp conf.conf /etc/asterisk/
--      
-+      if [ ! -d ${DESTDIR}${INSTALL_MODULES_DIR} ]; then \
-+              $(INSTALL) -m 755 -d ${DESTDIR}${INSTALL_MODULES_DIR} ; \
-+      fi
-+      for x in $(SHAREDOS); do \
-+              $(INSTALL) -m 755 $$x ${DESTDIR}$(INSTALL_MODULES_DIR) ; \
-+      done
-+
-+#config: all
-+#     if [ ! -d ${DESTDIR}${INSTALL_CONFIG_DIR} ]; then \
-+#             $(INSTALL) -m 755 -d ${DESTDIR}${INSTALL_CONFIG_DIR} ; \
-+#     fi
-+#     $(INSTALL) -m 640 conf.conf ${DESTDIR}${INSTALL_CONFIG_DIR}
diff --git a/net-misc/asterisk-app_conference/files/app_conference-20050506-compile.patch b/net-misc/asterisk-app_conference/files/app_conference-20050506-compile.patch
deleted file mode 100644 (file)
index 92bac63..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- app_conference/conference.c.orig   2005-05-06 16:07:11.284165472 +0200
-+++ app_conference/conference.c        2005-05-06 16:09:43.245063904 +0200
-@@ -611,7 +611,7 @@
-       // acquire conference mutexes
-       ast_mutex_lock( &conf->lock ) ;
-       
--      if ( pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) 
-+      if ( ast_pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) 
-       {
-               // detach the thread so it doesn't leak
-               pthread_detach( conf->conference_thread ) ;
---- app_conference/member.c.orig       2005-05-06 16:12:26.710213424 +0200
-+++ app_conference/member.c    2005-05-06 16:14:36.121539912 +0200
-@@ -71,10 +71,14 @@
-       //
-       // setup asterisk read/write formats
-       //
--      
-+
-+#ifdef ASTERISK_UNSTABLE_CVS
-       ast_log( AST_CONF_DEBUG, "CHANNEL INFO, CHANNEL => %s, DNID => %s, CALLER_ID => %s, ANI => %s\n", 
-               chan->name, chan->cid.cid_dnid, chan->cid.cid_num, chan->cid.cid_ani ) ;
--
-+#else
-+      ast_log( AST_CONF_DEBUG, "CHANNEL INFO, CHANNEL => %s, DNID => %s, CALLER_ID => %s, ANI => %s\n", 
-+              chan->name, chan->dnid, chan->callerid, chan->ani ) ;
-+#endif
-       ast_log( AST_CONF_DEBUG, "CHANNEL CODECS, CHANNEL => %s, NATIVE => %d, READ => %d, WRITE => %d\n", 
-               chan->name, chan->nativeformats, member->read_format, member->write_format ) ;
---- app_conference/app_conference.h.orig       2005-05-06 16:10:08.133280320 +0200
-+++ app_conference/app_conference.h    2005-05-06 16:10:36.249006080 +0200
-@@ -31,6 +31,7 @@
- #include <asterisk/channel.h>
- #include <asterisk/file.h>
- #include <asterisk/cli.h>
-+#include <asterisk/utils.h>
- /* standard includes */
- #include <stdlib.h>
-@@ -40,8 +41,6 @@
- #include <math.h>
- #include <stdio.h>
--#include <pthread.h>
--
- #if (SILDET == 2)
- #include "libspeex/speex_preprocess.h"
- #endif
diff --git a/net-misc/asterisk-app_conference/files/app_conference-20060210-astcfg.diff b/net-misc/asterisk-app_conference/files/app_conference-20060210-astcfg.diff
deleted file mode 100644 (file)
index f2f2af6..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
---- app_conference/Makefile.orig       2005-10-27 19:53:35.000000000 +0200
-+++ app_conference/Makefile    2006-02-11 00:07:01.000000000 +0100
-@@ -17,10 +17,11 @@
- # app_conference defines which can be passed on the command-line
- #
--INSTALL_PREFIX := /opt/horizon
--INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
-+DESTDIR :=
-+INSTALL_MODULES_DIR := $(shell /usr/bin/asterisk-config --modulesdir)
-+INSTALL_CONFIG_DIR  := $(shell /usr/bin/asterisk-config --sysconfdir)
--ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include
-+ASTERISK_INCLUDE_DIR := $(shell /usr/bin/asterisk-config --includedir)
- # turn app_conference debugging on or off ( 0 == OFF, 1 == ON )
- APP_CONFERENCE_DEBUG := 1
-@@ -43,28 +44,16 @@
- INSTALL = install
- CC = gcc
--INCLUDE = -I$(ASTERISK_INCLUDE_DIR) 
-+# skip asterisk includes if they are in /usr/include/asterisk
-+ifneq ($(shell dirname $(ASTERISK_INCLUDE_DIR)), /usr/include)
-+INCLUDE = -I$(ASTERISK_INCLUDE_DIR)
-+endif
-+
- LIBS = -ldl -lpthread -lm
- DEBUG := -g 
--CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
--#CFLAGS += -O2
--#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math 
--# PERF: below is 10% faster than -O2 or -O3 alone.
--#CFLAGS += -O3 -ffast-math -funroll-loops
--# below is another 5% faster or so.
--CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant
--
--# this is fun for PPC
--#CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic
--
--# this is fun for x86
--CFLAGS += -march=pentium3 -msse -mfpmath=sse,387
--
--
--# adding -msse -mfpmath=sse has little effect.
--#CFLAGS += -O3 -msse -mfpmath=sse
--#CFLAGS += $(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+CFLAGS += -pipe -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
-+
- CFLAGS += $(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS += -DCRYPTO
-@@ -102,16 +91,22 @@
-       rm -f *.so *.o $(OBJS)
- app_conference.so : $(OBJS)
--      $(CC) -pg -shared -Xlinker -x -o $@ $(OBJS)
-+      $(CC) -shared -Xlinker -x -o $@ $(OBJS)
- vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o
-       $(CC) $(PROFILE) -o $@ $^ -lm
- install: all
--      for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(INSTALL_MODULES_DIR) ; done
--      /var/horizon/mojo/lib/horizoncmd restart asterisk
--
--# config: all
--#     cp conf.conf /etc/asterisk/
--      
-+      if [ ! -d ${DESTDIR}${INSTALL_MODULES_DIR} ]; then \
-+              $(INSTALL) -m 755 -d ${DESTDIR}${INSTALL_MODULES_DIR} ; \
-+      fi
-+      for x in $(SHAREDOS); do \
-+              $(INSTALL) -m 755 $$x ${DESTDIR}$(INSTALL_MODULES_DIR) ; \
-+      done
-+
-+#config: all
-+#     if [ ! -d ${DESTDIR}${INSTALL_CONFIG_DIR} ]; then \
-+#             $(INSTALL) -m 755 -d ${DESTDIR}${INSTALL_CONFIG_DIR} ; \
-+#     fi
-+#     $(INSTALL) -m 640 conf.conf ${DESTDIR}${INSTALL_CONFIG_DIR}
diff --git a/net-misc/asterisk-app_conference/metadata.xml b/net-misc/asterisk-app_conference/metadata.xml
deleted file mode 100644 (file)
index 8d1e4dd..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>voip</herd>
-</pkgmetadata>