gentoo resync : 17.02.2021

28 files changed, 166 insertions, 198 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d749dea0d495..7a459d587735 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 68ca1bde59a9..9eaf75310db5 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -5,7 +5,7 @@ DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d2025
 DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
 DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20200601.3.53.ebuild 6002 BLAKE2B 6626c8dfc3bdcfe9ebd730cb93296fa5e07c36b775e589ed3e8e16d91aacc1ab2f94c0ab51841bb2c6540d9d7d4ff3ea78e4190323fb5aecf82a14b5ef61c55f SHA512 7ae00ec422dc5dd6b6f1021c6ac7ec76801689c653c3c3e2c17ac96e6e5ade0f6dbbe06ce50850a7b5cd4206fa3db07156324ce17cb04dd54d9158b162a0468e
-EBUILD ca-certificates-20200601.3.59.ebuild 6011 BLAKE2B b8d1ce6d119c7d56bd8988bcd2fd153cb129463ff2b29195fe6e9f67eb48266139968db20225f3183fcbcf98b8a5fec37a0ac2961c40bcb524d1387ac3a3e838 SHA512 1b873dfe73f8eea315ed5243328b4b61a02d389c3209395bda237b7143a01afe070071fb783e991573581fa5cc278f7d93a75d39034a1077846bfd351159a9ca
-EBUILD ca-certificates-20200601.3.60.ebuild 6147 BLAKE2B 8a56b54b197a3a495a33a2b6e7a9a50e079cf1d55761bf2473c79f03f9a10afcdd284e692e710634cca2622cecc8bed7d1c35ed2c9d7929dcfedfbb6e1f5794e SHA512 73cad6d1cbbf68a6808cce9c22a7f0be26e2a5631c88d737cf1441719a9b43979f625a1e4e22f2ae787ff8f8c76137ffe8b4d62a8e169f651565518bb373e0f5
+EBUILD ca-certificates-20200601.3.53.ebuild 5591 BLAKE2B caeca6b6ef04f9cffcd09f71a71e60f5a0bb83e2a17d250b7c70509d7b7c5a0157ca73551b3195f8e896967ca7693c286d654924a7e928a32588b4548169f0b5 SHA512 50173d5d27dea6a7425d59f05f7d6739a0c247ec171e641af26197746f28257fbdbe1e84ed2596a44bbf5ff2417e9e8526271cc6f552ba960ce95b30b6406f94
+EBUILD ca-certificates-20200601.3.59.ebuild 5600 BLAKE2B 9745244af02f8be68ba8f055d4f5c4bb5c1bcdd071daef8beee5c56ba00b10f6b57ea25a016d76cbba4fb7ab496727011fdb9b27b3fa120711bcf731e05e23cb SHA512 b72089184394cb71bc2de8cfe9b12944989b0fd0f1c50c7955f823c7d13d0fd1cc430d2d8f502f0fe338ebd002eeccc9f11d96e6d9e5f8dc7242b96d7bcc1233
+EBUILD ca-certificates-20200601.3.60.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
index 0858beed32b0..db37dd8ef656 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
@@ -13,16 +13,8 @@
 # now we know our cert database is kept in sync with nss and, if need be,
 # can be sync with nss tip of tree more frequently to respond to bugs.
 
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
 
 EAPI=6
 
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
index de868281fd53..65559a6386b6 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
@@ -13,16 +13,8 @@
 # now we know our cert database is kept in sync with nss and, if need be,
 # can be sync with nss tip of tree more frequently to respond to bugs.
 
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
 
 EAPI=6
 
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
index efcdad63373a..2f777c592fc7 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
@@ -13,16 +13,8 @@
 # now we know our cert database is kept in sync with nss and, if need be,
 # can be sync with nss tip of tree more frequently to respond to bugs.
 
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
 
 EAPI=7
 
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index fe00eb443c22..7aae2ee350cc 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -2,6 +2,6 @@ AUX ckb-0.4.2-gcc10.patch 868 BLAKE2B 67c3682f6aca611fd0955ab157e7e5b9a7ffd94a9a
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
 DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
-EBUILD ckb-0.4.2-r1.ebuild 794 BLAKE2B 5adcbcbb36a5e9c6da8bd9c31017b17020e68e2e8fc063d8227401726a3aa6626bb60012d4f323da00827274ae73aeec439c0199f249a1c5da7983ff7085b114 SHA512 392a3918f652d78b20fde9d8705bdd78ffbcf3847c0aa1352cf559b1dacfdf54f1316880ef8fe0e12bfd375c55b239037070cf606cb46d01187f4785ee09c7f8
-EBUILD ckb-0.4.3.ebuild 1146 BLAKE2B a7e9f2f602f6b18b5701271dd16681473055312336eb7934558f9afad0679056678efa4b84751f99cabfa0d042bea9954ae9be7c22d6fc82e7cdf8e389f8e5b7 SHA512 894ae0987964475cc160f9dbbbb3f864dc61a877474592e5d087e98707ddb0699aa1771d0a9556c00864c83ae59ed08d78f439ba653f7d556f95b6b99e9c1377
+EBUILD ckb-0.4.2-r2.ebuild 796 BLAKE2B 9bc343aa665e14200c2700e23517e735546e0ebf723c60d222297243af360c2a608ef1284a9df50692758f5274870c73af3154f6cf2a0a13b6cdb6fbcbb6452b SHA512 7a46d2b0deda858e4f3e4b64433e5d64497114c8cbe3ebaa8ea3046dc6e7e25104f906fe1c1456f1ef1fb3d06d8a0a582c14084bf1ad37c2c344d3807fed282b
+EBUILD ckb-0.4.3-r1.ebuild 1148 BLAKE2B ce766e2161c63520acb6dc9c62d71d847cc76b4bedb3fd7b8dae73bad21a4569fa6de344114e954e5b1228a719948ac5a05623909a590a4156b92080ce5b1a49 SHA512 94191e1fec557ab2046ff224e2809c61c25a93eb08dcbba24e1acc50b73670c200bb8a6c37d2ed1b918acd44fef3ace47831649138f3827741114806dd634e90
 MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.4.2-r1.ebuild b/app-misc/ckb/ckb-0.4.2-r2.ebuild
index 5dcd46ea00a6..6cf15eba6ad5 100644
--- a/app-misc/ckb/ckb-0.4.2-r1.ebuild
+++ b/app-misc/ckb/ckb-0.4.2-r2.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=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	>=dev-libs/quazip-0.7.2[qt5(+)]
+	>=dev-libs/quazip-0.7.2:0[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
diff --git a/app-misc/ckb/ckb-0.4.3.ebuild b/app-misc/ckb/ckb-0.4.3-r1.ebuild
index 5a1da477ebe7..8d8485e09da7 100644
--- a/app-misc/ckb/ckb-0.4.3.ebuild
+++ b/app-misc/ckb/ckb-0.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="dev-libs/libdbusmenu-qt
-	dev-libs/quazip
+	dev-libs/quazip:0
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 749ac031375b..c2150e89a171 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,5 +1,3 @@
-DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
 DIST gramps-5.1.3.tar.gz 17352457 BLAKE2B 8356e29d4e9e2ee78f0f09e54db8f77b2db991652f2c6b2fdc742b8f2e160a2c9c2b7df1a43c34e5d05b12b540e88cd8572fe89cfbb3a1ecb6df650a39ac0651 SHA512 045d5dd6aac4745ce527624657bbee25b9130e63b1b66bdd6a8409cdc876f1f3a4a6c0435d433a62bfffb723f6ac66d93829b79fc12c8768694c266b7a3b82cc
-EBUILD gramps-5.1.2-r1.ebuild 2321 BLAKE2B 78863227d4ccf314cb30754f209a2ad2eaaba5f33b42a4bad1d44eadc5387f6335a394c7290a42247e4bee8bc34e0c7729635733af44fcc9d9af60426a230b1b SHA512 5406be180aea6c369127eb204f674b9adf9f9bcb6ba6693ef3274d29c1778daa45c4fa58b62fbb45aaa5652feb45817f6bc8c3ee343d0fa6dac738c28d45aec4
 EBUILD gramps-5.1.3.ebuild 2742 BLAKE2B eb76a2536d3840f1c2aa9700b3d7cd985f7f22ed11a510b19ac864031841ee6481b15e79e82e3b6ed4c835e30599e72b431e4d98d658e4e9359a054ed11d8f74 SHA512 019f19b67ec71f6a8f7cfe5ad9d7350c191b2f263375d61a822d39f2d4335756f3f2260ea1bed99ae4c0b496645d96a431a095af20005aad84126b8b8612d028
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.1.2-r1.ebuild b/app-misc/gramps/gramps-5.1.2-r1.ebuild
deleted file mode 100644
index 680a20e2d492..000000000000
--- a/app-misc/gramps/gramps-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-		dev-python/PyICU[${PYTHON_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	')
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
-}
-
-python_test_all() {
-	# Gramps builds just fine out of tree but it confuses its test suite.
-	# The following might be an ugly hack but at least it lets the tests
-	# run properly until either I or upstream have come up with something
-	# better.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	esetup.py test
-}
-
-# Ugly hack to work around Bug #717922
-python_install() {
-	local mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-		build
-	)
-	distutils-r1_python_install
-	echo -n "/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index bf1d49d8d847..100c2426b43a 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
-EBUILD hivex-1.3.18.ebuild 1952 BLAKE2B f23df043901210d6baa3c40ccb18e48193d3781edbe7c13deccd8aea477deb168763edb5be25e7338a5f4d4e29971bada710a9e21b5d9e5a0e77669f91cac7ab SHA512 e37a6212e3fa9cd60d39773b2e0856b86c952a4ef4377d0bb3e0634dc0b21a7af6de071e3eee48c536fe71f3391aa560892be7a4c956d5b31642957d6ff93ddf
+EBUILD hivex-1.3.18.ebuild 1954 BLAKE2B f8f37ab6842487f92cd27d46dd8fcb1314d9744d7102ed230bb1f47b01fc6d22212193fc8eb44079253efbae95525485436ad7c6d8ec382fc31840add3b8303e SHA512 1c155dc9e098b98db0ef7dedb6916c9677ebc576ebeccb18f719ac7dbb422f3f104dd8c44e4cee45f48a8fb4be5313e8f3bff14ab1fd759b0574bdbd46af6173
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
index 38d0a31f9cd0..f1c6db65034f 100644
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_OPTIONAL=yes
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit eutils perl-module ruby-ng python-single-r1
 
diff --git a/app-misc/logiops/Manifest b/app-misc/logiops/Manifest
new file mode 100644
index 000000000000..6985ea89ac08
--- /dev/null
+++ b/app-misc/logiops/Manifest
@@ -0,0 +1,6 @@
+AUX logid.initd 509 BLAKE2B 950294904989544d1dea65f516493a986cbe8556a17e66f7be0cd33f19d514b38e820c61241d32785d6f3607d6f2c6a2af4270ab60dc72dfcc5a5ffa7b91779f SHA512 bf98e11c87d9486dd3f59494eae7fda9536bc6a90166bf8fa5c4226d189a86bc83aa9192d0b8f6e962cdc7d0f76e295d50c7c345f9ae445926670ecfe3b6830b
+DIST logiops-0.2.2.tar.gz 64350 BLAKE2B 84a8a0a7efd9c1cb87f78ad8bb685f75f34952a95879d93a4db6782dcc1b416a28402cd68affdea25c127013be801a819bbf91a614718ec413374c47c8282c34 SHA512 49803fe383b04a3c6cb6b1d094c73b29dd30534c8faad0ff1a0b3a35cf031c8b2751d1368d6bb2fcb1be84c83a97b70bc31a0fad1e898904b5371a210a6e88f5
+DIST logiops-0.2.2_p20200108.tar.gz 69366 BLAKE2B 3a688123c6167ec365c2f538c8f36818662bf63f3b1cd98e26bb4fd32eaa6e026b3e1b9e8dc116a6b6988d7abcd34fe7506329a9453bbd678bbf6b0ec53fd4f5 SHA512 5072f85f7c9c2505a8e3e5e089383a22c6ff659ece35f6761f77c2b3c7bd65a8ace7351cefb387a46c2d9e1a904573c96bf5ef3d11f12300b699c1df2ffae3d1
+EBUILD logiops-0.2.2.ebuild 1004 BLAKE2B 7064a464cee391ac07914db3dd30241a3d1eb3187fbee277f60d02833e61d28a38111fdd402fa74cdf2e00257e7881b327dd0cae5b18fbfc14ed0fec9ab16f85 SHA512 8c79a77731025ff61526bca9c19fd90cb32966a22def50fddfd51ff80acb68cc3f2b4acd6b32c4103495571610d3c5b2ec1432da70889d06b87b87f17ee23b79
+EBUILD logiops-0.2.2_p20200108.ebuild 1104 BLAKE2B 3952e7407a265b6ffc7b2d5e005400e6a9a81500435397ffbe240217754af0eb9250ae7b599690095300bae0765b49b6ab033922cb0fd595ba9beea98902b3e6 SHA512 1b9c68de1c2108c574adbd8847d285ae360d5c85f81d45be675d4325445635d70e1d8ca8a2e6bb3842c7ff4b5dc491d491c7d01b8bc09baa3c814fda76c70b3e
+MISC metadata.xml 393 BLAKE2B aaec420ee83380a435e6e5757f404d4ac0a9d6827bd35daf57807de0b0603e88308e1ecadca6c522afeccec6bb2e73d12970f2e5df180961fd9527b54f40351c SHA512 86b4e72e338e102564be34f04bc29da0cc3b4f78b608e31596f79e74dd85e074dac1f75d90fa1da9ae4fc62dbff8a35efc23bc9d16a52f147337cef795115ba1
diff --git a/app-misc/logiops/files/logid.initd b/app-misc/logiops/files/logid.initd
new file mode 100644
index 000000000000..3c852c6e4397
--- /dev/null
+++ b/app-misc/logiops/files/logid.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+logid_config="/etc/logid.cfg"
+name="Logitech Configuration Daemon"
+pidfile="${RC_PREFIX}/run/logid.pid"
+
+command="${RC_PREFIX}/usr/bin/logid"
+command_background="true"
+command_args="-c ${logid_config}"
+
+start_pre() {
+	if [ ! -f "${logid_config}" ]; then
+		eerror "The file '${logid_config}' could not be found!"
+		eerror "Please create one before you start the daemon."
+		exit 1
+	fi
+}
diff --git a/app-misc/logiops/logiops-0.2.2.ebuild b/app-misc/logiops/logiops-0.2.2.ebuild
new file mode 100644
index 000000000000..2e63d684128d
--- /dev/null
+++ b/app-misc/logiops/logiops-0.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices"
+HOMEPAGE="https://github.com/PixlOne/logiops"
+SRC_URI="https://github.com/PixlOne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	dev-libs/libconfig:=
+	dev-libs/libevdev
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "TESTED.md" )
+
+pkg_pretend() {
+	local CHECK_CONFIG="~HID_LOGITECH ~HID_LOGITECH_HIDPP"
+
+	check_extra_config
+}
+
+src_install() {
+	default
+
+	cmake_src_install
+
+	insinto /etc
+	newins logid.example.cfg logid.cfg
+
+	newinitd "${FILESDIR}"/logid.initd logid
+}
+
+pkg_postinst() {
+	einfo "An example config file has been installed as /etc/logid.cfg."
+	einfo "See https://github.com/PixlOne/logiops/wiki/Configuration for more information."
+}
diff --git a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
new file mode 100644
index 000000000000..56376f8f42ba
--- /dev/null
+++ b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="a0687c8f18e312824ac04043c410b637ce89e371"
+
+inherit cmake linux-info
+
+DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices"
+HOMEPAGE="https://github.com/PixlOne/logiops"
+SRC_URI="https://github.com/PixlOne/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	dev-libs/libconfig:=
+	dev-libs/libevdev
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "TESTED.md" )
+
+pkg_pretend() {
+	local CHECK_CONFIG="~HID_LOGITECH ~HID_LOGITECH_HIDPP"
+
+	check_extra_config
+}
+
+src_install() {
+	default
+
+	cmake_src_install
+
+	insinto /etc
+	newins logid.example.cfg logid.cfg
+
+	newinitd "${FILESDIR}"/logid.initd logid
+}
+
+pkg_postinst() {
+	einfo "An example config file has been installed as /etc/logid.cfg."
+	einfo "See https://github.com/PixlOne/logiops/wiki/Configuration for more information."
+}
diff --git a/app-misc/logiops/metadata.xml b/app-misc/logiops/metadata.xml
new file mode 100644
index 000000000000..97fd00877606
--- /dev/null
+++ b/app-misc/logiops/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/PixlOne/logiops/issues</bugs-to>
+		<remote-id type="github">PixlOne/logiops</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/mediacrush-cli/Manifest b/app-misc/mediacrush-cli/Manifest
index f7d7058ec77a..dda10331c43f 100644
--- a/app-misc/mediacrush-cli/Manifest
+++ b/app-misc/mediacrush-cli/Manifest
@@ -1,4 +1,4 @@
 DIST mediacrush-cli-1.1.2.tar.gz 3299 BLAKE2B d3235ef82e7c6dc4ff0c19662514dc848b34904b19105c49343a91b401ea2611e4d090f586a06521f3e0d55e336027456507fbcbe2eed0ada9d0f0765556af12 SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c
-EBUILD mediacrush-cli-1.1.2.ebuild 926 BLAKE2B 8318ece130c2df64cb954546c1f01ac8e9efccd066d7f13420e29047067c99953764eee5b84e39c23bf966ae73196ae7e97834d2e9e4944ef954655b136f0b42 SHA512 63a417b5a6f1c313fc93f9817f9f3a83379988da52dd3b030b4bcd89107322f4f2fcc247d9a3129bbb9851f6da00457c02c84a35f8e83927dd878aaa947ce4fb
-EBUILD mediacrush-cli-9999.ebuild 904 BLAKE2B 223c4dcb5a9fb268df9092a5db4816777f36d5656d6d0d68b1cf98972f62448882c5cdfab0fc0213c2d234d0c94dc4571400f937edda259f40e0743ff37ce520 SHA512 68217126fbf9b6710a5d7665325990ce3ab93fedc83e88601c4dcb646cae0653957d1b7b93191321a9c7b23ac7ebb4b0414ed92b8589ec571361803cea58dee4
+EBUILD mediacrush-cli-1.1.2.ebuild 910 BLAKE2B 13e906fbdf80f720f34a47ffc262bb7fdcdcce9476e25956eda663d1e8e5ca5f95fe982e68689b3eb5e8da982c385a7391dc81a538538cf7b671a75f55edf1df SHA512 2d368c0f47a25ab7ed99127bc03eff718a5931ea35d696b14559e9cba9e8036f31435a08fb00b33d83d0ee742e9596a947cdeae942d12694e1ebb313ca226d93
+EBUILD mediacrush-cli-9999.ebuild 888 BLAKE2B 12d098ac31e66c99a8bf9691f5bbbc62a93012f8542de12af690e3a3da14fce319050fe6a1a52ae42d31e617728873bcfd02e31c820e3cebe8f8f292fd86493c SHA512 2da5feb0214fa4be4154beaf2215d602e3b47c54a5c353908c259c4d0892b1a0b6890f7dc4295fae98995361021f227e019c8384eef6574adcba2a2524feabae
 MISC metadata.xml 262 BLAKE2B 7b9a308d8a01487fb4f750860b742d96d6f05470a672b6e9759e23e958f5a0f2f314b819d96113049d0439e51993899e58a74193fedf77351844ed5c898876ab SHA512 0810bb0acec3604cbe7eb8677bfca60b172b54a9aaff2367ecbd892c0d64ba910cf482021a8b482180a811532f74fba9217c7e417b1140bc587d7b67346df3de
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
index 7ccf263f351a..a8d2a2d39cb5 100644
--- a/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
+++ b/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,6 @@ EAPI=5
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/MediaCrush/MediaCrush-cli.git"
 	SRC_URI=""
-	KEYWORDS=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/MediaCrush/MediaCrush-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
index c0f0b0e722b7..552c7ca56352 100644
--- a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
+++ b/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,6 @@ EAPI=5
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/MediaCrush/MediaCrush-cli.git"
 	SRC_URI=""
-	KEYWORDS=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/MediaCrush/MediaCrush-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-misc/note/Manifest b/app-misc/note/Manifest
index c54facad73b8..c468e377a38d 100644
--- a/app-misc/note/Manifest
+++ b/app-misc/note/Manifest
@@ -1,5 +1,5 @@
 DIST note-1.3.26.tar.gz 53485 BLAKE2B b88fe67b708d85a60ea705caa99506a5ef59c442ed233b349cb07bf1cbc80514e8324b63f6e7a1ea6727e9742b11ecf4c460ecda818fc03de4532a132e3aa608 SHA512 4de22da10aef93e694cd1facb356666241435d2a468c25d43f42453c708d9a75b451820a01d952e587cca34b310a64c6e0069cdbe264376eb0cf50e3f852a252
 DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
-EBUILD note-1.3.26.ebuild 1343 BLAKE2B a72edb53b059c808ea073bf2fbb1013360675d89b9ba2d8334786a2231da91acc23cf0d170b85311b08fbf4eaad9aa01703d9a30f934ae949c34fc38ab779f48 SHA512 4a71b9b86dbd5a8cf4d5f6b1827c39563eb0253ee05f6392336be0bf2b436e5834e040f8b89c397f35a202f080ff3c8c3323cc0f0d9be23f59df2b76f7a0bbb5
+EBUILD note-1.3.26.ebuild 1342 BLAKE2B 9c0bf0963b79e1dcd1379429733b8eb7abe38fab19159f584ae2cf105b13b48966218443c11cc7c733c96b158503b0eb6325317a2b876d3c1328b241a02d170f SHA512 533d74bccaa70c097a2de704652e00f330bbd055ce3b75ca2d804e5956ef1fbd506275678a914d2cde18331a6245c4e926ca49125da1b9f573e2eb69d94a0c91
 EBUILD note-1.3.3-r2.ebuild 1321 BLAKE2B 048c1db99c1562b4e1e2ab89ef50c4bd338a9a87b7eb00a1c1e9e1ff08ccf9a81abf33622dfa2a753841d492fcfa24d4c7fad6c38477e42e2b570fa589f1db38 SHA512 9213fd08ea701cad178fc0a222accc4bfcb9ccb62034fcd58e87d0b90b02a9fa8ae445807d368f9e8c519393bfdd251a032847b69ab7e424b9f8f28b81439c86
 MISC metadata.xml 404 BLAKE2B d3156915a5f7af0c7bb45f39e7083fefe0eccc23fa2e278b236447144dbc132443fee61adda923687bd507892fa1d027e2494ce63f0ea219ba2274b036d2d533 SHA512 e2e8d63b287148f69f14e2fef3ee6c89ada388d69ea7a589a5ca8e75726d93fbcd419bfc26ee09549a429aa0ecb63a6e521ccfe25550f6169df3f6b92a7f078d
diff --git a/app-misc/note/note-1.3.26.ebuild b/app-misc/note/note-1.3.26.ebuild
index 248b317de6cd..b64e5a6b716b 100644
--- a/app-misc/note/note-1.3.26.ebuild
+++ b/app-misc/note/note-1.3.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="crypt dbm general mysql text"
 
 DEPEND="
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 0af00f07606a..02f9f1ba1639 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch 765 BLAKE2B f71598d503d5c9981b2955aa1eadf374d7bf00cc1af7b6733aee8009ff7bb20455a6539a7614ec742b4067e6a9337f1dfe713bfc19fb8344af6a43422867a148 SHA512 e9661c5365d2c71fe9f016d936b3d4c844c91cbc9649f877eee385ad894ff03bd3a8e90ecc504aaf1f21c7d339348f22b59a45859fe9b1527113ad7eb39dfd9e
 AUX rbutil-1.4.1-quazip.patch 1829 BLAKE2B 616af9d3d90384c70f717c363dfea2f4a7a3b9ad75438612a92e12997d2239d10860acc17fb8f2885ef6863764257c2756e03d9d2650e1af90e8f097607a3906 SHA512 6e30cfccb30d9f0dd677abd55fd2d53dc2cf8c06aadd8f278d119d1fca5c5a78e2adb84bf32feac37f6d82ba00e090b3693ef4d28c0f3234b8445368f4bd0cb0
 DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2
-EBUILD rbutil-1.4.1.ebuild 1473 BLAKE2B 8eb9e602c3e3825771f4e7d5da3d902fb3c29ab7828c006262586e085323bebe0216b5585db5508b9211867b44ef72f3a4f9f52e7186b9749ac915ba7b28b75f SHA512 393d79bdde8b701cc5ca480d23ea2721cfdf24bc9f909916804e7d29b0554bdefa6f0a55d366f094b34756e9fd547f175e12d67a6bbcbb4fe9ee4ae14076d240
+EBUILD rbutil-1.4.1-r1.ebuild 1475 BLAKE2B aeb6e184759a04c0dea644e140589686125341320d9cb1af0ea539e2d8a8ff3341929e8f83a7c18a3ba6c42426430a3edc343e52cb785559580daca830ddf31a SHA512 cce769fa3152092f1daf2aa260eb609db663275e042b71b96192505b7cce67282efb8ea8f1b67aa3f890e24533921c0fb7840046f28c3789d317a753cc30bc78
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/rbutil-1.4.1.ebuild b/app-misc/rbutil/rbutil-1.4.1-r1.ebuild
index f558a5e9dd92..fbb297fc7fb5 100644
--- a/app-misc/rbutil/rbutil-1.4.1.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="debug"
 
 RDEPEND="
 	dev-libs/crypto++:=
-	dev-libs/quazip
+	dev-libs/quazip:0
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 1c818ec0de40..2fd4aef6eef2 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,6 +1,5 @@
 AUX 0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch 660 BLAKE2B 56250a860b836d64b190049912123ebc5a06202ad25a6aa974a420b856f472d7aa5364cee96539c204e2c09c88a9f6e59cc5606aacf5b8c29655310340233a49 SHA512 6af9226a73280ca1c5f3f95d11b9c8f10ad4d847df9401643a8294645031cd3141916e4b00a188e25795f4a51f9f55e4caf2ba3280d5c9bd89f44a89411389a5
 AUX task-2.5.1-clang-build-system.patch 720 BLAKE2B 346ed760dfdc0e7dfb90de4ed91f49fbe91e48e28c624177898ec317fef9f0c43854e18527c57b21ba84320dc87adde3837f5cce69e1ffeb548cc1cbc0ab51a5 SHA512 afeb97da39429fa7402d1f856923d168bd07ae05492099c3132ebf04e459707208ccd0c1a7927c554c7573ae4c296e224e49e12a72e499543057fe7a7b25d8e1
 DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6b0834f875b1b02b38dbfde5e961122fdde00dc5ff29b56226a5ce0f805bd1be8a8194c9e185ab80ad6d6c2 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10
-EBUILD task-2.5.1-r1.ebuild 1264 BLAKE2B 9ce29b7eb39bd74479dbd22f7169072047f6f84610dadfffff0cc092ec28764be925760ef0707c37b91294bbeb9bda530fde908837e704ed9d2132a338d32508 SHA512 1cb91bbc30012a9c292a4d3b3c40aa6ef80ff7580b2fd86d9e12e7a1b49b414c0fa9de60c1ac6b55067b5f258977517b7f103488d2923cd4e96d787dc074d150
 EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
 MISC metadata.xml 435 BLAKE2B bc50b21afa9614b81ef07ba84c6261fa5978fc8e050a7b2436e83eb2030a86404c89c37a2acc6164d53d0aa265921fea209eb0e3e10d67b3dc028a41f4a2885a SHA512 2b2ea567948e32f5cab9fbebb7e5b96add831e4992eab88bcc304c26eb2bf533fade36048dbdbf36202c174a63cd8587b33f2a7ba86d0fd8bf009a860c9a7593
diff --git a/app-misc/task/task-2.5.1-r1.ebuild b/app-misc/task/task-2.5.1-r1.ebuild
deleted file mode 100644
index 25ea234d42b0..000000000000
--- a/app-misc/task/task-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="https://taskwarrior.org/"
-SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="+sync vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
-	sync? ( net-libs/gnutls:0= )
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_SYNC=$(usex sync)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	if use vim-syntax; then
-		rm scripts/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r scripts/vim/*
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh/*
-	fi
-
-	exeinto "/usr/share/${PN}/scripts"
-	doexe scripts/add-ons/*
-}
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
index 5c7fb4105602..85f12d4ede21 100644
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@@ -1,5 +1,5 @@
 DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
 DIST worker-4.6.1.tar.bz2 1615384 BLAKE2B a0d665f82d585d4e8a7e515e44b23541da24f6712c86bff422d4612ea67292c31cd204367965f8dd0ed91e69fa11453f7fc5a0228b2508d8397bde39460ff6f1 SHA512 f5977bc2c84c1eebb0058d63c7d10a0b39fa3c3bace09b6adac82f6a17bd9df8b1e2ba8138d764899895b69493493245cb6f7aff15014471a109a023fe203e57
 EBUILD worker-3.8.3-r100.ebuild 1350 BLAKE2B ae916e885f177c37254b0c1fc5239f8f4de0d58c2bdb01cda99fec2ee4ae1e74b51e390bf4faaa0c7361f23853eb3b9f4636f6ae715951e79a98f0c1b8169622 SHA512 9b2d3087f599bb130516cd6b64ee95496eed76c217be928d18d05fb45d9b2ddb373edc2f01477aebc89f4097f4063898ce31ab84150102fc6c237bbb59903a81
-EBUILD worker-4.6.1-r100.ebuild 1462 BLAKE2B 9fc627c1c4d9978a765cb4610ab3a736493ac1859ef576735a4f8b812a889d7a9b94bb95b0bfe3113470557b5caced7e4c29b5585a7db8b6c9c3929ae84e65ff SHA512 526226fa2e59308ed69e20a2f7b36b2359a6d491ecee795575c3aefc22f2ac6879943e6a4ced74203f197f934142b43dfa6fe4e34ad3c451e2179c2358742e6f
+EBUILD worker-4.6.1-r100.ebuild 1461 BLAKE2B ce272601e1963df20e1f1951daec4c98faa43081e3e4f262d6f18f174bc2dcb88c9cdfa845bec4f0e21e1ec85fc4f43e599286908b83c26f9a35bae22b86c50a SHA512 3a2d5b007fb7d5e02da607e274c7d3a9658242369f743d0dff4abb4c0ac4a54f14bad26463f0fbcc1b5e9270475bb9e5d45b6a2dd991b7216cfc1c72bc051448
 MISC metadata.xml 625 BLAKE2B 663b7236063925cb15a6025b7c48b0cceb01c0af01955215eed227939c1e6f471de78fa16ddaba4eb152b78303d835690a7b18d630f7440bab3934c89b69fc46 SHA512 b8a94fd69a914d144791fca62c5f52085dfc8d9f2d09810860e761683f34bef87623f0e15a33713fac06a1c7529f1967faf155c96b5a8d5bef7a9abb9ff02883
diff --git a/app-misc/worker/worker-4.6.1-r100.ebuild b/app-misc/worker/worker-4.6.1-r100.ebuild
index 091e1de2f8ca..bd319146baa0 100644
--- a/app-misc/worker/worker-4.6.1-r100.ebuild
+++ b/app-misc/worker/worker-4.6.1-r100.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"