gentoo resync : 20.03.2022

5 files changed, 10 insertions, 84 deletions

diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 4c09f85c0d13..8f5b26703617 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,10 +1,7 @@
-AUX duplicity-0.8.19-fix-docs-cmd.patch 628 BLAKE2B 6acf30fd8881a14003a158e76a23b81af0e049c090c671adbf147c7a77b5ed57e75b9c9b169e38a06fdceb310bdc4f74bacb543a66e5820d3d1ab9951dca997d SHA512 6b2e401d6ce8c2ee41dd1ea8ffaed7602b8167fbf0cf465c214ddf8d1ef8af8b74a1a6c93741c6b34705b53b2caad438736a6ee7c6c3483b11d8ede029758348
-AUX duplicity-0.8.20-fix-docs-cmd.patch 628 BLAKE2B 6dbcc6b64b870f798b4bc62730b05b1753688163fd7629326324d7b68d8360b72604380416d53db0042017672d08875cd3c75e8d36554b72b99b52a6bc88c4d3 SHA512 bf9c51a3409ca7b234e3ca83552e378322668ca12c5f3682d796aba765007e86572beab310d0050411894beda85e753e3d6385a1a0bed2cae28212c4d28750dc
 AUX duplicity-0.8.21-fix-docs-cmd.patch 628 BLAKE2B e43ce23bfa03a78e86a604487b2bc16fe924fcb4044283ea6fb6cc9afa87aa6cee52a4cbefa6a6918b7c98ee3bd914d753f85db6d74c86a615952d0fc2435256 SHA512 13fc15337b8e5bc6b3dff4954b8d0aabcad8b9f1a95c08c367c816fa762c528262427625f8b5ed3ef985e5577e5dea633ae8f78a2aa4f35a3778b2c6fe6f12fc
-DIST duplicity-0.8.19.tar.gz 1372739 BLAKE2B 6a5a642597529eea37c7224cbfdd115db42c16f6391e553454f8f82cea86240bbd68a62513129496a1f978411fdeec50c3d918bb99b470fa1444fd77e7e6c9b7 SHA512 c1a1f5894f8b94ac61bd98270f138c58ef5a68f3624e7e88224b15539ca6e08874df9cebb36b10167d133b1af6a93b29e7bf4084c348b9cd7914ff24415be57c
-DIST duplicity-0.8.20.tar.gz 1376671 BLAKE2B af3fd95b699cd9b3c6bbe259e0dd898fc058461efcb2d1d51c8c2d539df7e32fe70fb6af4b314cd6fce219345f23eb0ab342d0c7f28b05ec1ee4333c02d93415 SHA512 ac43473a18031fa33cee0b7a3dc6b33c830ba9d19a0129c065a226824af8aacf00230ae05bf2e0d7614ad4ce9724e40e9b8305114175af63d8a8a8642ffdce67
+AUX duplicity-0.8.22-fix-docs-cmd.patch 636 BLAKE2B b35c164689104cf545a0bdb4d103fbab33e7f3ca231523ccb12e672863f601b42ce3de7ee2ba10b3efb118f413bd295f1b7e436ae702624bfe1f4cff6587a4be SHA512 c13b000352e6241d2454ff5ae206cd7ccf9e2594caa3be60a2adb4894020d812dd3720d0fffe16ca3e8402e448b174ff7d9137349dfda77fd724545b058f59b6
 DIST duplicity-0.8.21.tar.gz 1375469 BLAKE2B 15da671b30305415dfafdef50f5f57eaea0d6504a3f35845bf4570bb0cd2d6d3c879e94dda5739f30acd54748ef7abb993405660d24cf96ab919cec08690e015 SHA512 573c79937e4b19e99d167fddaebfd7b747d3c5f240b14e575fecd45a225c6c279d5ce0132645bbefcddcbc688f9d67317a3ec3a0816fcb4ff303b217fe10b012
-EBUILD duplicity-0.8.19.ebuild 1202 BLAKE2B b2ec8a0ef183bd7b20d018c44eca71dc7440ae910d2d97d5f0ba9185cd9982d091bc79400cecd1bcae86efb46178973aae9c467b7749db976bbd7cff9b622437 SHA512 6cdfb73228e6327fad27f28725d48353b9e1c933470c51fd73d5aec98623916878a69964cea9fb0dfd812fcd1abd99f3ef7846b9b1b816db5117e68929615f43
-EBUILD duplicity-0.8.20.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
+DIST duplicity-0.8.22.tar.gz 1408482 BLAKE2B 3a8b6eb79d5f67e8f274bdaaaf0bb5b6c9f0ebf91a3b6a849b876cdf2c9af0f5435946150b5db6ab5e524cedc5b98b40c456b1de0fe8c6e33c024fe3c7d881fa SHA512 474237e3ca9876fb124baf9871f781b8347c85e76b7b4191d6993a76fb4728500091c74ed0943c6c22d69651c08094b6d155eca742d1711bebe676734c84d12a
 EBUILD duplicity-0.8.21.ebuild 1202 BLAKE2B 0b72af8049dba29080a14379857d90be886faf570dc5c0333a7268b33978ce3ffc4a8d54fb6baa0e6f68d7185a8545355ad1802586cb30e488604facb435cc5f SHA512 e4119a8eb6c11787c76c3c01d40239d882b1fc21022de2221ff4240bbdf2e0e037441f338cdc0b585713328794c0d4adc33981ff33676c9aa2eabc86f0cf2101
+EBUILD duplicity-0.8.22.ebuild 1200 BLAKE2B a95276cba6394c1f0918e3abdce51f7ebfd40d50b901afa0b75c17388cdf2dd297e733db174c56688a7fc5d13642aa447bee5f0602765372a68baaf3c71e97c3 SHA512 a4da6337b28ec6bbc7d11c0eaedb2e944fd30ae88715a70af0be37a7ed6175f3d9f35f032d0230ddd40b9a45a7503bba8c3e76cb9376d165499e857694554e40
 MISC metadata.xml 455 BLAKE2B cc38c235e02397d73b26aaddfdbbd872cb7dbe1a777302618e44769e1895b7d7c90e7de7d7cf8a63388e20283fe0f9937da3ed0ffec21d960543220c253fff33 SHA512 0fb009ecd0b771bc8e04980cb1aa49a872193cfa59a0e10966322a9764c1c08d859504afd78f839e7a98a6224e4d1fe20dd6dff549cadda5c7e31b74ed0a82b8
diff --git a/app-backup/duplicity/duplicity-0.8.19.ebuild b/app-backup/duplicity/duplicity-0.8.19.ebuild
deleted file mode 100644
index 25044aa70a1c..000000000000
--- a/app-backup/duplicity/duplicity-0.8.19.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-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"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${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/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.20.ebuild b/app-backup/duplicity/duplicity-0.8.22.ebuild
index 4b901f06dcdb..05713d415754 100644
--- a/app-backup/duplicity/duplicity-0.8.20.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.22.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+EAPI=8
+PYTHON_COMPAT=( python3_8 python3_9 python3_10 )
 
 inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
+HOMEPAGE="https://duplicity.gitlab.io/"
 SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-backup/duplicity/files/duplicity-0.8.19-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.19-fix-docs-cmd.patch
deleted file mode 100644
index afcef7ab948c..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.19-fix-docs-cmd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- duplicity-0.8.19/setup.py	2021-05-10 13:37:38.352142737 -0400
-+++ duplicity-0.8.19/setup.py	2021-05-10 13:39:02.829865546 -0400
-@@ -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':
diff --git a/app-backup/duplicity/files/duplicity-0.8.20-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.22-fix-docs-cmd.patch
index 6ce5860e1959..450c9f1d85d4 100644
--- a/app-backup/duplicity/files/duplicity-0.8.20-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.22-fix-docs-cmd.patch
@@ -1,13 +1,13 @@
---- duplicity-0.8.20/setup.py	2021-08-05 09:14:41.483669131 -0400
-+++ duplicity-0.8.20/setup.py	2021-08-05 09:15:35.086895059 -0400
+--- duplicity-0.8.22/setup.py	2022-03-19 15:08:36.755624771 -0400
++++ duplicity-0.8.22/setup.py	2022-03-19 15:09:38.332763172 -0400
 @@ -94,17 +94,6 @@
                  u'bin/rdiffdir.1'
                  ]
              ),
 -            (u'share/doc/duplicity-%s' % Version,
 -                [
--                u'AUTHORS',
 -                u'CHANGELOG.md',
+-                u'CONTRIBUTING.md',
 -                u'COPYING',
 -                u'README.md',
 -                u'README-LOG.md',