commit:     ffbd84e135210bf1d427bed61f7cf9ba5e6cac72
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  3 18:52:34 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 18:52:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbd84e1

app-backup/duplicity: don't duplicate patches

They only differ by modification time in the header.

Bug: https://bugs.gentoo.org/779616
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/duplicity/duplicity-3.0.4.0.ebuild       |  2 +-
 app-backup/duplicity/duplicity-3.0.5.ebuild         |  2 +-
 .../files/duplicity-3.0.5-fix-docs-cmd.patch        | 21 ---------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/app-backup/duplicity/duplicity-3.0.4.0.ebuild 
b/app-backup/duplicity/duplicity-3.0.4.0.ebuild
index d00fd62eff44..d5240ce0c469 100644
--- a/app-backup/duplicity/duplicity-3.0.4.0.ebuild
+++ b/app-backup/duplicity/duplicity-3.0.4.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${CDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-       "${FILESDIR}/${P}-fix-docs-cmd.patch"
+       "${FILESDIR}/${PN}-3.0.4.0-fix-docs-cmd.patch"
 )
 
 python_test() {

diff --git a/app-backup/duplicity/duplicity-3.0.5.ebuild 
b/app-backup/duplicity/duplicity-3.0.5.ebuild
index ba0a1ecc129d..bf150ebbcff4 100644
--- a/app-backup/duplicity/duplicity-3.0.5.ebuild
+++ b/app-backup/duplicity/duplicity-3.0.5.ebuild
@@ -45,7 +45,7 @@ EPYTEST_DESELECT=(
 )
 
 PATCHES=(
-       "${FILESDIR}/${P}-fix-docs-cmd.patch"
+       "${FILESDIR}/${PN}-3.0.4.0-fix-docs-cmd.patch"
 )
 
 distutils_enable_tests pytest

diff --git a/app-backup/duplicity/files/duplicity-3.0.5-fix-docs-cmd.patch 
b/app-backup/duplicity/files/duplicity-3.0.5-fix-docs-cmd.patch
deleted file mode 100644
index 27efb4bf878a..000000000000
--- a/app-backup/duplicity/files/duplicity-3.0.5-fix-docs-cmd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/setup.py 2025-06-20 14:24:53.235641712 -0400
-+++ b/setup.py 2025-06-20 14:25:22.748056343 -0400
-@@ -113,18 +113,6 @@
-                 "man/duplicity.1",
-             ],
-         ),
--        (
--            f"share/doc/duplicity-{Version}",
--            [
--                "CHANGELOG.md",
--                "AUTHORS.md",
--                "COPYING",
--                "README.md",
--                "README-LOG.md",
--                "README-REPO.md",
--                "README-TESTING.md",
--            ],
--        ),
-     ]
- 
-     # short circuit fot READTHEDOCS

Reply via email to