gentoo resync : 08.01.2021

6 files changed, 52 insertions, 127 deletions

diff --git a/net-voip/yate/Manifest b/net-voip/yate/Manifest
index 9b65b439dfaf..262c151c9788 100644
--- a/net-voip/yate/Manifest
+++ b/net-voip/yate/Manifest
@@ -1,10 +1,8 @@
 AUX yate-6.0.0-dont-mess-with-cflags.patch 582 BLAKE2B 9c78da40c8bbfb46a8a4e6e2c9ee53f49bb888dff33d887dba6e7bbefcf5c951bf724945c8741af99fe513b18980b687f8f23c2025fd317885bf0174c8964961 SHA512 f6ac060c2d2542b974f6f89e6af232f1fb16abdb3d985f7c6a8067b19d74fa56f56e14c847e44705aff29c4b7fa5434bb54ee263774a035875c02d2535e8e361
-AUX yate-9999-dont-mess-with-cflags.patch 582 BLAKE2B 9c78da40c8bbfb46a8a4e6e2c9ee53f49bb888dff33d887dba6e7bbefcf5c951bf724945c8741af99fe513b18980b687f8f23c2025fd317885bf0174c8964961 SHA512 f6ac060c2d2542b974f6f89e6af232f1fb16abdb3d985f7c6a8067b19d74fa56f56e14c847e44705aff29c4b7fa5434bb54ee263774a035875c02d2535e8e361
+AUX yate-6.2.0-my_bool.patch 653 BLAKE2B 2849e7374b76d0aa4e44823c10d2156521ec0ac8bb1f9c2dfb4ac83326ee89196c0acc2d76b3aba2719883ecf3eab4b92dda119f6e21a471f875fe13fa8a21bf SHA512 04d02e763665501ba93d4e144cbb779371112010d56e4311027424cddbdb19355cb30885d32fdf2fcae4f99a8d23b6b6dc8c818af859314b6b06658fc75d7cda
 AUX yate.confd 274 BLAKE2B 03308e8fdf036d07eca9f262e2989a8a934d01f160cb9fa42193734a4ce27de06641784d5e9be45b6593b77e2af30720314fdc36189bd0c13f33b42cffb85dc3 SHA512 b865d094c708eb512e0c56272acaab16e563a28fbfc65a7950a0918399392d7c96db636866c0217f486acbc71e3c6b726a52a5e16872757c5a7a12311d9dd2ac
 AUX yate.initd 738 BLAKE2B a36a8ef19c7e0c1d8e066d4903d979f43a537725da0ccccfef8e2b6bc3b76a7860c33a019896251be92f41f354b9057fcf2baa57920e22f81487755dfafa2c6f SHA512 769ef1c41b398f94c8e9e2c522ae76025362a0cf76df9eea6e9d329c0d735d41006ecb824c300ad5ede01851360d18545735432fa7574f5b472c2c3b64e6b3da
-DIST yate-6.0.0-1.tar.gz 6039879 BLAKE2B d6d6398f7a91543c44435ab3cd73eaa1cca59c098c8b3ddbe66f5b058c45ab6cfc74533cc184235a44b499046331fa467961fc6fcd291418b24918d88f1037b9 SHA512 3a56bf5cd20c8452063f968de5d7993a926463b736686cd3df7a152d57be07fabeef9cebc91018ff0ad5b726157a9a9a0240969a752e7844f6431618b4eec53a
-DIST yate-6.1.0-1.tar.gz 6074737 BLAKE2B a59445b546730c1e9756e634c663f3ecc6875056ade1272afe9fc2a79c591515c7472b892a593df5c3001be6c822093fef0a16822b7537e477d064c06d849e03 SHA512 e23c9d45b98222cc4499833ef242e011b6d8c32213e9716958349bcbe74b1c168351b04ad9633073127d9463cda83c3236bd5640c0987cc14fd8f02349b4b293
-EBUILD yate-6.0.0.ebuild 2103 BLAKE2B 0006aa5eee4cb9f72410492d0c004a1d61e9482e39181bd66eb0c251fda9a4987fc6609178e53de56b9063615eecbdb1f28b6d90e65a39558b1bd4a6674d6161 SHA512 5e2d343acdff1335f8e0fecb9c1e3bf20a1557e079ca936c793cd7c03b881e6429c1f2a0d0ae488a3f08ee0bc02f36306797b90d979e46d75fd142f25c44f571
-EBUILD yate-6.1.0.ebuild 2109 BLAKE2B 8d34165a2cf07b99dcc44b7a270081ea2c60f59737306850b9bd584a7fe2c5f8f65b6a9115753ed19430b459a2e352f5241e42f8224680944294224db02556eb SHA512 edf89308d82d975beeeb1e4c50ead1f71b05138f357cc928998cf7150fc450fde7152b2e3a3833fd0f5ae487f7da0f473c868072524786f501618af74e274a91
-EBUILD yate-9999.ebuild 2103 BLAKE2B 0006aa5eee4cb9f72410492d0c004a1d61e9482e39181bd66eb0c251fda9a4987fc6609178e53de56b9063615eecbdb1f28b6d90e65a39558b1bd4a6674d6161 SHA512 5e2d343acdff1335f8e0fecb9c1e3bf20a1557e079ca936c793cd7c03b881e6429c1f2a0d0ae488a3f08ee0bc02f36306797b90d979e46d75fd142f25c44f571
+DIST yate-6.2.0-1.tar.gz 6114538 BLAKE2B cc96c894192d99bebd6bfe4dc6fb137298e880f03d2ad0482f98bcac20e35b17d94e7dcf159fdc28c7ce68d8a7e8856ba7648d3fe8ef7815c0bd3690764506e2 SHA512 e84446ec5df58408b8b0065a59f21a5dd619560844ebdffbee3a7c927f45a18c5dd78858a48b8641177e29b2370d3b0f9e490db5417b4dd3c395fd7e02bd1eb0
+EBUILD yate-6.2.0.ebuild 2175 BLAKE2B cbf726932886502f6856f1cf66974fc5ad8b269a02e3fd275818c27dcc6486e3599e85a43f35e8fd4a88f5c63a21c69e42c1b6c15c4dbd0ae4941fa115dd354c SHA512 aa21ace80735f94d7d01a8fce59bb867c11ac44135a374741ea27b0626b0298bcf5caf7972048440f6ace4a4b49f339b76222c3e997680fd0d6a0b808a7697c6
+EBUILD yate-9999.ebuild 2175 BLAKE2B cbf726932886502f6856f1cf66974fc5ad8b269a02e3fd275818c27dcc6486e3599e85a43f35e8fd4a88f5c63a21c69e42c1b6c15c4dbd0ae4941fa115dd354c SHA512 aa21ace80735f94d7d01a8fce59bb867c11ac44135a374741ea27b0626b0298bcf5caf7972048440f6ace4a4b49f339b76222c3e997680fd0d6a0b808a7697c6
 MISC metadata.xml 1011 BLAKE2B 6f489007bcf1c0482783f027877f2298f14bcdc2d20a0bd2395a0be30e0116fadc70ebb5c690f3e1909adb2f4850ed9c12619fd71e463bd17e058386aff8dbb9 SHA512 80f06c2548a2c6bcc7cff5970890ede52c6598dd2e7b21280be5cb702012070151887fed7100c0fc549359b5c2fd9832891a2b282f59927a492cba4d9997728d
diff --git a/net-voip/yate/files/yate-6.2.0-my_bool.patch b/net-voip/yate/files/yate-6.2.0-my_bool.patch
new file mode 100644
index 000000000000..a2ddb857f397
--- /dev/null
+++ b/net-voip/yate/files/yate-6.2.0-my_bool.patch
@@ -0,0 +1,21 @@
+--- yate.o/modules/server/mysqldb.cpp	2020-03-03 18:03:34.000000000 +0200
++++ yate/modules/server/mysqldb.cpp	2020-12-29 15:38:56.717897678 +0200
+@@ -22,6 +22,7 @@
+ #include <yatephone.h>
+ 
+ #include <stdio.h>
++#include <stdbool.h>
+ #include <mysql.h>
+ 
+ #ifndef CLIENT_MULTI_STATEMENTS
+@@ -508,8 +509,8 @@
+ 
+ #ifdef MYSQL_OPT_RECONNECT
+ 	    // this option must be set after connect - bug in mysql client library
+-	    my_bool reconn = 1;
+-	    mysql_options(mySqlConn->m_conn,MYSQL_OPT_RECONNECT,(const char*)&reconn);
++	    bool reconn = 1;
++	    mysql_options(mySqlConn->m_conn,MYSQL_OPT_RECONNECT,&reconn);
+ #endif
+ 
+ #ifdef HAVE_MYSQL_SET_CHARSET
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 1a2a98c24e9e..000000000000
--- 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-6.0.0.ebuild b/net-voip/yate/yate-6.0.0.ebuild
deleted file mode 100644
index adfc9f09121a..000000000000
--- a/net-voip/yate/yate-6.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-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}6/${P}-1.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="doc cpu_flags_x86_sse2 sctp dahdi zaptel wpcard tdmcard wanpipe +ilbc +ilbc-webrtc +isac-float isac-fixed postgres mysql +gsm +speex spandsp +ssl +zlib amrnb"
-
-RDEPEND="
-	postgres? ( dev-db/postgresql:* )
-	mysql? ( virtual/mysql )
-	gsm? ( media-sound/gsm )
-	speex? ( media-libs/speex )
-	ssl? ( dev-libs/openssl:0 )
-	zlib? ( sys-libs/zlib )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	spandsp? ( >=media-libs/spandsp-0.0.3 )
-	dahdi? ( net-misc/dahdi )
-"
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-dont-mess-with-cflags.patch )
-
-src_prepare() {
-	default_src_prepare
-	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) \
-		--without-libqt4
-		$(use_enable cpu_flags_x86_sse2 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 ssl openssl)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${ED}" install
-	else
-		emake DESTDIR="${ED}" install-noapi
-	fi
-	newinitd "${FILESDIR}"/yate.initd yate
-	newconfd "${FILESDIR}"/yate.confd yate
-}
diff --git a/net-voip/yate/yate-6.1.0.ebuild b/net-voip/yate/yate-6.2.0.ebuild
index b44cc916db18..601590ffc4a6 100644
--- a/net-voip/yate/yate-6.1.0.ebuild
+++ b/net-voip/yate/yate-6.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -24,20 +24,25 @@ 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 )
+	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 )
 "
-DEPEND="doc? ( app-doc/doxygen )
+DEPEND="${DEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	${RDEPEND}"
+	doc? ( app-doc/doxygen )
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.0.0-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
diff --git a/net-voip/yate/yate-9999.ebuild b/net-voip/yate/yate-9999.ebuild
index adfc9f09121a..601590ffc4a6 100644
--- a/net-voip/yate/yate-9999.ebuild
+++ b/net-voip/yate/yate-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -24,20 +24,25 @@ 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 )
+	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 )
 "
-DEPEND="doc? ( app-doc/doxygen )
+DEPEND="${DEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	${RDEPEND}"
+	doc? ( app-doc/doxygen )
+"
 
-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
@@ -54,7 +59,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-archlib=$(get_libdir) \
-		--without-libqt4
+		--without-libqt4 \
 		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable sctp) \
 		$(use_enable dahdi) \