gentoo auto-resync : 07:08:2024 - 12:37:20

6 files changed, 138 insertions, 21 deletions

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index e4f1cd4e0af8..899c18c177aa 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,10 +1,12 @@
 AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199ed21c2d6e0fd61e639d2eb669ee00c53088db2b6290dc98149ce20b0fafd8700c891c SHA512 1f7d9888a794ca4db64332430f6fd4ed3e257618fd87855922ff9186bca332827197f4f5aa199a27586fd2fcee04ed4d617bbaeb3866d9ba6f9c37ff8cb61ba1
-AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
+AUX initd 676 BLAKE2B 2ea3b4f82a6f432d7afbe5256fd61aea5d39313a1c02b001319d2dab760694b76b5846bb8fd2594589e026b123918fa7fb84580860f4deccd8005febcc3ee464 SHA512 0913e9eff00fac22af5b0929c05413e5e78c7268020c53d1f42c33ecc586a8ec9c921cb555157a8866af86ee8ec98a1c2e3ee2ab4d6842ca1913baee3ca16744
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
-AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
+AUX tox-bootstrapd.service 504 BLAKE2B 3ce3e96734220da225e292c2feffa1507917ba84372a9e76be34b3ffddd70f1d896f4ac2058b3a8826e5cd9b2d7b441cca5f39305c785422ecc5e12a9f65b757 SHA512 eb1dddc7c6de009c31c646a1384984fa92612414d51d531a4247057b34523f8ea32e0a615500a63a55910c994e99535018bfea8c8879926704e0c84ff102ab6f
 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
 EBUILD tox-0.2.13-r1.ebuild 2923 BLAKE2B 48eb83d424000252e60af6e2402157450cfde117592a9a8c4dfe95bf13aecd9e79abd192366417c307ec196c8b3461e8c0d3f7be8729b8c42859bd9bfb437df1 SHA512 08bfa551014c05320a6ef30121ff5a21838b95779da7341f559a4a0e4f0e43ab2f3f9e8ca3b358ac98059c3f7b679c5379e6dd146db997a30c3790f127d7b0af
 EBUILD tox-0.2.18-r3.ebuild 3219 BLAKE2B e1790ab52dd89432e92cb90b8afcd7f515e11fadf76f19bc1ebc81682b33eab99ba87a3215cae778ae3347195e8b707bf087b210809d0822f5b40b42aea6365e SHA512 594d430d78a9895e013f0b34831404dadcaa327b6808f59dd770e4be0c0906da682f5da564d24e6fbe28080822ee5aca8b51bc659c4bc8e6bb77d6be1e21163d
-EBUILD tox-9999.ebuild 3333 BLAKE2B 1261442ee05fe59801104eda78ac2799d400d8623e9f257d144801b78e092ef8a579fdd0e7cfa44b5a505ca29f3e97ab82fa5736e52c7a47b1bfa00cd8cecca9 SHA512 fdbd9aaadf36b5e56393bd3f17eae78c989d37a6ff9cf7942c48112fb1245a50a33ab495d8fc5ef7de459040fddfba02f944dc500c91b8c7051c6531238c2c4e
-MISC metadata.xml 985 BLAKE2B a77c49ccdcb1407dc40590f2fbcd4a932d1167dbaad973c878da09107def195cc9755c6d5f1a824cf22006543f1f6db3461d03e11ba7a21b3f321b6173c8aee8 SHA512 67eecd0db74c985cd97c840414ff6860a1d5a3ac9eaa00cd73c5c61e59831ff458a596251605af9515817f074d76eb342c12714409e7b31176d56e9ee311fc0c
+EBUILD tox-0.2.19.ebuild 3017 BLAKE2B 1fa0e8e6c9e40da4408020b8a62031d6fefb94bec7a4021791c59878921a341682cdfea63b39d29e599b0a350c70dc19406db7a36e0f8cfd34d29fd071b4b38a SHA512 f172e747b6c9ed90b6588fddcfcdd2a6973aa76db2eab9f56c31994bf1c988e6afaba556970b31ea5b3c355f0e519e04a8e3416e1dfcfc66a7b9d0fc23e4e11e
+EBUILD tox-9999.ebuild 2812 BLAKE2B a7b1eb295d0bea191282e9bd1086ad5d1f2138fe884fea4e070832f284b1ed66b00304028e8979e3ea1e1b0074ee96ca05a2539dbfd6b4105a7d65f189f2cdc5 SHA512 d5c779416ebca8fce9dbaf26d476b7677446af31bb07afb54b2516fa38436e5cd6d30c54a19eb96dfd7a198b3e54019f4dbd7202c6b37d60600793ceb4a54486
+MISC metadata.xml 1049 BLAKE2B 4150b812ccf96ccd8a98066054d37b0e74123f8c68b2f68a0cbe6e7227e628a34ed7813ea012b6e468f23b2e8f27a67922108014d8c019fe303e1f57a0dbb7ad SHA512 ed549db2d83091dbd6fba5c7b1997e3062b0739b83e12a7113f9da0fa3e70ee97871e52dfca4465ec13746c3f43002dd02db19168ce07437bcefe9dcd69bfbaf
diff --git a/net-libs/tox/files/initd b/net-libs/tox/files/initd
index 49880897a1a0..b5ef4cd4db41 100644
--- a/net-libs/tox/files/initd
+++ b/net-libs/tox/files/initd
@@ -16,6 +16,8 @@ start() {
 	checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${PIDDIR}"
 	checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${KEYSDIR}"
 
+	set rc_ulimts 4096
+
 	start-stop-daemon --start \
 		--pidfile "${PIDFILE}" \
 		--user="${TOX_USER}" --group="${TOX_GROUP}" \
diff --git a/net-libs/tox/files/tox-bootstrapd.service b/net-libs/tox/files/tox-bootstrapd.service
index ae2f238cd60c..aec928c7054e 100644
--- a/net-libs/tox/files/tox-bootstrapd.service
+++ b/net-libs/tox/files/tox-bootstrapd.service
@@ -5,7 +5,11 @@ After=network.target
 [Service]
 User=tox
 Group=tox
+#Since the daemon can use around 600 tcp sockets,
+#increase the soft limit on open files to 4096
+LimitNOFILE=4096
 RuntimeDirectory=tox-bootstrapd
+RuntimeDirectoryMode=750
 PIDFile=/run/tox-bootstrapd/tox-bootstrapd.pid
 WorkingDirectory=/var/lib/tox-bootstrapd
 ExecStart=/usr/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf
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-0.2.19.ebuild b/net-libs/tox/tox-0.2.19.ebuild
new file mode 100644
index 000000000000..87981c32e0e5
--- /dev/null
+++ b/net-libs/tox/tox-0.2.19.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/0.2"
+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 )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal(-)]
+	av? (
+		media-libs/libvpx:=
+		media-libs/opus
+	)
+	daemon? ( dev-libs/libconfig:= )"
+
+RDEPEND="${DEPEND}
+	daemon? (
+		acct-group/tox
+		acct-user/tox
+	)
+	key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	#Remove faulty tests
+	for testname in lan_discovery; do
+		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAUTOTEST=$(usex test ON OFF)
+		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
+		-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+=(
+			-DNON_HERMETIC_TESTS=OFF
+			-DPROXY_TEST=OFF
+			-DTEST_TIMEOUT_SECONDS=150
+			-DUSE_IPV6=$(usex ipv6 ON OFF)
+		)
+	else
+		mycmakeargs+=(-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_test() {
+	cmake_src_test -j1
+}
+
+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 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
-}