gentoo resync : 11.05.2021

12 files changed, 94 insertions, 50 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 30e428a08467..cb3bb917fed8 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 48106b03c7a1..0e3bd20ba18c 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,10 +1,13 @@
 AUX duplicity-0.8.15-fix-docs-cmd.patch 888 BLAKE2B 17627c86ed5b895ff08c6394b407b69f8653913d7e1bbbcd994c574a817e7f018a8b6f26819a147387414f9997b32e95fc76e2f4583158ee453d03a489b8b4b7 SHA512 a901c5870fcc6745873b5850b2d2544948cb766d72d7ca8f8869d03bc9512f4527ec62df3f29a1151675a91e6c6b3816069008d1b5d56e45b787e2bddaed4aa5
 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
+AUX duplicity-0.8.19-fix-docs-cmd.patch 628 BLAKE2B 6acf30fd8881a14003a158e76a23b81af0e049c090c671adbf147c7a77b5ed57e75b9c9b169e38a06fdceb310bdc4f74bacb543a66e5820d3d1ab9951dca997d SHA512 6b2e401d6ce8c2ee41dd1ea8ffaed7602b8167fbf0cf465c214ddf8d1ef8af8b74a1a6c93741c6b34705b53b2caad438736a6ee7c6c3483b11d8ede029758348
 DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
 DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
 DIST duplicity-0.8.18.tar.gz 1352646 BLAKE2B 9703ad0780d6bd7db970941f529192132f1b7c138c72831cfdeb1b703dc9d952e28cf453a77a62babc872ec57d9193fa7293607401e278d12ec8143f779d2a60 SHA512 fd9dc472e4145725de343a3195ca8c898570ec492d46bc385d354c40b2c31e7c0da1f6e15e2a4a391d35926ae77e854992f4c973e55b072006c3f6489e27408f
+DIST duplicity-0.8.19.tar.gz 1372739 BLAKE2B 6a5a642597529eea37c7224cbfdd115db42c16f6391e553454f8f82cea86240bbd68a62513129496a1f978411fdeec50c3d918bb99b470fa1444fd77e7e6c9b7 SHA512 c1a1f5894f8b94ac61bd98270f138c58ef5a68f3624e7e88224b15539ca6e08874df9cebb36b10167d133b1af6a93b29e7bf4084c348b9cd7914ff24415be57c
 EBUILD duplicity-0.8.15.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
 EBUILD duplicity-0.8.17.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
 EBUILD duplicity-0.8.18.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
+EBUILD duplicity-0.8.19.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
 MISC metadata.xml 454 BLAKE2B 08e99a3d0e80e38e1ec062be7e4a1a4cc5b8d9e579381142a7c274c27cf585b7c3fd62fa14b1b2b486ec26d8aec4f7dcbc91fa7d8400b36fe609e240c67d6552 SHA512 a4c895eaf690f40fc197acf26501b2da386a3af716b4dda87d84e2d459ef9642e19e1e5ebca8a6ae156c272321d82279e573eaaf1ad3e19e7d5dd35e9f9e69ea
diff --git a/app-backup/duplicity/duplicity-0.8.19.ebuild b/app-backup/duplicity/duplicity-0.8.19.ebuild
new file mode 100644
index 000000000000..4b901f06dcdb
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.8.19.ebuild
@@ -0,0 +1,51 @@
+# 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/files/duplicity-0.8.19-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.19-fix-docs-cmd.patch
new file mode 100644
index 000000000000..afcef7ab948c
--- /dev/null
+++ b/app-backup/duplicity/files/duplicity-0.8.19-fix-docs-cmd.patch
@@ -0,0 +1,20 @@
+--- 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/kfoldersync/Manifest b/app-backup/kfoldersync/Manifest
index bb74ffc136c1..a10f7951d034 100644
--- a/app-backup/kfoldersync/Manifest
+++ b/app-backup/kfoldersync/Manifest
@@ -1,3 +1,4 @@
+AUX kfoldersync-3.4.1-kwindowsystem-5.82.patch 795 BLAKE2B 3d570880a72687e2add10742c2fb95683736c2dbe912e88f2ca1dca5520b78a9a1aa5cda7922df04723110b0a779513eff1e979aa933402a3ee5266e51583562 SHA512 a95ae41a7dfd46d6f3c864e73a2403ee07e8e321759b0d1034c4d62324bced9801d462e2b43a7d4f444bde776580f40731b07f023bdedf9364651bc036be8e63
 DIST kfoldersync-3.4.1.tar.xz 49308 BLAKE2B b2d928d7b4111d69f9fdf28efcddb72da715b6bc143d94cc6d37fd8e5888f5ebd70d11e57a1cdce046ced7f55b6ba4a3da9d64947928d60ddb560b593af9a996 SHA512 b51c005942f0627f8ab3428e860c5f336df0282fd3dc184cac6897755a740ca873241e63828b1af7704b373e0a92de1a4bd9dbe8db3b7a35fbbafc2a509603d0
-EBUILD kfoldersync-3.4.1.ebuild 962 BLAKE2B 3beb77087a0ff57f27aa0287cdc5adbafa7fb221fd6950516708276d98b8a8a6ce48bb72fc3de862fdc6355d910f1f303f006557ddb811b5bd8e5bbcfc901f5c SHA512 229d62df5c4f0357d834523ff63b52f966d6d2c65e1a052a1fdf96b21e5febe26122936f2cf5acd608ff4ee390be8965dacf59fd451f4535e6c6fd9abdfbbfd7
+EBUILD kfoldersync-3.4.1.ebuild 1038 BLAKE2B d6a69e9680c7dff233d46148b83bfaf3173eb9224d22ca75d20b22ca9cf31c9226a779322a9b430eb1788fd24a69c107b8c8cbb1608b0cfb643700bf06ab4859 SHA512 ea7415f6d04de1b27f27ec14adaaf6d3decad37cdd9912f5667dce5fe8d9015236e36cfb87bb917ed7b286c0910b3f0658a6b6a9dcdcbb7cec2ab44080e52405
 MISC metadata.xml 521 BLAKE2B c1b348ed6b4d0ec451a6da0508000c2f67a56f41e7c85c80535fdcd87e7fcc16b91efa957052e82f4cde5e44a5147410b0c5a7b22a51a09a893d6eb887682de2 SHA512 23ce04633c404da4e581a1931230ccff3069093280a0e049b2612f881005296c358f4c01d8ab9fcc344a176d143b9dbd87b5218204a7eace67fc2ea55f8b7d61
diff --git a/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch b/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch
new file mode 100644
index 000000000000..f83c0e5b23c0
--- /dev/null
+++ b/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch
@@ -0,0 +1,11 @@
+--- a/src/kfoldersync.cxx	2017-01-24 10:27:17.000000000 +0100
++++ b/src/kfoldersync.cxx	2021-05-08 23:52:28.891166974 +0200
+@@ -173,7 +173,7 @@
+ {
+     // Connect to dbus (keep it without parent to avoid potential SIGABRT)
+     static const KDBusService dbus_service(KDBusService::Unique);
+-    connect(&dbus_service, &KDBusService::activateRequested, this, [&]{KStartupInfo::setNewStartupId(this, KStartupInfo::startupId()); KWindowSystem::forceActiveWindow(winId());}, Qt::DirectConnection);
++    connect(&dbus_service, &KDBusService::activateRequested, this, [&]{KStartupInfo::setNewStartupId(this->window()->windowHandle(), KStartupInfo::startupId()); KWindowSystem::forceActiveWindow(winId());}, Qt::DirectConnection);
+ 
+     // Setup toolbar
+     QMenu * const app_menu = new QMenu(this);
diff --git a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
index 252fea2b53ce..5de0a6109900 100644
--- a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
+++ b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,3 +34,5 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # downstream patch
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 472865fc4af6..223b83d619b8 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -595,5 +595,5 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 EBUILD restic-0.11.0.ebuild 32428 BLAKE2B 9547c7ce3116e92e034880bae157c1f82430e8b0740d1a5dfcb43898c6b68b300a518b973f6fe70306cba0d64a143fbfed08c8223ad08a6e94f2c3fee8775324 SHA512 9b6170323810b0b94ce6c5664276e2fc5bb6d2517e0e73ef9b086eaf90337a533c775b943e603a91f54f4e2128991a8f1d99fdc3bad269a7d4e7ecea4a429d96
-EBUILD restic-0.12.0.ebuild 32340 BLAKE2B 7c314c0ad25d3152a30f2e9c456ddcd2be539a0cea0a76eb29cc9c9e9a595a13a5a3998884ec2aff98f043707abed8526ad6ef8a8d58e6bfd36417d10ec83895 SHA512 7e98d06858110c4d45a2aeeb2be64f9e994db186f9de6c33e971071364e1dad75b7c2eb62f56d74541a82b697d4e55255efbdeea5b8bcf7d6db751a04e8b54ef
+EBUILD restic-0.12.0.ebuild 32347 BLAKE2B 62c5eeb77666a75edf38ecd7279ef6357cec816afedb8122705ca2c4e61a77c6b1ad3ec9f8bc661348b7a718ae9c0d5d24154ffb64d99e17f670165875986023 SHA512 ea6d12e33ca0dcb61f6f53c36a8da2cc29fb318fd314bf9e1bcadbe5246e28ef80b13e6b351b70c89648f301c8e6f3fc6b1d2e9b846d5adef15d2a20681629e9
 MISC metadata.xml 474 BLAKE2B 1b2acd92a1ff87ae82add1c26a0624296502c45f8f82abb1fc7a07e5b5320933ab93d56f1d10bbba63b804f7720202c6959f655d220366a4cdd2fe55c8b57844 SHA512 c5fe6467d6d74f94afc85d184355fa9933698d2c55e7b35f923ecbc377ed118f7c101bbe8eabf22feb3ead48f5be00728955b7e1a25772b7e49a4f430bd72a91
diff --git a/app-backup/restic/restic-0.12.0.ebuild b/app-backup/restic/restic-0.12.0.ebuild
index 2f9ae4252353..1a6e09ae863c 100644
--- a/app-backup/restic/restic-0.12.0.ebuild
+++ b/app-backup/restic/restic-0.12.0.ebuild
@@ -606,7 +606,7 @@ SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="sys-fs/fuse:0"
diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest
index 9c456c967465..f1a8135b083a 100644
--- a/app-backup/tarsnap/Manifest
+++ b/app-backup/tarsnap/Manifest
@@ -1,6 +1,4 @@
 AUX tarsnap-1.0.39-respect-AR.patch 302 BLAKE2B e03e8b6787697bfab6ef2974cfc248f38eb398512d2e516c8089c676f78c83b390f117a338cacd4d7ef01a2ec13a52bb73210f8b9300b97d9e2ef82391d3bbf1 SHA512 0f35e836abc7e376e9a5fd5e618064667b3ba4415e8280e09b6a9a894ec531bed6ce301d89a6d55dfa14dfb27e98f7d5c53e5b3a7b7cd84fbe9807229c0d5ff1
-DIST tarsnap-autoconf-1.0.37.tgz 629450 BLAKE2B 440858098c5c3f2be6fb6b1473ab4fade158203162c04fbc4c2e051f443c7ce3246ab0701e117bccb436b8f1f022e986ec67f653a3c34b9c36da99ca85d73bc8 SHA512 050053f2109b74cda16511cf35ab2c11e0470ba745c661d254b7c17efde9e629830d519896b343dbd4f48ee739dfef47b724eb5e2e78c3e7dbc4ae018a536a5f
 DIST tarsnap-autoconf-1.0.39.tgz 641089 BLAKE2B 4da7fa75c2a6df3186fac4f39a511532ae866c287a2bdc8dcc22049b53fcc903305f84fae9258793bc0c7a47b208d0bf2995143ee7b4296a35b4ca41d65d9a09 SHA512 dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4
-EBUILD tarsnap-1.0.37.ebuild 864 BLAKE2B e6a2825be94571f20a53d58b20a2caa8b93d98ade4c8e860086c72b40f7660f197956f7ba98766820404b32d44c64a7bb66520b4e73befac26bcbcc40f909290 SHA512 58cc437364ca3b2129354eafa8308fa66980e4cd77e5445000bc0a0dc7f8b3f88ed69daab524436c993166d31c96d10b83899e30ff78d7e58914b2567bc22f7d
-EBUILD tarsnap-1.0.39.ebuild 981 BLAKE2B 7c9b7922f45d17e2bceb48667b2aa11b776393d4c203b09d4679969740c88a53a89de5fc5b986165b5f026848f25d19e40b9da0f07999d3d4d69574188ba7b5f SHA512 7a5624d44ce32d3af76354c1c79ac5e00b13ab22a00b70d947201e70dfd35c024bc012379e74ea2473dd16caa63600312f7ca53174fcf816f7d850a62eb8dfa6
+EBUILD tarsnap-1.0.39.ebuild 979 BLAKE2B eb4313b4a96fba12030c41163b29e9d1e730a048b033491e8778996d73fe0685748ff88ab9bacd02e6f2a560548695464d647bd2136b395e5be8ec00a17e7cc7 SHA512 d9d219c6b8e9bcc44bb00172b7a142445382f50f8d800309905929dd7aa6e76da89c9ba00445e5c608efbb0339af1dac8dcb3d978539a96ae14e1864db972f6d
 MISC metadata.xml 269 BLAKE2B 846219f06712943539be1908eed5ae369ce69b724f910897e6f3757ed0a9650bb7f350e6eb083de4cfe55f11d7b7f9fab6f259172c664cf06888391818c790e7 SHA512 48f5508e9d9d2287d2d842e27ade7b707141c67b4558c4481fcc9cbd8280ca791a9629881fd1ce6a9a1defd26ff81d40ccbd0655c395a2e899be48c93051a714
diff --git a/app-backup/tarsnap/tarsnap-1.0.37.ebuild b/app-backup/tarsnap/tarsnap-1.0.37.ebuild
deleted file mode 100644
index 129029b4b85a..000000000000
--- a/app-backup/tarsnap/tarsnap-1.0.37.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Online backups for the truly paranoid"
-HOMEPAGE="http://www.tarsnap.com/"
-SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
-
-LICENSE="tarsnap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl bzip2 lzma xattr"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	acl? ( sys-apps/acl )
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	virtual/os-headers" # Required for "magic.h"
-
-S=${WORKDIR}/${PN}-autoconf-${PV}
-
-src_configure() {
-	econf \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
-		$(use_with lzma)
-}
-
-src_install() {
-	default
-	dobashcomp misc/bash_completion.d/*
-}
diff --git a/app-backup/tarsnap/tarsnap-1.0.39.ebuild b/app-backup/tarsnap/tarsnap-1.0.39.ebuild
index 90b4f5c9a52a..c665e1765051 100644
--- a/app-backup/tarsnap/tarsnap-1.0.39.ebuild
+++ b/app-backup/tarsnap/tarsnap-1.0.39.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
 
 LICENSE="tarsnap"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acl bzip2 lzma xattr"
 
 RDEPEND="