gentoo resync : 16.09.2020

5 files changed, 54 insertions, 158 deletions

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 4131db447fef..0ace9ab30bb3 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,11 +2,9 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
-DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
 DIST c-toxcore-0.2.11.tar.gz 507476 BLAKE2B 67e86a5e5c8da1c387a319e6726eaccec28608f165f0b165d12e379cc7d8080baf9b89f438804ab8e59a8690a11bebba7f2ef689554800312fe039da77e70cac SHA512 616b30423a170463b4445f6940e038fd9af820946c970260fcf72cc54d08d2615364b9f086869180e3ae26154ea92fea6e9a602366306bc40c3e1575e86350df
 DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
-EBUILD tox-0.2.10.ebuild 3119 BLAKE2B 4eb4584d7ebc7dcb4e365ef3baff2a2bff5546c37051511f36987abf38f0b2c9b82937d9f33f0efc99697e7c84195eb94f6eb6bf1f57747a80fe386308d636e4 SHA512 bc52cd62f1165d7659adad3e46bf79d7caa708495cc9695205048a16a831cda41cd9799056edef2c7f459b3f33109ae648f36c9f1b7eece3dc5e6c82519975d9
-EBUILD tox-0.2.11.ebuild 3183 BLAKE2B dfadd25086119764477120fefcd81f3d1277223de61d223961cc9fa424e5109beb2aecd6401f5d46949927f2fa96839cf68237e0ee0eb7662fee2f9d853ff0cf SHA512 f170e0826c4e077b0c0b8936a8ea787e0f0ea851e278a3a49399d524040493b7fe0bdfffd3bccdce9e08c724a36c3d543944317d3cbb64e47f431619d75ea5f8
-EBUILD tox-0.2.12.ebuild 2844 BLAKE2B 6a7a2ea6a10b3750c095937ab6e9b9ecd4fe6202281d1b6610b16a452a57f879131d5133654df3713f6e38bfbf2bb012344501f8ef08a810e357af167863aad2 SHA512 995e516b90b21e943fbc5b5731a14b533e180e13becd887bf3de590953df2b0d3279267b03cef62f7ccc67a1df6ecc2a3856d2839b83fb19f7a79c294c3176c2
-EBUILD tox-9999.ebuild 3060 BLAKE2B ee68a7b8141408b59296d0ad7c14ea69d082ae31a736ea4405d10c35414ae91146ac8442dc242a86ee4aa79aa2652dee975d79f9905dd420263d670ee39981af SHA512 3f45c8b5d5e16c9fb52a895b15ba65036bbcae0e8086eac804aa6dd8cbdea4cb1dc3b2402e69c960444dd0ecedae28c2bf3cab716d9867ab97403e976eae1ec3
+EBUILD tox-0.2.11.ebuild 3219 BLAKE2B daa3f0c785d6c426795618731d3667410a1433efd453085e412b464466cfa174831b7fd0c060977fd8c6d9cd668a18e9cfb888b0a8192d6c302bdc035c87175c SHA512 7db0921d096e9b05affc5dae171fed0f8c31c088b3356bc5e2b3f5329b78b6c5e8b00c989bfd6d1b41d1965d578841fc1382c126bddd470d590b774b18ded80d
+EBUILD tox-0.2.12.ebuild 2905 BLAKE2B 14e9022c6c946847c0e4711e3c02e9f36334f84a0b6f3e8da79376af2dc131e9029b1f5a8f5efbebd0e00341772bc96c98b8abeb9f902f6d399b2f78eddd2aeb SHA512 250a3a8d862d03937e54e2a1247b9d3760fc636475214b08606a0eaaa17061a7fa810889349113bfc7df7b9356164ab9cc0e6b8ddbd30b0116324d02258d952c
+EBUILD tox-9999.ebuild 2717 BLAKE2B fe39a1975c90b5924a2d59946789ba9053b8ee5e3f6c6a09654383496d8e5c0d27aa2c18ddfef5d2563b508b0c59f4a997765a57a3cb51b0be3cd3362a214398 SHA512 6f10c3082f71032632e25d6ce3b503a92126d19b5d45d9438c96155da43edf83e30e23a7ac670b55a35887a0d3e85f873678a9c6d0c996514fdb1da171b43972
 MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025
diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild
deleted file mode 100644
index 5964c671805c..000000000000
--- a/net-libs/tox/tox-0.2.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-MY_P="c-toxcore-${PV}"
-DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/0.2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
-
-REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
-		daemon? ( dht-node )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="
-	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
-	av? (
-		media-libs/libvpx
-		media-libs/opus
-	)
-	daemon? ( dev-libs/libconfig )"
-RDEPEND="
-	${DEPEND}
-	daemon? (
-		acct-group/tox
-		acct-user/tox
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUTOTEST=$(usex test)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DBUILD_MISC_TESTS=$(usex test)
-		-DBUILD_TOXAV=$(usex av)
-		-DDHT_BOOTSTRAP=$(usex dht-node)
-		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
-	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
-	fi
-
-	if use log-trace; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE")
-	elif use log-debug; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG")
-	elif use log-info; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO")
-	elif use log-warn; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING")
-	elif use log-error; then
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
-	else
-		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "Logging disabled"
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/initd tox-dht-daemon
-		newconfd "${FILESDIR}"/confd tox-dht-daemon
-		insinto /etc
-		doins "${FILESDIR}"/tox-bootstrapd.conf
-		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
-	fi
-}
-
-pkg_postinst() {
-	if use dht-node; then
-		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node that causes the program to be"
-		ewarn "built with a null library reference. This causes an infinite loop for certain revdep-rebuild"
-		ewarn "commands. If you aren't running a node, please consider disabling the dht-node use flag."
-	fi
-	if use daemon; then
-		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
-	fi
-}
diff --git a/net-libs/tox/tox-0.2.11.ebuild b/net-libs/tox/tox-0.2.11.ebuild
index bd541befcf1b..d293d7067869 100644
--- a/net-libs/tox/tox-0.2.11.ebuild
+++ b/net-libs/tox/tox-0.2.11.ebuild
@@ -80,6 +80,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/net-libs/tox/tox-0.2.12.ebuild b/net-libs/tox/tox-0.2.12.ebuild
index f6c830c2713e..76511a2fe702 100644
--- a/net-libs/tox/tox-0.2.12.ebuild
+++ b/net-libs/tox/tox-0.2.12.ebuild
@@ -38,7 +38,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	cmake_src_prepare
-	#remove faulty tests
+
+	# Remove faulty tests
+	local testname=
 	for testname in lan_discovery save_compatibility; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
 	done
@@ -53,11 +55,14 @@ src_configure() {
 		-DDHT_BOOTSTRAP=$(usex dht-node)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
+		-DMUST_BUILD_TOXAV=$(usex av)
+	)
+
 	if use test; then
 		mycmakeargs+=(
 			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
+			-DUSE_IPV6=$(usex ipv6)
+		)
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
@@ -80,6 +85,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index 206fb9c4e391..6e0181ca0d85 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -19,23 +19,27 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
 
-COMMON_DEPEND="
-	av? ( media-libs/libvpx
-		media-libs/opus )
-	daemon? ( acct-group/tox
-		acct-user/tox
-		dev-libs/libconfig )
-	>=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]"
 BDEPEND="virtual/pkgconfig"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
+DEPEND=">dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	av? (
+		media-libs/libvpx:=
+		media-libs/opus
+	)
+	daemon? ( dev-libs/libconfig )"
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-group/tox
+		acct-user/tox
+	)"
 
 src_prepare() {
 	cmake_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
+
+	# Remove faulty tests
+	local faultytest=(lan_discovery save_compatibility)
+	local testname=
+	for testname in "${faultytest[@]}"; do
 		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
 	done
 }
@@ -44,20 +48,21 @@ src_configure() {
 	local mycmakeargs=(
 		-DAUTOTEST=$(usex test)
 		-DBOOTSTRAP_DAEMON=$(usex daemon)
+		-DBUILD_MISC_TESTS=$(usex test)
 		-DBUILD_TOXAV=$(usex av)
 		-DDHT_BOOTSTRAP=$(usex dht-node)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
+		-DMUST_BUILD_TOXAV=$(usex av)
+	)
+
 	if use test; then
 		mycmakeargs+=(
-			-DBUILD_AV_TEST=$(usex av)
 			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
+			-DUSE_IPV6=$(usex ipv6)
+		)
 	else
-		mycmakeargs+=(
-			-DBUILD_AV_TEST=OFF
-			-DUSE_IPV6=OFF)
+		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
 
 	if use log-trace; then
@@ -77,6 +82,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_src_test -j1
+}
+
 src_install() {
 	cmake_src_install
 
@@ -91,21 +100,12 @@ src_install() {
 
 pkg_postinst() {
 	if use dht-node; then
-		ewarn "There is currently an unresolved issue with tox"
-		ewarn "DHT Bootstrap node that causes the program to be"
-		ewarn "built with a null library reference. This"
-		ewarn "causes an infinite loop for certain rev-dep-rebuild"
-		ewarn "commands. If you aren't running a node, please"
-		ewarn "consider disabling the dht-node flag"
-	fi
-	if use daemon; then
-		if [[ -f ${EROOT}/var/lib/tox-dht-bootstrap/key ]]; then
-			ewarn "Backwards compatability with the bootstrap daemon might have been"
-			ewarn "broken a while ago. To resolve this issue, REMOVE the following files:"
-			ewarn "    ${EROOT}/var/lib/tox-dht-bootstrap/key"
-			ewarn "    ${EROOT}/etc/tox-bootstrapd.conf"
-			ewarn "    ${EROOT}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid"
-			ewarn "Then just re-emerge net-libs/tox"
-		fi
+		ewarn "There is currently an unresolved issuer with tox DHT"
+		ewarn "Bootstrap node that causes the program to be built"
+		ewarn "with a null libray reference. This causes an infinite"
+		ewarn "loop for certain revdep-rebuild commands. If you aren't"
+		ewarn "running a node, please consider disabling the dht node"
+		ewarn "use flag. For more information please refer to"
+		ewarn "https://github.com/toktok/c-toxcore/issues/1144"
 	fi
 }