gentoo auto-resync : 29:06:2024 - 08:00:25

4 files changed, 12 insertions, 162 deletions

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index b858fd436a98..7adf3183b115 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,9 +1,5 @@
-DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c SHA512 aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
-DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5 SHA512 07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1
-DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b SHA512 917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc
 DIST cherrytree_1.0.4.tar.xz 3436940 BLAKE2B 67fec738e05f1823b9206d9a58f85be94df9c54d94e15a7408ade4801065523707e973bb0643d4b1c0ddb6c94a2a9eb00530b5c8cbd291696daa98f2d18f6767 SHA512 615c551523ef3cc7edaeeeeb632c3e0d4fa4ca1feca719a15e5b3e47f38113c1033ed13ef4a2821b14a3b4ef3a4079bce7f8f2c5643d11a4ecd6cbdc49b408e5
-EBUILD cherrytree-1.0.0.ebuild 1548 BLAKE2B a20f71c4c0a5445b93d6f1ce94a1be148b650628146ea6aaba2d5badd049732435de2c24bcfd3e84b88203eebdc37e7cb0f594cec85d43ca5cd9f06a98614611 SHA512 4099fb15a0db124e3672854fe611a23003d30384831f2480f892276cc28567c39736f79e6ed5040d7a91bbfb93dfa00bda3348263a9de098c5b5885016df819b
-EBUILD cherrytree-1.0.1.ebuild 1543 BLAKE2B 4a919743a3b5b532b0b451b1de255038763081287d19240c3891f331a33a28710b7d4f2cb950bb32c95cf4ce1a6d7a9801e7bbfc0b7d672ac1a40d7c4d3ea1be SHA512 db81821a1131365df2234dff2cedb0c22e194bd9f0130830bb0d2e28b46fe6d1b5645339b3be124190326d29c572ffa152290c7b1a226f140d37788577b7293f
-EBUILD cherrytree-1.0.2.ebuild 1537 BLAKE2B 664a7ead4707688c07cf0c6ce1bca699ae91306d7ccf45f351abff8cf7e25478a963fd245bac4b18781d378985655616ba90631fee9e789cfeb7a51f94b45cc2 SHA512 04b02708a37cb5750979644d28c9a47d0761b5508fb0dde97e4a5f0ff48a9bb8df29d27f6716b13833400c6c7c98420c1a138b032b3e1274d236c4afc6f52490
+DIST cherrytree_1.1.2.tar.xz 3460288 BLAKE2B bb09581bee1634d0d9885a6946b0baf5cb10db73d6c264ad7543ebeb4bba94be825a1f43ee4995c14dbd332ae414d44a1db461ca5f50b7d5f76f66b02ec9bed4 SHA512 39d1e765e3a644966a5571580baf7cd33b2ac65a05efebd31bfe7a6b037359f880309806d95e240d78a3f21dd312b7b4decdcd5cc5e50b48935ea3643a9dcf7e
 EBUILD cherrytree-1.0.4.ebuild 1537 BLAKE2B 664a7ead4707688c07cf0c6ce1bca699ae91306d7ccf45f351abff8cf7e25478a963fd245bac4b18781d378985655616ba90631fee9e789cfeb7a51f94b45cc2 SHA512 04b02708a37cb5750979644d28c9a47d0761b5508fb0dde97e4a5f0ff48a9bb8df29d27f6716b13833400c6c7c98420c1a138b032b3e1274d236c4afc6f52490
+EBUILD cherrytree-1.1.2.ebuild 1556 BLAKE2B be54e1ebdf5d292e1e4c63c8b9f264eab27b173377e56889ed7e03b515c6fc05e490e51902efbd5c8ed3f1f3a729b9afdda916db0653eae37d73b6e60918853d SHA512 d72777d46fc18228dc66c1e9ee95f0207e6fd20d049c133db37b713c6976410166e62758882816dc2f47d7739ba7f11adbadcce169f7eeb3e12db4f49dcc9a50
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.0.0.ebuild b/app-text/cherrytree/cherrytree-1.0.0.ebuild
deleted file mode 100644
index a757d8026dc5..000000000000
--- a/app-text/cherrytree/cherrytree-1.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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/cherrytree/cherrytree-1.0.1.ebuild b/app-text/cherrytree/cherrytree-1.0.1.ebuild
deleted file mode 100644
index 837ea599e0fc..000000000000
--- a/app-text/cherrytree/cherrytree-1.0.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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/cherrytree/cherrytree-1.0.2.ebuild b/app-text/cherrytree/cherrytree-1.1.2.ebuild
index dd062ad78a2f..136172d6e48a 100644
--- a/app-text/cherrytree/cherrytree-1.0.2.ebuild
+++ b/app-text/cherrytree/cherrytree-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake python-any-r1 xdg
 
@@ -13,13 +13,15 @@ HOMEPAGE="https://www.giuspen.com/cherrytree/"
 SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$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"
+
+KEYWORDS="~amd64 ~x86"
+
 IUSE="nls test"
 
 # Has deps that aren't available in ::gentoo repo
@@ -36,13 +38,13 @@ RDEPEND="app-i18n/uchardet
 	dev-libs/fribidi
 	dev-libs/glib:2
 	dev-libs/libfmt:=
+	dev-libs/libsigc++:2
 	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"
+	x11-libs/cairo[X]
+	x11-libs/gtk+:3[X]
+	x11-libs/pango[X]"
 
 DEPEND="${PYTHON_DEPS}
 	${RDEPEND}"