gentoo resync : 21.09.2018

5 files changed, 6 insertions, 152 deletions

diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index 21022911b0e0..a285bd1e166d 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -2,11 +2,7 @@ AUX coturn.conf 46 BLAKE2B 8ae3300f7a0a6e09fde5259b660ec69c7b15cd08d2edcd7a5f77d
 AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294a6fab79d01a3bebbd048dc0bdd2423b62c2b56fe16dece95613846ad45bc9d5c3642a79fa726eff SHA512 f4228af88e51a38b06b0f91e1494d4e61a9a9f18cbab9fe85c323267e28045ebaae2832bae114da6e326cf22bf8efbd2bd5677cbcdde8fe994eca60802a6dc66
 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d
 AUX turnserver.init 636 BLAKE2B b73a5c43ea89243a77039688822f8188cef1d49f5b9ba7aaf95516ed08f9fe7ba876083c556dd8a58d2c79b0c9b1d28039f2e1893ffd58b1f1b8508f5f7903b3 SHA512 bdfad74908009edce899298aca755cead6bcab77663893d0fb4c83134d5d5eb569493be6ae39c4654ddb0079d6bfa259e3932fbb275eae8f6af13c7c197776a7
-DIST coturn-4.5.0.4.tar.gz 381015 BLAKE2B 838cbdbcc2a3a5b1bdd93f2688ecca8bd81b3349501b6729562b6d45037a8fc27fce6c39a035ecfd6f36d03402e78f796cf3b19a4894e5bfcd89ab3172980c36 SHA512 1d267b715b08853a5434d0a10cffd49e035624353e6733ff7349c549ef3f69240c2488097d81e33f7a551e02d72a26f1f430aefb9cbacda511a2ae6f883cd414
-DIST coturn-4.5.0.6.tar.gz 394071 BLAKE2B 35a805d0e210439cd8f32621f342f3a2d9da17392d8fbae5ac8165bcefa6e8f0ed1a32a2c785bff075bcf33ab2f0f22da8c7c620e40f3ae6f582733f6802c431 SHA512 4ad7d482af675033d050258e2af04b813561414d4ba926cfd336c6548200dbf1a90f9511983b8cad20713c7edff2a424c9d6b11d401717794e3d1af6b7ed9208
 DIST coturn-4.5.0.7.tar.gz 396579 BLAKE2B ac66fbac772ad4b182f0c4b64178a780bfb364e4c1cf105fc340ac60da0a4c2e2b186c3ce08cade347a5d1a4b233bfed604db74eacd81967c3090e00bc1e36e8 SHA512 4e6e4efb456449752b2cd242c9be7c5dc2298472e338293d3de21c3a9da968f2f304625663372bb4d857c092c694aa4681630773a46e4928b9c60c69378adacc
-EBUILD coturn-4.5.0.4-r1.ebuild 1848 BLAKE2B 45b06fe5697eb4c8acd4f1895a467a847aa077d69875b07817ff9db6f3f084b27b31a1af84f75853f272b303c8c84442247b6272dc190b152905d540e64cbedf SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e
-EBUILD coturn-4.5.0.6.ebuild 1848 BLAKE2B 45b06fe5697eb4c8acd4f1895a467a847aa077d69875b07817ff9db6f3f084b27b31a1af84f75853f272b303c8c84442247b6272dc190b152905d540e64cbedf SHA512 4f97bf43ec53608ee08204a430ea13fd800bceeef0aebb18edf14a73a59a213f46229e64bab48534476dc662301fb2c19260398d12af0c9279ea693bdc16ae4e
-EBUILD coturn-4.5.0.7.ebuild 1868 BLAKE2B 5f596bb69b89cb55a559efb64f8f9e63766d8c74cbe96244ff0c13d15d50e35fd6afb64e33f421fd3aa019844cfda3c2f9fdebfee9958ad640e5f43d41054f52 SHA512 14034e8e9c47613b4132e42c07f0f625e836ec70213f05e1503bb5099f5b8ad86f56532301566e46cd22c7e309fa7e789131b0f666ec097af7432f9d797d6b43
-EBUILD coturn-9999.ebuild 1868 BLAKE2B 5f596bb69b89cb55a559efb64f8f9e63766d8c74cbe96244ff0c13d15d50e35fd6afb64e33f421fd3aa019844cfda3c2f9fdebfee9958ad640e5f43d41054f52 SHA512 14034e8e9c47613b4132e42c07f0f625e836ec70213f05e1503bb5099f5b8ad86f56532301566e46cd22c7e309fa7e789131b0f666ec097af7432f9d797d6b43
+EBUILD coturn-4.5.0.7.ebuild 1929 BLAKE2B c5a52b53da3a986076af1c9b79ec4d5ca83199b058b4bfedf855fb7498b799bfa5f4a29f337b6a4bfc9830aa7808be3d12267f43f38861c4163f175771e013f2 SHA512 30cdbe95fbcf2e17979c898c132835928b6508e96fa4f372015e5048bf14cadd0000317cfbdf403023361bda8045177b7e89d55e607e9aa6d7e0450f10ac7c00
+EBUILD coturn-9999.ebuild 1929 BLAKE2B c5a52b53da3a986076af1c9b79ec4d5ca83199b058b4bfedf855fb7498b799bfa5f4a29f337b6a4bfc9830aa7808be3d12267f43f38861c4163f175771e013f2 SHA512 30cdbe95fbcf2e17979c898c132835928b6508e96fa4f372015e5048bf14cadd0000317cfbdf403023361bda8045177b7e89d55e607e9aa6d7e0450f10ac7c00
 MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.0.4-r1.ebuild b/net-im/coturn/coturn-4.5.0.4-r1.ebuild
deleted file mode 100644
index 02115af32237..000000000000
--- a/net-im/coturn/coturn-4.5.0.4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user systemd tmpfiles
-DESCRIPTION="coturn TURN server project"
-HOMEPAGE="https://github.com/${PN}/${PN}"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-	DEPEND="dev-vcs/git"
-#	S="${WORKDIR}/${PN}-master"
-else
-	KEYWORDS="~x86 ~amd64"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="mongodb mysql postgres redis sqlite"
-RDEPEND="dev-libs/libevent[ssl]
-	 dev-libs/openssl:*
-	 mongodb? ( dev-libs/mongo-c-driver )
-	 mysql? ( virtual/mysql )
-	 postgres? ( dev-db/postgresql:* )
-	 redis? ( dev-libs/hiredis )
-	 sqlite? ( dev-db/sqlite )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
-	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
-	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
-	    || die "sed for simple-log failed"
-	if ! use mongodb; then
-		export TURN_NO_MONGO=yes
-	fi
-	if ! use mysql; then
-		export TURN_NO_MYSQL=yes
-	fi
-	if ! use postgres; then
-		export TURN_NO_PQ=yes
-	fi
-	if ! use redis; then
-		export TURN_NO_HIREDIS=yes
-	fi
-	if ! use sqlite; then
-		export TURN_NO_SQLITE=yes
-	fi
-
-	econf $(use_with sqlite)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/turnserver.init" turnserver
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	dotmpfiles "${FILESDIR}/${PN}.conf"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-	enewgroup turnserver
-	enewuser turnserver -1 -1 -1 turnserver
-	elog "You need to copy /etc/turnserver.conf.default to"
-	elog "/etc/turnserver.conf and do your settings there."
-}
diff --git a/net-im/coturn/coturn-4.5.0.6.ebuild b/net-im/coturn/coturn-4.5.0.6.ebuild
deleted file mode 100644
index 02115af32237..000000000000
--- a/net-im/coturn/coturn-4.5.0.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user systemd tmpfiles
-DESCRIPTION="coturn TURN server project"
-HOMEPAGE="https://github.com/${PN}/${PN}"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-	DEPEND="dev-vcs/git"
-#	S="${WORKDIR}/${PN}-master"
-else
-	KEYWORDS="~x86 ~amd64"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="mongodb mysql postgres redis sqlite"
-RDEPEND="dev-libs/libevent[ssl]
-	 dev-libs/openssl:*
-	 mongodb? ( dev-libs/mongo-c-driver )
-	 mysql? ( virtual/mysql )
-	 postgres? ( dev-db/postgresql:* )
-	 redis? ( dev-libs/hiredis )
-	 sqlite? ( dev-db/sqlite )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \
-	    -i "${S}/examples/etc/turnserver.conf"  || die "sed for logdir failed"
-	sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \
-	    || die "sed for simple-log failed"
-	if ! use mongodb; then
-		export TURN_NO_MONGO=yes
-	fi
-	if ! use mysql; then
-		export TURN_NO_MYSQL=yes
-	fi
-	if ! use postgres; then
-		export TURN_NO_PQ=yes
-	fi
-	if ! use redis; then
-		export TURN_NO_HIREDIS=yes
-	fi
-	if ! use sqlite; then
-		export TURN_NO_SQLITE=yes
-	fi
-
-	econf $(use_with sqlite)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/turnserver.init" turnserver
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.${PN}" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	dotmpfiles "${FILESDIR}/${PN}.conf"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-	enewgroup turnserver
-	enewuser turnserver -1 -1 -1 turnserver
-	elog "You need to copy /etc/turnserver.conf.default to"
-	elog "/etc/turnserver.conf and do your settings there."
-}
diff --git a/net-im/coturn/coturn-4.5.0.7.ebuild b/net-im/coturn/coturn-4.5.0.7.ebuild
index 438817b8c4a6..daad5953188a 100644
--- a/net-im/coturn/coturn-4.5.0.7.ebuild
+++ b/net-im/coturn/coturn-4.5.0.7.ebuild
@@ -20,9 +20,9 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="mongodb mysql postgres redis sqlite"
-RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl] )
+RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] )
 	 mongodb? ( dev-libs/mongo-c-driver )
-	 mysql? ( virtual/mysql )
+	 mysql?  ( dev-db/mysql-connector-c )
 	 postgres? ( dev-db/postgresql:* )
 	 redis? ( dev-libs/hiredis )
 	 sqlite? ( dev-db/sqlite )"
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
index 438817b8c4a6..daad5953188a 100644
--- a/net-im/coturn/coturn-9999.ebuild
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -20,9 +20,9 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="mongodb mysql postgres redis sqlite"
-RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl] )
+RDEPEND="|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] )
 	 mongodb? ( dev-libs/mongo-c-driver )
-	 mysql? ( virtual/mysql )
+	 mysql?  ( dev-db/mysql-connector-c )
 	 postgres? ( dev-db/postgresql:* )
 	 redis? ( dev-libs/hiredis )
 	 sqlite? ( dev-db/sqlite )"