ebuild cleanup, QA warnings fix, adding stable version

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

10 files changed, 166 insertions, 743 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/Manifest b/net-voip/yate/Manifest
index 6862218059ae..aec65fc6aeb2 100644
--- a/net-voip/yate/Manifest
+++ b/net-voip/yate/Manifest
@@ -1,11 +1,29 @@
-AUX yate-2.0.0-as-needed.patch 5325 SHA256 b72e87cf3280570ff66c63af3403c69f09f86298f58975381e85e167874002bb SHA512 260877ae502bb795232b80cd972a6fdacd032a219c4c972f6806aec9c53a53f82788c694f046ef584f8681921aa70df60b5d196a9bc050d2bf8ce1488c800b9e WHIRLPOOL 46c83298160ba852528f624047acdb61e5f16d1e15f5128658ef154a5771a18cde462bf9bf11a93696c92e58f946c9ec9fa06d48e736f7fd287f5ce9323354ad
-AUX yate-2.0.0-cxxflags.patch 11447 SHA256 add0eba7962e0374693235914337de42acecd543abe8fda2b1c1c1e5692ab195 SHA512 94f1a13f702e46ad33b52aed4336a1c7fc270b70ea4e79d41d707190d2455c266c501897640b9df53f7341dae45e931651e8579fa931f56af115f1ff51a51b16 WHIRLPOOL 8a213665dd753e96c56c896762baeb283204db8eb4660991445ee338bf3f9d9bd2c40a5ceebc4f96ac6abe65169673588e6294229fc85de202c70054d986d895
-AUX yate-2.0.0-ilbc-alsa-oss.patch 2779 SHA256 419c71dd1699043a830f534f24f415c5793e7f39968d43134152e12a81b45653 SHA512 924484438d110e66aa4cd471e004704d38f73cec739e7085884e023bf24988eaa4c6f4eda717ca023bd9fb92594691846bb71cf9a073d551f71c650c67e36340 WHIRLPOOL 76322468939dc5365a0246beb1f6766159163403f214b697b34e61e1f7fee7f5c88f72f96feca1d9c71917793248a25b23596607427c27363c7c971741a8881d
-AUX yate-2.0.0-spandsp.patch 314 SHA256 986465d339c4dbb0f8399296e429254e5b6cd73fc69ae7f22df3bf17b60ff8e1 SHA512 c9e9407a204354fdfd10d94ce78707cfb01c3f8b7978c998f93f313e29242fa0aebdd8cf6ae793b131b1ce9328f19042e2d3e1fab1d99f97c559e03692f7bb85 WHIRLPOOL e05f18ab9991fc11275964814e25714481f5f48e73be61511c4641afae95e2b6d9dff91ed349d239578f892e80438af573b9556e8e7b8a6bf87b04fc36f9d383
-AUX yate-4.3.0-ilbc-alsa-oss.patch 3155 SHA256 b05f2ed4352915c8d5ba31e6d3063ccbe1b5eddf02046ad27e12f70f9b0c4c2e SHA512 d344d103d3cc3957afe7ca29b7470002af10f19f0dead3dbfbb79580dff8eb9dadaebf3178559fea797f309ac65519551160a1965460343e55a5646ced0d834d WHIRLPOOL 26f8250be5710699653608ff2343e183a2bf867bb161dfc62edf93d178db03590483ef8c98da3bc0487d4c1f78661c0e136f6a341c37805b425212a677ba3a12
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX dont-mess-with-cflags.patch 575 SHA256 39d4d650d9493f13f422e67c70ee2218924fcf6222677301b2008838d96c2bb8 SHA512 c1acbbf6a6a3bf0aa2b3fd235f215fd18063a5a80bb38277bba6774df8a5860e94ce7c6eb7f11cb8a73df39822fa96fa1604f77948ad36d57c6d8c2e5f87fa47 WHIRLPOOL be41134ea0a57015c549bc0603e3ade8483b55d6b7d28ea6d87879fabe372b5f0e881de6f26ebb137b47eae58b846d203454b9f30c137f0db3665019597032da
 AUX yate.confd 274 SHA256 1007d50abbe320b64153f12bdf33032b7a3ae9dd51507cc6b431bef2bf9f31cc SHA512 b865d094c708eb512e0c56272acaab16e563a28fbfc65a7950a0918399392d7c96db636866c0217f486acbc71e3c6b726a52a5e16872757c5a7a12311d9dd2ac WHIRLPOOL 0d465f8bef87db3d0d01e1b82839132595604f96de8ba5ebbaff61ebb8b0614c83059e7d8e56476dfdc56f2ae702be85c45f3e33dc36d7a55de0ce4525c8ddb1
 AUX yate.initd 849 SHA256 cfb7b9ff028176267dfd4ff7161f80e57c0dc20ff92c1ec114f752fb378122ca SHA512 7e2c1a6154bab2b21626545cb6b4d2997da473feefb52e6d4d2a20bbc6f2df8c84f8cd1f881c948277af84495ab16f698b474ba55949d27153a47a3af1bc2fe2 WHIRLPOOL 747dfe323b4882f0f2100f5210a80be775976325fc6c17b2e672c823a8c7da0cf91944457873fb7a0ef62787a183811d5a1d98c1290ec01504803cfc5dd741c0
 AUX yate.rc6 507 SHA256 2dc7b4760dd14319612d2863ed36648b9c8a88db07dc9ea82df2cf4ccd138ad8 SHA512 b8ac2c03e8d3ab8c186e31c6c0930fc194f264c6f4589b50f365f283a1460cfefd81601c046e0a77038e44b2c5bf41cffecf04e01e0b075072a2647e4fb3a021 WHIRLPOOL a6f04659a4601d5ae519efcdb950e1bbe0f39fa34b6e11021ea02e6ab3346f0376b01b34bae58762b01e576567633c72883ddc9bf1d74b73205d10449578b490
-EBUILD yate-9999.ebuild 1870 SHA256 2b4a075cacec7db840ce794f5578f5592c7545ca6166570e2c3f22419ae8fa2b SHA512 f27aaa7eb19b3a80fbb2fbca17a9adb9ecc093551b0fb76287bb5d7c8650ec937decb082f28cf17286fe72c2f3026ba6f6dba54210ce2426d9319b39a43bb4d6 WHIRLPOOL ed71998c9bd4b91062ebe884cbad42102be22b2517b103b952da52fe369f6023b9cb28ce461b5094c8e338e0eb759fba3f13f86e2ab7eca1a8e9011102a5ccf8
-MISC ChangeLog 4561 SHA256 d520f1d8f5a2d0b9a84d7499e21c8af531a101df6de3ad23ea2ed4327085e3bf SHA512 494fba75cc20b32df48b529b57dd10ce6c23e29735bc77bb78039c98aa5f50735076a55ff362eae387ab6d7f8f3f049139401ca570619a155ac278b321599d17 WHIRLPOOL 053140b3b82fba65402675ac29575e4f36f82615c4b517be1cd6f0e6e971c1590d6fadd95709504ca7845859bae7cdbb7ddf79f26411df3e89d7461520882f72
+DIST yate-5.3.0-1.tar.gz 4084795 SHA256 d931ad0104f4a24422e5bf8cbcfd2c3bad68c13bf852cc3c10f4fd31ab9a43df SHA512 35f5630fb9ba6b29dec721362f80fb35ce31a626683cfb0ab5b1c449934d8712306435f5170e0e1553a894fbc4a0106c2de819994f2d545849edb461b7ae9307 WHIRLPOOL 57e8d41c2b625a2c7f609e8304d8c45fd31f337a2481cb5f1117822e9d802b31adc99a2b52d5b88684bdc3d6117b1f1545ff7d6937f1fa35ed62b32e9d2bc8de
+EBUILD yate-5.3.0.ebuild 2242 SHA256 6a2efbc3893982c3144e76f3b69a38cd59757acb50539da3557076afc6c05587 SHA512 8621f80829ff2fda93f8cce7055f2ceb09e21d81c3014c0a5505b1bbd7ba1ece9985bbb66b655181d2d56f874f0eaa39091af8d70d96f455a472925a4c7766d3 WHIRLPOOL 5a58352ae132585ffe4d6a51cdf5bb9d1749cb777d16965b308c012ddef7ddf9432e302059e46c23dc07d5921f3b98d717449d9d232d6ae1dabb62558c754c58
+EBUILD yate-9999.ebuild 2241 SHA256 473238cf51f04f360ece42967c0daa79d2942b8238cb9e36dddceb2da6c1f118 SHA512 53d7f9c230d3b1340885cf1f8c97e0ac4ad11a2eb68c9c256a7cb4e4f31001f6731b68ab42e404c2637f1230b289b65da654f09ad5ecfc2e2e3196789a4731e7 WHIRLPOOL cec63aabe26d639d8c76e21dae09222265ff298709802b41ac7120a35367643bcfbe89c32fe64ef2f81021eaeba0fdf4e8bebc4961d710415d4a232fbebbb676
+MISC ChangeLog 4960 SHA256 419b216d8a4788d93027c37446b4bba677c061c057225492dc9a8fbe43163c95 SHA512 f7dbf781f6b59a91b3cc17f52151402ae567246ebd4d48bb2608c5e7d560b50d5dde546f65fc7b0f520640b7ffd5eb3ea409b80dca78bcffcb8e4b27b8876d77 WHIRLPOOL c9a5c09300dcb252bcfa568201e19fa56c43b044fa4c58f5158728c170129945130143c934ceb965191fbb03fd6e99277870d6305f11fa4088466b0b790626e7
 MISC metadata.xml 1020 SHA256 258c8381dbbffa8d8b16ad4331a2355af6ba6a5036f1298ac0190c4941e516ab SHA512 0a660988559b09101087fafe19206e540d139ca322be9f0b1c424a1b0e7b599744f0ea14ecf0eea4aa61ddcfddab1bbb49b9358936b84437d487157018ab1f70 WHIRLPOOL 9f75bebc58a96261f8ea422f70ceeed86036a133d9eb3c283bb9ed3927554e24b09c2acd05b7b66c14437ac52e67bf145ef5858b752fa103ab04ba5d2bd555f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCgAGBQJT0rskAAoJEKXdFCfdEflKx64QAKbm+AIu7FPKK5LHmoHt2/25
+KQIX6Z639P54Y9cHRYXt+PeU5FKQkfplc/KE87WieYLaw0A9zdHhf5NEGUMjwKT/
+Y29EYxP6s6d0olMel+xjJIYYmXZHO4S7pCwnSeNIPVjPYfUhD71UE/3bZ0Aejz3t
+qq9MoIZklfXK6RXssDaw5QzNDYVXnpEuj+fi8MT6Iao1Om5OCI7Gnv/FAee3mXTS
+uo2W+pEj0kfWH2lIrNq9t1rYHkqDQ4Uv9m0GzdxsxQ7UMOjqZ5iW2DsLKfduLtMm
+EWh8gq6WlLyY92SiHeTVxAVlB9ExM3u5kQHjxzLx3tjK01hTAhEklfWBpJauQYlq
+xC5u/LAC45FGMclOEeP2brTnv9xiDh7x0Tnp1e6eq/P+v4WFtoWyb80oGYYocCXD
+isbPOKyYY2veF/OQc98yCW/6Socx8KVzISlt738JLDhlYwzs5uz3yWpV1Vze/0EW
+802085qtdjNzy5feDHlKSYnIgRwyh93tlHWrCxR6MZX6zTbT+Wl9QmDs06aZ2uQE
+gGXlt0DVCJdl1/ogE58vbca7XgQBPzd0Bo4ydwpCVltPVGBrshTC6bWH4n7bvXBG
+MSJzfUh/zK7gXJVucPi/JXaGbCYP7m1qKRl2UwazVcK7aQV1H3usYYzW/QAfh7Xw
+2ZqTALqwiLSrh01z7791
+=nZ7Y
+-----END PGP SIGNATURE-----
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
+}