gentoo resync : 07.01.2022

3 files changed, 39 insertions, 49 deletions

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 57648d07c74a..9c3f8f0472cf 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,9 +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.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.11-r1.ebuild 3223 BLAKE2B fddaa170b391fb67b8eac614c602487cf71a000e0437d3b87826499f268e5d410ee7239ab12f7b0b2acb7bc5c88a60e3daf7c694572fb2ba47167b4cc73cc005 SHA512 f0e18ffec3d23b9bc6c9a143aa0f3c666dd4cb791cc9303bc92e6a6160dabbdf8972af4cf517f3fce5e24344f5c4e0b057a2edc06b0d0b234fee6858a907d1be
+DIST c-toxcore-0.2.13.tar.gz 511533 BLAKE2B 8c68180710e3d06eaaef9fc05dc0ff2492907586934d1d6f57f147e07bb78b262f78b0057911e4b5cd27d2d1efb51cb714f757b90caa269988e604cafa62cd00 SHA512 f4ed9ea4afb7f9c14a5afd949f3a52e7880838c910acaf5adc39acb09ad574406be08f43b76a9fbdd4fc4bd14f0d73212dc7bd10783565055c910c6c3e5e357a
 EBUILD tox-0.2.12-r1.ebuild 2905 BLAKE2B de657ca8b2815d0d165a41ea78026bd8f813aa4e601336db68f7123ffd52c0b97e9bd10c99591c3af9f27ec53974521ed3c37b90ee4509961a67bd667a7dd12c SHA512 0265c8c0ebdf18113f600f2d5ad8cb2d87965b3b43393502dba0acde2e587974981e077c69f18ad7303b1d419649ce814afa5102f2a9eb08d60ceb148a14d255
-EBUILD tox-9999.ebuild 2719 BLAKE2B cee3819c949279bc5003f53772161c4606a339918050c5f11ede33e75a38fff8c045d07aba94a20ed8514c9a438a64966c9944aefbafd51b7407d3eadef86b3d SHA512 bb32c733c7daed2f65061d46935d53b5683cf81a771d538ee642902665402fa3a1a24dd547e7203b492982f407e672ebc3f036f7fb9deeea0d6ebdd877e09166
+EBUILD tox-0.2.13.ebuild 2922 BLAKE2B 0018dfbe0fcaea6e2a4c72da082c96b6ab9ef7de3bd9f821f284be64157dab166b3bdea8e2e2d25a15e9de4cba2ccdd87089058572afa39778a7fbd1fa503aea SHA512 c26a1d8220edb4cf5db4ea92d9a900e112a798f7238748afb0ef17e80255cdbd54b39abd983d68bb892641272e978fa64a3f569a7a408c6b3a51f9017eac095a
+EBUILD tox-9999.ebuild 2689 BLAKE2B 12827a3eaa9c54410ec4f3eefd12016e4fb8c4540cd94295c45e31b6dc6563edc866d81edff197347e155587c5dace9f5195ae33d6e7d0ac70e24a59f61e957d SHA512 0c362388a3157a103e5ef110fbd1e8e202a8e39140309529198c40cffd5a64bab163f19820f1da4c24340850421efc7216fdbffb0527e69f405581c8b0b67ad4
 MISC metadata.xml 901 BLAKE2B 5125123a0e27a8cda166ed3516d75fb0bb034d77e38f553ba96bdc58744d7cc1bffe58e0fa6d2467a2dcc0f5caf74a7a2c12697664065732d335f0b8bbb8bbad SHA512 7f76b178a4b0a25a3a0eadbe844c07cbaa2103cc4296674c37c3fb18ed626e3cfc7110b8ff4e04ed0f7a83b65a0dc19666074d71f87d0e7e75d84fb1aade3d16
diff --git a/net-libs/tox/tox-0.2.11-r1.ebuild b/net-libs/tox/tox-0.2.13.ebuild
index e508bc927f6d..e05b2ca9cd78 100644
--- a/net-libs/tox/tox-0.2.11-r1.ebuild
+++ b/net-libs/tox/tox-0.2.13.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
+HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
 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"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
-	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+	dev-libs/libsodium:=[asm,urandom,-minimal]
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
@@ -38,26 +38,30 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	cmake_src_prepare
-	#remove faulty tests
-	for testname in bootstrap lan_discovery save_compatibility; do
+
+	#Remove faulty tests
+	for testname in lan_discovery save_compatibility set_status_message; 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)
+		-DAUTOTEST=$(usex test ON OFF)
+		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_MISC_TESTS=$(usex test ON OFF)
+		-DBUILD_TOXAV=$(usex av ON OFF)
+		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av))
+		-DENABLE_STATIC=OFF
+		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
+	)
+
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6))
+			-DTEST_TIMEOUT_SECONDS=150
+			-DUSE_IPV6=$(usex ipv6 ON OFF)
+		)
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
@@ -99,21 +103,12 @@ src_install() {
 pkg_postinst() {
 	if use dht-node; then
 		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
-		ewarn "developers and is on their TODO list."
+		ewarn "developers and is on their TODO list. For more information,"
+		ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'"
 		ewarn ""
 		ewarn "There is currently an unresolved issue with tox DHT Bootstrap node"
 		ewarn "that causes the program to be built with a null library reference."
 		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
 		ewarn "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-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index e80ab4531665..ba31cc1a5c28 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake git-r3 systemd
 
@@ -13,14 +13,14 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
 LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS=""
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn )
+REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND=">dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
@@ -36,31 +36,26 @@ RDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
-	# Remove faulty tests
-	local faultytest=(lan_discovery save_compatibility)
-	local testname=
-	for testname in "${faultytest[@]}"; do
+	#remove faulty tests
+	for testname in lan_discovery save_compatibility set_status_message; 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)
+		-DAUTOTEST=$(usex test ON OFF)
+		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_MISC_TESTS=$(usex test ON OFF)
+		-DBUILD_TOXAV=$(usex av ON OFF)
+		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av)
-	)
-
+		-DENABLE_STATIC=OFF
+		-DMUST_BUILD_TOXAV=$(usex av ON OFF))
 	if use test; then
 		mycmakeargs+=(
 			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6)
-		)
+			-DUSE_IPV6=$(usex ipv6 ON OFF))
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi