net-voip/yate: Bump, remove qt4, cleanup.

Bug: https://bugs.gentoo.org/642544
Package-Manager: Portage-2.3.24, Repoman-2.3.6

8 files changed, 43 insertions, 139 deletions

diff --git a/net-voip/yate/Manifest b/net-voip/yate/Manifest
index 346a5bcd3025..533efbecc759 100644
--- a/net-voip/yate/Manifest
+++ b/net-voip/yate/Manifest
@@ -1,2 +1 @@
-DIST yate-5.4.0-1.tar.gz 5027248 BLAKE2B 2fa42ac45fce7ba9069e9eac55b866590c9b1c06531438e1cbceb06a2e970465c4ee5f0f6831b523781b6afb4b2871c85b03d6ce68a6e1f3bbf7b1578ed3bd42 SHA512 27c4bb7b00c37a9eaff7be210ba0812a0267fb186b357186734115ded73627dbf8fd3f292a3efbf7b33ca3e7c2e6a6f460d0ee4068e2a8415c58e3f698ae5e5b
-DIST yate-5.5.0-1.tar.gz 4186159 BLAKE2B 53ef346969f45c4e98ec16b80b553b4e42c2b848710b97015f0cc20d474db3d0b212eb951e6829edadfbe026aed12070dab8d999e1640102f010b2669b28c3e6 SHA512 8f19253ed140e53895c2df73eb961d0fc2cf2688ee59e9957ce9a1f7f32e4be85aff8221ecbcb7b4dda1560d52d14e3b252670f71a563310788e0d1e30c5f9bc
+DIST yate-6.0.0-1.tar.gz 6039879 BLAKE2B d6d6398f7a91543c44435ab3cd73eaa1cca59c098c8b3ddbe66f5b058c45ab6cfc74533cc184235a44b499046331fa467961fc6fcd291418b24918d88f1037b9 SHA512 3a56bf5cd20c8452063f968de5d7993a926463b736686cd3df7a152d57be07fabeef9cebc91018ff0ad5b726157a9a9a0240969a752e7844f6431618b4eec53a
diff --git a/net-voip/yate/files/yate-5.4.0-dont-mess-with-cflags.patch b/net-voip/yate/files/yate-5.4.0-dont-mess-with-cflags.patch
deleted file mode 100644
index 961d73fa1ccc..000000000000
--- a/net-voip/yate/files/yate-5.4.0-dont-mess-with-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-5.5.0-dont-mess-with-cflags.patch b/net-voip/yate/files/yate-6.0.0-dont-mess-with-cflags.patch
index 1a2a98c24e9e..1a2a98c24e9e 100644
--- a/net-voip/yate/files/yate-5.5.0-dont-mess-with-cflags.patch
+++ b/net-voip/yate/files/yate-6.0.0-dont-mess-with-cflags.patch
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
new file mode 100644
index 000000000000..1a2a98c24e9e
--- /dev/null
+++ b/net-voip/yate/files/yate-9999-dont-mess-with-cflags.patch
@@ -0,0 +1,14 @@
+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/metadata.xml b/net-voip/yate/metadata.xml
index 1ee930a73d0d..521039e8ef61 100644
--- a/net-voip/yate/metadata.xml
+++ b/net-voip/yate/metadata.xml
@@ -21,6 +21,5 @@
 		<flag name="speex">use Speex codec</flag>
 		<flag name="amrnb">use AMR-NB</flag>
 		<flag name="spandsp">use spandsp library</flag>
-		<flag name="h323">use OpenH323</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-voip/yate/yate-5.5.0-r1.ebuild b/net-voip/yate/yate-5.5.0-r1.ebuild
deleted file mode 100644
index 9e4cc965eb8c..000000000000
--- a/net-voip/yate/yate-5.5.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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 h323 spandsp +ssl qt4 +zlib amrnb"
-
-RDEPEND="
-	postgres? ( dev-db/postgresql )
-	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}"/${P}-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 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 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
-	newinitd "${FILESDIR}"/yate.initd yate
-	newconfd "${FILESDIR}"/yate.confd yate
-}
diff --git a/net-voip/yate/yate-5.4.0-r1.ebuild b/net-voip/yate/yate-6.0.0.ebuild
index 9e4cc965eb8c..adfc9f09121a 100644
--- a/net-voip/yate/yate-5.4.0-r1.ebuild
+++ b/net-voip/yate/yate-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="The Yate AV Suite"
 HOMEPAGE="http://yate.null.ro/"
@@ -13,34 +13,34 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit subversion
 	KEYWORDS=""
 else
-	SRC_URI="http://voip.null.ro/tarballs/${PN}5/${P}-1.tar.gz"
+	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 h323 spandsp +ssl qt4 +zlib amrnb"
+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 )
+	postgres? ( dev-db/postgresql:* )
 	mysql? ( virtual/mysql )
 	gsm? ( media-sound/gsm )
 	speex? ( media-libs/speex )
-	ssl? ( dev-libs/openssl )
-	h323? ( net-libs/h323plus )
+	ssl? ( dev-libs/openssl:0 )
 	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 ) )
+DEPEND="doc? ( app-doc/doxygen )
 	virtual/pkgconfig
 	${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-dont-mess-with-cflags.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+	default_src_prepare
 	eautoreconf
 	./yate-config.sh || die
 }
@@ -54,6 +54,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-archlib=$(get_libdir) \
+		--without-libqt4
 		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable sctp) \
 		$(use_enable dahdi) \
@@ -71,10 +72,7 @@ src_configure() {
 		$(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)
+		$(use_with ssl openssl)
 }
 
 src_compile() {
diff --git a/net-voip/yate/yate-9999.ebuild b/net-voip/yate/yate-9999.ebuild
index 3cd9af1e385b..adfc9f09121a 100644
--- a/net-voip/yate/yate-9999.ebuild
+++ b/net-voip/yate/yate-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="The Yate AV Suite"
 HOMEPAGE="http://yate.null.ro/"
@@ -13,33 +13,34 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit subversion
 	KEYWORDS=""
 else
-	SRC_URI="http://voip.null.ro/tarballs/${PN}5/${P}-1.tar.gz"
+	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 h323 spandsp +ssl qt4 +zlib amrnb"
+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 )
+	postgres? ( dev-db/postgresql:* )
 	mysql? ( virtual/mysql )
 	gsm? ( media-sound/gsm )
 	speex? ( media-libs/speex )
-	ssl? ( dev-libs/openssl )
-	h323? ( net-libs/h323plus )
+	ssl? ( dev-libs/openssl:0 )
 	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 ) )
+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
 }
@@ -53,6 +54,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-archlib=$(get_libdir) \
+		--without-libqt4
 		$(use_enable cpu_flags_x86_sse2 sse2) \
 		$(use_enable sctp) \
 		$(use_enable dahdi) \
@@ -70,10 +72,7 @@ src_configure() {
 		$(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)
+		$(use_with ssl openssl)
 }
 
 src_compile() {
@@ -86,4 +85,6 @@ src_install() {
 	else
 		emake DESTDIR="${ED}" install-noapi
 	fi
+	newinitd "${FILESDIR}"/yate.initd yate
+	newconfd "${FILESDIR}"/yate.confd yate
 }