gentoo auto-resync : 14:10:2022 - 07:43:49

7 files changed, 8 insertions, 18 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index c33937c49efd..b1adbe0e9743 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
index 3a56c3b5ad8a..878317765b79 100644
--- a/app-backup/deja-dup/Manifest
+++ b/app-backup/deja-dup/Manifest
@@ -1,5 +1,5 @@
 DIST deja-dup-42.8.tar.bz2 1467818 BLAKE2B 6f02fc458890f076bf0a8e1ffdc9d72880fd9f1a692d439ecfa5d8b08234472f3ae27aa801144b3e42e9c8b67b550c0882dc93c23d27e6e428ce1eddd80a912d SHA512 76c98e8635ffae076008efa73a92860c6d4e67d39339d452c253269bb3ed032b819ac40d65c2d8fbf195ecaf304796f516e861b0552be972838f95bf59af0a5c
 DIST deja-dup-43.4.tar.bz2 989830 BLAKE2B c67056b4498dbdb8f1346d682449e4a23070f052d6c4b3e205bd10da63148a6327666de79d163bd6450b34c130fedcdccc2053fabf7578a2d7d68decb325f510 SHA512 2413a3b1ef891e0151d61ee6fcec00f609f209da0faebe387dc8dba4abb55aa4ed925bdfee5768c7e8e8794bc9a793fb0769947030102aed57ac56983cd78943
-EBUILD deja-dup-42.8-r1.ebuild 1220 BLAKE2B 26da6a7e2aabc83be1a60e143d0c27757c2fea62f3de39cfa18d353325030cfe7cf4b9c11bf9981f18506c63dddc317fa94f1898c0950ef59822ea5a51ff7302 SHA512 27c81ab23c08956e866f631730e295dbcca3fcb2f3d3d84a9dbda60fde14129bfcd702c13d689e7cac24b54f4b9c22174e6d11f91e3543fa022a09608e5d09bc
-EBUILD deja-dup-43.4.ebuild 1209 BLAKE2B 89f3e5dfd5af9157a1c9dc9637d560b2a1fb15c91aa2134266c931f3079b0258087f8fb37f87db7ce0a2cfc1da9d0c00cfb16e3d8b8cd4e480db338be672fcba SHA512 98c440b1c3645b0a93c6383642cb764a82d708d07e66b05cd0a652b00987db8f6c4e9bcb6ade471d74020a8e7ee7b7952eb65a2ad0f7a02284270d40679387eb
+EBUILD deja-dup-42.8-r2.ebuild 1071 BLAKE2B 6fa0455867c974453b8f5609820c7656114d4165f7ff4b5ac7ae48aad969c13ceeca41add900108910b6a06c1abc6d59dc52bada8fbf30e179164967839591c4 SHA512 4f2a07b53ff8eaa316600006bf31d6eb23f1c7a64a7fd128f68547afc2f9ead22af676f6d380b62a9165b88df6ef67b28e8c8a649e85aa7c03ca86f8081da76a
+EBUILD deja-dup-43.4-r1.ebuild 1060 BLAKE2B 204c899685f9372ec4c4a02a5af2735d575661f68bc81a208e3fcc811d98578ae1ec1a086f33a3a2454c25e9a8b4ee4d28c739317ccc3e9818c66390d89751fa SHA512 b2bbea67ea72f7a2119757e98fa4265d561e07928a2adbccb3836a37f5017d5d33d2a68f6867da6b215f5b02de6227f1db5798fbb9e60703b60aec0ec527852e
 MISC metadata.xml 1118 BLAKE2B e56ff39a4eb5290c056fbf39b8c34d56c62b63cd65c317786b9e2a14f0c850edc3102db7908e106a9b94c642f8a34dcbbead2fe08e20f8a44fac16a3dfc3afee SHA512 1b2b8c04079a2c6d08c14722b235ef106c4711156ed147b9ace5da0aa29cec362903adb27d13835e32cfb955b688428dffc2593ce7e4202e93233b879c07dd6e
diff --git a/app-backup/deja-dup/deja-dup-42.8-r1.ebuild b/app-backup/deja-dup/deja-dup-42.8-r2.ebuild
index 19087d6d3c7d..6ddd8f92fabb 100644
--- a/app-backup/deja-dup/deja-dup-42.8-r1.ebuild
+++ b/app-backup/deja-dup/deja-dup-42.8-r2.ebuild
@@ -24,12 +24,9 @@ BDEPEND="
 	test? ( dev-libs/appstream-glib )
 "
 
-# deja-dup can not recognize duplicity-1.0.0 and throws an error
-# https://gitlab.gnome.org/World/deja-dup/-/issues/334
 DEPEND="
 	dev-libs/atk
 	>=app-backup/duplicity-0.7.14
-	<app-backup/duplicity-1.0.0
 	>=app-crypt/libsecret-0.18.6[vala]
 	>=dev-libs/glib-2.64:2[dbus]
 	>=dev-libs/json-glib-1.2
diff --git a/app-backup/deja-dup/deja-dup-43.4.ebuild b/app-backup/deja-dup/deja-dup-43.4-r1.ebuild
index b05a0347fbcb..53f1ed16bfed 100644
--- a/app-backup/deja-dup/deja-dup-43.4.ebuild
+++ b/app-backup/deja-dup/deja-dup-43.4-r1.ebuild
@@ -24,8 +24,6 @@ BDEPEND="
 	test? ( dev-libs/appstream-glib )
 "
 
-# deja-dup can not recognize duplicity-1.0.0 and throws an error
-# https://gitlab.gnome.org/World/deja-dup/-/issues/334
 DEPEND="
 	>=gui-libs/libadwaita-1.0:1
 	>=dev-libs/glib-2.70.0:2
@@ -36,7 +34,6 @@ DEPEND="
 	>=app-crypt/libsecret-0.18.6[vala]
 	>=net-libs/libsoup-3.0:3.0
 	>=app-backup/duplicity-0.8.21
-	<app-backup/duplicity-1.0.0
 "
 
 RDEPEND="${DEPEND}
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index a170f0edaf54..b174abec9a29 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -4,10 +4,10 @@ AUX duplicity-1.0.0-fix-docs-cmd.patch 642 BLAKE2B 50a0f501d852989c153f6dd3653ee
 AUX duplicity-1.0.1-fix-docs-cmd.patch 642 BLAKE2B 02fc2a2efcfbd6cabe6da997efbf02401df0560edc239b949f89357c66735b6a7282c356fd93ce2b1163543e1fb95ab17332a4ac9f0aea16ae5ec92f232c6c8b SHA512 410515e48aa5c64aa72bb6930bedc5542f57265d31c80bca1c95244d2e87bcf74a822308d27263f48726349a8271db6663b14159c6c3f4b10d25869078fdce6b
 DIST duplicity-0.8.22.tar.gz 1408482 BLAKE2B 3a8b6eb79d5f67e8f274bdaaaf0bb5b6c9f0ebf91a3b6a849b876cdf2c9af0f5435946150b5db6ab5e524cedc5b98b40c456b1de0fe8c6e33c024fe3c7d881fa SHA512 474237e3ca9876fb124baf9871f781b8347c85e76b7b4191d6993a76fb4728500091c74ed0943c6c22d69651c08094b6d155eca742d1711bebe676734c84d12a
 DIST duplicity-0.8.23.tar.gz 1385252 BLAKE2B 63042486e6e17d2d93af72f617990c879763d5921e230302f406b4f9e7c57a67284130f9f57849b9ffc8638614b55f0f8abdf6bb20201155b33b72bef952ec9f SHA512 083cf0060a8c7a8472c6ee4ffbb87e85edf0fcdaba95862a9f272cc03d8ab3d18b584a8d256473e6cfab9eed6f993382b846b692a8c0dd46fd3a2d8215e54e45
-DIST duplicity-rel.1.0.0.tar.bz2 802941 BLAKE2B 7b5f33b2b8b0f938a86688ea68838fd45a1405e69cc59e9cc082035253d123258f6a30239ecc470e9210b5bafeda556909fe94887517be8c75a2c18641de66b0 SHA512 a3a0a8eee8f2555f275676c24c3e0933ef0ba267b64eccb7765dad751e58aae3ed0ffac4c4cee3acd3dd76c93bb799edb7fe1430ae159389174cc37ab646f339
-DIST duplicity-rel.1.0.1.tar.bz2 900987 BLAKE2B c298b436aff054d4c0eb389047257586fb0f4b0d9b08c47ddcedbfc539f99c27f1af1e434bd409f7a3a14c5ef24d293cc96fe174ba3338a9d54a5ec8337de231 SHA512 691e093025a8f9c3802588d8ecb9e946efe1637a117a46f3c51d8fa40848c2a7d8899574009a4b0486488719af5c8fd49cab180fac12e94657480a95e26af391
+DIST duplicity-1.0.0.tar.gz 1381405 BLAKE2B 5de886ca767c01097bc4954c2dc5e6c222c7f9a70f03476d3f8b749cd2d2c25a93458f656e9847cdb0a5cba27bc9466fd825f9b28cbdb593e602cec62876eb9a SHA512 27601f1e83fe685b94caf3703bf8001111efcf0e0af371f3c5434354c55bffba9d3dbd9b48b11808557154c61acfa7c19700dd1f45b10c471c570d85f145b7dd
+DIST duplicity-1.0.1.tar.gz 1928618 BLAKE2B f7ffdd488e42219b66b6174dbb944283d02910f57cae9fcf849e8f5363986664a49ba7e316d6b3efdce89deec7e4c6a65a95bcb365fa23b928244b5e8f29d48b SHA512 dab8341b990b1899de6080f2539681f0a84f1875fabf04ccd68908e8dcdf55cd31f26d1431488b49ac6b048a1e7ff2e0a0afa27f6eccfd6a20f47dd7193b4563
 EBUILD duplicity-0.8.22.ebuild 1198 BLAKE2B 14b7f2881e24e0c6df0210106aed3bff676d5cc1ca3b6d94a9ba0244d116dbc062935da3ebd6f7cd9d76aff3d56a491f6dd29491b2cc037e1144066e0b5d73d4 SHA512 a969b0c486327c11fa6aa17416ef2e42f6ac379d8969a8da46d7a498dca12c0820740aee58dfd15b6b736f599eb07c2ba38869fd4b345605cba09feba234a1b0
 EBUILD duplicity-0.8.23-r1.ebuild 1200 BLAKE2B 75599f9de3f25c79a4cef0469da0cea55df513b7ddc63101bbb984e32002ef2d6a5f0af88d7f6875b013b2dac643e1ab0a89b83d1ab48597961bcad9ab213c0e SHA512 05c1a684a6fede46426f8ef8c65aaa017079c9127e39fcf75b83d0b5ccbde7573693d55462a1404b21367b6e8d2be5555267c11888d98c2469a321a6e718afe0
-EBUILD duplicity-1.0.0.ebuild 1243 BLAKE2B 3ff8313b3a117cd747d91e07f34d0d403a2579a81867578e80752f837f704363e92d976e7624043be505628dfda3b6eb674de08d9a707886f40032841b244044 SHA512 3ec6aaa0c37cc286d79a1ab0df2bbc5182800b09dbb5d33c86ddf1d495c61f644fb76945e4e0f5c52f1d8ee4bd2b23d81f0100e66a78ed9e409fab62427f9075
-EBUILD duplicity-1.0.1.ebuild 1243 BLAKE2B 3ff8313b3a117cd747d91e07f34d0d403a2579a81867578e80752f837f704363e92d976e7624043be505628dfda3b6eb674de08d9a707886f40032841b244044 SHA512 3ec6aaa0c37cc286d79a1ab0df2bbc5182800b09dbb5d33c86ddf1d495c61f644fb76945e4e0f5c52f1d8ee4bd2b23d81f0100e66a78ed9e409fab62427f9075
+EBUILD duplicity-1.0.0-r1.ebuild 1162 BLAKE2B a99bc6dd88c6a8cddb023f20280844e1fdc9598726187e615b1217f3c85196bf1659fb5c7001d1a4d83410353647dad5b6bec7791b056ea61846bdd22cf1c2be SHA512 12dfa2ee409776950f7e9ac6922450b6c466757c5a81d4d09eb28e157879d90d96181e3f21b35ccda584c80633fd9abfd7fe2909ae3fc2b51bdea573d642c165
+EBUILD duplicity-1.0.1-r1.ebuild 1162 BLAKE2B a99bc6dd88c6a8cddb023f20280844e1fdc9598726187e615b1217f3c85196bf1659fb5c7001d1a4d83410353647dad5b6bec7791b056ea61846bdd22cf1c2be SHA512 12dfa2ee409776950f7e9ac6922450b6c466757c5a81d4d09eb28e157879d90d96181e3f21b35ccda584c80633fd9abfd7fe2909ae3fc2b51bdea573d642c165
 MISC metadata.xml 455 BLAKE2B cc38c235e02397d73b26aaddfdbbd872cb7dbe1a777302618e44769e1895b7d7c90e7de7d7cf8a63388e20283fe0f9937da3ed0ffec21d960543220c253fff33 SHA512 0fb009ecd0b771bc8e04980cb1aa49a872193cfa59a0e10966322a9764c1c08d859504afd78f839e7a98a6224e4d1fe20dd6dff549cadda5c7e31b74ed0a82b8
diff --git a/app-backup/duplicity/duplicity-1.0.0.ebuild b/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
index 2d2b3174a000..5d96b440a67c 100644
--- a/app-backup/duplicity/duplicity-1.0.0.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
 HOMEPAGE="https://duplicity.gitlab.io/"
-SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/duplicity-rel.${PV}.tar.bz2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -41,8 +41,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
-S="${WORKDIR}/duplicity-rel.${PV}"
-
 python_test() {
 	esetup.py test
 }
diff --git a/app-backup/duplicity/duplicity-1.0.1.ebuild b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
index 2d2b3174a000..5d96b440a67c 100644
--- a/app-backup/duplicity/duplicity-1.0.1.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
 HOMEPAGE="https://duplicity.gitlab.io/"
-SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/duplicity-rel.${PV}.tar.bz2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -41,8 +41,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
-S="${WORKDIR}/duplicity-rel.${PV}"
-
 python_test() {
 	esetup.py test
 }