gentoo auto-resync : 22:12:2022 - 01:55:45

5 files changed, 18 insertions, 219 deletions

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 2adcd3d83c2f..6eca90a3fa4b 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,9 +1,5 @@
-DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
-DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742 SHA512 2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
-DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865 SHA512 eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2 SHA512 98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6
-EBUILD cherrytree-0.99.37.ebuild 1938 BLAKE2B 02616be9599b9c31bc85d96f70469be605eff6ad863c5ce7ce68974541d46845ea8ace862635fa2b99ec2fe1335b11d559eae60125236506a6c6c01fd4854c93 SHA512 df1dc2e036a067cb1d0b5d84dc6ea0e4217f68c292c14a94e89161575c6e51bd9a9ac3f473740468af80865a099eb221c467e98ab7d31b132c226b90656bbffe
-EBUILD cherrytree-0.99.47-r1.ebuild 2068 BLAKE2B 0443e9b568c60c824fc92b35de0ea863ee272e97487764a2dff4e099ae57846b304baa25effce149cf86ebed2837a7b07479bdf60c7722ff6157d8e21443d4c0 SHA512 3d80785cd39cba9f2c25ec96803b4c9932a97d2282091498642f861ab817193dc68c606659a4b096bd512114fdd348ae62ab4a1766e938f560384f6eafd21663
-EBUILD cherrytree-0.99.48.ebuild 2086 BLAKE2B bfdf9439d30c2e4ca75eba623d87b8967ae48f6a75e7111a3ee607ebd77cfe1558e6ef1aaf38511861cb06a63d88a3ed570724c8f692420a467665201643c1ae SHA512 c5ad0157d2d08e17c1809ec05546807f043dcea30e8584d73c631ec7bbb88915f2319cbdb42a19b3bbc720dbf244c28832e9fe1ef707c565f0e028a44227758a
-EBUILD cherrytree-0.99.51.ebuild 1821 BLAKE2B e1f6aef8e57f77d96e2bef17570fd3cb7ac5b8dc619298fe3f7c503cf1a6cfbed754e8a8284f17da2068a68ea34f1a39a149d8f520df9ef27bf1c59d7e8310d2 SHA512 ae1748a54db0af941e712ba18a52a0bd3dc159671717bcc1ae5409a1943ef446806bef89ee217e0e893b2b0f953eeb29eaa735f60c670788801b0d3a5ddc1edf
+DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0 SHA512 e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
+EBUILD cherrytree-0.99.51-r1.ebuild 1823 BLAKE2B ca75c88b23274741a42e71170748796f07e3e500158ef08f7e608d853f5e0e0be3eed48faca4d3f0909479d40dd0c4de833519087f2dcef3ab71e6e9c1db091f SHA512 cf7e0feb3efb81c96eec79f898c4a12f55fb65799fc30feff47555a255300f412912a2b5d00d28b4bed1b2fff89eaca606757512f9b59b75b71a8487df407a4a
+EBUILD cherrytree-0.99.53.ebuild 1543 BLAKE2B 0b35f6b7aeda262415bf44962477932ee95d14a754989908cf8c259ac430a1358bc358170667c3294e37a7997104f35c2f70aad25257057a60c9a218412bc80e SHA512 43c0017a661f7598bf2b8ad79cdeea0355a81871a009c686b8f9d94aad3240ec2ae2bbacab7bc6060a0cba7fcb818defa8a4370d6a80c369db6144dfad3cfb13
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild b/app-text/cherrytree/cherrytree-0.99.37.ebuild
deleted file mode 100644
index 2534d1a2e1ca..000000000000
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
-	S="${WORKDIR}/${P}/future"
-else
-	SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-# 	S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# 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/glib:2
-	dev-libs/libfmt
-	dev-libs/libxml2:2
-	dev-libs/spdlog
-	net-misc/curl
-	"
-DEPEND="${RDEPEND}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-	test? ( dev-util/cpputest )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# disable compress man pages
-	sed -i -e \
-		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-		CMakeLists.txt || die
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -i \
-			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-			CMakeLists.txt || die
-	fi
-
-# 	python_fix_shebang .
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXEC="${PYTHON}"
-		-DUSE_NLS=$(usex nls)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
deleted file mode 100644
index 7f173bed6432..000000000000
--- a/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
-	S="${WORKDIR}/${P}/future"
-else
-	SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
-	#SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${P/-/_}
-
-	KEYWORDS="~amd64 ~x86"
-	# S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# 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/glib:2
-	dev-libs/libfmt:=
-	dev-libs/libxml2:2
-	dev-libs/spdlog
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-	)
-	test? ( dev-util/cpputest )"
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# disable compress man pages
-	sed -i -e \
-		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-		CMakeLists.txt || die
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -i \
-			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-			CMakeLists.txt || die
-	fi
-
-	# 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-0.99.51.ebuild b/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
index b9a3c9d99fa5..080371b262c0 100644
--- a/app-text/cherrytree/cherrytree-0.99.51.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-i18n/uchardet
 	dev-libs/glib:2
 	dev-libs/libfmt:=
 	dev-libs/fribidi
-	dev-libs/spdlog
+	dev-libs/spdlog:=
 	net-misc/curl
 	x11-libs/cairo
 	x11-libs/gtk+:3
diff --git a/app-text/cherrytree/cherrytree-0.99.48.ebuild b/app-text/cherrytree/cherrytree-0.99.53.ebuild
index 7787d4048a92..0cb5ef709c01 100644
--- a/app-text/cherrytree/cherrytree-0.99.48.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.53.ebuild
@@ -3,25 +3,17 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1 xdg
 
 DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
-	S="${WORKDIR}/${P}/future"
-else
-	SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
-	#SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${P/-/_}
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
 
-	KEYWORDS="~amd64 ~x86"
-	# S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
+KEYWORDS="~amd64 ~x86"
 
 # GPL-3 — future/src/ct (CherryTree)
 # LGPL-2.1 — future/src/7za (7zip)
@@ -41,40 +33,31 @@ RDEPEND="app-i18n/uchardet
 	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/fribidi
-	dev-libs/spdlog
+	dev-libs/spdlog:=
+	gui-libs/vte:2.91-gtk4
 	net-misc/curl
 	x11-libs/cairo
 	x11-libs/gtk+:3
 	x11-libs/pango"
-DEPEND="${RDEPEND}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"
+
+BDEPEND="
 	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-	)
+	nls? ( sys-devel/gettext )
 	test? ( dev-util/cpputest )"
 
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
 src_prepare() {
 	# disable compress man pages
 	sed -i -e \
 		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
 		CMakeLists.txt || die
 
-	if [[ ${PV} != *9999 ]]; then
-		sed -i \
-			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-			CMakeLists.txt || die
-	fi
-
 	# python_fix_shebang .
 	cmake_src_prepare
 }