commit: 93f455bde0cbf4463fe389b2331d3d6eea50c0bb
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 01:16:19 2026 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Feb 16 01:16:55 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f455bd
app-arch/cfv: drop 3.0.0
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
app-arch/cfv/Manifest | 1 -
app-arch/cfv/cfv-3.0.0.ebuild | 55 ----------------------
.../files/cfv-3.0.0-fix-removed-assertequal.patch | 39 ---------------
app-arch/cfv/files/cfv-3.0.0-fix-removed-imp.patch | 39 ---------------
4 files changed, 134 deletions(-)
diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest
index 33429a7cada4..4f1ef627fc69 100644
--- a/app-arch/cfv/Manifest
+++ b/app-arch/cfv/Manifest
@@ -1,3 +1,2 @@
-DIST cfv-3.0.0.gh.tar.gz 91600 BLAKE2B
5a0d53a2b75973967ef976ce55d5262f71af97a8d7c64e8ea94ed9d66fd12778e10321e82bdbc4b8037df3f1a9c9c817694a7cd5e60615fc903127df9057b04f
SHA512
9a44bf20f0a4f48a93631353d0b0ab79ea15d19f1da5492296dd4bd4e6208d3f0d71e957165e31d07b5faa7fc75122f0ae5ddbd8d54b9c6b633c43695b362640
DIST cfv-3.1.0.gh.tar.gz 93155 BLAKE2B
45dd2cfa121052a96de4b8d8b9d1b25e4639c3956c8e0878981381dce89560abd3d1c56a7c1d7c3c86f97e767ea43f1d4df08a4be725d392a2a25bb2576f4ee6
SHA512
71c02cc0e5cb1dcf32aa180075744ccde27cf08765a6cf50b24bbdf68d61ba46d9e2e98cc9d414bddf1538ead1426f8eff56cfa788ad283981922c96519b10c4
DIST cfv-3.2.0.gh.tar.gz 93931 BLAKE2B
902f2817d8d822f6b59db54120b414472b849e7fa39e8b807f342ace651165f657c3f05667105842d955eb6b63a42a7c1d518a4d5217e53a0156d65e6a72834f
SHA512
30b2d310c95335a25cc174ec2a2efd102c8cc53d93a083a64d6eca26bf17214b1622fd2565514414e2edfbfe12de9efe5ca423669ce06c2f4f69ca75d95cd32c
diff --git a/app-arch/cfv/cfv-3.0.0.ebuild b/app-arch/cfv/cfv-3.0.0.ebuild
deleted file mode 100644
index 239956198afc..000000000000
--- a/app-arch/cfv/cfv-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# Tests fail with pypy3 as of PyPy 7.3.9 / Python 3.9.12
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Command-line File Verify - versatile file checksum creator and
verifier"
-HOMEPAGE="https://github.com/cfv-project/cfv/";
-# Tests aren't included in PyPI tarballs
-SRC_URI="https://github.com/cfv-project/${PN}/archive/v${PV}.tar.gz ->
${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- app-arch/cksfv
- )
-"
-
-PATCHES=(
- # Backported from
https://github.com/cfv-project/cfv/commit/5259bcbe3434c6974f7a65cc435dd0b4cfc3f864
- "${FILESDIR}/${P}-fix-removed-assertequal.patch"
- # See https://github.com/cfv-project/cfv/pull/53
- "${FILESDIR}/${P}-fix-removed-imp.patch"
-)
-
-python_prepare_all() {
- # Remove upstream's attempt to install the man page
- sed -i '/\sdata_files=/d' setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # In order to run integration tests in addition to unit tests, we can't
- # just rely on pytest here, we need to use upstream's runner.
- "${EPYTHON}" "test/test.py" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman cfv.1
-}
-
-pkg_postinst() {
- optfeature "the dimension column of JPEG Sheriff crc files"
dev-python/pillow
-}
diff --git a/app-arch/cfv/files/cfv-3.0.0-fix-removed-assertequal.patch
b/app-arch/cfv/files/cfv-3.0.0-fix-removed-assertequal.patch
deleted file mode 100644
index aa7820d03a92..000000000000
--- a/app-arch/cfv/files/cfv-3.0.0-fix-removed-assertequal.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 5259bcbe3434c6974f7a65cc435dd0b4cfc3f864
-Author: Louis Sautier <[email protected]>
-Date: Tue Nov 1 15:48:21 2022 +0100
-
- tests: use assertEqual instead of assertEquals
-
- The latter is deprecated and causes warnings when running tests.
-
---- a/test/test_caching.py
-+++ b/test/test_caching.py
-@@ -136,18 +136,18 @@ class RelPathKeyTest(RelTestCase):
- self.mkfile('aAaA/Aaa2', '2')
- self.mkfile('aAaA/AAa2', '3')
-
-- self.assertEquals(a1, cache.nocase_findfile(self.mkpath('aaAA/aaa1')))
-+ self.assertEqual(a1, cache.nocase_findfile(self.mkpath('aaAA/aaa1')))
- with self.assertRaises(IOError) as cm:
- cache.nocase_findfile(self.mkpath('aaAb/aaa1'))
-- self.assertEquals(errno.ENOENT, cm.exception.errno)
-+ self.assertEqual(errno.ENOENT, cm.exception.errno)
-
- with self.assertRaises(IOError) as cm:
- cache.nocase_findfile(self.mkpath('aaAA/aab1'))
-- self.assertEquals(errno.ENOENT, cm.exception.errno)
-+ self.assertEqual(errno.ENOENT, cm.exception.errno)
-
- with self.assertRaises(IOError) as cm:
- cache.nocase_findfile(self.mkpath('aaAA/aaa2'))
-- self.assertEquals(errno.EEXIST, cm.exception.errno)
-+ self.assertEqual(errno.EEXIST, cm.exception.errno)
-
- def test_nocase_findfile_parent(self):
- cache = FileInfoCache()
-@@ -159,4 +159,4 @@ class RelPathKeyTest(RelTestCase):
- # one.
- with self.assertRaises(IOError) as cm:
- cache.nocase_findfile(self.mkpath('aaAA/aaa2'))
-- self.assertEquals(errno.EEXIST, cm.exception.errno)
-+ self.assertEqual(errno.EEXIST, cm.exception.errno)
diff --git a/app-arch/cfv/files/cfv-3.0.0-fix-removed-imp.patch
b/app-arch/cfv/files/cfv-3.0.0-fix-removed-imp.patch
deleted file mode 100644
index d4fa6e9aeb29..000000000000
--- a/app-arch/cfv/files/cfv-3.0.0-fix-removed-imp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ecf720058f63930d53075584a59cf42e035347eb
-Author: Louis Sautier <[email protected]>
-Date: Sun May 12 15:44:26 2024 +0200
-
- Fix tests for Python 3.12: remove "imp", fixes #21, #44
-
- The "imp" module was removed in Python 3.12.
- The replacement functions were added in Python 3.5, see
-
https://docs.python.org/3/library/importlib.html#importlib.util.spec_from_file_location
-
https://docs.python.org/3/library/importlib.html#importlib.util.module_from_spec
-
---- a/test/cfvtest.py
-+++ b/test/cfvtest.py
-@@ -23,8 +23,8 @@ from builtins import map
- from builtins import object
-
- import fnmatch
--import imp
- import importlib
-+import importlib.util
- import os
- import shlex
- import sys
-@@ -201,8 +201,14 @@ def setcfv(fn=None, internal=None):
- cfv_compiled = compile(_cfv_code, cfvfn, 'exec')
-
- with open(cfvfn, 'rt') as f:
-+ # For spec_from_file_location to accept a file without the .py suffix
("cfv")
-+ importlib.machinery.SOURCE_SUFFIXES.append('')
-+ spec = importlib.util.spec_from_file_location('cfvwrapper', cfvfn)
-+ module = importlib.util.module_from_spec(spec)
- # This is so that the sys.path modification of the wrapper (if it has
one) will be executed..
-- imp.load_source('cfvwrapper', cfvfn, f)
-+ spec.loader.exec_module(module)
-+ # Restore SOURCE_SUFFIXES to its default value
-+ importlib.machinery.SOURCE_SUFFIXES.pop()
-
- get_version_flags()
-
