gentoo auto-resync : 15:11:2024 - 03:02:36

3 files changed, 82 insertions, 2 deletions

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index c24eae32ed19..0a525c1a51a5 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,5 @@
 DIST cherrytree_1.1.4.tar.xz 4714968 BLAKE2B 98cb6c20f5f957420b01352f3b1ba86768010e64583d94130e878eca747350c5eab11107ef3719c65f3a6126127b31e4d0e5807f90548f9f8819cd16f0f299f1 SHA512 053871386b4fd5e9964082421c63a10f332942fb1b29e5145b18858a1219ad55e108235dda279bdbf9b3516fd17502c55357e196a327232a6d82aaa1e06598d9
-EBUILD cherrytree-1.1.4-r1.ebuild 1581 BLAKE2B 87dba2516f1bba9d05fb47277909c6b7f1aa2d56aabfe649922d7711b2c4348be84890f34bbd8ab7bb27fbed1c465f31691a4240e2910c0335fbdaf022ad759a SHA512 318aef7e326b62c1b0c345ac7a678f174e8086e6c8083fcd731e16136b83aa95a23a0133a0656d876940978adc7bab3b0bdc5893ac350c48a92b01cbfc98ac6f
+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
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.1.4-r1.ebuild b/app-text/cherrytree/cherrytree-1.1.4-r2.ebuild
index 112fe0853cc1..b15546fb1a6e 100644
--- a/app-text/cherrytree/cherrytree-1.1.4-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-1.1.4-r2.ebuild
@@ -27,6 +27,7 @@ IUSE="nls test"
 # Has deps that aren't available in ::gentoo repo
 RESTRICT="test"
 
+# <dev-libs/libfmt-11 https://github.com/giuspen/cherrytree/issues/2548
 RDEPEND="app-i18n/uchardet
 	app-text/gspell:=
 	>=dev-cpp/glibmm-2.64.2:2
@@ -37,7 +38,7 @@ RDEPEND="app-i18n/uchardet
 	dev-db/sqlite:3
 	dev-libs/fribidi
 	dev-libs/glib:2
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-11:=
 	dev-libs/libsigc++:2
 	dev-libs/libxml2:2
 	>=dev-libs/spdlog-1.5:=
diff --git a/app-text/cherrytree/cherrytree-1.2.0.ebuild b/app-text/cherrytree/cherrytree-1.2.0.ebuild
new file mode 100644
index 000000000000..26f7d785b46a
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.2.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2023-2024 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
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
+
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+
+SLOT="0"
+
+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
+	dev-cpp/gtkmm:3.0
+	x11-libs/gtksourceview:4
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm:1.4
+	dev-db/sqlite:3
+	dev-libs/fribidi
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	>=dev-libs/spdlog-1.5:=
+	>=x11-libs/vte-0.70.2:2.91
+	net-misc/curl
+	x11-libs/cairo[X]
+	x11-libs/gtk+:3[X]
+	x11-libs/pango[X]"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/cpputest )"
+
+src_prepare() {
+	# disable compress man pages
+	sed -i -e \
+		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+		CMakeLists.txt || die
+
+	# python_fix_shebang .
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXEC="${PYTHON}"
+		-DUSE_NLS=$(usex nls)
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_SHARED_FMT_SPDLOG=ON
+	)
+
+	cmake_src_configure
+}