gentoo resync : 25.11.2020

7 files changed, 51 insertions, 51 deletions

diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index be35b6572bab..a3cdd901262e 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,10 +1,10 @@
-AUX duplicity-0.8.12.1612-fix-docs-cmd.patch 859 BLAKE2B fd3e94fcd2f408a3c81b0ab3b749956dae48e540b1c826d79ba411ed24729874a60757543539610b6aed99123f3a34dbfe432663f73824325da748410ff5a0dc SHA512 4d1c6101b93ae8ee8bd3ba3203ed4c149a13c7b41e4ce11a048d378bc0ad54b2e51b2a3d7ef93c9935e980545e68425f52582f9eddeec465095ee31f40dfee71
-AUX duplicity-0.8.13-fix-docs-cmd.patch 863 BLAKE2B b5ba9fb41d3e863b6064e0a76f778fd52cc7544495500e7106218cbfd30a484c499c03132752cdacef43c7aaa299982a0822e433767fbc94299e0045017c7168 SHA512 3c9c4e4c759a0cc4ba7e3b9be9955ad16638baebd1720dadf902be32ccfdfdc306973f8897e99af1c67b5b689dd1713ed8928e25cbbf26040b4e8070e89de346
 AUX duplicity-0.8.15-fix-docs-cmd.patch 888 BLAKE2B 17627c86ed5b895ff08c6394b407b69f8653913d7e1bbbcd994c574a817e7f018a8b6f26819a147387414f9997b32e95fc76e2f4583158ee453d03a489b8b4b7 SHA512 a901c5870fcc6745873b5850b2d2544948cb766d72d7ca8f8869d03bc9512f4527ec62df3f29a1151675a91e6c6b3816069008d1b5d56e45b787e2bddaed4aa5
-DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951
-DIST duplicity-0.8.13.tar.gz 1463564 BLAKE2B 31037b0a27e043937f80ee91939793e304c0f7b1c96ee4bc9fe7c06dde69f374a718028d9ae4a98cfd7f866af72e5ed0a8f679319a73428207a99961961e8d2d SHA512 71e07fa17dcf2002a0275bdf236c1b2c30143e276abfdee15e45a75f0adeefc9e784c76a578f90f6ed785f093f364b877551374204e70b930dd5d0920f7e1e75
+AUX duplicity-0.8.16-fix-docs-cmd.patch 900 BLAKE2B 11146466f54446cd7c24d7a2cb5dc15e337df870bd134adf7d8e1ecc839a6d6f21aeeea38fbf9bd5c9ef5cfe15d99ce40e536e0d5b8db99f4348a5f96d6231cf SHA512 8dd321bf4ff06145c04a8a1378b2933dac83eae6d770a96a0f6c2362e0f84b496702b792c46468b757f4859d1b4ff9202fd976500d8d05ac056ecaf4b760e5bf
+AUX duplicity-0.8.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
 DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
-EBUILD duplicity-0.8.12.1612-r1.ebuild 1157 BLAKE2B a83a4638ded58e9efa48c726b2e718d24a0dffc69dfa372bce56818059f58230e4050490efe2d9eba17c0abfd686a8c6b8c69bedcd3108d35a7e07fea173ff36 SHA512 b4f7a04ba7d1e0f56b6b335fac26efbaa448fb53714c84df34595c7126c9b49acbfe28e44bdd2e6fe240827d307f1379ebe1e2fe78fb6dbe0bbf4fe412f39898
-EBUILD duplicity-0.8.13.ebuild 1205 BLAKE2B 5d1a72ad6fbd6a0c1b4de39d66ccaedaa389c1755d902d0c2ccf2ca5843c59451e4f27006594729a3b4d0b6e9698912ed558e6eb5f6c0a73f9c02da57d0d208a SHA512 d230b126a6f20a5b2f2b78db0569ecb7683955dda2e164975ae3b5ee658c9d471eef1e644456485181ce6b92dd727a1c29cd752208a58acb6dfe9a9ebe2029a5
-EBUILD duplicity-0.8.15.ebuild 1214 BLAKE2B b01f34aa6c8e2f8c3ad311b10625bb917255e31b0539b03eb1e27cc018dcabed39b660280ec2dd00dcfafa124be8ba6551eaf6c5262f8da367d54b16f8b0e3f9 SHA512 36a4dc9d94fabb743864fc4d4f8b30b43168f0373116c63a34ddf677d29e6f7231270bd12a38de371375fce9c81cac43d143709ce898df37bc4e09b0a2a4f132
+DIST duplicity-0.8.16.tar.gz 1470714 BLAKE2B c9b2df3a7f008d44595b76d5f1d86ef53996d3ad788415e3a0fa122a7246bb5ae92e73be5079b3cef9a9a93a0b106f3be6405882028d79dc49194276a7c8f4a7 SHA512 67e8fe7d5db7da82d82f24892d721e32cd63fcdb8bbc5e60508af06e4c9b637f593ce0b1902c31433c92ed97035880e44368e9a461ad197511171f67de937f73
+DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
+EBUILD duplicity-0.8.15.ebuild 1213 BLAKE2B 8508a2135b3ca0438e15cbd198a7060cf81eec4cdb1c08f5b4c0e4fe13a17831611f1a173174400f9f272ffae803b756886694d3950d646252ec9058c52a448e SHA512 922bd8eca9e3222b8ece9677eb1b1a343cd0edd26a274773bd10d79cc0c4f935e3f9d484c460f5c0336595a1d92a80e4c9d079ab3c1ae4cf2f2a92e0d66dc0cd
+EBUILD duplicity-0.8.16.ebuild 1215 BLAKE2B aeb0926a8b5497858a2ff183eda686ae5a84b0d94e7535db14130b7f15222c8c30408ed7cd374cf6e450606fa8ac945bd9fc7b8c2183c6fa98a54e0ca39c1069 SHA512 88dc9fb68fb3f244721b411ef20f5f64e7f35b280f2cd084082433f15fab89eaa51e51d0d971c883a98acb394e1951f9fc6f2931be5596e2b4bd797f1805fa88
+EBUILD duplicity-0.8.17.ebuild 1215 BLAKE2B aeb0926a8b5497858a2ff183eda686ae5a84b0d94e7535db14130b7f15222c8c30408ed7cd374cf6e450606fa8ac945bd9fc7b8c2183c6fa98a54e0ca39c1069 SHA512 88dc9fb68fb3f244721b411ef20f5f64e7f35b280f2cd084082433f15fab89eaa51e51d0d971c883a98acb394e1951f9fc6f2931be5596e2b4bd797f1805fa88
 MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a
diff --git a/app-backup/duplicity/duplicity-0.8.15.ebuild b/app-backup/duplicity/duplicity-0.8.15.ebuild
index 7b8519212934..4ed9d94f38eb 100644
--- a/app-backup/duplicity/duplicity-0.8.15.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="s3 test"
 
 CDEPEND="
diff --git a/app-backup/duplicity/duplicity-0.8.13.ebuild b/app-backup/duplicity/duplicity-0.8.16.ebuild
index afc6288b43a1..ab86fd3ebc15 100644
--- a/app-backup/duplicity/duplicity-0.8.13.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.16.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit distutils-r1
 
diff --git a/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild b/app-backup/duplicity/duplicity-0.8.17.ebuild
index 9bbe98ffa27a..ab86fd3ebc15 100644
--- a/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.17.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
+HOMEPAGE="https://www.nongnu.org/duplicity/"
 SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="s3 test"
 
 CDEPEND="
@@ -22,6 +22,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		app-arch/par2cmdline
 		dev-python/mock[${PYTHON_USEDEP}]
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,