gentoo auto-resync : 18:09:2024 - 12:11:36

4 files changed, 2 insertions, 159 deletions

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index cd3b0c5c5a75..c24eae32ed19 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,7 +1,3 @@
-DIST cherrytree_1.1.2.tar.xz 3460288 BLAKE2B bb09581bee1634d0d9885a6946b0baf5cb10db73d6c264ad7543ebeb4bba94be825a1f43ee4995c14dbd332ae414d44a1db461ca5f50b7d5f76f66b02ec9bed4 SHA512 39d1e765e3a644966a5571580baf7cd33b2ac65a05efebd31bfe7a6b037359f880309806d95e240d78a3f21dd312b7b4decdcd5cc5e50b48935ea3643a9dcf7e
-DIST cherrytree_1.1.3.tar.xz 4714064 BLAKE2B 440d963a6e30a93a218af188c726b25a842738ea471daa8f82cab439f240780685eeed211d270d050a1b4fef896075e68407d456d48c0690961beb9861cdd51e SHA512 3d02d822fd342689420b45b51cbd4c272d88ad97b568b87a3f8b724a32554c6443293657ff1486a998e3f46fd91420dcb4a09ba7330d6e3fe4a6fc34f0783e9e
 DIST cherrytree_1.1.4.tar.xz 4714968 BLAKE2B 98cb6c20f5f957420b01352f3b1ba86768010e64583d94130e878eca747350c5eab11107ef3719c65f3a6126127b31e4d0e5807f90548f9f8819cd16f0f299f1 SHA512 053871386b4fd5e9964082421c63a10f332942fb1b29e5145b18858a1219ad55e108235dda279bdbf9b3516fd17502c55357e196a327232a6d82aaa1e06598d9
-EBUILD cherrytree-1.1.2.ebuild 1556 BLAKE2B be54e1ebdf5d292e1e4c63c8b9f264eab27b173377e56889ed7e03b515c6fc05e490e51902efbd5c8ed3f1f3a729b9afdda916db0653eae37d73b6e60918853d SHA512 d72777d46fc18228dc66c1e9ee95f0207e6fd20d049c133db37b713c6976410166e62758882816dc2f47d7739ba7f11adbadcce169f7eeb3e12db4f49dcc9a50
-EBUILD cherrytree-1.1.3.ebuild 1579 BLAKE2B 4e229f511c68959ad8a847a6ae6f2118f7c07c3d876551a1d40986a2641af5b78689ef2a7a2dfab1036e2977dbc292b6d9e86112c9980493d11f64a3e6dc4aaa SHA512 ce6c0ba9af4e0c67cb12291701b06e1763a809af60f2225005cfd273595df6ef9fc57bac95632be321eeda392b7896945c6113103df1d03113f9ab7ca489b533
-EBUILD cherrytree-1.1.4.ebuild 1579 BLAKE2B 4e229f511c68959ad8a847a6ae6f2118f7c07c3d876551a1d40986a2641af5b78689ef2a7a2dfab1036e2977dbc292b6d9e86112c9980493d11f64a3e6dc4aaa SHA512 ce6c0ba9af4e0c67cb12291701b06e1763a809af60f2225005cfd273595df6ef9fc57bac95632be321eeda392b7896945c6113103df1d03113f9ab7ca489b533
+EBUILD cherrytree-1.1.4-r1.ebuild 1581 BLAKE2B 87dba2516f1bba9d05fb47277909c6b7f1aa2d56aabfe649922d7711b2c4348be84890f34bbd8ab7bb27fbed1c465f31691a4240e2910c0335fbdaf022ad759a SHA512 318aef7e326b62c1b0c345ac7a678f174e8086e6c8083fcd731e16136b83aa95a23a0133a0656d876940978adc7bab3b0bdc5893ac350c48a92b01cbfc98ac6f
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.1.3.ebuild b/app-text/cherrytree/cherrytree-1.1.3.ebuild
deleted file mode 100644
index 92140c4a5713..000000000000
--- a/app-text/cherrytree/cherrytree-1.1.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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
-	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/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/cherrytree/cherrytree-1.1.2.ebuild b/app-text/cherrytree/cherrytree-1.1.4-r1.ebuild
index 136172d6e48a..112fe0853cc1 100644
--- a/app-text/cherrytree/cherrytree-1.1.2.ebuild
+++ b/app-text/cherrytree/cherrytree-1.1.4-r1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="app-i18n/uchardet
 	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]
diff --git a/app-text/cherrytree/cherrytree-1.1.4.ebuild b/app-text/cherrytree/cherrytree-1.1.4.ebuild
deleted file mode 100644
index 92140c4a5713..000000000000
--- a/app-text/cherrytree/cherrytree-1.1.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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
-	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/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
-}