commit: 9b6b26f8247519720f3d88d3f1be6d94f2c37e43
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 15 10:12:52 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 15 10:24:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6b26f8
app-backup/duplicity: drop 3.0.6-r1
3.0.6.1 is the same, use that.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-backup/duplicity/Manifest | 2 -
app-backup/duplicity/duplicity-3.0.6-r1.ebuild | 68 ----------------------
.../files/duplicity-3.0.6-tests-sort.patch | 31 ----------
3 files changed, 101 deletions(-)
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index d490ccae0533..e7a3f776a6ba 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,4 +1,2 @@
-DIST duplicity-3.0.6-fix-pexpect-sftp-regression.patch.xz 6892 BLAKE2B
b872c3bacf80d0224269937a958e508bd03ccffb10ef53730d8300d072c2e4961c5a48e010aff315474e30fbefcc461c2ff75718aecb550b379bbdbf12df9465
SHA512
76238d85c33ad91417046abd02e3e5a20e538f39406f2a5d95402e48cb122680dce94d01704421b2597d0b5fe8783c64e09270f23f456ee55bfc527990698f8a
DIST duplicity-rel.3.0.5.tar.bz2 952327 BLAKE2B
a5befdcfbca07655b690c681a7858e181029f6432583006872d9a1fe446a157717d6bfdc8462b087d719548ad8e761efb35b37ee23441bd7ed7830cbf5ed1612
SHA512
c57cd0192989ea98ef297aa5eb1e80f32f885af8c035521fffed115e2bd77af187b726a500e8d2e3f4100b00490cc62079dcba4568ca0d17239763477d3e7cb5
DIST duplicity-rel.3.0.6.1.tar.bz2 958273 BLAKE2B
5018689e2d3cafde97933f7d194acaaf5d43536e792f6588215a6d6f6751dc23aab628eb3b636bba24f9d74d32bf29debf27619216789fd49277acc76d06ae0a
SHA512
8da5018a41253c326ec2602c603abf3876af7ad9f4dc98f77ce2c70e8b69324ccb6fb20e8ca9b7e467c0c4dd29ea5d3ce7e3929a66308c8a25b68cb449b43141
-DIST duplicity-rel.3.0.6.tar.bz2 960619 BLAKE2B
9b83008408a3ef5148614e3db1a87f45347cae11455d0f9295570231b0d85fbd987d3724c5623a0713e412ebb496d6ea81ca611c88b769d210e597aca468f934
SHA512
4c385a53a0e70e1d7b6cde564d8ef458a765273583b73375af113a065006fa75204e0596f7a7e4eb3bcb090889548f4c5878a5c744ce5f34f610c0843dea3ce3
diff --git a/app-backup/duplicity/duplicity-3.0.6-r1.ebuild
b/app-backup/duplicity/duplicity-3.0.6-r1.ebuild
deleted file mode 100644
index 37086da8cec1..000000000000
--- a/app-backup/duplicity/duplicity-3.0.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://duplicity.gitlab.io/";
-SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/${PN}-rel.${PV}.tar.bz2";
-SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.6-fix-pexpect-sftp-regression.patch.xz";
-S="${WORKDIR}"/${PN}-rel.${PV}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-COMMON_DEPEND="
- net-libs/librsync
- app-crypt/gnupg
- dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/setuptools-scm[${PYTHON_USEDEP}]
- test? (
- || ( app-arch/par2cmdline app-arch/par2cmdline-turbo )
- dev-python/pexpect[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- dev-python/paramiko[${PYTHON_USEDEP}]
- s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
-"
-
-EPYTEST_DESELECT=(
- # Linting tests (black, pylint, etc); not relevant for us
- testing/test_code.py::CodeTest::test_black
- testing/test_code.py::CodeTest::test_pep8
- testing/test_code.py::CodeTest::test_pylint
- # boto3
- testing/unit/test_cli_main.py::CommandlineTest::test_intermixed_args
-)
-
-EPYTEST_IGNORE=(
- testing/test_code.py
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.4.0-fix-docs-cmd.patch
- "${FILESDIR}"/${PN}-3.0.5-dont-repeat-standard-paths.patch
- "${FILESDIR}"/${P}-tests-sort.patch
- "${WORKDIR}"/${PN}-3.0.6-fix-pexpect-sftp-regression.patch
-)
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
- elog "Duplicity has many optional dependencies to support various
backends."
- elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/files/duplicity-3.0.6-tests-sort.patch
b/app-backup/duplicity/files/duplicity-3.0.6-tests-sort.patch
deleted file mode 100644
index 59f44fa4e323..000000000000
--- a/app-backup/duplicity/files/duplicity-3.0.6-tests-sort.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://gitlab.com/duplicity/duplicity/-/commit/8990fad4af95dd87b0d12b9c4c225defe929de8a
-
-From 8990fad4af95dd87b0d12b9c4c225defe929de8a Mon Sep 17 00:00:00 2001
-From: Kenneth Loafman <[email protected]>
-Date: Fri, 7 Nov 2025 06:45:20 -0600
-Subject: [PATCH] fix:test: Fix test_restore_to_nonexisting_dir().
-
-Add sorted() around listdir()
-
-Fixes #898
----
- testing/functional/test_restore.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testing/functional/test_restore.py
b/testing/functional/test_restore.py
-index bebc724ef..069b3cafd 100644
---- a/testing/functional/test_restore.py
-+++ b/testing/functional/test_restore.py
-@@ -62,8 +62,8 @@ class RestoreTest(FunctionalTestCase):
- self.backup("full", f"{_runtest_dir}/testfiles/dir1")
- self.restore()
- self.assertEqual(
-- os.listdir(f"{_runtest_dir}/testfiles/dir1"),
-- os.listdir(f"{_runtest_dir}/testfiles/restore_out"),
-+ sorted(os.listdir(f"{_runtest_dir}/testfiles/dir1")),
-+ sorted(os.listdir(f"{_runtest_dir}/testfiles/restore_out")),
- )
-
- def test_restore_path_to_nonexisting_dir(self):
---
-GitLab
