gentoo resync : 13.06.2020

3 files changed, 12 insertions, 40 deletions

diff --git a/app-backup/duplicity/files/duplicity-0.8.09-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.09-fix-docs.patch
deleted file mode 100644
index 2141a359b896..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.09-fix-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- duplicity-0.8.09/setup.py	2020-01-19 21:15:47.770168177 -0500
-+++ duplicity-0.8.09/setup.py	2020-01-19 21:16:53.347709792 -0500
-@@ -51,12 +51,6 @@
- data_files = [(u'share/man/man1',
-                [u'bin/duplicity.1',
-                 u'bin/rdiffdir.1']),
--              (u'share/doc/duplicity-%s' % version_string,
--               [u'COPYING',
--                u'README',
--                u'README-REPO',
--                u'README-LOG',
--                u'CHANGELOG']),
-               ]
- 
- top_dir = os.path.dirname(os.path.abspath(__file__))
diff --git a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch
deleted file mode 100644
index 0cd64d6dc36e..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- duplicity-0.8.12.1612/setup.py	2020-03-05 09:18:42.532941503 -0500
-+++ duplicity-0.8.12.1612/setup.py	2020-03-05 09:20:10.612061492 -0500
-@@ -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':
diff --git a/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
index 6b8c710f3160..23b31e23fc07 100644
--- a/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
@@ -1,10 +1,10 @@
---- duplicity-0.8.11.1596/setup.py	2020-03-05 09:18:42.532941503 -0500
-+++ duplicity-0.8.11.1596/setup.py	2020-03-05 09:20:10.612061492 -0500
-@@ -88,18 +88,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 @@
                  u'bin/rdiffdir.1'
                  ]
              ),
--            (u'share/doc/duplicity-%s' % version_string,
+-            (u'share/doc/duplicity-%s' % Version,
 -                [
 -                u'AUTHORS',
 -                u'CHANGELOG',
@@ -19,3 +19,11 @@
          ]
  
      if not os.environ.get(u'READTHEDOCS') == u'True':
+@@ -319,7 +307,6 @@
+         ],
+     test_suite=u"testing",
+     cmdclass={
+-        u"build_scripts": BSCommand,
+         u"install": InstallCommand,
+         u"sdist": SdistCommand,
+         u"test": TestCommand,