gentoo resync : 13.06.2020

8 files changed, 18 insertions, 201 deletions

diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index c33005d8cda9..d59fd97a9d55 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,13 +1,7 @@
-AUX duplicity-0.8.09-fix-docs.patch 549 BLAKE2B 57e20c1f65918e548941ce56969a9a22620bb69577ca1c0168149f28203f0d1068fd6676ade5ef153069823070e033791b4a4e517e79a11d9b33a30f6444c174 SHA512 0ba8e5f02e5e873835ac418d312694ea6b699fc15a2b09828aaa0e2b75bb499d0b054799c619d1bd8bafc97e042eb12e6a64a3c0298158cbc7c2dcd30216f4a2
-AUX duplicity-0.8.11.1596-fix-docs.patch 665 BLAKE2B f664af2867546957fafdf717b792ebc8e4d75fdd6451d7c252284107f8fcd4029d2815ffa21c622738226885e396b25a1f2485f44a15275e0a8b0b248ea27735 SHA512 4ce3d557c5ef3e32f9032cc10285b8059800b8d0f57e46ebcb0fc85a1da361b0475303ba94f8e4a25a70cb27b506de477d7657fbfe0b77d80646a3025bcd8bb2
 AUX duplicity-0.8.12.1612-fix-docs-cmd.patch 859 BLAKE2B fd3e94fcd2f408a3c81b0ab3b749956dae48e540b1c826d79ba411ed24729874a60757543539610b6aed99123f3a34dbfe432663f73824325da748410ff5a0dc SHA512 4d1c6101b93ae8ee8bd3ba3203ed4c149a13c7b41e4ce11a048d378bc0ad54b2e51b2a3d7ef93c9935e980545e68425f52582f9eddeec465095ee31f40dfee71
-AUX duplicity-0.8.12.1612-fix-docs.patch 665 BLAKE2B 5a82b97397d63153df54b0bdfc62e2896980fd665b91cacff92aefd143b23ea662b6d0ee0cd6251938a41a83e3046d027bf4bfffed1e90cbec1240d2ff0c9b95 SHA512 20b2827e72b441f15d9abfb63f0415758f83b82f3669e104b6b9d9db4d3d00401defe42d9c24415197795535049f280ef6b7c74a15c55e4ce61837d85b7eed4d
-DIST duplicity-0.8.09.tar.gz 1856764 BLAKE2B b5d0dd3270c237694000dc36a65a4293c43264edf933a195692d2847d008a898d5cf95c0b21b285503023ef8885278485cebabc2d2b7094ae65e13d277c80e5a SHA512 e4045a1c1adbf0927ee5325f02b79e7c0b38034080be4b563f20f1af593c8c1943a772fe7f212730e60f7c7cee93756426fe769a62050d42651fd1af7f6ba50a
-DIST duplicity-0.8.11.1596.tar.gz 1872223 BLAKE2B ad3ee2536731d1a6e8fb3fd87bb69b8ce8b43bb90688fe957cfb2718ad44f57db98c3aec4805356a7d44bea681f6ec9603aa082dbf86e58684fbe8000d1676b5 SHA512 67940d73d8213559ba88ec21e1326aca0dd065888cbf2e3c68f0f515ba9246100fd6e6d0bd1f12cb678702559f2266b7905931506d2ff6fe6fd35c673593479b
+AUX duplicity-0.8.13-fix-docs-cmd.patch 863 BLAKE2B b5ba9fb41d3e863b6064e0a76f778fd52cc7544495500e7106218cbfd30a484c499c03132752cdacef43c7aaa299982a0822e433767fbc94299e0045017c7168 SHA512 3c9c4e4c759a0cc4ba7e3b9be9955ad16638baebd1720dadf902be32ccfdfdc306973f8897e99af1c67b5b689dd1713ed8928e25cbbf26040b4e8070e89de346
 DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951
-EBUILD duplicity-0.8.09-r1.ebuild 1134 BLAKE2B 04496a663087d1a1e068c42d2037df9920d3d628ec1e9ebd45113f36a8c92103a293fab7875e386742c69f1bd9d0c076db13b85b4721048d9fc7bd45e9d4520d SHA512 dc7ef2f8e721b890265a0f17e62139e2918cf6b5722f38725868cfe740c440fbbf3cb13b33e5ff9a5c11416a59b0f6b4a031a19fb03a65161ce76d5d7611d9cb
-EBUILD duplicity-0.8.11.1596-r1.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed
-EBUILD duplicity-0.8.11.1596.ebuild 1145 BLAKE2B a8d81c55738f9321e39f1a3676d3d2acb7f08115893bcf5f1da5dad6cff6de0b99d0358b18877682b7e4586380a8addc8c4766452a974259e40cc6dcf538c957 SHA512 61da41a243dc4db5304c2239da604d05b7ad8081e7273af0b94fe1ad566ffc7e848d4e8cb7a542dbf746b88205c9bba71dcc5509714d7eff79e6b71dcdfc4228
+DIST duplicity-0.8.13.tar.gz 1463564 BLAKE2B 31037b0a27e043937f80ee91939793e304c0f7b1c96ee4bc9fe7c06dde69f374a718028d9ae4a98cfd7f866af72e5ed0a8f679319a73428207a99961961e8d2d SHA512 71e07fa17dcf2002a0275bdf236c1b2c30143e276abfdee15e45a75f0adeefc9e784c76a578f90f6ed785f093f364b877551374204e70b930dd5d0920f7e1e75
 EBUILD duplicity-0.8.12.1612-r1.ebuild 1157 BLAKE2B a83a4638ded58e9efa48c726b2e718d24a0dffc69dfa372bce56818059f58230e4050490efe2d9eba17c0abfd686a8c6b8c69bedcd3108d35a7e07fea173ff36 SHA512 b4f7a04ba7d1e0f56b6b335fac26efbaa448fb53714c84df34595c7126c9b49acbfe28e44bdd2e6fe240827d307f1379ebe1e2fe78fb6dbe0bbf4fe412f39898
-EBUILD duplicity-0.8.12.1612.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed
+EBUILD duplicity-0.8.13.ebuild 1205 BLAKE2B 5d1a72ad6fbd6a0c1b4de39d66ccaedaa389c1755d902d0c2ccf2ca5843c59451e4f27006594729a3b4d0b6e9698912ed558e6eb5f6c0a73f9c02da57d0d208a SHA512 d230b126a6f20a5b2f2b78db0569ecb7683955dda2e164975ae3b5ee658c9d471eef1e644456485181ce6b92dd727a1c29cd752208a58acb6dfe9a9ebe2029a5
 MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a
diff --git a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild b/app-backup/duplicity/duplicity-0.8.09-r1.ebuild
deleted file mode 100644
index 6507cb77f9b0..000000000000
--- a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-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/${PV}/+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/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.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.11.1596.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596.ebuild
deleted file mode 100644
index f9ce35aa9879..000000000000
--- a/app-backup/duplicity/duplicity-0.8.11.1596.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-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/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.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.12.1612.ebuild b/app-backup/duplicity/duplicity-0.8.12.1612.ebuild
deleted file mode 100644
index 3f789257f08d..000000000000
--- a/app-backup/duplicity/duplicity-0.8.12.1612.ebuild
+++ /dev/null
@@ -1,50 +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/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.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.11.1596-r1.ebuild b/app-backup/duplicity/duplicity-0.8.13.ebuild
index 3f789257f08d..afc6288b43a1 100644
--- a/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.13.ebuild
@@ -7,7 +7,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/"
+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"
@@ -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}]
@@ -37,7 +38,7 @@ RDEPEND="${CDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.patch"
+	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
 python_test() {
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,