[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: efaea5f1c5543f982a5dbb7ed2debbe6f487fbba Author: Louis Sautier gentoo org> AuthorDate: Sat May 25 00:37:28 2024 + Commit: Louis Sautier gentoo org> CommitDate: Sat May 25 00:38:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efaea5f1 app-arch/cfv: add 3.1.0, enable py3.13 Signed-off-by: Louis Sautier gentoo.org> app-arch/cfv/Manifest | 1 + app-arch/cfv/cfv-3.1.0.ebuild | 48 +++ 2 files changed, 49 insertions(+) diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest index db038dfc39a1..cdecf640cbc1 100644 --- a/app-arch/cfv/Manifest +++ b/app-arch/cfv/Manifest @@ -1 +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 diff --git a/app-arch/cfv/cfv-3.1.0.ebuild b/app-arch/cfv/cfv-3.1.0.ebuild new file mode 100644 index ..90b1af6f41c1 --- /dev/null +++ b/app-arch/cfv/cfv-3.1.0.ebuild @@ -0,0 +1,48 @@ +# 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.16 / Python 3.10.14 +PYTHON_COMPAT=( python3_{10..13} ) + +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 + ) +" + +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 +}
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/files/, app-arch/cfv/
commit: 79716aeed4c9440379bb8236a9e857270ae94290 Author: Louis Sautier gentoo org> AuthorDate: Sun May 12 14:03:49 2024 + Commit: Louis Sautier gentoo org> CommitDate: Sun May 12 14:12:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79716aee app-arch/cfv: enable py3.12 New patches were required but they only affect the test suite, not the runtime files. Closes: https://bugs.gentoo.org/929279 Signed-off-by: Louis Sautier gentoo.org> app-arch/cfv/cfv-3.0.0.ebuild | 11 -- .../files/cfv-3.0.0-fix-removed-assertequal.patch | 39 ++ app-arch/cfv/files/cfv-3.0.0-fix-removed-imp.patch | 39 ++ 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/app-arch/cfv/cfv-3.0.0.ebuild b/app-arch/cfv/cfv-3.0.0.ebuild index 02f12d0e670c..239956198afc 100644 --- a/app-arch/cfv/cfv-3.0.0.ebuild +++ b/app-arch/cfv/cfv-3.0.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 optfeature @@ -26,6 +26,13 @@ BDEPEND=" ) " +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 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 new file mode 100644 index ..aa7820d03a92 --- /dev/null +++ b/app-arch/cfv/files/cfv-3.0.0-fix-removed-assertequal.patch @@ -0,0 +1,39 @@ +commit 5259bcbe3434c6974f7a65cc435dd0b4cfc3f864 +Author: Louis Sautier +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 new file mode 100644 index ..d4fa6e9aeb29 --- /dev/null +++ b/app-arch/cfv/files/cfv-3.0.0-fix-removed-imp.patch @@ -0,0 +1,39 @@ +commit ecf720058f63930d53075584a59cf42e035347eb +Author: Louis Sautier +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") ++
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: 640f8e674a25c16d37f95ba1b647628615847f5f Author: Louis Sautier gentoo org> AuthorDate: Sat Nov 5 03:26:00 2022 + Commit: Louis Sautier gentoo org> CommitDate: Sat Nov 5 04:30:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640f8e67 app-arch/cfv: resurrect package, version 3.0.0 Signed-off-by: Louis Sautier gentoo.org> app-arch/cfv/Manifest | 1 + app-arch/cfv/cfv-3.0.0.ebuild | 48 +++ app-arch/cfv/metadata.xml | 20 ++ 3 files changed, 69 insertions(+) diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest new file mode 100644 index ..db038dfc39a1 --- /dev/null +++ b/app-arch/cfv/Manifest @@ -0,0 +1 @@ +DIST cfv-3.0.0.gh.tar.gz 91600 BLAKE2B 5a0d53a2b75973967ef976ce55d5262f71af97a8d7c64e8ea94ed9d66fd12778e10321e82bdbc4b8037df3f1a9c9c817694a7cd5e60615fc903127df9057b04f SHA512 9a44bf20f0a4f48a93631353d0b0ab79ea15d19f1da5492296dd4bd4e6208d3f0d71e957165e31d07b5faa7fc75122f0ae5ddbd8d54b9c6b633c43695b362640 diff --git a/app-arch/cfv/cfv-3.0.0.ebuild b/app-arch/cfv/cfv-3.0.0.ebuild new file mode 100644 index ..5b940295d074 --- /dev/null +++ b/app-arch/cfv/cfv-3.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 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_{8..11} ) + +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 + ) +" + +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/metadata.xml b/app-arch/cfv/metadata.xml new file mode 100644 index ..373591c9c7a7 --- /dev/null +++ b/app-arch/cfv/metadata.xml @@ -0,0 +1,20 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + sb...@gentoo.org + Louis Sautier + + + cfv is a utility to test and create a wide range of checksum + verification files. It currently supports testing and creating sfv, + sfvmd5, csv, csv2, csv4, md5, bsdmd5, sha1, sha224, sha256, sha384, + sha512, torrent and crc files. Test-only support is available for par, + par2. + + + cfv + cfv-project/cfv + https://github.com/cfv-project/cfv/issues + +
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: 4dbd877095a5fb958b13a6df3f280f60033de059 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 08:51:51 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri Feb 7 09:08:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbd8770 app-arch/cfv: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> app-arch/cfv/cfv-1.18.3-r1.ebuild | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild index 05ba386240c..3fdafa44a20 100644 --- a/app-arch/cfv/cfv-1.18.3-r1.ebuild +++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,8 +18,10 @@ KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac DEPEND="" RDEPEND="${PYTHON_DEPS} - dev-python/python-fchksum[${PYTHON_USEDEP}] - bittorrent? ( net-p2p/bittornado[${PYTHON_USEDEP}] )" + $(python_gen_cond_dep ' + dev-python/python-fchksum[${PYTHON_MULTI_USEDEP}] + bittorrent? ( net-p2p/bittornado[${PYTHON_MULTI_USEDEP}] ) + ')" REQUIRED_USE=${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: f5b05007b443a5e31421c70e444f0f1b0b7e8a0e Author: Mikle Kolyada gentoo org> AuthorDate: Wed May 2 21:52:06 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed May 2 21:52:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b05007 app-arch/cfv: [QA] Drop dead dependency Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-arch/cfv/cfv-1.18.3-r1.ebuild | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild index a83d0cfdaf2..f15261510f0 100644 --- a/app-arch/cfv/cfv-1.18.3-r1.ebuild +++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,12 +19,7 @@ KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-maco DEPEND="" RDEPEND="${PYTHON_DEPS} dev-python/python-fchksum[${PYTHON_USEDEP}] - bittorrent? ( - || ( - net-p2p/bittorrent[${PYTHON_USEDEP}] - net-p2p/bittornado[${PYTHON_USEDEP}] - ) - )" + bittorrent? ( net-p2p/bittornado[${PYTHON_USEDEP}] )" REQUIRED_USE=${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: 452501f4759db5dcda4928c185ac9d8e98aafebe Author: Pacho Ramos gentoo org> AuthorDate: Wed Nov 9 13:27:45 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Nov 9 14:03:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=452501f4 app-arch/cfv: Drop old Package-Manager: portage-2.3.2 app-arch/cfv/Manifest | 1 - app-arch/cfv/cfv-1.18.2.ebuild | 32 2 files changed, 33 deletions(-) diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest index e55a885..13ffe35 100644 --- a/app-arch/cfv/Manifest +++ b/app-arch/cfv/Manifest @@ -1,2 +1 @@ -DIST cfv-1.18.2.tar.gz 67970 SHA256 73fc368e3717cdc7062c3c909778d03d15128bc9a18a76c7e4f7a75e8a99f391 SHA512 8999349485a404b71aec8abe21b554a867c6a94ed77dda2441f418c5798a243039685d72ccfb5e020885c8bab2a571da48d98a3171339bf14becfacca3ae5508 WHIRLPOOL b6d2d19bb69975b3cecfd884be034983318e118ee609dea0ebd9491a42c945a53e0e613daafd99fdc76542364013749989880ebe6969e8acdd3a48e3a942bb18 DIST cfv-1.18.3.tar.gz 68030 SHA256 ff28a8aa679932b83eb3b248ed2557c6da5860d5f8456ffe24686253a354cff6 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71 WHIRLPOOL 895211c61ff57068f28945fd374d3b9e2f00dc2739e1b884bbdb7cfa0a799d50ee36ff6791bb6457e2eba5f613a8b57b77bd1b3bacc7c4a329f0326d58375b13 diff --git a/app-arch/cfv/cfv-1.18.2.ebuild b/app-arch/cfv/cfv-1.18.2.ebuild deleted file mode 100644 index 0b754c2.. --- a/app-arch/cfv/cfv-1.18.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit python - -DESCRIPTION="Utility to test and create .sfv, .csv, .crc and md5sum files" -HOMEPAGE="http://cfv.sourceforge.net/; -SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="amd64 hppa ppc sparc x86 ~x86-fbsd" - -DEPEND="" -RDEPEND="dev-python/python-fchksum" - -src_compile() { - true -} - -src_install() { - dobin cfv || die "dobin failed" - doman cfv.1 || die "doman failed" - dodoc README Changelog || die "dodoc failed" - python_convert_shebangs -r 2 "${ED}" -}
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: 8c9037aabb827ecfff84c5c75b943624fe5d048b Author: Pacho Ramos gentoo org> AuthorDate: Tue Nov 1 10:18:14 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Nov 1 10:18:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9037aa app-arch/cfv: x86 stable, bug #591464 Package-Manager: portage-2.3.2 app-arch/cfv/cfv-1.18.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild index 8d2beb3..3d3e24f 100644 --- a/app-arch/cfv/cfv-1.18.3-r1.ebuild +++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" IUSE="bittorrent" -KEYWORDS="amd64 hppa ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" DEPEND="" RDEPEND="${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/
commit: 4339e04429a62919dda8b81cdb5b613e04a943b2 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Oct 2 08:13:46 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Oct 2 08:13:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4339e044 app-arch/cfv: Stable for HPPA (bug #591464). Package-Manager: portage-2.3.1 RepoMan-Options: --ignore-arches app-arch/cfv/cfv-1.18.3-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild index 3838e18..8d2beb3 100644 --- a/app-arch/cfv/cfv-1.18.3-r1.ebuild +++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" IUSE="bittorrent" -KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 hppa ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" DEPEND="" RDEPEND="${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: app-arch/cfv/files/
commit: 0ab5f7f957f7a0ff1aa4f55a59980a691e674382 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Jul 1 19:51:05 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sun Jul 3 11:28:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab5f7f9 app-arch/cfv: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/1812 Signed-off-by: Patrice Clement gentoo.org> app-arch/cfv/files/cfv-1.18.1-modulefix.patch | 21 - 1 file changed, 21 deletions(-) diff --git a/app-arch/cfv/files/cfv-1.18.1-modulefix.patch b/app-arch/cfv/files/cfv-1.18.1-modulefix.patch deleted file mode 100644 index a415a3a..000 --- a/app-arch/cfv/files/cfv-1.18.1-modulefix.patch +++ /dev/null @@ -1,21 +0,0 @@ branches/cfv-1_x-branch/cfv/cfv2006/03/28 07:29:01 340 -+++ branches/cfv-1_x-branch/cfv/cfv2007/03/04 01:57:56 401 -@@ -1360,12 +1360,15 @@ - #-- .torrent -- - _btimporterror = None - try: -- from BitTorrent import bencode, btformats -+ from BTL import bencode, btformats - except ImportError, e1: - try: -- from BitTornado import bencode; from BitTornado.BT1 import btformats -+ from BitTorrent import bencode, btformats - except ImportError, e2: -- _btimporterror = '%s and %s'%(e1,e2) -+ try: -+ from BitTornado import bencode; from BitTornado.BT1 import btformats -+ except ImportError, e3: -+ _btimporterror = '%s and %s and %s'%(e1,e2,e3) - - class Torrent(ChksumType): - description = 'BitTorrent metainfo'