From ffee87acb9da64faa51afba9aed8bcaa1dbdf9bb Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Sun, 12 Oct 2025 02:04:29 +0900
Subject: [PATCH] app-text/jrnl: drop 4.1, 4.2

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 app-text/jrnl/Manifest               |  2 --
 app-text/jrnl/files/test_fixes.patch | 11 -------
 app-text/jrnl/files/tomli.patch      | 20 -------------
 app-text/jrnl/jrnl-4.1.ebuild        | 45 ----------------------------
 app-text/jrnl/jrnl-4.2.ebuild        | 44 ---------------------------
 5 files changed, 122 deletions(-)
 delete mode 100644 app-text/jrnl/files/test_fixes.patch
 delete mode 100644 app-text/jrnl/files/tomli.patch
 delete mode 100644 app-text/jrnl/jrnl-4.1.ebuild
 delete mode 100644 app-text/jrnl/jrnl-4.2.ebuild

diff --git a/app-text/jrnl/Manifest b/app-text/jrnl/Manifest
index ce002753ca..4b6b4d8e73 100644
--- a/app-text/jrnl/Manifest
+++ b/app-text/jrnl/Manifest
@@ -1,3 +1 @@
-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/test_fixes.patch b/app-text/jrnl/files/test_fixes.patch
deleted file mode 100644
index 6cafd907f7..0000000000
--- a/app-text/jrnl/files/test_fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/lib/when_steps.py
-+++ b/tests/lib/when_steps.py
-@@ -7,7 +7,7 @@
- from pytest_bdd import when
- from pytest_bdd.parsers import parse
- from pytest_bdd.parsers import re
--from pytest_bdd.steps import inject_fixture
-+from pytest_bdd.compat import inject_fixture
- 
- from jrnl.main import run
-
diff --git a/app-text/jrnl/files/tomli.patch b/app-text/jrnl/files/tomli.patch
deleted file mode 100644
index c522f43840..0000000000
--- a/app-text/jrnl/files/tomli.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patching out toml in favor for tomli as the latter is already included in the Gentoo repo
-
---- a/tests/lib/fixtures.py
-+++ b/tests/lib/fixtures.py
-@@ -9,7 +9,7 @@
- from unittest.mock import Mock
- from unittest.mock import patch
- 
--import toml
-+import tomli
- from keyring import backend
- from keyring import errors
- from pytest import fixture
-@@ -204,7 +204,7 @@
- @fixture
- def toml_version(working_dir):
-     pyproject = os.path.join(working_dir, "..", "pyproject.toml")
--    pyproject_contents = toml.load(pyproject)
-+    pyproject_contents = tomli.load(pyproject)
-     return pyproject_contents["tool"]["poetry"]["version"]
diff --git a/app-text/jrnl/jrnl-4.1.ebuild b/app-text/jrnl/jrnl-4.1.ebuild
deleted file mode 100644
index c2a79b9cb5..0000000000
--- a/app-text/jrnl/jrnl-4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-
-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"
-IUSE="test"
-
-PATCHES="
-	${FILESDIR}/tomli.patch
-	${FILESDIR}/test_fixes.patch
-"
-
-DEPEND="
-	dev-python/rich
-	dev-python/colorama
-	dev-python/cryptography
-	dev-python/keyring
-	dev-python/parsedatetime
-	dev-python/python-dateutil
-	dev-python/pyxdg
-	dev-python/ruamel-yaml
-	dev-python/tzlocal
-	test? (
-		<dev-python/pytest-8.1
-		dev-python/pytest-bdd
-		dev-python/pytest-xdist
-		dev-python/tomli
-		)
-"
-
-RDEPEND="${DEPEND}"
-distutils_enable_tests pytest
diff --git a/app-text/jrnl/jrnl-4.2.ebuild b/app-text/jrnl/jrnl-4.2.ebuild
deleted file mode 100644
index 085e97d1ed..0000000000
--- a/app-text/jrnl/jrnl-4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-
-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"
-IUSE="test"
-
-PATCHES="
-	${FILESDIR}/tomli.patch
-"
-
-DEPEND="
-	dev-python/rich
-	dev-python/colorama
-	dev-python/cryptography
-	dev-python/keyring
-	dev-python/parsedatetime
-	dev-python/python-dateutil
-	dev-python/pyxdg
-	dev-python/ruamel-yaml
-	dev-python/tzlocal
-	test? (
-		<=dev-python/pytest-8.1
-		>dev-python/pytest-bdd-6.0
-		>dev-python/pytest-xdist-2.5.0
-		dev-python/tomli
-		)
-"
-
-RDEPEND="${DEPEND}"
-distutils_enable_tests pytest