commit: 2ba8e118a773299183d19ed042b53d8ce0c9a8cc Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Oct 11 17:04:29 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Sat Oct 11 17:04:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ba8e118
app-text/jrnl: add 4.2.1 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> app-text/jrnl/Manifest | 1 + app-text/jrnl/files/jrnl-4.2.1-tomllib.patch | 43 ++++++++++++++++++++++++++++ app-text/jrnl/jrnl-4.2.1.ebuild | 38 ++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/app-text/jrnl/Manifest b/app-text/jrnl/Manifest index ffb996766e..ce002753ca 100644 --- a/app-text/jrnl/Manifest +++ b/app-text/jrnl/Manifest @@ -1,2 +1,3 @@ DIST jrnl-4.1.tar.gz 671439 BLAKE2B f5781f1dd042e89779e8437765abedb76ab71cfe48ea14d5f8ff1b8a32d5d1d73a78b125615cf868964f8fab21833d3b923ad07b7893b652938963339c6db2b0 SHA512 c5e17b8dd863cdf251f5622099e07645d65ecb27a4b765df6b6c6f89a482e73b800e4906f14ffffc9567b3f9620f87f98fcc0b5ae355a22368f90a3279718252 +DIST jrnl-4.2.1.tar.gz 677392 BLAKE2B 5552b4162db774c1e9cde931eed97394489d1e4162b469ed77181d0a17bd30ff06f7c1d6a0c0aa206ee76d1a4c2d4c443744dfa8abcced137d5fb48649a925c8 SHA512 dd2a1aebb336f1457415bbb43a8338357db3c70a1f021486af4d8e567c6384f3e8c0c815e7bf713db9d0d61cf230d67528d4d03ce1aec692b7a8c963728c2ce8 DIST jrnl-4.2.tar.gz 674573 BLAKE2B b4f1f288746f26cf9aa5fb28946a72c89ea963d4ca72a4221c92345d1c47060435ffd88c0b4471f20f6045b64ef753d51a11b83144ca13316b86ebc23b8ed32d SHA512 0fb58f23e11754246ea19679fb8e67ac06fd1fb1e0c025bd588da96bf0efa69254a3859a7581f9df831f8f8d9df120c4bfda3f96ab800567c7d7398d5a4676b5 diff --git a/app-text/jrnl/files/jrnl-4.2.1-tomllib.patch b/app-text/jrnl/files/jrnl-4.2.1-tomllib.patch new file mode 100644 index 0000000000..3ac5e9a375 --- /dev/null +++ b/app-text/jrnl/files/jrnl-4.2.1-tomllib.patch @@ -0,0 +1,43 @@ +cherry picked from https://github.com/jrnl-org/jrnl/pull/2028 +From: "Benjamin A. Beasley" <[email protected]> +Date: Fri, 15 Aug 2025 10:33:31 -0400 +Subject: [PATCH] For Python 3.11, use `tomllib` for tests + +Avoid a test dependency on the PyPI `toml` package. +--- a/tests/lib/fixtures.py ++++ b/tests/lib/fixtures.py +@@ -2,6 +2,7 @@ + # License: https://www.gnu.org/licenses/gpl-3.0.html + + import os ++import sys + import tempfile + from collections import defaultdict + from collections.abc import Iterable +@@ -9,7 +10,6 @@ + from unittest.mock import Mock + from unittest.mock import patch + +-import toml + from keyring import backend + from keyring import errors + from pytest import fixture +@@ -203,8 +203,16 @@ def working_dir(request): + + @fixture + def toml_version(working_dir): +- pyproject = os.path.join(working_dir, "..", "pyproject.toml") +- pyproject_contents = toml.load(pyproject) ++ pyproject_path = os.path.join(working_dir, "..", "pyproject.toml") ++ if sys.version_info >= (3, 11): ++ import tomllib ++ ++ with open(pyproject_path, "rb") as pyproject: ++ pyproject_contents = tomllib.load(pyproject) ++ else: ++ import toml ++ ++ pyproject_contents = toml.load(pyproject_path) + return pyproject_contents["tool"]["poetry"]["version"] + + diff --git a/app-text/jrnl/jrnl-4.2.1.ebuild b/app-text/jrnl/jrnl-4.2.1.ebuild new file mode 100644 index 0000000000..4cd905857e --- /dev/null +++ b/app-text/jrnl/jrnl-4.2.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) + +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Collect your thoughts and notes without leaving the command line" +HOMEPAGE="https://jrnl.sh"; +SRC_URI="https://github.com/jrnl-org/jrnl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +PATCHES=( + "${FILESDIR}"/${P}-tomllib.patch +) + +DEPEND=" + dev-python/rich[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/parsedatetime[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + dev-python/tzlocal[${PYTHON_USEDEP}] +" + +RDEPEND="${DEPEND}" +EPYTEST_PLUGINS=( pytest-{bdd,xdist} ) +distutils_enable_tests pytest
