commit:     508f64373c1c99c89f60fd296475df6913e7e50a
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 25 10:22:05 2026 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Feb 25 23:37:07 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508f6437

net-libs/tox: update the live 9999 ebuild

- Use the 9999 ebuild as a base for releases at least while it's here.
    Upstream hasn't been moving so fast that a 9999 necessarily makes
    very much sense to keep though.
- Use the GitHub 'archive' archive instead of 'release'.
    The release archive content is a bit unstable at this time, and
    it seems we mostly prefer the plain archive in general.
- Include the 'cmp' fork in sources.
    Since this is a submodule, it isn't included in the non-release
    archive.
- Use 'CMAKE_SKIP_TESTS' to exclude flaky tests.
    The tests live in another directory now, with some new ones to
    skip as well.  Unsure if even '-j1' will help with them.
- Use 'CMAKE_QA_COMPAT_SKIP' to skip a QA warning.
    The warning is being triggered by a docker file, which is not
    used here.
- Include the 'postinst' message from '0.2.20'.

Bug: https://bugs.gentoo.org/964599
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 net-libs/tox/tox-9999.ebuild | 45 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index f68cb24a6fec..5902fda9a2fc 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,19 +1,28 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake systemd
 
+# The notice is triggered by a docker file, which is unused here.
+# https://bugs.gentoo.org/964599
+CMAKE_QA_COMPAT_SKIP=1
+CMP_COMMIT="52bfcfa17d2eb4322da2037ad625f5575129cece"
+
 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";
+       EGIT_SUBMODULES=( third_party/cmp )
 else
        MY_P="c-toxcore-${PV}"
-       
SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/${MY_P}.tar.gz";
+       SRC_URI="
+               https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz
+               https://github.com/TokTok/cmp/archive/${CMP_COMMIT}.tar.gz -> 
toktok-cmp-${CMP_COMMIT}.tar.gz
+       "
        KEYWORDS="~amd64 ~arm ~x86"
        S="${WORKDIR}/${MY_P}"
 fi
@@ -41,13 +50,22 @@ RDEPEND="${DEPEND}
        )
        key-utils? ( || ( sys-devel/gcc[openmp] 
llvm-runtimes/clang-runtime[openmp] ) )"
 
-src_prepare() {
-       cmake_src_prepare
+# Skip flaky tests.
+CMAKE_SKIP_TESTS=(
+       scenario_group_topic
+       scenario_lan_discovery
+       scenario_tox_many
+)
+
+src_unpack() {
+       default
 
-       #Remove faulty tests
-       for testname in lan_discovery; do
-               sed -i -e "/^auto_test(${testname})$/d" 
./auto_tests/CMakeLists.txt || die
-       done
+       if [[ ${PV} == 9999 ]]; then
+               git-r3_src_unpack
+       else
+               rm -d ${MY_P}/third_party/cmp || die
+               mv cmp-${CMP_COMMIT} ${MY_P}/third_party/cmp || die
+       fi
 }
 
 src_configure() {
@@ -98,6 +116,8 @@ src_configure() {
 }
 
 src_test() {
+       # Some tests appear to get flaky with multiple jobs running.
+       # https://bugs.gentoo.org/730434
        cmake_src_test -j1
 }
 
@@ -112,3 +132,12 @@ src_install() {
                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
+}

Reply via email to