[gentoo-commits] repo/gentoo:master commit in: net-voip/yate/files/, net-voip/yate/

[gentoo-commits] repo/gentoo:master commit in: net-voip/yate/files/, net-voip/yate/

[Sam James]

commit:     2d666342dbf4ed53ff1dd77946722dd91918bf96
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Tue Dec 29 13:57:09 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 16:32:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d666342

net-voip/yate: bring -9999 in line with 6.2.0.

This basically brings in the known required patches, and removes
duplicate -9999 patch from files/.

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://bugs.gentoo.org/666012
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-voip/yate/files/yate-9999-dont-mess-with-cflags.patch | 14 --------------
 net-voip/yate/yate-9999.ebuild                            |  9 ++++++---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/net-voip/yate/files/yate-9999-dont-mess-with-cflags.patch b/net-voip/yate/files/yate-9999-dont-mess-with-cflags.patch
deleted file mode 100644
index 1a2a98c24e9..00000000000
--- a/net-voip/yate/files/yate-9999-dont-mess-with-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://build.opensuse.org/package/view_file/network:telephony/yate/dont-mess-with-cflags.patch?expand=1
-
-Index: yate/configure.ac
-===================================================================
---- yate.orig/configure.ac
-+++ yate/configure.ac
-@@ -1652,7 +1652,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="$HAVE_NO_OVERLOAD_VIRT_WARN $RTTI_OPT $MODULE_CFLAGS"
- MODULE_LDRELAX="-rdynamic -shared"

diff --git a/net-voip/yate/yate-9999.ebuild b/net-voip/yate/yate-9999.ebuild
index adfc9f09121..5ed8e890f9e 100644
--- a/net-voip/yate/yate-9999.ebuild
+++ b/net-voip/yate/yate-9999.ebuild
@@ -24,12 +24,12 @@ IUSE="doc cpu_flags_x86_sse2 sctp dahdi zaptel wpcard tdmcard wanpipe +ilbc +ilb
 
 RDEPEND="
 	postgres? ( dev-db/postgresql:* )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	gsm? ( media-sound/gsm )
 	speex? ( media-libs/speex )
 	ssl? ( dev-libs/openssl:0 )
 	zlib? ( sys-libs/zlib )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
+	ilbc? ( media-libs/libilbc )
 	spandsp? ( >=media-libs/spandsp-0.0.3 )
 	dahdi? ( net-misc/dahdi )
 "
@@ -37,7 +37,10 @@ DEPEND="doc? ( app-doc/doxygen )
 	virtual/pkgconfig
 	${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-dont-mess-with-cflags.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.0-dont-mess-with-cflags.patch"
+	"${FILESDIR}/${PN}-6.2.0-my_bool.patch"
+)
 
 src_prepare() {
 	default_src_prepare