diff options
Diffstat (limited to 'app-text/cherrytree')
-rw-r--r-- | app-text/cherrytree/Manifest | 4 | ||||
-rw-r--r-- | app-text/cherrytree/cherrytree-0.99.47-r1.ebuild (renamed from app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild) | 53 |
2 files changed, 25 insertions, 32 deletions
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest index a048488a24c2..2365a6f68d40 100644 --- a/app-text/cherrytree/Manifest +++ b/app-text/cherrytree/Manifest @@ -1,5 +1,5 @@ -DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54 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 +DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742 SHA512 2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023 EBUILD cherrytree-0.99.37.ebuild 1938 BLAKE2B 02616be9599b9c31bc85d96f70469be605eff6ad863c5ce7ce68974541d46845ea8ace862635fa2b99ec2fe1335b11d559eae60125236506a6c6c01fd4854c93 SHA512 df1dc2e036a067cb1d0b5d84dc6ea0e4217f68c292c14a94e89161575c6e51bd9a9ac3f473740468af80865a099eb221c467e98ab7d31b132c226b90656bbffe +EBUILD cherrytree-0.99.47-r1.ebuild 2068 BLAKE2B 0443e9b568c60c824fc92b35de0ea863ee272e97487764a2dff4e099ae57846b304baa25effce149cf86ebed2837a7b07479bdf60c7722ff6157d8e21443d4c0 SHA512 3d80785cd39cba9f2c25ec96803b4c9932a97d2282091498642f861ab817193dc68c606659a4b096bd512114fdd348ae62ab4a1766e938f560384f6eafd21663 MISC metadata.xml 251 BLAKE2B 807473dcec4b0ae2f6941f34664628d5842fd525b66aab0dec500b3e9aeb8b5d350edd18e46805bbd71a90aa02e8de98bbce6f5321a3b3bd5b1582a107424cf5 SHA512 e31af6e228e83d7eaff87e8c09c7939ebf20a062ed71ca7ee7fda148e68ea5886025346d30b5429f8358475d98a5f2a09b9a2b32ca280306ac6230a6ae2ff872 diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild index 8ea8d40b3a31..7f173bed6432 100644 --- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild +++ b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake python-any-r1 xdg-utils +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" @@ -15,10 +15,12 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/giuspen/cherrytree" S="${WORKDIR}/${P}/future" else - COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523 - SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + 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" + # S="${WORKDIR}/${PN}-${COMMIT}/future" fi # GPL-3 — future/src/ct (CherryTree) @@ -28,32 +30,34 @@ LICENSE="GPL-3 LGPL-2.1 MIT" SLOT="0" IUSE="nls test" -RESTRICT="!test? ( test )" +# Has deps that aren't available in ::gentoo repo +RESTRICT="test" -RDEPEND=" +RDEPEND="app-i18n/uchardet app-text/gspell:= - dev-libs/glib:2 >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 - dev-libs/libxml2:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 - dev-db/sqlite:3" + 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? ( - 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}]" } @@ -70,7 +74,7 @@ src_prepare() { CMakeLists.txt || die fi - python_fix_shebang . + # python_fix_shebang . cmake_src_prepare } @@ -79,19 +83,8 @@ src_configure() { -DPYTHON_EXEC="${PYTHON}" -DUSE_NLS=$(usex nls) -DBUILD_TESTING=$(usex test) + -DUSE_SHARED_FMT_SPDLOG=ON ) cmake_src_configure } - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} |