From 4418da21bd05d610a3450f4aa75481785ca372a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Feb 2025 19:26:40 +0000 Subject: gentoo auto-resync : 27:02:2025 - 19:26:39 --- app-text/cherrytree/Manifest | 2 +- app-text/cherrytree/cherrytree-1.2.0.ebuild | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'app-text/cherrytree') diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest index 0a525c1a51a5..30ff713c0c3c 100644 --- a/app-text/cherrytree/Manifest +++ b/app-text/cherrytree/Manifest @@ -1,5 +1,5 @@ DIST cherrytree_1.1.4.tar.xz 4714968 BLAKE2B 98cb6c20f5f957420b01352f3b1ba86768010e64583d94130e878eca747350c5eab11107ef3719c65f3a6126127b31e4d0e5807f90548f9f8819cd16f0f299f1 SHA512 053871386b4fd5e9964082421c63a10f332942fb1b29e5145b18858a1219ad55e108235dda279bdbf9b3516fd17502c55357e196a327232a6d82aaa1e06598d9 DIST cherrytree_1.2.0.tar.xz 4735884 BLAKE2B 47f2aef52bb1fea23be8f5db3d2ec9f4c6a596bb6136350098f870688e34e5662241f188f1c94331af2119b59546c95fbe8254bdbb187990b514f9d21fd76214 SHA512 729e8227eb1f0616e110153ac2139cc7019ed5e1a949c8be40fd2235ee5d2e0f0b1925c57d72c9b443852e5b80a50793e4e903b7df41da8e95a172210f7ec035 EBUILD cherrytree-1.1.4-r2.ebuild 1657 BLAKE2B 893c2c23d9d3346d7888124f8dd05a4afd1d1c1e069cf369958bcba4913a5000475749a60d73b0568a07587856a21718774ede97856d2d30ca17be8503aa5e8d SHA512 e214bd9137cf08741a4b66b97625a3ceebf494b0485cbaf10363de2c76ad03c04efc57ca3b7595b386afbd2ee3f1e4679c1d4c9bddd8f9f3b5a892ccd4b09b0b -EBUILD cherrytree-1.2.0.ebuild 1580 BLAKE2B ee3fda2b702c2dfb75f27155690daf70ad4d21fa20d95b9b1b9ab6679db1ae5a41a207c2926d8322422ee4df6617b17ffb09a292b467046f2ceb98244e9a3d1d SHA512 8c08da5ca6b1e298ec3357525a4cd1256e202c5573eb5f26c6679b76c43e4859726177fdf9b02f594b2bc0bca11e1170693b564d51c9ebe68edc60759b5be93e +EBUILD cherrytree-1.2.0.ebuild 1832 BLAKE2B ab7f6c4b9575777b7fa4279b743c585190174200dd94d90d5f161e04738827ec7d027183a822b6d0b6d68d031d7f3bd4967130e207b429ceb3839aa4dca8d5dc SHA512 680629f7215503e77fb304d8a586c94bc227961fe1330aea79b1c5e2e2f41004f059e683406a203df20a729d866c38cab8ede5b4e326b121c743800e1feac8d2 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0 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 +} -- cgit v1.2.3