gentoo resync : 31.05.2021

3 files changed, 94 insertions, 2 deletions

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index cec05bef592d..43e4b6553958 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,5 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
-EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
+DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
+EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2089 BLAKE2B 038125bfaec0ced1b0a091189a1feefeaaa1bb30210b1c6c41b183f986d06a28ab2f33d8bb728513467cd1b91bc625bcff10936c034ad49213e50a90626fce1c SHA512 7964528b0fbfbd1636f6e1e3df3652cb2a71b39980479c17f30753b7dce2c89d49be2942632b07964fad164e9835a34238f010d42ca163569cf6949af16940b2
+EBUILD cherrytree-0.99.37.ebuild 1938 BLAKE2B 02616be9599b9c31bc85d96f70469be605eff6ad863c5ce7ce68974541d46845ea8ace862635fa2b99ec2fe1335b11d559eae60125236506a6c6c01fd4854c93 SHA512 df1dc2e036a067cb1d0b5d84dc6ea0e4217f68c292c14a94e89161575c6e51bd9a9ac3f473740468af80865a099eb221c467e98ab7d31b132c226b90656bbffe
 MISC metadata.xml 250 BLAKE2B 9f586a12b964da0dbeb5a079a39f8145e2e33e41c4edcd5c937d86a1746b0d291ebc8c6bff25def4d8f433577e2eb6f68892028e06c68044274df0ca782ed3a1 SHA512 d64c36dfd03da64937992558c892459cc634ba06c2d988087299b8c02c497be99875a16038246728a6320ecfaf385d03ca30d6f4fc823f3379bb6f0f48875e06
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
index 55a62632c259..8ea8d40b3a31 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1 xdg-utils
 
diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild b/app-text/cherrytree/cherrytree-0.99.37.ebuild
new file mode 100644
index 000000000000..2534d1a2e1ca
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -0,0 +1,90 @@
+# 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
+}