[gentoo-commits] repo/gentoo:master commit in: net-libs/tox/

["Pacho Ramos" <pacho@gentoo.org>]

commit:     60f4d35adb42c59d61e919f2a0709d6d2d48925c
Author:     Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
AuthorDate: Sun Apr 21 20:29:54 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 19:01:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f4d35a

net-libs/tox: Bump to tox-0.2.19

This upgrade fixed the issue in dht-node's daemon.
Therefore, the related warning in the ebuild has
been removed. This upgrade also provided an option
to build the unstable api, so the "experimental"
use flag has been added. Lastly, these changed
were applied to the live ebuild.

Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com>
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 net-libs/tox/Manifest                              |  1 +
 net-libs/tox/metadata.xml                          |  1 +
 .../tox/{tox-9999.ebuild => tox-0.2.19.ebuild}     | 40 +++++++++-------------
 net-libs/tox/tox-9999.ebuild                       | 24 ++++---------
 4 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index 2fc1f7467d21..a34b6ee88b7b 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,2 +1,3 @@
 DIST c-toxcore-0.2.13.tar.gz 511533 BLAKE2B 8c68180710e3d06eaaef9fc05dc0ff2492907586934d1d6f57f147e07bb78b262f78b0057911e4b5cd27d2d1efb51cb714f757b90caa269988e604cafa62cd00 SHA512 f4ed9ea4afb7f9c14a5afd949f3a52e7880838c910acaf5adc39acb09ad574406be08f43b76a9fbdd4fc4bd14f0d73212dc7bd10783565055c910c6c3e5e357a
 DIST c-toxcore-0.2.18.tar.gz 653247 BLAKE2B c27da02753aede5056c42e5bf1949920fc30e98a23c058ab445c2fe345271e442885a3eeb011e8fde16d8fc8451376a015c5f821145785c75e7d0dda3a8b72eb SHA512 e9b0d73a2e0460290c8453a0a64fc91deed2e0cf87f945d0ba203b929f19a296571d7140f4df89b06f7e67f2b61894460ce4dd32ab9ecf6ea7d5b67538fadb23
+DIST c-toxcore-0.2.19.tar.gz 860531 BLAKE2B 5c341d85f9af2d44656600f1e2e95d5bc420effd7cb084f7568276831c489712ea39b8ffac7e901c50672f1a7adb68bcb9eab72cb3123bed5a5e7cc3a4749777 SHA512 793070e2f53e9736e23803d5e60dab8997b2e1f0b0655807b32667d660ee240b1904842aee1910f508ef26f0d4af8ca003fe384e6c59f26787a1059f5d5a5b22

diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 434e886648f5..c98525545bf6 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
 		<flag name="dht-node">Enables DHT Bootstrap Node.</flag> 
+		<flag name="experimental">Enables the experimental api</flag>
 		<flag name="key-utils">Builds utilities to create custom keys and profiles</flag>
 		<flag name="log-error">Log level: 1</flag>
 		<flag name="log-warn">Log level: 2</flag>

diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-0.2.19.ebuild
similarity index 67%
copy from net-libs/tox/tox-9999.ebuild
copy to net-libs/tox/tox-0.2.19.ebuild
index e8d52a959406..87981c32e0e5 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-0.2.19.ebuild
@@ -5,22 +5,17 @@ EAPI=8
 
 inherit cmake systemd
 
+MY_P="c-toxcore-${PV}"
+S="${WORKDIR}/${MY_P}"
+
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
-else
-	MY_P="c-toxcore-${PV}"
-	SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
+SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av debug daemon dht-node experimental ipv6 key-utils 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 )"
@@ -45,7 +40,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	#Remove faulty tests
-	for testname in lan_discovery save_load; do
+	for testname in lan_discovery; do
 		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
@@ -55,21 +50,24 @@ src_configure() {
 		-DAUTOTEST=$(usex test ON OFF)
 		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
 		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
-		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
+		-DBUILD_FUZZ_TESTS=OFF #Requires the compiler to be Clang
 		-DBUILD_MISC_TESTS=$(usex test ON OFF)
 		-DBUILD_TOXAV=$(usex av ON OFF)
 		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
 		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=OFF
+		-DEXPERIMENTAL_API=$(usex experimental ON OFF)
 		-DFULLY_STATIC=OFF
 		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
+		-DUNITTEST=OFF
 	)
 
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=150
 			-DNON_HERMETIC_TESTS=OFF
+			-DPROXY_TEST=OFF
+			-DTEST_TIMEOUT_SECONDS=150
 			-DUSE_IPV6=$(usex ipv6 ON OFF)
 		)
 	else
@@ -111,14 +109,10 @@ 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. 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."
+	if use daemon; then
+		elog "Before you can run the daemon, you need to add nodes to"
+		elog "configuration which exists at /etc/tox-bootstrapd.conf"
+		elog "Details about these nodes can be found at https://nodes.tox.chat"
+		elog "Then run, if necessary, #rc-update add tox-dht-daemon default"
 	fi
 }

diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index e8d52a959406..0ecda67307a5 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
+IUSE="+av debug daemon dht-node experimental ipv6 key-utils 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 )"
@@ -45,7 +45,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	#Remove faulty tests
-	for testname in lan_discovery save_load; do
+	for testname in lan_discovery; do
 		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
@@ -55,21 +55,24 @@ src_configure() {
 		-DAUTOTEST=$(usex test ON OFF)
 		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
 		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
-		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
+		-DBUILD_FUZZ_TESTS=OFF #Requires the compiler to be Clang
 		-DBUILD_MISC_TESTS=$(usex test ON OFF)
 		-DBUILD_TOXAV=$(usex av ON OFF)
 		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
 		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=OFF
+		-DEXPERIMENTAL_API=$(usex experimental ON OFF)
 		-DFULLY_STATIC=OFF
 		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
+		-DUNITTEST=OFF
 	)
 
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=150
 			-DNON_HERMETIC_TESTS=OFF
+			-DPROXY_TEST=OFF
+			-DTEST_TIMEOUT_SECONDS=150
 			-DUSE_IPV6=$(usex ipv6 ON OFF)
 		)
 	else
@@ -109,16 +112,3 @@ src_install() {
 		systemd_dounit "${FILESDIR}"/tox-bootstrapd.service
 	fi
 }
-
-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. 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
-}