Update Duplicity

Signed-off-by: Daniel Solano <gentoo@sattvik.com>

6 files changed, 32 insertions, 118 deletions

diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 0f1f7e1..d9bf6ca 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,13 +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
 AUX duplicity-0.8.16-fix-docs-cmd.patch 900 BLAKE2B 11146466f54446cd7c24d7a2cb5dc15e337df870bd134adf7d8e1ecc839a6d6f21aeeea38fbf9bd5c9ef5cfe15d99ce40e536e0d5b8db99f4348a5f96d6231cf SHA512 8dd321bf4ff06145c04a8a1378b2933dac83eae6d770a96a0f6c2362e0f84b496702b792c46468b757f4859d1b4ff9202fd976500d8d05ac056ecaf4b760e5bf
-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.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
 DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
 DIST duplicity-0.8.16.tar.gz 1470714 BLAKE2B c9b2df3a7f008d44595b76d5f1d86ef53996d3ad788415e3a0fa122a7246bb5ae92e73be5079b3cef9a9a93a0b106f3be6405882028d79dc49194276a7c8f4a7 SHA512 67e8fe7d5db7da82d82f24892d721e32cd63fcdb8bbc5e60508af06e4c9b637f593ce0b1902c31433c92ed97035880e44368e9a461ad197511171f67de937f73
-EBUILD duplicity-0.8.12.1612-r1.ebuild 1207 BLAKE2B a836b3a304a621599fd954db310631b40282d17cf3caa8260654d3084f0ac80fb3bd3271658948bdad7933ab89fa56dce0e6d87c3347b36631efa30ab286314e SHA512 2bc376ac9796f406e68cf1d941fbe186c9474b29660bb52546fb11c89ac09569c56c1774483c90dabc091e5c9aee30c24696958ae3a51c3d04fd88e04d47b44d
-EBUILD duplicity-0.8.13.ebuild 1255 BLAKE2B b3c29acaaba8252f616356996e4f8e69bb3ef6a8d8d1e4ee7203b200408a4730b43c2e0c5ef4449e911666596c24eb9114c0d95afc686123a91db7b806f0722d SHA512 84139e888933b8dc75bcbd4a1844265252e74a134fc6362a8e2160b100b812b8db356a4e1d3cd3f66200b74c1c58f991881f81dacc308c19c15e4cf45de5a698
+DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
 EBUILD duplicity-0.8.15.ebuild 1263 BLAKE2B fbc61b56bdfb9623594155da2dc3d3093f7a812a13e5b4a942b5dee2a7289ffca00f53694e651db1b5a73e8db9408fd05a92ae8737e8b8aca6c65dfc194e705b SHA512 1caf21baba871d93983a7c8defbf8cc1dbd857a51a5323de921a5680f27d02f6a20995620c8df5433481282f16addd2c5b4faae6c34eb50ef02c46d5ef91c2c4
 EBUILD duplicity-0.8.16.ebuild 1265 BLAKE2B 1b7bb9cfd13fc2245f43e3b00fab0a064e57051043201af8e9aeaccaeca610d8fb7a198e74368ee251c56b1a58a8cc28fdb7bf54ad218ea09ff9baac617cff66 SHA512 1827ceddc8fb7e0d176fc9f179f22d53d90485a19c9f9d8965184a6dc560efed694afbf46db44a74fa6f73aa126eecd3db4412c0ed98a33f1c94982a4b9424db
+EBUILD duplicity-0.8.17.ebuild 1265 BLAKE2B 1b7bb9cfd13fc2245f43e3b00fab0a064e57051043201af8e9aeaccaeca610d8fb7a198e74368ee251c56b1a58a8cc28fdb7bf54ad218ea09ff9baac617cff66 SHA512 1827ceddc8fb7e0d176fc9f179f22d53d90485a19c9f9d8965184a6dc560efed694afbf46db44a74fa6f73aa126eecd3db4412c0ed98a33f1c94982a4b9424db
 MISC metadata.xml 1464 BLAKE2B ce583c0e3d2a4b51e8c7afdecd6032bee99fdbbd1a435772587812b1cf87275f9f00d73b7bd6b7f0b7992d2947058e40a1b37fcd775e1c0902e81ebb55d92390 SHA512 bbeb13d7d9728e930eaf2f40fc03ef75234e3c27e532e5e1d069e8da44a0ddfe1b406c53588413a83985b03c94207c8ce1739ccf60e8d114abfde817375ea0fc
diff --git a/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild b/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild
deleted file mode 100644
index 6ff9a0b..0000000
--- a/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://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"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( || (
-			dev-python/boto3[${PYTHON_USEDEP}]
-			dev-python/boto[${PYTHON_USEDEP}]
-		) )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-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/duplicity-0.8.13.ebuild b/app-backup/duplicity/duplicity-0.8.17.ebuild
index 40eeed8..d13d8ac 100644
--- a/app-backup/duplicity/duplicity-0.8.13.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.17.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/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 89cd583..0000000
--- 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.13-fix-docs-cmd.patch
deleted file mode 100644
index 23b31e2..0000000
--- a/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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,
--                [
--                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':
-@@ -319,7 +307,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
--        u"build_scripts": BSCommand,
-         u"install": InstallCommand,
-         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 0000000..a0fce6b
--- /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,