gentoo resync : 25.11.2020

3 files changed, 38 insertions, 39 deletions

diff --git a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch
deleted file mode 100644
index 89cd583e6bff..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- duplicity-0.8.12.1612/setup.py	2020-05-07 12:07:21.571865871 -0400
-+++ duplicity-0.8.12.1612/setup.py	2020-05-07 12:08:29.617846122 -0400
-@@ -88,18 +88,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % version_string,
--                [
--                u'AUTHORS',
--                u'CHANGELOG',
--                u'Changelog.GNU',
--                u'COPYING',
--                u'README',
--                u'README-LOG',
--                u'README-REPO',
--                u'README-TESTING',
--                ],
--            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -265,7 +253,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
--        u"build_scripts": BSCommand,
-         u"install": InstallCommand,
-         u"test": TestCommand,
-         },
diff --git a/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.16-fix-docs-cmd.patch
index 23b31e23fc07..3b8fa1c22ed6 100644
--- a/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.16-fix-docs-cmd.patch
@@ -1,6 +1,6 @@
---- duplicity-0.8.13/setup.py	2020-06-02 16:19:25.127576334 -0400
-+++ duplicity-0.8.13/setup.py	2020-06-02 16:20:33.730535892 -0400
-@@ -89,18 +89,6 @@
+--- duplicity-0.8.16/setup.py	2020-10-12 13:44:15.382732960 -0400
++++ duplicity-0.8.16/setup.py	2020-10-12 13:46:03.553414858 -0400
+@@ -93,18 +93,6 @@
                  u'bin/rdiffdir.1'
                  ]
              ),
@@ -10,20 +10,20 @@
 -                u'CHANGELOG',
 -                u'Changelog.GNU',
 -                u'COPYING',
--                u'README',
--                u'README-LOG',
--                u'README-REPO',
--                u'README-TESTING',
+-                u'README.md',
+-                u'README-LOG.md',
+-                u'README-REPO.md',
+-                u'README-TESTING.md',
 -                ],
 -            ),
          ]
  
      if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -319,7 +307,6 @@
+@@ -340,7 +328,6 @@
          ],
      test_suite=u"testing",
      cmdclass={
--        u"build_scripts": BSCommand,
+-        u"build_scripts": BuildScriptsCommand,
          u"install": InstallCommand,
+         u"install_data": InstallDataCommand,
          u"sdist": SdistCommand,
-         u"test": TestCommand,
diff --git a/app-backup/duplicity/files/duplicity-0.8.17-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.17-fix-docs-cmd.patch
new file mode 100644
index 000000000000..a0fce6b2c5d8
--- /dev/null
+++ b/app-backup/duplicity/files/duplicity-0.8.17-fix-docs-cmd.patch
@@ -0,0 +1,28 @@
+--- duplicity-0.8.17/setup.py	2020-11-24 19:32:40.089024404 -0500
++++ duplicity-0.8.17/setup.py	2020-11-24 19:33:32.326309755 -0500
+@@ -93,17 +93,6 @@
+                 u'bin/rdiffdir.1'
+                 ]
+             ),
+-            (u'share/doc/duplicity-%s' % Version,
+-                [
+-                u'AUTHORS',
+-                u'CHANGELOG.md',
+-                u'COPYING',
+-                u'README.md',
+-                u'README-LOG.md',
+-                u'README-REPO.md',
+-                u'README-TESTING.md',
+-                ],
+-            ),
+         ]
+ 
+     if not os.environ.get(u'READTHEDOCS') == u'True':
+@@ -339,7 +328,6 @@
+         ],
+     test_suite=u"testing",
+     cmdclass={
+-        u"build_scripts": BuildScriptsCommand,
+         u"install": InstallCommand,
+         u"install_data": InstallDataCommand,
+         u"sdist": SdistCommand,