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 66183138359 for ; Fri, 4 Sep 2020 20:57:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88C89E0822; Fri, 4 Sep 2020 20:57:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6D039E0822 for ; Fri, 4 Sep 2020 20:57:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5FD0C340C98 for ; Fri, 4 Sep 2020 20:57:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A6C72FC for ; Fri, 4 Sep 2020 20:57:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1599252991.f639e5bfbbd2eae0a5eed22e4af32287bc57f039.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/tox/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/tox/tox-0.2.12.ebuild net-libs/tox/tox-9999.ebuild X-VCS-Directories: net-libs/tox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f639e5bfbbd2eae0a5eed22e4af32287bc57f039 X-VCS-Branch: master Date: Fri, 4 Sep 2020 20:57:12 +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: dae29617-a8e2-45bd-b6cc-2d90733dd8ee X-Archives-Hash: c9ef2731c452dda7ecfa5cc2ae19b6b1 commit: f639e5bfbbd2eae0a5eed22e4af32287bc57f039 Author: Sam James gentoo org> AuthorDate: Fri Sep 4 20:55:44 2020 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 4 20:56:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f639e5bf net-libs/tox: minor style changes Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: Sam James gentoo.org> net-libs/tox/tox-0.2.12.ebuild | 11 ++++++++--- net-libs/tox/tox-9999.ebuild | 14 +++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/net-libs/tox/tox-0.2.12.ebuild b/net-libs/tox/tox-0.2.12.ebuild index 3723ccda4d6..76511a2fe70 100644 --- a/net-libs/tox/tox-0.2.12.ebuild +++ b/net-libs/tox/tox-0.2.12.ebuild @@ -38,7 +38,9 @@ S="${WORKDIR}/${MY_P}" src_prepare() { cmake_src_prepare - #remove faulty tests + + # Remove faulty tests + local testname= for testname in lan_discovery save_compatibility; do sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die done @@ -53,11 +55,14 @@ src_configure() { -DDHT_BOOTSTRAP=$(usex dht-node) -DENABLE_SHARED=ON -DENABLE_STATIC=$(usex static-libs) - -DMUST_BUILD_TOXAV=$(usex av)) + -DMUST_BUILD_TOXAV=$(usex av) + ) + if use test; then mycmakeargs+=( -DTEST_TIMEOUT_SECONDS=120 - -DUSE_IPV6=$(usex ipv6)) + -DUSE_IPV6=$(usex ipv6) + ) else mycmakeargs+=(-DUSE_IPV6=OFF) fi diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild index 23e322bf207..6e0181ca0d8 100644 --- a/net-libs/tox/tox-9999.ebuild +++ b/net-libs/tox/tox-9999.ebuild @@ -35,8 +35,10 @@ RDEPEND=" src_prepare() { cmake_src_prepare - #remove faulty tests + + # Remove faulty tests local faultytest=(lan_discovery save_compatibility) + local testname= for testname in "${faultytest[@]}"; do sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die done @@ -51,14 +53,16 @@ src_configure() { -DDHT_BOOTSTRAP=$(usex dht-node) -DENABLE_SHARED=ON -DENABLE_STATIC=$(usex static-libs) - -DMUST_BUILD_TOXAV=$(usex av)) + -DMUST_BUILD_TOXAV=$(usex av) + ) + if use test; then mycmakeargs+=( -DTEST_TIMEOUT_SECONDS=120 - -DUSE_IPV6=$(usex ipv6)) + -DUSE_IPV6=$(usex ipv6) + ) else - mycmakeargs+=( - -DUSE_IPV6=OFF) + mycmakeargs+=(-DUSE_IPV6=OFF) fi if use log-trace; then