7 files changed, 76 insertions, 107 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 621291e866e4..a330f3e4349b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 49668a36e6dd..3a325faaea78 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,5 +1,7 @@
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2 SHA512 98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6
 DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0 SHA512 e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
+DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b SHA512 c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
 EBUILD cherrytree-0.99.51-r1.ebuild 1823 BLAKE2B 11783ba9bab860ba1b4602c636f79cd05695f977312d276aecb2daf3cf39af2edd51dac2c0fbae27dadb957a2e2a737c48128e31cdcab0ca6c5e55484c3e8214 SHA512 d4f91cb0f061635df38d7aec3b25c47e764598a522a608376b188d527523511e07eced0d9877aac8f560b70824ea8dd2c081695e8bd5e534b3fbdaa163974006
 EBUILD cherrytree-0.99.53.ebuild 1543 BLAKE2B 1c64d83f880e7ba0070460ebf8da6a72c964369ba7f7edc627c59496be8a8e6ebdfc49697ef6f28be7c3bd51b7e8ab3252794ebacd90e5a792f21d8d856b86c4 SHA512 425280be6a4c18a46105c2a9dc6292ad5a5431facb5885b80615df7865b3b6e767dbeef63456b900295e943ff1a08f1fa7f426d891a75c60e0ce4a756b59aca6
+EBUILD cherrytree-0.99.54.ebuild 1547 BLAKE2B 8616ded1ee517f081100325b1439cf1b2b03e7e4a5a9fa58aa909b08171c6dda39d733d87bd7caf6b8f461b73b21744b7fdca93358f4502fd79f75dc3b64c660 SHA512 0a826fd8bb018f1ec00e3f53fa03f0006d43dbc75bb765181e14c72cd8724c02ccfd3d5ec567fb30a33630becb0c0abfe711876a10caa3b07a17f15144205082
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-0.99.54.ebuild b/app-text/cherrytree/cherrytree-0.99.54.ebuild
new file mode 100644
index 000000000000..589376ce484d
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.54.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# 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"
+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
+	dev-cpp/gtksourceviewmm:3.0
+	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/libxml2:2
+	dev-libs/spdlog:=
+	>=x11-libs/vte-0.70.2:2.91
+	net-misc/curl
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/pango"
+
+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/pytextile/Manifest b/app-text/pytextile/Manifest
deleted file mode 100644
index 33eb89884257..000000000000
--- a/app-text/pytextile/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580
-DIST python-textile-4.0.2.gh.tar.gz 49296 BLAKE2B e9ac36b0ecf401a07aea1037c1f4390e440123d7e16f8fef64c257d27f6ef9c6918018ff34e9f8ad367767f3ebc5ce7957be424b2e6dac62fe8a1f7736b8eff7 SHA512 eb59e44b9a8521bcfa98f476e23efd727ffd867277d24f102bbb9511a99a0d636c324e22f8562382074007f304490c4ec6a5fde529f41b15f055a9cf16d49b8e
-EBUILD pytextile-4.0.1.ebuild 1015 BLAKE2B 4e2871f71b0f694ff49dae7d0c614f22966052e60335a8a147724a42e7a0fc1b72e06a08ca4c780c8c1500bb1583464bfe12ca7f9ec9e62e5ea7f36824446af9 SHA512 d76fd1f20fd076d0b9b52bdc7da972612e2e3df94efcbc7bd8c953132f8603ec8750bb5b56e4e921ca5ba790355d400198793abe08ca3f3b7798fde221784324
-EBUILD pytextile-4.0.2.ebuild 919 BLAKE2B d51a7813e643aebeabb9242acddea5cd3694b5e838cbedf53413ba3b5ced376b258f823c49f2a97ca887d2f107333062c7943cb0ff7481b185c35aa40e6f5388 SHA512 6a355376574c2b87142643603707cf33f026c23604919580f7788aff431908a167e04416402f1161d25ff56682626fa6f64ccea2c970edbc1796f55de21d4f7e
-MISC metadata.xml 580 BLAKE2B f318193518ce2529a1345249d6b876b6c98cf84f896666650323b94d60969fdded5c438e676c06f854a4050a85d7d27b7e16f74914ff80f12d51f1c66f234544 SHA512 7d9e4a0720730b6b96a2bc3828c21d3a31168f8b7ec4ae2f28a4f26b7632199a14b241dd954a944a42c1e9dffd07a8835720e60e7608d1952759e0627de176f7
diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
deleted file mode 100644
index 9fcb3d2c7ea1..000000000000
--- a/app-text/pytextile/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator. 
-  Textile simplifies the work of creating (X)HTML.</longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">textile</remote-id>
-    <remote-id type="github">textile/python-textile</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/pytextile/pytextile-4.0.1.ebuild b/app-text/pytextile/pytextile-4.0.1.ebuild
deleted file mode 100644
index 37ef028d8b06..000000000000
--- a/app-text/pytextile/pytextile-4.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-MY_P="python-textile-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/textile/python-textile"
-SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# remove useless --cov arg injection
-	rm pytest.ini || die
-	# remove useless pytest-runner dep
-	sed -e "s/pytest-runner//g" -i setup.py || die
-}
-
-python_test() {
-	local deselect=(
-		# tests that need network access
-		tests/test_getimagesize.py
-		tests/test_imagesize.py
-		tests/test_textile.py
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/app-text/pytextile/pytextile-4.0.2.ebuild b/app-text/pytextile/pytextile-4.0.2.ebuild
deleted file mode 100644
index e0c784fe396a..000000000000
--- a/app-text/pytextile/pytextile-4.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P="python-textile-${PV}"
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="
-	https://github.com/textile/python-textile/
-	https://pypi.org/project/textile/
-"
-SRC_URI="
-	https://github.com/textile/python-textile/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests that need network access
-		tests/test_getimagesize.py
-		tests/test_imagesize.py
-		tests/test_textile.py
-	)
-	epytest -o addopts=
-}