gentoo auto-resync : 16:01:2024 - 11:29:23

4 files changed, 36 insertions, 24 deletions

diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index adadcf1b9299..e4f1cd4e0af8 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -4,7 +4,7 @@ AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
 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
-EBUILD tox-0.2.13.ebuild 2920 BLAKE2B 59bf6f61244b267d49a181359b3322186efe21217578b6561b41dcd798e50bc9104beb27dbd611485949a112a80ab11d774f4f17a18cdfb23f4ef106729383cc SHA512 8fdb59395d4ce07c6f2edbfc8a8672b021a0b32d62682ecc697e9e816be09d31587be9c41e9b5755aaab1570d9c7aa12d84e3ac6c7b68abdc0c1a099df35fb75
-EBUILD tox-0.2.18-r2.ebuild 3216 BLAKE2B bed2db497833184abdc3d20c960c660d144fa35dfcf37ac8d6a3cea96652dcee40496cc580f9a90980a2961e82d1c34c5a153f8d4d3ed088d808221461a49e41 SHA512 2522ba64c4713c502c165b4e49f77aaf19fd78f26d3502c0acd459c7c4392a7877cfbd1c00ad2606a3926e94049f1cfd3f339ac36ed8193c6540224e12093966
-EBUILD tox-9999.ebuild 3070 BLAKE2B e46fe49a195dbfe48e4dab8b1ced3ec3c043e7df8ad2642a9f0954743541488d5faad7b95f18f8491f0be14c2707fa0bae337e0b149252f4ce53ec2ed6d33090 SHA512 280695ece672c4d5a495cb6b9f4766bafbe7cd008c72ee3c399f7389cbc4a4afb11855e9f06f6e44deb7404d5cab9b6b4b47379a1e046aa7129f6f0652ed91dc
+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
diff --git a/net-libs/tox/tox-0.2.13.ebuild b/net-libs/tox/tox-0.2.13-r1.ebuild
index 184c65e211bf..cabfe0645e38 100644
--- a/net-libs/tox/tox-0.2.13.ebuild
+++ b/net-libs/tox/tox-0.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
-	dev-libs/libsodium:=[asm,urandom,-minimal]
+	dev-libs/libsodium:=[asm,urandom,-minimal(-)]
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
diff --git a/net-libs/tox/tox-0.2.18-r2.ebuild b/net-libs/tox/tox-0.2.18-r3.ebuild
index 91e51e38d1d6..4cc9474eb842 100644
--- a/net-libs/tox/tox-0.2.18-r2.ebuild
+++ b/net-libs/tox/tox-0.2.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal(-)]
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index a529f806e7a6..e8d52a959406 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,33 +1,40 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake git-r3 systemd
+inherit cmake systemd
 
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
-HOMEPAGE="https://tox.chat"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
+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
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-KEYWORDS=""
 IUSE="+av debug daemon dht-node ipv6 key-utils 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 )
 		daemon? ( dht-node )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal(-)]
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
 	)
 	daemon? ( dev-libs/libconfig:= )"
-RDEPEND="
-	${DEPEND}
+
+RDEPEND="${DEPEND}
 	daemon? (
 		acct-group/tox
 		acct-user/tox
@@ -37,7 +44,7 @@ RDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
-	#remove faulty tests
+	#Remove faulty tests
 	for testname in lan_discovery save_load; do
 		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
@@ -55,12 +62,16 @@ src_configure() {
 		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=OFF
-		-DMUST_BUILD_TOXAV=$(usex av ON OFF))
+		-DFULLY_STATIC=OFF
+		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
+	)
+
 	if use test; then
 		mycmakeargs+=(
 			-DTEST_TIMEOUT_SECONDS=150
 			-DNON_HERMETIC_TESTS=OFF
-			-DUSE_IPV6=$(usex ipv6 ON OFF))
+			-DUSE_IPV6=$(usex ipv6 ON OFF)
+		)
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
 	fi
@@ -77,8 +88,9 @@ src_configure() {
 		mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR")
 	else
 		mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
-		einfo "Logging Disabled"
+		einfo "Logging disabled"
 	fi
+
 	cmake_src_configure
 }
 
@@ -104,9 +116,9 @@ pkg_postinst() {
 		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 issuer with tox DHT Bootstrap node"
-		ewarn "that causes the program to be built with a null libray reference."
+		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, consider disabling the dht node use flag"
+		ewarn "If you aren't running a node, please consider disabling the dht-node use flag."
 	fi
 }