From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C47B138334 for ; Mon, 4 Nov 2019 06:23:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD33BE0A82; Mon, 4 Nov 2019 06:23:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B63EFE0A82 for ; Mon, 4 Nov 2019 06:23:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3B4A34C832 for ; Mon, 4 Nov 2019 06:23:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8BD58AA for ; Mon, 4 Nov 2019 06:23:45 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1572847662.9e2eb6cf66ed0095be122abec0d033d9dbc77417.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/tox/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/tox/tox-9999.ebuild X-VCS-Directories: net-libs/tox/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 9e2eb6cf66ed0095be122abec0d033d9dbc77417 X-VCS-Branch: master Date: Mon, 4 Nov 2019 06:23:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2c9cbda0-cb67-436e-a466-79f98922ef5f X-Archives-Hash: 7669560e9224758f3b54c3ac83dd0496 commit: 9e2eb6cf66ed0095be122abec0d033d9dbc77417 Author: Josiah Mullins protonmail com> AuthorDate: Sat Oct 19 01:57:21 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Nov 4 06:07:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e2eb6cf net-libs/tox: update tox-9999 This commit introduces compatability with GLEP 81; updates the EAPI from 6 to 7; updates the cflags options; disables dht-node by default; and optimizes the package requirement section. Signed-off-by: Josiah Mullins protonmail.com> Signed-off-by: Joonas Niilola gentoo.org> net-libs/tox/tox-9999.ebuild | 89 ++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 24 deletions(-) diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild index 3c267ef0e1e..501b16dc726 100644 --- a/net-libs/tox/tox-9999.ebuild +++ b/net-libs/tox/tox-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils git-r3 systemd user +inherit cmake-utils git-r3 systemd DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" HOMEPAGE="https://tox.chat" @@ -13,29 +13,66 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git" LICENSE="GPL-3+" SLOT="0/0.2" KEYWORDS="" -IUSE="+av daemon log-debug log-trace +no-log static-libs test" +IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test" -REQUIRED_USE="^^ ( no-log log-trace log-debug )" +REQUIRED_USE="^^ ( log-debug log-error log-info log-trace log-warn ) + daemon? ( dht-node )" -RDEPEND=" - av? ( media-libs/libvpx:= +COMMON_DEPEND=" + av? ( media-libs/libvpx media-libs/opus ) - daemon? ( dev-libs/libconfig ) + daemon? ( acct-group/tox + acct-user/tox + dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND}" + +src_prepare() { + cmake-utils_src_prepare + #remove faulty tests + for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do + sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die + done +} src_configure() { local mycmakeargs=( - -DTRACE=$(usex log-trace) - -DDEBUG=$(usex log-debug) - -DBUILD_TOXAV=$(usex av) - -DMUST_BUILD_TOXAV=$(usex av) - -DBUILD_AV_TEST=$(usex av) + -DAUTOTEST=$(usex test) -DBOOTSTRAP_DAEMON=$(usex daemon) + -DBUILD_TOXAV=$(usex av) + -DDHT_BOOTSTRAP=$(usex dht-node) + -DENABLE_SHARED=ON -DENABLE_STATIC=$(usex static-libs) - ) + -DMUST_BUILD_TOXAV=$(usex av)) + if use test; then + mycmakeargs+=( + -DBUILD_AV_TEST=$(usex av) + -DTEST_TIMEOUT_SECONDS=120 + -DUSE_IPV6=$(usex ipv6)) + else + mycmakeargs+=( + -DBUILD_AV_TEST=OFF + -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-utils_src_configure } @@ -49,20 +86,24 @@ src_install() { doins "${FILESDIR}"/tox-bootstrapd.conf systemd_dounit "${FILESDIR}"/tox-bootstrapd.service fi - - find "${D}" -name '*.la' -delete || die } pkg_postinst() { + if use dht-node; then + ewarn "There is currently an unresolved issue with tox" + ewarn "DHT Bootstrap node that causes the program to be" + ewarn "built with a null library reference. This" + ewarn "causes an infinite loop for certain rev-dep-rebuild" + ewarn "commands. If you aren't running a node, please" + ewarn "consider disabling the dht-node flag" + fi if use daemon; then - enewgroup tox - enewuser tox -1 -1 -1 tox - if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; 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 " ${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