7 files changed, 148 insertions, 7 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b41b389b3c4b..cd2135388f2b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
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
+}
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 8593676b4b97..9d515ffbc19a 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,4 +1,6 @@
 DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
+DIST libetonyek-0.1.11.tar.xz 1513056 BLAKE2B 2c96e85b4c11ae33a858e3b3f6ec3c76aaa9b9a4e798f436ae5a379adc48622ca5f1da1d7a7b29b2dac8dab27c05acc2f98d778c5258432c688534fbcce0eb86 SHA512 b04593062d905340fdc6049d9fcd4524f8f8d8e313041b1ca811c63c08b218398b11a5cd6c3c724659d108c6f15756d5a87c88e85e27b2b5ed846af3b90de2ab
 EBUILD libetonyek-0.1.10-r2.ebuild 1359 BLAKE2B 714d95873d635778d1bafc74c146869d2369d4626c88c708425831717b6fe8fa8e01ef9d8b8f52d7c34da281e1a8bae7f36ae058e81240910c6317339020d91e SHA512 c7ac3df4eb3512bc2046e9a042e38aa356f628cc22dff8cf2aac2ddfcc64396c865f9cf945a58723e3a195264fecc39f5a57ac45fb6baeab7446ab8e615d158e
-EBUILD libetonyek-9999.ebuild 1287 BLAKE2B daa47822ed6b831c89f0b063adbaf83d98085bc4bcb52003db52a326acbb3b73e137654f4f61fe7f53eae086e9591495b082b057eb82e32306ec928d79d2c21d SHA512 2f266ee7c64281bba4f9698a87ef8009fa58aee04e2e5ebf3dfb4fa6f0d649505280ad8ff6437bee80ec44ee6f39e8aafd4afba649a2cd4612149bea74bf152c
+EBUILD libetonyek-0.1.11.ebuild 1218 BLAKE2B 8bf5e3d2130a0c2d230ef77af573b1b3e9b21a22877607fb347f8dbc71308a183359ef702b344383d5360df478b223eda1a6f0dce9a5cff48e935d5a911f12ed SHA512 c72426f05eeceb85c2f922664818711869e681bdc29754fba7fb9bcb050ccc1430efc88c418009bb087209ae1ac3b012fd4c9627f3504998dc1356aa3dd774fa
+EBUILD libetonyek-9999.ebuild 1248 BLAKE2B 7564752599bf6de66f10d6638acf602a5551c1c86c0418d41cd8151c7a5dcc955f8b45823ddcac40892a55877634b797aa7402c055ab3d5aa0582e7b1ef5cebc SHA512 c24dd35a5d3c2086813f8b0f6dfcd925f8ef88ecddec2e6bb3e7f78584ffe43f46a651eb1ef2096973c178413a364516d4ec2ab83bd8578d273eb2e594b7daef
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libetonyek/libetonyek-0.1.11.ebuild b/app-text/libetonyek/libetonyek-0.1.11.ebuild
new file mode 100644
index 000000000000..535cecb7dd54
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	>=dev-util/mdds-2.1:1=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	media-libs/glm
+	dev-build/libtool
+	test? ( dev-util/cppunit )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4" || die
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		--with-mdds=2.1
+		$(use_with doc docs)
+		$(use_enable test tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 874395b30224..975c7f6efb90 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="doc static-libs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -41,7 +41,7 @@ BDEPEND="
 
 src_prepare() {
 	default
-	[[ -d m4 ]] || mkdir "m4"
+	[[ -d m4 ]] || mkdir "m4" || die
 	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
@@ -50,7 +50,6 @@ src_configure() {
 		--disable-werror
 		--with-mdds="${MDDS_VER}"
 		$(use_with doc docs)
-		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
 	econf "${myeconfargs[@]}"
@@ -58,5 +57,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }