gentoo resync : 03.03.2021

18 files changed, 22 insertions, 310 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 60b07521e908..d31234fafe50 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
index b10778c65e8b..c65f80e6cfb1 100644
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@@ -1,7 +1,3 @@
-DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
-DIST backupninja-backupninja_upstream-1.2.0.tar.gz 186229 BLAKE2B dc96e10a2db2002d548f6340c807d79b258be7b02d6075450763467b2b9a1fa0c3141093c1725f3fece8efff5d5a35d3fc5deb9cb509c97068836cdd5f160049 SHA512 59c7d64136027f93c1e1fe8051d449405298e1fbb47f93db9af180a64e1356e1ee0a4f83db483c7b26c0ecd0c5a6b7cf023ab1b9bdb123ee04cb44b449442246
 DIST backupninja-backupninja_upstream-1.2.1.tar.gz 186791 BLAKE2B 2e761b5538c77f359b2cc8b8c593589303f36b5b4d4d9f65457a1786cc671bdc57ad067c5bc7678fbe1afdd17406c3dedd641f2553213ec28186defd4b9d1fd4 SHA512 974276697f908cbf2203fd0cd3ebfe4f44c350714616d3a74191df4f9e101ce6d5f90cd2887dc06c5ed937ea19f9b72db28f5735255fae9d6db4faeaacee808c
-EBUILD backupninja-1.1.0.ebuild 542 BLAKE2B cd2d70a5f52e44cd916647565a565a88fb9a9850a7a881675ab39870ae8ecc81e134682f786af97235b03591552ad701e04923fe44274d76fc014dbda5a9ff91 SHA512 3537e26e1567f887855f40e52066a8249bd8994ceb197e461b05cc49fd53e80ea51c6d2d42f6f3ed81e6c7e24ed601c49a9601258e4aa94b2d583752c9963e43
-EBUILD backupninja-1.2.0.ebuild 544 BLAKE2B 36fe14ab48fd57974e798da735d36783dc8747b1ee7ccf57ef88d1859ff527bb0f2944788401a914a450f2db919874b4d533bf56dad85671ebee108ffcde8f46 SHA512 d87450bfcb3b38430596c62c670caeab57358a8658a6711e66a47f8b9379f047fd3d12b68004aaf4c75df27ec29abf0cc45e6cfcf1da014859709aeb764b842c
-EBUILD backupninja-1.2.1.ebuild 540 BLAKE2B fc388dc02fc7dd3144a0687a8408235a576682d8bec41cb8061bf3cca2b26fe5d81adb1f2238c255e784c25257b540776e0c4ce1d575d33d81f67cda1bed08b3 SHA512 3ae5581e68196de30323654939c835b7ef3107de2390703ca70936bada4576b2dc1eefdcebe9f8c32f671775e0bf19b576acd48b2b03ed1278284821f32e76b7
+EBUILD backupninja-1.2.1.ebuild 538 BLAKE2B b0579f86d7755c9cd29d0be3af672e78cf12b1ccf30f63654921b5c09cb4929a6617dbaaa1b14ef099cdefa26cd9a4309d05dfc73055e5f730dd5d6d8a1043d8 SHA512 2dfebffda7334cb8dcaf19f70ded5136fa14e0b50fad943316a007f369f5b6f4d9acca2825f982f03b1dcec3f7bbe291cba6e166cab96d572a3a8cfcca9fe800
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-backup/backupninja/backupninja-1.1.0.ebuild b/app-backup/backupninja/backupninja-1.1.0.ebuild
deleted file mode 100644
index 4eaa653e31b5..000000000000
--- a/app-backup/backupninja/backupninja-1.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="lightweight, extensible meta-backup system"
-HOMEPAGE="https://0xacab.org/riseuplabs/backupninja"
-SRC_URI="https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-util/dialog"
-DEPEND=""
-
-S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
-
-src_configure() {
-	econf --localstatedir=/var #578614
-}
diff --git a/app-backup/backupninja/backupninja-1.2.0.ebuild b/app-backup/backupninja/backupninja-1.2.0.ebuild
deleted file mode 100644
index 5fbdc03e502c..000000000000
--- a/app-backup/backupninja/backupninja-1.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="lightweight, extensible meta-backup system"
-HOMEPAGE="https://0xacab.org/riseuplabs/backupninja"
-SRC_URI="https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-util/dialog"
-DEPEND=""
-
-S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
-
-src_configure() {
-	econf --localstatedir=/var #578614
-}
diff --git a/app-backup/backupninja/backupninja-1.2.1.ebuild b/app-backup/backupninja/backupninja-1.2.1.ebuild
index 2daecb0d2abc..ae6ce6cd5c3b 100644
--- a/app-backup/backupninja/backupninja-1.2.1.ebuild
+++ b/app-backup/backupninja/backupninja-1.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-util/dialog"
 DEPEND=""
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 04f28a4d6c2c..520c3359e7a2 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -5,6 +5,6 @@ DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa
 EBUILD borgbackup-1.1.11-r2.ebuild 933 BLAKE2B d91496fa7f293bb96dadd180b70cb2dfd4642d11a9a216f9628401d9feb4266927c0e30bad7daa84f1a06438ce6af1687b8cecdada685b6ff94fee9ef4d50714 SHA512 e850dfd769f89368e20f62ea902cdb75a9c1e96e4743034da2ee27692445cf35f2210f9135bc78c76340d8649ee943f91465bf58ffb25fa38577f0ec42a2ccb7
 EBUILD borgbackup-1.1.13.ebuild 944 BLAKE2B 97a6e152d9051779457f5082d38a0239f67f953ecd73f6d9f4617275554e4c277df2054db1adbeb9806d7a02ba2f9919111bb336fe60dc326edc5b459dacf8ba SHA512 61a7d466234e65b89000f29c78d93bfdaa3fa566a54929b4d60ab44e7e7b9504689e712275839f74b59c8ee6539453626289e967061cc6888aca91795c2eeb0a
 EBUILD borgbackup-1.1.14.ebuild 944 BLAKE2B 1522f4450a67775a614e597ebdc2b3e010edd3110e0e2499558fa68488ccfc2f40cbfaabc9c8f6b93496adb7a23972baba6085607425dddec7fe3a21cf005c90 SHA512 3fd8db8e4f1ab1c8797362acc27f2102e55dca3d9dad1a44151da3665ddf9c2643feaadf42222719683b101fb21665f63572d849898aa18a9b6e54e56928a51e
-EBUILD borgbackup-1.1.15.ebuild 949 BLAKE2B c90f1d9149e5c4ec3b37b543d363db9a8bce0dcd65c069777b85c4b10b3aea52fac4f1f008c6a03a74a6d65bdadbf00ad389fe229b54f61bf4a960fe85e5229f SHA512 259fb2d02e0874dd0243df72855616c0bb658fcbc0613a78c5d72c7c1b999fe27b71e6d56efa4cea306e7a645cd34b2b0623798bb124608b18fd3bcb945af6b1
+EBUILD borgbackup-1.1.15.ebuild 956 BLAKE2B a79d33cea40d25c63eb62b7bbba0f27b16d229e5caa45f164c9f605923d453f0e670fa9c9c2523ff389ba987f2b45053999922de0a50a9542ac2af7734be3805 SHA512 0a2d8610382a4a34b5a21a24738ff8a48c282b78cd19f6397ff705cea3b5c9f450d58ace334451275572e222bf2aec57d6e0860c946edfcf5d8b8e8f0cdcd853
 EBUILD borgbackup-9999.ebuild 946 BLAKE2B 6173e891ff31cf2682aaf813daab17485b0017c8585c029cc96a229b4085683021baf05d7fe46b47737f71dac8b30e7b0523b5cda3c6d2150acfbb44012aa7a7 SHA512 14e55850b506e5357c0ea423f94125355d560ed107f40d4e6fbc796cba412dfc4195582649250458b2ade2d9257ecb6ff2e2f2a0f94b7cca2b1a9c0246596c2e
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.15.ebuild b/app-backup/borgbackup/borgbackup-1.1.15.ebuild
index 38874fede511..756672758369 100644
--- a/app-backup/borgbackup/borgbackup-1.1.15.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.15.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 5afce2efb990..9de6e5001baf 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,5 +1,5 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 DIST borgmatic-1.5.12.tar.gz 72964 BLAKE2B d71537eed019b10c3257d4b068c31aff63919e0cdb068b49c2ed92d2e97d37b8735f30b1225fb453e79372aeab49817e9200770aac4cc0f80c0bac14e84678d1 SHA512 67c7c7683e9fb7dd0321b3db6887212b040596f1d7e767cceeae6fa4cc02bb0a46344befbbc7a33b454a4692b04ae88d9031f71867788a94f771999d885112d5
-EBUILD borgmatic-1.5.12.ebuild 2119 BLAKE2B f38343871f3c6557bb773bb66089b238d1e1b2015994f38a7cb6ef72260a4f831954096d00a3d73369d71413f4dbb29c93642a1b91c0ac97b610e20bf8522430 SHA512 dc71788d70d150433cd548f90ed7dc85b13897493d0f499965b97540052c10bab483c2facd68f83e673ff2ed0c7cc3bca9dbdc542e86c9a4e427b94a55d892a7
+EBUILD borgmatic-1.5.12.ebuild 2124 BLAKE2B 685fa0dbd3a794abc48c05423ec06facdc1f75f1592a0626c74615b21fa03c85a00af4d7cfeed4ab7c0dbc42b32286ab72e1fd557d1c7e06e9443f6afd2ad150 SHA512 d7904e5d603f3c3ce18f3858107b7ff314ca59b0f3b7e900ba1454849b392c1a7f5db707e419774d996e10e4367e6f3d819995069efd9e264f2324293d51fc3a
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.12.ebuild b/app-backup/borgmatic/borgmatic-1.5.12.ebuild
index 360103d364e1..053aa40b5878 100644
--- a/app-backup/borgmatic/borgmatic-1.5.12.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm"
 
 # Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
 RESTRICT="test"
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 776669267c9a..3c2481bb74ee 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -2,6 +2,6 @@ DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481
 DIST dar-2.6.10.tar.gz 2140424 BLAKE2B 840a7a3d33825658be541157468a15bc3a3082083a35c426ecbab1cd2e8026e0a4d15671a33472068e1256878d1f60d414c2c069a3223ab5050756b13c887b69 SHA512 2fceafba6c6851c5dd11c0d1a3fda8aeddac16f39cf0051027b178703a5e821fb769c42624063d8722d80ea62bb735f3b0c6c39538c1c939234df49d6b757428
 DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
 EBUILD dar-2.5.11.ebuild 2240 BLAKE2B 676849c6b7e0be4af55d7a4dd67159ef3d0eeea289de1cbd18c5920e9bdf793c0dac7a7f78d76eb1b42c712cd8de2b4545f9e6e911a5532916f17f9076fe9b49 SHA512 635cfb86497ccd0bece7145538130ac301345ee37f71c28c620c10236ffb02d5d184b1eebe0a09fdeb3b56ef644fe497d3fa49d319aa526529a7317f4be79f7e
-EBUILD dar-2.6.10.ebuild 2429 BLAKE2B 066bc84262d49df1b32154879b7941b7f70a9e367ea9c6e5ceb4759d229421f42e55d2fa71df7eeffdb745103a2c9e0cda1a8f8eb99dbd2f1375bfd373ad9334 SHA512 a06d72b3c4d8fb4a9af5705be061c2cff6231fae2dfe12479af6ff148faca56d0c6c28543ba3648598f3bc06d997bcd66897fc82906dcdea860af90ab8d344d2
+EBUILD dar-2.6.10.ebuild 2428 BLAKE2B c593a80f822bd0c0f7151afd315c19ed43442bb7e6f7cd224efca9b8b0fcbc8b0bd7544c89005e436516a5cf6cdf50a94b0f27453888d7014f7689cc7c202d39 SHA512 36bb65b69130fb29c4ad9b3a33779ddc6a637b97daea68bf6e5e6df32e08546300e4772e345744cfca67e52039b8d96e6f931a19be6ab055e1bc3ab8284ee93f
 EBUILD dar-2.6.13.ebuild 2425 BLAKE2B 4c8e3cdf8fada15050eb7ade152f270e52333c1d4a9cde791524e48a84f5048fb692765a3f83f433c0badaed1e1890efef1361357b0bc696277b524c4557b4ac SHA512 9ae119eb61f6a77043593defc8a790a4dd52339ac9ec26abbf3902840df84a74674926b1e2653423fafdaae9f1bcc5b457074ee3bfe5071c24c50044cf0d23ff
 MISC metadata.xml 839 BLAKE2B 9a7022a2e4a20a5519d5242e1d67d30918c5f723f970e6725c7dfb39a16d8130d117fd1cea49a76c209921ed960b6ac9b94ed37aa54e5e41afd39c3e68f23a0c SHA512 e877836606715f1624a67d8b32fb0d586d646b05e5ea6c589adf3c4c8ca4950c251edd212da7b07a0cf763d94e0e0f1c5f8f89c3019e4bfd8c1e3bd89aacd393
diff --git a/app-backup/dar/dar-2.6.10.ebuild b/app-backup/dar/dar-2.6.10.ebuild
index 8cce3a914ff9..f37ecb73ec03 100644
--- a/app-backup/dar/dar-2.6.10.ebuild
+++ b/app-backup/dar/dar-2.6.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
 
 RESTRICT="test" # need to be run as root
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 13c4bb9013df..666da2e6e0e6 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,10 +1,10 @@
 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
 AUX duplicity-0.8.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
+AUX duplicity-0.8.18-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
 DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
+DIST duplicity-0.8.18.tar.gz 1352646 BLAKE2B 9703ad0780d6bd7db970941f529192132f1b7c138c72831cfdeb1b703dc9d952e28cf453a77a62babc872ec57d9193fa7293607401e278d12ec8143f779d2a60 SHA512 fd9dc472e4145725de343a3195ca8c898570ec492d46bc385d354c40b2c31e7c0da1f6e15e2a4a391d35926ae77e854992f4c973e55b072006c3f6489e27408f
 EBUILD duplicity-0.8.15.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
-EBUILD duplicity-0.8.16.ebuild 1194 BLAKE2B baa44ad3457afb3201e19dbd6c3471fe109a37e623c32da871e09479c0884931489f4c0cbf85325226497b32a4c83db9533edbdd4d3e38247986d53815ee3948 SHA512 f720ade045545c48484c83f8ece71aa9712965648a73f702f9aaf4cdfd97a40b61bdfe84adb7da303800ff022714bcccc9dc67eb1364252c632cfebb42aaf080
-EBUILD duplicity-0.8.17.ebuild 1194 BLAKE2B baa44ad3457afb3201e19dbd6c3471fe109a37e623c32da871e09479c0884931489f4c0cbf85325226497b32a4c83db9533edbdd4d3e38247986d53815ee3948 SHA512 f720ade045545c48484c83f8ece71aa9712965648a73f702f9aaf4cdfd97a40b61bdfe84adb7da303800ff022714bcccc9dc67eb1364252c632cfebb42aaf080
+EBUILD duplicity-0.8.17.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
+EBUILD duplicity-0.8.18.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
 MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a
diff --git a/app-backup/duplicity/duplicity-0.8.17.ebuild b/app-backup/duplicity/duplicity-0.8.17.ebuild
index 6d763c668f4c..8f7cf391d022 100644
--- a/app-backup/duplicity/duplicity-0.8.17.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.17.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"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"
 
 CDEPEND="
diff --git a/app-backup/duplicity/duplicity-0.8.16.ebuild b/app-backup/duplicity/duplicity-0.8.18.ebuild
index 6d763c668f4c..4b901f06dcdb 100644
--- a/app-backup/duplicity/duplicity-0.8.16.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 inherit distutils-r1
 
diff --git a/app-backup/duplicity/files/duplicity-0.8.16-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch
index 3b8fa1c22ed6..a0fce6b2c5d8 100644
--- a/app-backup/duplicity/files/duplicity-0.8.16-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch
@@ -1,14 +1,13 @@
---- 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 @@
+--- 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',
--                u'Changelog.GNU',
+-                u'CHANGELOG.md',
 -                u'COPYING',
 -                u'README.md',
 -                u'README-LOG.md',
@@ -19,7 +18,7 @@
          ]
  
      if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -340,7 +328,6 @@
+@@ -339,7 +328,6 @@
          ],
      test_suite=u"testing",
      cmdclass={
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index b30e2eeda419..2fcf819bcd23 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -5,6 +5,5 @@ AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a1
 AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
-EBUILD tsm-8.1.6.0-r1.ebuild 7429 BLAKE2B 727e0fe53cd8fddcde4336531a191cb7dc026bcdaa09d8cc33f9bdca8de0b9ae870a5b9aae529dd140ba77c7e02521c66daa5ff0ed9b4fe2e329036a37146e0a SHA512 52bed6adb701a86608d0228013b609c491b0aa6c75cae494626ff7a609ae17c55d8e7af4d6e5eddb55f8e434ca689d2d37b95fde73c409aa6ab2e742c756274a
-EBUILD tsm-8.1.6.0.ebuild 7426 BLAKE2B 5fe14950099f1bfeb0dea59abf012e33782fcebf5006007812fc87d39124fa429ea78aed05859bda74d70d8765c079fed11f2410def1c939868b79288a58e05e SHA512 4128b6769eb1709f8aacb794b5fe016b5ac102d4823dea50cdbf532d34e2f10d9caa31f096ff0e01ce5850f61d0815b8103096cdf7a0fd02358808f5dbc0bb3e
+EBUILD tsm-8.1.6.0-r1.ebuild 7428 BLAKE2B f22643906e9699b33f2d91f8145928db1226883ff4297c3a12dd5ec7d330c847a70d59e3f5ce384925f1f55dfb8610f0e7a27a6db1511060ac3a6b59c58df5f8 SHA512 9d4f43f867c59f72183ac97560e9121d4c8390f4a40b5d392aed6b9377b816258164acbe671149b694632db3e8d12e07bfbc68ceca56b7ecc899683e5a5b0bad
 MISC metadata.xml 398 BLAKE2B 78fb8e9d30a09caddcc2006326db44bbb2c12b83e174f8af3263d738a1ae958922297d910225137a0f9056f50f76086aeb5ee37e342a1302fb060159f1c50c99 SHA512 d232b0705cc9e5ec35eca0f5c2492b5211cc083db2f825268055b1097017f60967d2e12d61083173593a3c9387f6879584abc2cbe58da69c32fb2ff6d2e83903
diff --git a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
index 34225aedc4c4..cab9db6b1d19 100644
--- a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
+++ b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="acl java +tsm-cit +tsm-hw"
 QA_PREBUILT="*"
 
diff --git a/app-backup/tsm/tsm-8.1.6.0.ebuild b/app-backup/tsm/tsm-8.1.6.0.ebuild
deleted file mode 100644
index f84a86e3d25a..000000000000
--- a/app-backup/tsm/tsm-8.1.6.0.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
-
-DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
-HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
-
-MY_PV_MAJOR=$(get_major_version)
-MY_PV_MINOR=$(get_version_component_range 2)
-MY_PV_TINY=$(get_version_component_range 3)
-MY_PV_PATCH=$(get_version_component_range 4)
-
-MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
-MY_PVR_ALLDOTS=${PV}
-
-if [[ ${MY_PV_PATCH} == 0 ]]; then
-	MY_RELEASE_PATH=maintenance
-else
-	MY_RELEASE_PATH=patches
-fi
-BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
-BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
-BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
-SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
-SRC_URI="${BASE_URI}${SRC_TAR}"
-
-RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
-LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
-	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
-	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
-	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
-
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="acl java +tsm-cit +tsm-hw"
-QA_PREBUILT="*"
-
-# not available (yet?)
-#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
-#	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
-MY_LANG_PV="${MY_PVR_ALLDOTS}-"
-for lang in ${MY_LANGS}; do
-	IUSE="${IUSE} l10n_${lang%:*}"
-	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
-${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
-${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
-done
-unset lang
-
-DEPEND="
-	acct-group/tsm
-"
-RDEPEND="
-	acct-group/tsm
-	dev-libs/expat
-	dev-libs/libxml2
-	sys-fs/fuse:0
-	acl? ( sys-apps/acl )
-	java? ( >=virtual/jre-1.7 )
-"
-
-S="${WORKDIR}/bacli"
-
-pkg_setup() {
-	DOC_CONTENTS="
-		Note that you have to be root to be able to use the Tivoli Storage Manager
-		client. The dsmtca trusted agent binary does not exist anymore.
-
-		For information on how to give other users access, please see the following
-		URLs:
-		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin
-		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca
-	"
-}
-
-src_unpack() {
-	local rpm rpms lang
-	mkdir bacli || die
-	cd bacli || die
-	unpack ${SRC_TAR}
-
-	cd "${S}"
-	for rpm in *.rpm; do
-		case ${rpm} in
-			TIVsm-APIcit.*|TIVsm-BAcit.*)
-				use tsm-cit && rpms="${rpms} ./${rpm}"
-				;;
-			TIVsm-BAhdw.*)
-				use tsm-hw && rpms="${rpms} ./${rpm}"
-				;;
-			TIVsm-JBB.*|*-filepath-*)
-				# "journal based backup" for all filesystems
-				# requires a kernel module.
-				# "Linux Filepath source code" available
-				# by request from vendor
-				;;
-			*)
-				rpms="${rpms} ./${rpm}"
-				;;
-		esac
-	done
-	for rpm in ${A}; do
-		case ${rpm} in
-			*.rpm)
-				rpms="${rpms} ${rpm}"
-				;;
-		esac
-	done
-
-	rpm_unpack ${rpms}
-
-	# Avoid strange error messages caused by read-only files
-	chmod -R u+w "${S}" || die
-}
-
-src_install() {
-	cp -a opt "${D}" || die
-	cp -a usr "${D}" || die
-
-	# The RPM files contain postinstall scripts which can be extracted
-	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
-	# Below we try to mimic the behaviour of these scripts.
-	# We don't deal with SELinux compliance (yet), though.
-	local RPM_INSTALL_PREFIX CLIENTDIR i
-	RPM_INSTALL_PREFIX=/opt
-	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
-
-	# Create links for messages; this is spread over several postin scripts.
-	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
-	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
-	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
-	#done
-
-	# Mimic TIVsm-API64 postinstall script
-	for i in libgpfs.so libdmapi.so; do
-		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
-	done
-
-	# The TIVsm-BA postinstall script only does messages and ancient upgrades
-
-	# The gscrypt64 postinstall script only deals with s390[x] SELinux
-	# and the symlink for the iccs library which we handle in the loop below.
-
-	# Move stuff from /usr/local to /opt, #452332
-	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
-	rmdir "${D}"/usr/local || die
-
-	# Mimic gskssl64 postinstall script
-	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
-		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
-			/usr/lib64/libgsk8${i}_64.so
-	done
-	for i in capicmd ver; do
-		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
-	done
-
-	# Done with the postinstall scripts as the RPMs contain them.
-	# Now on to some more Gentoo-specific installation.
-
-	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
-
-	# Avoid "QA Notice: Found an absolute symlink in a library directory"
-	local target
-	find "${D}"usr/lib* -lname '/*' | while read i; do
-		target=$(readlink "${i}")
-		rm -v "${i}" || die
-		dosym "../..${target}" "${i#${D}}"
-	done
-
-	keepdir /var/log/tsm
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/tsm.logrotate" tsm
-
-	keepdir /etc/tivoli
-
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
-	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
-
-	# Added the hostname to be more friendly, the admin will need to edit this file anyway
-	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
-	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
-	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
-
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
-	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
-
-	# Setup the env
-	dodir /etc/env.d
-	ENV_FILE="${D}/etc/env.d/80tivoli"
-	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
-	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
-	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
-	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
-
-	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-
-	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
-	newinitd "${FILESDIR}/dsmc.init.d" dsmc
-	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
-
-	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
-	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
-
-	systemd_dounit "${FILESDIR}/dsmc.service"
-	systemd_dounit "${FILESDIR}/dsmcad.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local i dirs
-	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
-		if [[ ! -e $i ]]; then
-			touch $i || die
-			chown :tsm $i || die
-			chmod 0660 $i || die
-		fi
-	done
-
-	# Bug #375041: the log directory itself should not be world writable.
-	# Have to do this in postinst due to bug #141619
-	chown root:tsm /var/log/tsm || die
-	chmod 0750 /var/log/tsm || die
-
-	# Bug 508052: directories used to be too restrictive, have to widen perms.
-	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
-	chown root:root "${dirs[@]}" || die
-	chmod 0755 "${dirs[@]}" || die
-
-	FORCE_PRINT_ELOG=1
-	DISABLE_AUTOFORMATTING=1
-	readme.gentoo_print_elog
-}