ebuild cleanup, QA warnings fix, adding stable version

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

9 files changed, 141 insertions, 736 deletions

diff --git a/net-voip/yate/ChangeLog b/net-voip/yate/ChangeLog
index 0c3ac4a1a346..427ae26313c7 100644
--- a/net-voip/yate/ChangeLog
+++ b/net-voip/yate/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-voip/yate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/ChangeLog,v 1.28 2014/04/28 05:21:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/ChangeLog,v 1.29 2014/07/25 20:12:38 zerochaos Exp $
+
+*yate-5.3.0 (25 Jul 2014)
+
+  25 Jul 2014; Rick Farina <zerochaos@gentoo.org>
+  +files/dont-mess-with-cflags.patch, +yate-5.3.0.ebuild,
+  -files/yate-2.0.0-as-needed.patch, -files/yate-2.0.0-cxxflags.patch,
+  -files/yate-2.0.0-ilbc-alsa-oss.patch, -files/yate-2.0.0-spandsp.patch,
+  -files/yate-4.3.0-ilbc-alsa-oss.patch, yate-9999.ebuild:
+  ebuild cleanup, QA warnings fix, adding stable version
 
   28 Apr 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag description from metadata.xml
diff --git a/net-voip/yate/files/dont-mess-with-cflags.patch b/net-voip/yate/files/dont-mess-with-cflags.patch
new file mode 100644
index 000000000000..961d73fa1ccc
--- /dev/null
+++ b/net-voip/yate/files/dont-mess-with-cflags.patch
@@ -0,0 +1,15 @@
+https://build.opensuse.org/package/view_file/network:telephony/yate/dont-mess-with-cflags.patch?expand=1
+
+Index: yate/configure.in
+===================================================================
+--- yate.orig/configure.in
++++ yate/configure.in
+@@ -1447,7 +1447,6 @@ fi
+ 
+ 
+ INSTALL_D="install -D"
+-CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| *\)-g[[0-9]]*//' | sed 's/[[[:space:]]]\{2,\}/ /g'`
+ MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK $HAVE_BLOCK_RETURN"
+ MODULE_CPPFLAGS="-fno-check-new $RTTI_OPT $MODULE_CFLAGS"
+ MODULE_LDRELAX="-export-dynamic -shared"
+
diff --git a/net-voip/yate/files/yate-2.0.0-as-needed.patch b/net-voip/yate/files/yate-2.0.0-as-needed.patch
deleted file mode 100644
index c37f14b1b322..000000000000
--- a/net-voip/yate/files/yate-2.0.0-as-needed.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- ./Makefile.in.old	2009-07-30 12:17:10.000000000 +0000
-+++ Makefile.in	2009-07-30 12:19:55.000000000 +0000
-@@ -299,7 +299,7 @@
- Makefile: @srcdir@/Makefile.in $(MKDEPS)
- 	./config.status
- 
--yate: libyate.so $(OBJS) $(LIBS)
-+yate: ${OBJS} libyate.so $(LIBS)
- 	$(LINK) -o $@ $(LIBTHR) $^
- 
- libyate.so: $(YLIB)
---- ./modules/Makefile.in.old	2009-07-30 12:21:07.000000000 +0000
-+++ ./modules/Makefile.in	2009-07-30 12:25:18.000000000 +0000
-@@ -14,7 +14,7 @@
- INCLUDES := -I.. -I@top_srcdir@
- CFLAGS += -Wall @MODULE_CFLAGS@ @INLINE_FLAGS@
- CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
--LDFLAGS:= @LDFLAGS@ -L.. -lyate
-+LDFLAGS += -L..
- MODFLAGS:= @MODULE_LDFLAGS@
- MODRELAX:= @MODULE_LDRELAX@
- MODSTRIP:= @MODULE_SYMBOLS@
-@@ -106,7 +106,7 @@
- endif
- 
- LOCALFLAGS =
--LOCALLIBS =
-+LOCALLIBS = -lyate
- CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
- COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CXX) $(LDFLAGS)
-@@ -198,74 +198,74 @@
- server/ysigchan.yate server/analog.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig
- server/wpcard.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig @WANPIPE_HWEC_INC@
- server/zapcard.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig @ZAP_FLAGS@
--server/ysigchan.yate server/wpcard.yate server/zapcard.yate server/analog.yate: LOCALLIBS = -lyatesig
-+server/ysigchan.yate server/wpcard.yate server/zapcard.yate server/analog.yate: LOCALLIBS += -lyatesig
- 
- server/analogdetect.yate: ../libs/ymodem/libyatemodem.a
- server/analogdetect.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymodem
--server/analogdetect.yate: LOCALLIBS = -L../libs/ymodem -lyatemodem
-+server/analogdetect.yate: LOCALLIBS += -L../libs/ymodem -lyatemodem
- 
- h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@
--h323chan.yate: LOCALLIBS = @H323_LIB@
-+h323chan.yate: LOCALLIBS += @H323_LIB@
- 
- server/pgsqldb.yate: LOCALFLAGS = @PGSQL_INC@
--server/pgsqldb.yate: LOCALLIBS = -lpq
-+server/pgsqldb.yate: LOCALLIBS += -lpq
- 
- server/mysqldb.yate: LOCALFLAGS = @MYSQL_INC@
--server/mysqldb.yate: LOCALLIBS = @MYSQL_LIB@
-+server/mysqldb.yate: LOCALLIBS += @MYSQL_LIB@
- 
--enumroute.yate: LOCALLIBS = @RESOLV_LIB@
-+enumroute.yate: LOCALLIBS += @RESOLV_LIB@
- 
--client/alsachan.yate: LOCALLIBS = -lasound
-+client/alsachan.yate: LOCALLIBS += -lasound
- 
- yiaxchan.yate: ../libs/yiax/libyateiax.a
- yiaxchan.yate: LOCALFLAGS = -I@top_srcdir@/libs/yiax
--yiaxchan.yate: LOCALLIBS = -L../libs/yiax -lyateiax
-+yiaxchan.yate: LOCALLIBS += -L../libs/yiax -lyateiax
- 
- yjinglechan.yate: ../libs/yxml/libyatexml.a ../libs/yjingle/libyatejingle.a
- yjinglechan.yate: LOCALFLAGS = -I@top_srcdir@/libs/yxml -I@top_srcdir@/libs/yjingle
--yjinglechan.yate: LOCALLIBS = -L../libs/yjingle -L../libs/yxml -lyatejingle -lyatexml
-+yjinglechan.yate: LOCALLIBS += -L../libs/yjingle -L../libs/yxml -lyatejingle -lyatexml
- 
- server/dbpbx.yate server/pbxassist.yate: ../libs/ypbx/libyatepbx.a
- server/dbpbx.yate server/pbxassist.yate: LOCALFLAGS = -I@top_srcdir@/libs/ypbx
--server/dbpbx.yate server/pbxassist.yate: LOCALLIBS = ../libs/ypbx/libyatepbx.a
-+server/dbpbx.yate server/pbxassist.yate: LOCALLIBS += ../libs/ypbx/libyatepbx.a
- 
- server/mgcpgw.yate server/mgcpca.yate: ../libs/ymgcp/libyatemgcp.a
- server/mgcpgw.yate server/mgcpca.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymgcp
--server/mgcpgw.yate server/mgcpca.yate: LOCALLIBS = ../libs/ymgcp/libyatemgcp.a
-+server/mgcpgw.yate server/mgcpca.yate: LOCALLIBS += ../libs/ymgcp/libyatemgcp.a
- 
- ifeq (@SYSTEM_ILBC@,yes)
--ilbccodec.yate: LOCALLIBS = -lilbc
-+ilbccodec.yate: LOCALLIBS += -lilbc
- else
- ilbccodec.yate: ../libs/ilbc/libilbc.a
--ilbccodec.yate: LOCALLIBS = ../libs/ilbc/libilbc.a
-+ilbccodec.yate: LOCALLIBS += ../libs/ilbc/libilbc.a
- endif
- ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
- 
--gsmcodec.yate: LOCALLIBS = -lgsm
-+gsmcodec.yate: LOCALLIBS += -lgsm
- gsmcodec.yate: LOCALFLAGS = @GSM_INC@
- 
--speexcodec.yate: LOCALLIBS = -lspeex
-+speexcodec.yate: LOCALLIBS += -lspeex
- speexcodec.yate: LOCALFLAGS = @SPEEX_INC@
- 
- amrnbcodec.yate: LOCALFLAGS = @AMRNB_INC@
--amrnbcodec.yate: LOCALLIBS = @AMRNB_LIB@
-+amrnbcodec.yate: LOCALLIBS += @AMRNB_LIB@
- 
--faxchan.yate: LOCALLIBS = -lspandsp
-+faxchan.yate: LOCALLIBS += -lspandsp
- faxchan.yate: LOCALFLAGS = @SPANDSP_INC@
- 
- ysipchan.yate: ../libs/ysip/libyatesip.a
- ysipchan.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysip
--ysipchan.yate: LOCALLIBS = ../libs/ysip/libyatesip.a
-+ysipchan.yate: LOCALLIBS += ../libs/ysip/libyatesip.a
- 
- yrtpchan.yate: ../libs/yrtp/libyatertp.a
- yrtpchan.yate: LOCALFLAGS = -I@top_srcdir@/libs/yrtp
--yrtpchan.yate: LOCALLIBS = ../libs/yrtp/libyatertp.a
-+yrtpchan.yate: LOCALLIBS += ../libs/yrtp/libyatertp.a
- 
- openssl.yate: LOCALFLAGS = @OPENSSL_INC@
--openssl.yate: LOCALLIBS = @OPENSSL_LIB@
-+openssl.yate: LOCALLIBS += @OPENSSL_LIB@
- 
- rmanager.yate: LOCALFLAGS = $(COREDUMP_INC)
--rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
-+rmanager.yate: LOCALLIBS += $(COREDUMP_LIB)
- 
- ../libyatesig.so ../libs/ysig/libyatesig.a:
- 	$(MAKE) -C ../libs/ysig
---- ./engine/Makefile.in.old	2009-07-30 12:15:05.000000000 +0000
-+++ ./engine/Makefile.in	2009-07-30 12:15:32.000000000 +0000
-@@ -120,4 +120,4 @@
- 	cd .. && ./config.status
- 
- ../$(YLIB): $(LIBOBJS) $(LIBS)
--	$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $(LIBTHR) $^ $(LIBAUX)
-+	$(LINK) -shared -o $@ -Wl,--soname=$(YLIB) $^ $(LIBTHR) $(LIBAUX)
diff --git a/net-voip/yate/files/yate-2.0.0-cxxflags.patch b/net-voip/yate/files/yate-2.0.0-cxxflags.patch
deleted file mode 100644
index 9fce51784938..000000000000
--- a/net-voip/yate/files/yate-2.0.0-cxxflags.patch
+++ /dev/null
@@ -1,398 +0,0 @@
---- Makefile.in.old	2009-07-28 01:23:48.000000000 +0200
-+++ Makefile.in	2009-07-28 01:00:34.000000000 +0200
-@@ -7,12 +7,12 @@
- # override DEBUG at compile time to enable full debug or remove it all
- DEBUG :=
- 
--CXX := @CXX@ -Wall
-+CXX := @CXX@
- SED := sed
- DEFS :=
- LIBTHR:= -lpthread
- INCLUDES := -I. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@
- LDCONFIG:=true
- 
-@@ -28,7 +28,7 @@
- OBJS := main.o
- 
- CLEANS = $(PROGS) $(SLIBS) $(LIBS) $(OBJS) yatepaths.h core
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CXX) $(LDFLAGS)
- 
- DOCGEN_F := $(INCS)
---- engine/Makefile.in.old	2009-07-28 01:04:58.000000000 +0200
-+++ engine/Makefile.in	2009-07-28 01:05:53.000000000 +0200
-@@ -4,15 +4,15 @@
- # override DEBUG at compile time to enable full debug or remove it all
- DEBUG :=
- 
--CC  := @CC@ -Wall
--CXX := @CXX@ -Wall
-+CC  := @CC@
-+CXX := @CXX@
- SED := sed
- DEFS :=
- LIBAUX:= @DLOPEN_LIB@
- LIBTHR:= -lpthread
- INCLUDES := -I.. -I@top_srcdir@
--CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
--CPPFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CFLAGS += -Wall @MODULE_CFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@
- LDCONFIG:=true
- 
-@@ -32,7 +32,7 @@
- LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS)
- CLEANS = $(LIBOBJS) core
- CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CXX) $(LDFLAGS)
- SCTPOPTS:=
- 
---- clients/qt4/Makefile.in.old	2009-07-28 01:02:13.000000000 +0200
-+++ clients/qt4/Makefile.in	2009-07-28 01:02:58.000000000 +0200
-@@ -4,13 +4,13 @@
- # override DEBUG at compile time to enable full debug or remove it all
- DEBUG :=
- 
--CXX := @CXX@ -Wall
-+CXX := @CXX@
- AR  := ar
- MOC := @QT4_MOC@
- DEFS:=
- 
- INCLUDES:=-I. -I@srcdir@ -I@top_srcdir@ @QT4_INC@
--CXXFLAGS:=$(CXXFLAGS) @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS:= -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatecbase.h @srcdir@/qt4client.h
- 
---- clients/Makefile.in.old	2009-07-28 01:01:13.000000000 +0200
-+++ clients/Makefile.in	2009-07-28 01:02:00.000000000 +0200
-@@ -7,12 +7,12 @@
- # override DEBUG at compile time to enable full debug or remove it all
- DEBUG :=
- 
--CXX := @CXX@ -Wall
-+CXX := @CXX@
- SED := sed
- DEFS :=
- LIBTHR:= -lpthread
- INCLUDES := -I.. -I@top_srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L.. -lyate
- INCFILES := @top_srcdir@/yatengine.h @top_srcdir@/yatephone.h ../yateversn.h
- 
-@@ -38,7 +38,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CXX) $(LDFLAGS)
- 
- prefix = @prefix@
---- modules/test/Makefile.in.old	2009-07-28 01:07:12.000000000 +0200
-+++ modules/test/Makefile.in	2009-07-28 01:08:05.000000000 +0200
-@@ -1,11 +1,11 @@
- # Makefile
- # This file holds the make rules for the Telephony Engine test cases
- 
--CXX := @CXX@ -Wall
-+CXX := @CXX@
- SED := sed
- DEFS :=
- INCLUDES := -I@top_srcdir@
--CFLAGS := -O0 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -O0 -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- MODFLAGS:= @MODULE_LDFLAGS@
- MODSTRIP:= @MODULE_SYMBOLS@
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CXX) $(LDFLAGS)
- MODLINK = $(CXX) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
- MODCOMP = $(COMPILE) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
---- modules/Makefile.in.old	2009-07-28 01:09:55.000000000 +0200
-+++ modules/Makefile.in	2009-07-28 01:10:29.000000000 +0200
-@@ -7,13 +7,13 @@
- # override DEBUG at compile time to enable full debug or remove it all
- DEBUG :=
- 
--CC  := @CC@ -Wall
--CXX := @CXX@ -Wall
-+CC  := @CC@
-+CXX := @CXX@
- SED := sed
- DEFS :=
- INCLUDES := -I.. -I@top_srcdir@
--CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
--CPPFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CFLAGS += -Wall @MODULE_CFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L.. -lyate
- MODFLAGS:= @MODULE_LDFLAGS@
- MODRELAX:= @MODULE_LDRELAX@
-@@ -108,7 +108,7 @@
- LOCALFLAGS =
- LOCALLIBS =
- CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CXX) $(LDFLAGS)
- MODLINK = $(CXX) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
- MODCOMP = $(COMPILE) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
---- libs/ysig/Makefile.in.old	2009-07-28 01:10:58.000000000 +0200
-+++ libs/ysig/Makefile.in	2009-07-28 01:11:28.000000000 +0200
-@@ -3,12 +3,12 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- LIBTHR := -lpthread
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesig.h
- 
-@@ -26,7 +26,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/ymgcp/Makefile.in.old	2009-07-28 01:13:18.000000000 +0200
-+++ libs/ymgcp/Makefile.in	2009-07-28 01:13:41.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatemgcp.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/yrtp/Makefile.in.old	2009-07-28 01:15:02.000000000 +0200
-+++ libs/yrtp/Makefile.in	2009-07-28 01:15:31.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatertp.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/ilbc/Makefile.in.old	2009-07-28 01:15:47.000000000 +0200
-+++ libs/ilbc/Makefile.in	2009-07-28 01:16:26.000000000 +0200
-@@ -1,12 +1,12 @@
- # Makefile
- # This file holds the make rules for the libilbc 
- 
--CC  := @CC@ -Wall
-+CC  := @CC@
- AR  := ar
- SED := sed
- DEFS :=
- INCLUDES := -I@top_srcdir@
--CFLAGS := -O3 -funroll-loops -fomit-frame-pointer -fsigned-char @MODULE_CFLAGS@
-+CFLAGS += -Wall  @MODULE_CFLAGS@
- LDFLAGS:= @LDFLAGS@
- 
- PROGS=
---- libs/yjingle/Makefile.in.old	2009-07-28 01:16:54.000000000 +0200
-+++ libs/yjingle/Makefile.in	2009-07-28 01:17:23.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@/../yxml -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/../yxml/tinystr.h @srcdir@/../yxml/tinyxml.h @srcdir@/xmlparser.h @srcdir@/xmpputils.h @srcdir@/yatejabber.h @srcdir@/yatejingle.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/ysip/Makefile.in.old	2009-07-28 01:17:40.000000000 +0200
-+++ libs/ysip/Makefile.in	2009-07-28 01:17:59.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatesip.h @srcdir@/util.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/ypbx/Makefile.in.old	2009-07-28 01:18:16.000000000 +0200
-+++ libs/ypbx/Makefile.in	2009-07-28 01:18:39.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatepbx.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/yxml/Makefile.in.old	2009-07-28 01:19:23.000000000 +0200
-+++ libs/yxml/Makefile.in	2009-07-28 01:19:43.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/tinystr.h @srcdir@/tinyxml.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/ymodem/Makefile.in.old	2009-07-28 01:20:00.000000000 +0200
-+++ libs/ymodem/Makefile.in	2009-07-28 01:20:16.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yatemodem.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
---- libs/yiax/Makefile.in.old	2009-07-28 01:20:44.000000000 +0200
-+++ libs/yiax/Makefile.in	2009-07-28 01:21:01.000000000 +0200
-@@ -3,11 +3,11 @@
- 
- DEBUG :=
- 
--CXX  := @CXX@ -Wall
-+CXX  := @CXX@
- AR  := ar
- DEFS :=
- INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
--CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXXFLAGS += -Wall @MODULE_CPPFLAGS@ @INLINE_FLAGS@
- LDFLAGS:= @LDFLAGS@ -L../.. -lyate
- INCFILES := @top_srcdir@/yateclass.h @srcdir@/yateiax.h
- 
-@@ -17,7 +17,7 @@
- 
- LOCALFLAGS =
- LOCALLIBS =
--COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
- LINK = $(CC) $(LDFLAGS)
- 
- prefix = @prefix@
diff --git a/net-voip/yate/files/yate-2.0.0-ilbc-alsa-oss.patch b/net-voip/yate/files/yate-2.0.0-ilbc-alsa-oss.patch
deleted file mode 100644
index 0eda1cbb20c0..000000000000
--- a/net-voip/yate/files/yate-2.0.0-ilbc-alsa-oss.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- configure.in.old	2009-07-28 00:50:23.000000000 +0200
-+++ configure.in	2009-07-28 00:19:46.000000000 +0200
-@@ -407,6 +407,8 @@
- AC_SUBST(WANPIPE_HWEC_INC)
- 
- HAVE_SOUNDCARD=no
-+AC_ARG_ENABLE(oss,AC_HELP_STRING([--enable-oss],[Enable OSS (default: yes)]),enable_oss=$enableval,enable_oss=yes)
-+if [[ "x$enable_oss" = "xyes" ]]; then
- AC_MSG_CHECKING([for sound card headers])
- AC_TRY_COMPILE([
- #include <sys/stat.h>
-@@ -425,9 +427,12 @@
- HAVE_SOUNDCARD="yes"
- )
- AC_MSG_RESULT([$HAVE_SOUNDCARD])
-+fi
- AC_SUBST(HAVE_SOUNDCARD)
- 
- HAVE_ALSA=no
-+AC_ARG_ENABLE(alsa,AC_HELP_STRING([--enable-alsa],[Enable ALSA (default: yes)]),enable_alsa=$enableval,enable_alsa=yes)
-+if [[ "x$enable_alsa" = "xyes" ]]; then
- AC_MSG_CHECKING([for ALSA headers])
- AC_TRY_COMPILE([
- #if defined(__linux__)
-@@ -444,6 +449,7 @@
- HAVE_ALSA="yes"
- )
- AC_MSG_RESULT([$HAVE_ALSA])
-+fi
- AC_SUBST(HAVE_ALSA)
- 
- 
-@@ -470,20 +476,35 @@
- 
- HAVE_ILBC=no
- ILBC_INC=""
--AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),want_ilbc=$enableval,want_ilbc=yes)
--if [[ "x$want_ilbc" = "xyes" ]]; then
--AC_MSG_CHECKING([for iLBC in libs])
--	basedir=`cd "$srcdir" && pwd`
--	incilbc="libs/ilbc"
--        if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
-+SYSTEM_ILBC=no
-+AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),ac_cv_use_ilbc=$enableval,ac_cv_use_ilbc=yes)
-+if [[ "x$ac_cv_use_ilbc" = "xyes" ]]; then
-+for i in /usr/include /usr/include/ilbc /usr/local/include /usr/local/include/ilbc; do
-+    ac_cv_use_ilbc="$i"
-+    test -f "$ac_cv_use_ilbc/iLBC_encode.h" && break
-+done
-+fi
-+if [[ "x$ac_cv_use_ilbc" != "xno" ]]; then
-+AC_MSG_CHECKING([for iLBC_encode.h in $ac_cv_use_ilbc])
-+if [[ -f "$ac_cv_use_ilbc/iLBC_encode.h" ]]; then
-+    HAVE_ILBC=yes
-+    ILBC_INC="-I$ac_cv_use_ilbc"
-+		SYSTEM_ILBC=yes
-+else
-+  AC_MSG_CHECKING([for iLBC in libs])
-+  basedir=`cd "$srcdir" && pwd`
-+  incilbc="libs/ilbc"
-+  if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
- 		HAVE_ILBC=yes
- 		ILBC_INC="-I$basedir/$incilbc"
--		ILBC_DEP="../$incilbc/libilbc.a"
-+		SYSTEM_ILBC=no
- 	fi
-+fi
- AC_MSG_RESULT([$HAVE_ILBC])
- fi
- AC_SUBST(HAVE_ILBC)
- AC_SUBST(ILBC_INC)
-+AC_SUBST(SYSTEM_ILBC)
- 
- 
- HAVE_SPEEX=no
---- modules/Makefile.in.old	2009-07-28 00:50:36.000000000 +0200
-+++ modules/Makefile.in	2009-07-28 00:48:51.000000000 +0200
-@@ -233,8 +233,12 @@
- server/mgcpgw.yate server/mgcpca.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymgcp
- server/mgcpgw.yate server/mgcpca.yate: LOCALLIBS = ../libs/ymgcp/libyatemgcp.a
- 
-+ifeq (@SYSTEM_ILBC@,yes)
-+ilbccodec.yate: LOCALLIBS = -lilbc
-+else
- ilbccodec.yate: ../libs/ilbc/libilbc.a
- ilbccodec.yate: LOCALLIBS = ../libs/ilbc/libilbc.a
-+endif
- ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
- 
- gsmcodec.yate: LOCALLIBS = -lgsm
diff --git a/net-voip/yate/files/yate-2.0.0-spandsp.patch b/net-voip/yate/files/yate-2.0.0-spandsp.patch
deleted file mode 100644
index 748f420b073f..000000000000
--- a/net-voip/yate/files/yate-2.0.0-spandsp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.old	2009-07-29 18:59:30.000000000 +0000
-+++ configure.in	2009-07-29 18:59:48.000000000 +0000
-@@ -579,6 +579,7 @@
- CFLAGS="$CFLAGS -Wall -Werror"
- AC_TRY_COMPILE([
- #define __STDC_LIMIT_MACROS
-+#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
- #include <math.h>
- #include <stdint.h>
- #include <stdlib.h>
diff --git a/net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch b/net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch
deleted file mode 100644
index 8a90ee55df72..000000000000
--- a/net-voip/yate/files/yate-4.3.0-ilbc-alsa-oss.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ur a/configure.in b/configure.in
---- a/configure.in	2012-12-21 15:26:49.000000000 +0100
-+++ b/configure.in	2013-06-18 17:38:10.292436508 +0200
-@@ -779,6 +779,8 @@
- AC_SUBST(WANPIPE_FLAGS)
- 
- HAVE_SOUNDCARD=no
-+AC_ARG_ENABLE(oss,AC_HELP_STRING([--enable-oss],[Enable OSS (default: yes)]),enable_oss=$enableval,enable_oss=yes)
-+if [[ "x$enable_oss" = "xyes" ]]; then
- AC_MSG_CHECKING([for sound card headers])
- AC_TRY_COMPILE([
- #include <sys/stat.h>
-@@ -797,9 +799,12 @@
- HAVE_SOUNDCARD="yes"
- )
- AC_MSG_RESULT([$HAVE_SOUNDCARD])
-+fi
- AC_SUBST(HAVE_SOUNDCARD)
- 
- HAVE_ALSA=no
-+AC_ARG_ENABLE(alsa,AC_HELP_STRING([--enable-alsa],[Enable ALSA (default: yes)]),enable_alsa=$enableval,enable_alsa=yes)
-+if [[ "x$enable_alsa" = "xyes" ]]; then
- AC_MSG_CHECKING([for ALSA headers])
- AC_TRY_COMPILE([
- #if defined(__linux__)
-@@ -816,6 +821,7 @@
- HAVE_ALSA="yes"
- )
- AC_MSG_RESULT([$HAVE_ALSA])
-+fi
- AC_SUBST(HAVE_ALSA)
- 
- # check for Mac OS X audio headers
-@@ -878,20 +884,36 @@
- 
- HAVE_ILBC=no
- ILBC_INC=""
--AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),want_ilbc=$enableval,want_ilbc=yes)
--if [[ "x$want_ilbc" = "xyes" ]]; then
--AC_MSG_CHECKING([for iLBC reference in libs])
--	basedir=`cd "$srcdir" && pwd`
--	incilbc="libs/ilbc"
--        if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
-+SYSTEM_ILBC=no
-+AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),ac_cv_use_ilbc=$enableval,ac_cv_use_ilbc=yes)
-+if [[ "x$ac_cv_use_ilbc" = "xyes" ]]; then
-+	for i in /usr/include /usr/include/ilbc /usr/local/include /usr/local/include/ilbc; do
-+		ac_cv_use_ilbc="$i"
-+		test -f "$ac_cv_use_ilbc/iLBC_encode.h" && break
-+	done
-+fi
-+if [[ "x$ac_cv_use_ilbc" != "xno" ]]; then
-+	AC_MSG_CHECKING([for iLBC_encode.h in $ac_cv_use_ilbc])
-+	if [[ -f "$ac_cv_use_ilbc/iLBC_encode.h" ]]; then
-+		HAVE_ILBC=yes
-+		ILBC_INC="-I$ac_cv_use_ilbc"
-+		SYSTEM_ILBC=yes
-+	else
-+		AC_MSG_CHECKING([for iLBC in libs])
-+		basedir=`cd "$srcdir" && pwd`
-+		incilbc="libs/ilbc"
-+		if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
- 		HAVE_ILBC=yes
- 		basedir=`echo "$basedir" | sed 's/\([[^\]]\)\([[[:space:]\$\"'\'']]\)/\1\\\2/g'`
- 		ILBC_INC="-I$basedir/$incilbc"
-+		SYSTEM_ILBC=no
- 	fi
-+fi
- AC_MSG_RESULT([$HAVE_ILBC])
- fi
- AC_SUBST(HAVE_ILBC)
- AC_SUBST(ILBC_INC)
-+AC_SUBST(SYSTEM_ILBC)
- 
- HAVE_ILBCWR=no
- ILBCWR_INC=""
-Nur in b: configure.in.orig.
-diff -ur a/modules/Makefile.in b/modules/Makefile.in
---- a/modules/Makefile.in	2012-12-21 15:26:49.000000000 +0100
-+++ b/modules/Makefile.in	2013-06-18 17:38:10.292436508 +0200
-@@ -344,9 +344,13 @@
- server/lksctp.yate: EXTERNFLAGS = @SCTP_FLAGS@
- server/lksctp.yate: EXTERNLIBS = -lsctp
- 
-+ifeq (@SYSTEM_ILBC@,yes)
-+ilbccodec.yate: LOCALLIBS = -lilbc
-+else
- ilbccodec.yate: ../libs/ilbc/libilbc.a
--ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
- ilbccodec.yate: LOCALLIBS = -L../libs/ilbc -lilbc
-+endif
-+ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
- 
- ilbcwebrtc.yate: ../libs/miniwebrtc/libminiwebrtc.a
- ilbcwebrtc.yate: LOCALFLAGS = @ILBCWR_INC@ -I@top_srcdir@/libs/miniwebrtc/audio/common/processing -I@top_srcdir@/libs/miniwebrtc
-Nur in b/modules: Makefile.in.orig.
diff --git a/net-voip/yate/yate-5.3.0.ebuild b/net-voip/yate/yate-5.3.0.ebuild
new file mode 100644
index 000000000000..a296731d4bd3
--- /dev/null
+++ b/net-voip/yate/yate-5.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-5.3.0.ebuild,v 1.1 2014/07/25 20:12:38 zerochaos Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="The Yate AV Suite"
+HOMEPAGE="http://yate.null.ro/"
+
+if [[ ${PV} == 9999 ]] ; then
+	ESVN_REPO_URI="http://voip.null.ro/svn/yate/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://voip.null.ro/tarballs/${PN}5/${P}-1.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc sse2 sctp dahdi zaptel wpcard tdmcard wanpipe +ilbc +ilbc-webrtc +isac-float isac-fixed postgres mysql +gsm +speex h323 spandsp +ssl qt4 +zlib amrnb"
+
+RDEPEND="
+	postgres? ( dev-db/postgresql-base )
+	mysql? ( virtual/mysql )
+	gsm? ( media-sound/gsm )
+	speex? ( media-libs/speex )
+	ssl? ( dev-libs/openssl )
+	h323? ( net-libs/h323plus )
+	zlib? ( sys-libs/zlib )
+	qt4? ( dev-qt/qtgui:4 dev-qt/designer:4 )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	spandsp? ( >=media-libs/spandsp-0.0.3 )
+	dahdi? ( net-misc/dahdi )
+"
+DEPEND="doc? ( || ( app-doc/doxygen dev-util/kdoc ) )
+	virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/dont-mess-with-cflags.patch
+	eautoreconf
+	./yate-config.sh || die
+}
+
+#fdsize, inline, rtti: keep default values
+#internalregex: use system
+#coredumper: not in the tree, bug 118716
+#wanpipe, wphwec: not in the tree, bug 188939
+#amrnb: not in tree!
+#zaptel: ??
+src_configure() {
+	econf \
+		--with-archlib=$(get_libdir) \
+		$(use_enable sse2) \
+		$(use_enable sctp) \
+		$(use_enable dahdi) \
+		$(use_enable zaptel) \
+		$(use_enable wpcard) \
+		$(use_enable tdmcard) \
+		$(use_enable wanpipe) \
+		$(use_enable ilbc) \
+		$(use_enable ilbc-webrtc) \
+		$(use_enable isac-float) \
+		$(use_enable isac-fixed) \
+		$(use_with postgres libpq) \
+		$(use_with mysql) \
+		$(use_with gsm libgsm) \
+		$(use_with speex libspeex) \
+		$(use_with amrnb) \
+		$(use_with spandsp) \
+		$(use_with h323 openh323 /usr) \
+		$(use_with h323 pwlib /usr) \
+		$(use_with ssl openssl) \
+		$(use_with qt4 libqt4)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	if use doc; then
+		emake DESTDIR="${ED}" install
+	else
+		emake DESTDIR="${ED}" install-noapi
+	fi
+}
diff --git a/net-voip/yate/yate-9999.ebuild b/net-voip/yate/yate-9999.ebuild
index 6c3f8bf55624..0a44665e743b 100644
--- a/net-voip/yate/yate-9999.ebuild
+++ b/net-voip/yate/yate-9999.ebuild
@@ -1,19 +1,27 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-9999.ebuild,v 1.3 2014/04/28 02:40:27 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-9999.ebuild,v 1.4 2014/07/25 20:12:38 zerochaos Exp $
 
 EAPI=5
 
-inherit subversion autotools
+inherit autotools eutils
 
 DESCRIPTION="The Yate AV Suite"
 HOMEPAGE="http://yate.null.ro/"
-ESVN_REPO_URI="http://voip.null.ro/svn/yate/trunk"
+
+if [[ ${PV} == 9999 ]] ; then
+	ESVN_REPO_URI="http://voip.null.ro/svn/yate/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://voip.null.ro/tarballs/${PN}5/${P}-1.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="sse2 sctp dahdi zaptel wpcard tdmcard wanpipe +ilbc +ilbc-webrtc +isac-float isac-fixed postgres mysql +gsm +speex h323 spandsp +ssl qt4 +zlib amrnb"
+IUSE="doc sse2 sctp dahdi zaptel wpcard tdmcard wanpipe +ilbc +ilbc-webrtc +isac-float isac-fixed postgres mysql +gsm +speex h323 spandsp +ssl qt4 +zlib amrnb"
 
 RDEPEND="
 	postgres? ( dev-db/postgresql-base )
@@ -28,9 +36,12 @@ RDEPEND="
 	spandsp? ( >=media-libs/spandsp-0.0.3 )
 	dahdi? ( net-misc/dahdi )
 "
-DEPEND="app-doc/doxygen virtual/pkgconfig ${RDEPEND}"
+DEPEND="doc? ( || ( app-doc/doxygen dev-util/kdoc ) )
+	virtual/pkgconfig
+	${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/dont-mess-with-cflags.patch
 	eautoreconf
 	./yate-config.sh || die
 }
@@ -70,3 +81,11 @@ src_configure() {
 src_compile() {
 	emake -j1
 }
+
+src_install() {
+	if use doc; then
+		emake DESTDIR="${ED}" install
+	else
+		emake DESTDIR="${ED}" install-noapi
+	fi
+}