From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D169D1582EF for ; Thu, 27 Feb 2025 05:33:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B4594343181 for ; Thu, 27 Feb 2025 05:33:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BB74C1102C9; Thu, 27 Feb 2025 05:33:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AFB7F1102C9 for ; Thu, 27 Feb 2025 05:33:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68F9E343181 for ; Thu, 27 Feb 2025 05:33:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7F9A1236 for ; Thu, 27 Feb 2025 05:33:24 +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: <1740630624.811e537d7536dea8f47b7213cee77eac737b65aa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/cherrytree/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/cherrytree/cherrytree-1.2.0.ebuild X-VCS-Directories: app-text/cherrytree/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 811e537d7536dea8f47b7213cee77eac737b65aa X-VCS-Branch: master Date: Thu, 27 Feb 2025 05:33:24 +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: 69cb9685-7e7f-4ef5-90ad-38926658e30a X-Archives-Hash: 16e90332b3a78fbcc3b77ef3aa7d79bd commit: 811e537d7536dea8f47b7213cee77eac737b65aa Author: Joel Anderson goatshriek com> AuthorDate: Sun Feb 2 18:45:26 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Feb 27 04:30:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811e537d app-text/cherrytree: update and enable tests The tests for cherrytree were restricted, with a comment that dependencies were not available in Gentoo. Upon further investigation and with confirmation from the upstream maintainer (giuspen/cherrytree#2645), the test dependencies have since changed, and now everything needed to run the tests is available. This change updates the dependencies and enables the tests, limiting the number of jobs due to a limitation in the test suite (giuspen/cherrytree#2663). Signed-off-by: Joel Anderson goatshriek.com> Closes: https://github.com/gentoo/gentoo/pull/40462 Signed-off-by: Sam James gentoo.org> app-text/cherrytree/cherrytree-1.2.0.ebuild | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app-text/cherrytree/cherrytree-1.2.0.ebuild b/app-text/cherrytree/cherrytree-1.2.0.ebuild index 26f7d785b46a..9c67de85be38 100644 --- a/app-text/cherrytree/cherrytree-1.2.0.ebuild +++ b/app-text/cherrytree/cherrytree-1.2.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake python-any-r1 xdg +inherit cmake python-any-r1 virtualx xdg DESCRIPTION="A hierarchical note taking application (C++ version)" HOMEPAGE="https://www.giuspen.com/cherrytree/" @@ -24,9 +24,6 @@ KEYWORDS="~amd64 ~x86" IUSE="nls test" -# Has deps that aren't available in ::gentoo repo -RESTRICT="test" - RDEPEND="app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 @@ -53,7 +50,7 @@ DEPEND="${PYTHON_DEPS} BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) - test? ( dev-util/cpputest )" + test? ( dev-cpp/gtest )" src_prepare() { # disable compress man pages @@ -71,7 +68,16 @@ src_configure() { -DUSE_NLS=$(usex nls) -DBUILD_TESTING=$(usex test) -DUSE_SHARED_FMT_SPDLOG=ON + -DAUTO_RUN_TESTING=OFF + -DUSE_SHARED_GTEST_GMOCK=$(usex test) ) cmake_src_configure } + +src_test() { + # the export test suite fails if more than one job is used for testing, so + # we force it to a single job here, for more detail see + # https://github.com/giuspen/cherrytree/pull/2663 + MAKEOPTS="${MAKEOPTS} -j1" virtx cmake_src_test +}