gentoo auto-resync : 29:08:2022 - 10:46:12

author: V3n3RiX <venerix@koprulu.sector> 2022-08-29 10:46:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-29 10:46:12 +0100
commit: d3fc35858ba4bc0c8038a8c536246b00fe648358 (patch)
tree: 416e79067bd12fc0b43e12f1b73ee15a62b8a5bf
parent: 2512faa12f58e69a2f3e27e13e10fd0aef3ab384 (diff)
341 files changed, 921 insertions, 3059 deletions
diff --git a/Manifest b/Manifest
index e184b0e75f76..11e4bed84cf8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29609 BLAKE2B 83e4b8e976c272e355c208a0b786c2cbd5019966202336070ac892e66bd8f4a3aaf83ebe2de3da0807fdc59bc026b67628409cf99b71f625025a5d74e812caba SHA512 8ef43621f0b69393ec773461c8bf235e06d38b037f8ccf2bc9084c867dd51b773062c4aff5aae381f4b2ad962cfc2a40e719cb41d55e07da6899a8b405606800
-TIMESTAMP 2022-08-29T03:09:48Z
+MANIFEST Manifest.files.gz 29626 BLAKE2B c74cf50f9d6d1dfaab4802a971bb64c05efc36fedac7f6c60b81ef937706ae8dd08c74efbd12bb39b9edd92737eb011223f37e513a5ebdfdab0b672e986cf2e9 SHA512 f8e66811ae9ee0c5965cf7edbac2ecce2866f2c3af20d161a375d1955a78e6a3fe7d6dd4fab6079c21847c479d472b0b76c45c34d9ac54a5986bb19333be02b3
+TIMESTAMP 2022-08-29T09:09:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMMLfxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMMgllfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDqiQ/+I5Nij2wbJEEkQUEfD5tFHZXaJZouRDly13om7Mg0rrwVCjMc4RC2B3oH
-sdtsNGaQSbr710HLI1dkAm/K6ryNQA8sHme1Z7dy0tAQsALTwKASkmApwLl1rRF1
-7Qsv+4ojA229tZsa8UNqlysgu0dNh/XaK9csWMXZrsnvxC1fjPKQeMVtiSNI7Oc2
-Z/Unt3HwVe1x0CBehFNToVD45x8ivoVisW0++SAF+AQzjwZ19pxDVC70trg5GrsH
-PW+qv0vp6xpuo5MOLw0wwG4z2peG9IMjfquurYXG9gkugbDq+qfCKI0e1iGHFmZ6
-uPN1pKJjJO+mbjcFqpq4xxQ9CGLegHQL3DwPr+J0YA6cf9j92TzEWZ609UnF8d43
-ITL2WMrS86Q2xbxIzR2NOn0wHnQxw9DTYmZ+vFjqWIlWQtmsgcrnr2IbWwVne1JZ
-KJ/9mz0RzE7MypmLGXOCY7x1wevgkUAA5drpXf7ysvxZNkK45bHAHiOEGKqYKJUD
-hH4vDhHu9Nu7QR05Cej6cZjiqLlmLd5rdNGYXGerHSI5hwmyJv5a88JoLkWAR0S9
-OMbMz8g3LjaaseU7Ykj8dgoOsRUrZlAfLKYUh+ftAB/dhOgxADvDjk1fhb8VeRB1
-5j3M4gw58wGRV6WmBuGN5Z3jsjR7B0h/H7UcUd+fSYQn0dYKhEc=
-=a9OG
+klC4hRAAmA2s/+dzj5qpLvJkkCkhUdqdW7QWKAZeRuT1ESQgzk4WlygGkhntxk36
+PDIshIK6xsXDvLxP8TNkFnay9zvFAx9FhLs7TDKlFYr86kHQVvpeex79OKpPrnNh
+30yipd86xXWfKdPPiCyh/GhuV35le3iVgFG25Ll9CnXJMYo7+aWr05ngc94slQQC
+8d5ZLI2zUhIsMNdRBSKAs89Itr2sFXiOL/rYo70iOtkPn5mtchCMEGrfZaIsue9q
+4yJGkUTHeQAuuRmCi1g9xNjASX25q3OJWLeNXesbikkXQEnWmur4N+sX0RQNL6Wl
+eDTkXZqf2jBQcs2Oevd9ijIiOm8e40XmIcxDfoT51vACAQTHUTmNNNHIAA7AKDsW
+Jzi6hCRqSV/YaVCxSjtEl6AyW/JZgdMUJHPJwXcpo2biGVTXqPNQ3ZbT8ztX09zQ
+7UFMr9GyWVFFb/haqUdTBi5/zM3jNK2S8LsoMAmpi7ADylNnJEOZFTXMoU7AzWN6
+pwghRqlWZYeNku4YEz71ZfgqG24TzZKb92keNM5xiBmzfXqLs+TdM/lEAK+9OWXZ
+osZ2Ihz9SiUEmyoqN/FbQwqDZRBSJ3FaJizxwnyWIYM0BGVtBhsIIXpCf3picjE0
++91HirtuRgfDtR/2a1AecB3810vt6XyDj6QnBRnSm1+4Gl0A/3k=
+=PC+P
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b15f76d8b689..afc29017afd4 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b7eb61d7bec2..769294bdeff0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 72209a2fab6d..432c30252a61 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,7 +6,6 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.17.0.tar.gz 2812615 BLAKE2B 80b5115b8825a87427a688ca7a9337334180fcb7722d437f44009b5cf74ede16dac52f1648a2e7595558abb5fa92322095e71dcf0d7d8d06a2275e13caf79163 SHA512 f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0
 DIST puppet-7.18.0.tar.gz 2816776 BLAKE2B 7c653744a9aa694c6e7558295d33fa8de1958f333cb274a51119ce543846ce649755d5c37ba677d1cdcf2417b237611073ef523aa7a109a3e3dc0e75bd986614 SHA512 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4
-EBUILD puppet-5.5.22-r1.ebuild 3750 BLAKE2B 4cfe9e58f764927a378ccb706ea14ed3ac8e981356c2000d16b8a33b924c7d08fd8cc6f27c70cf66f859d5649c13a33d4982ea69573ba73d4b19375c8da95cdb SHA512 87fff4d2c68e882894b3a24f28db1d0b68b081530eeaaf3149314aa1968094fe3f0b37b57c5240e2e4dfe19828084b82b07e0bc3105a1dee0b52f9e28f034cb4
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
 EBUILD puppet-7.17.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 EBUILD puppet-7.18.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
diff --git a/app-admin/puppet/puppet-5.5.22-r1.ebuild b/app-admin/puppet/puppet-5.5.22-r1.ebuild
deleted file mode 100644
index f534c29f43f0..000000000000
--- a/app-admin/puppet/puppet-5.5.22-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem systemd tmpfiles
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="https://puppet.com/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/hiera-3.2.1:0
-	=dev-ruby/facter-3*
-	>=dev-ruby/fast_gettext-1.1.2:0
-	>=dev-ruby/locale-2.1:0
-	>=dev-ruby/multi_json-1.10:0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet.conf
-
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c6b63aea5147..b694d32bc479 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 5a3725e750ed..32ceba9d4950 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -2,5 +2,5 @@ AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e
 DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
 DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51
 EBUILD libscrypt-1.21.ebuild 727 BLAKE2B b321164f5a0f62a20ee3d9bfbe8b28412190a8082883c6c859a971549049e5556103b3f7d27103f699b58fc78ae134a90a61741387b107245da99f95de8c263e SHA512 bb48155d4e4134fb93b41d4bfd8e70ce905d75af9678f72990402ce42780f6e4183a00284910d9a51cde8023551c6b6cbb4afa9126f7573a4498016d560b2020
-EBUILD libscrypt-1.22.ebuild 686 BLAKE2B 06dc32d329acaa1a28f0bdabd5107e7c61b1566cf5bf1f9da7a3ca64575e3f38f96092ef04cf6bf0c6bb3e1131429b75d8419b49d74ecc75b027125400b899f8 SHA512 8cf17552ca345953409afdde359c6d206962fa2ab09b3bee1a040b5da03777941aed2824eefadcccab9a5ea0d0c71f51812338162a2b2dbc7d59869846f987c6
+EBUILD libscrypt-1.22.ebuild 685 BLAKE2B 67bda0de76c6f1bdea9b932ac5d63e5e7bc7db775550daaafd1492255b712086ea5c96a3fdfd5aaf50d452a6335453877af31dc6f13df2d4c8a6c2334303ec1d SHA512 f09d5145d95d40e79aa2041a30446eb3558972e029579751ff479dcb100682fa542b44f54e5cf1d63b866a9f6afc7652a8cdbe6aa358077371d5a486bfb13362
 MISC metadata.xml 346 BLAKE2B 98662f24e6b883032afb7ee0afd68a249c56a87d8c581f9edf7926332147d0905bcff8c34ea8e531e2a049a5c326748f002a88b33974ae3897cb0aa20eb4220b SHA512 3c255d66cb79b5e9d959285ea196a112242d6bc1dfe3a0dddfdcd1d9a8ae99cacb06816c881d94d93087593924ea3a20e7c4c7ec0d3de672b9327b2bf5bff6e6
diff --git a/app-crypt/libscrypt/libscrypt-1.22.ebuild b/app-crypt/libscrypt/libscrypt-1.22.ebuild
index cc71bda3915e..543585f85bf6 100644
--- a/app-crypt/libscrypt/libscrypt-1.22.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 8e993b860ef0..a55a0e765fb7 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 5bf618ede737..b789a2be80c5 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -3,5 +3,5 @@ AUX moe-1.6-tinfo.patch 379 BLAKE2B 4b2b0b895181d98b742c5abe5bab3690a9f37d987e0b
 DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748
 DIST moe-1.12.tar.lz 87917 BLAKE2B b036b24193045cd5c64812af13e6cf542700e649e78f3ba416501d0915c0ac2eef09bebdb333d145e0428dfacdccef431588ce93b1f407a41a7bd7e0acbc163c SHA512 f0d5daba70d0018ce82d6673749b8f688c0bac58de7684cc24f5badffd6868d425c9f771404186ab5cec12ab94c3e20af870bd920bfef0432a622925838ebed7
 EBUILD moe-1.10.ebuild 698 BLAKE2B 181da72a9e3b4af805e8682b3fe6ecdf4eba42fb6ed0bc6bcf381dafda7624ccf0d86c1ac67d509470dedc25c6d2e9b9d348721fb34e8f0417e651faad70ee8f SHA512 5f53a824ce1e7e26e937327ae07182d820ba32817d5c3d1681aaf3ae65d03f0ae93fa117a5b41c7de6a27de5b295a337f096a8765a38d6e716580af1ef1a6df9
-EBUILD moe-1.12.ebuild 609 BLAKE2B c45bfb5b5c83d9bb9d0b1f09b17df59b7a52f5e17464ab3487d571ab581773e5d9831e6fa525047bff4837ce18881fdc368e64054af38b910e5cccb5d089dea1 SHA512 5c2c0abcf56e37e6a6a5c844e2b57f2e4dba5027bb2b1e6a8268e9a0d7817225a24cfb94e106123af90f9af781cfcd3b27e1e93fe3937dfd28db077c70fe320a
+EBUILD moe-1.12.ebuild 608 BLAKE2B 5ee3d4374f6439bf666b58a53988cf78ebbc572142eb6e86224dc7dfa844e1869dfa4926e99c01c3f816811ab15fceea15e71280c2619e7e322db2258c44f17f SHA512 67f58a4e4d018f69b4d7e9205d2f926f8113c3e99e388e5071c6e54fb070459679436b887a377cbf25ef7b741b7e0ac3e568011813e347179aa996867a323efb
 MISC metadata.xml 248 BLAKE2B dba7ab19012197ff483b3c5febb6e1eae41d23999686b287a45c38e89ff7565454473fac44579b1e367345933bd749897f8e737f50eaf024190c42069a3d4d16 SHA512 abd659f01838c035f4dfeb2c13e95a0e8e249b41d093af54ff31b4d87bfe03ae472e911a20ff0ad3ea6bb9718dbab822c8b7553ac0a7a59c1d09db7b4d910ea9
diff --git a/app-editors/moe/moe-1.12.ebuild b/app-editors/moe/moe-1.12.ebuild
index 5b893619380a..8c5cdd983499 100644
--- a/app-editors/moe/moe-1.12.ebuild
+++ b/app-editors/moe/moe-1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 38425c14b288..d948aec38c05 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -5,5 +5,5 @@ DIST scite-5.2.4.tgz 3440615 BLAKE2B a98028774837f7c19a73d3ceef0e7cf945674b0b0d2
 EBUILD scite-5.1.1.ebuild 2392 BLAKE2B 961960cb16d294c7c546aa3576551d47d2f08fc4305be47d70e18247a25ca8d86225cdd1d6f7d3c7e47c9a5dd5530e177a89cf29bb32600c64222f0cf5afc9d8 SHA512 2a5cf39d354c248ac1d743e1a9a01e77657cd681a2c41380c05699035ad6a2e7203baa5dfa8262955fa2209b0d381344759de3a16fa93e60eb1090b74e5abbe5
 EBUILD scite-5.1.3.ebuild 2399 BLAKE2B aa552326db18257573410f3759bec58c93fa6b331997c0475f459c698f41f685cde2d05e5c9ba88e70998566a45b6a18a52a128dc5d3ad00b429d9f7e9043221 SHA512 777e8ec73b35e14962728cbfa6ca7dbe1170ccab75c2abe0cb184580a9fffb2192df27fe853fd0f65018c9991dd33dfca059b086a64f85be4f2a7044fc024bd8
 EBUILD scite-5.1.6.ebuild 2402 BLAKE2B 86ec7a053d1f68d5d89e016e89ec2e454fd51ae721e5db9321f6b25b0f33330e43ece975f59ce083bf2f11eba8d1ed16f8ad2bcd0fdb1ac8e003b4548b197e6a SHA512 d7457b043d4bcee57b2004807c698ce2838ecbc798a731d068336cbf367b807650a47e8f8e571f3fc365140d29b899f0414dacd4edab13f921ac23539b525e0e
-EBUILD scite-5.2.4.ebuild 2409 BLAKE2B fe5bf289bfdaea39bc730b7162004f7e328761a05ad3032545ee91945c720a7319ac70ecf7a655add1fe9619224c326c3af5dbc9b1ef4a2236c729b25fe7fb1c SHA512 4b9634f47ee3c9a09e1757a8ab48f2a34a0b9af3a5490f895fe99d3b0089f407b8c005d9e72d5110fc690c39c8f56de197ba273cbbaccc9cc8500bf1435bf051
+EBUILD scite-5.2.4.ebuild 2407 BLAKE2B 4f4152a5c86023389166cadd2ca4f2070e3c7135919bacc6fb069bac1ce50339eb5d024d17ab35058e3bdd4e17f86d6b11b4ada869dfcb09d21b8d6777693bc5 SHA512 89c31d5f67001812f5bed6eec6c4495e2b03c33d00798057e5f9823a95929b6fdb9b769eb6f75e7bba7e433358c85126e23e07f541a6a2a1ab1a336633869b07
 MISC metadata.xml 477 BLAKE2B 6b4ee233530c91bd81cb7aaec6533f9d4f917765d372e8e84bed225da07b0db5e94f00d34644d9496a3d7321c8a16dc6e65b993263901ab8e58b65664f50458c SHA512 b7329399a31e6e514cebc509b048943a4cce7fca1affc7ac9f401420e885d51a7af6f60d61bc5405326c54a2d1207583f066e3b77ab4b08d00333b6ec43cdc0d
diff --git a/app-editors/scite/scite-5.2.4.ebuild b/app-editors/scite/scite-5.2.4.ebuild
index 19bb5f74a12c..3cf3d6aca8a5 100644
--- a/app-editors/scite/scite-5.2.4.ebuild
+++ b/app-editors/scite/scite-5.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 4762be25f60f..6db15f5188bc 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
deleted file mode 100644
index 36a94d88d748..000000000000
--- a/app-misc/zygrib/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX zygrib-8.0.1-libs.patch 627 BLAKE2B 0f94addb56e17028736dde079833b144f41a98612710415224d7f265d30de8affc299e609d60da168d8c9cf02a700d661d846f5a2562f7ff2b49eea0041b4b91 SHA512 99a92039a2aa4969871b212bd495ebb30eb0eadc07c9a28c3d633bd6444fb380cfba9cb9cf75804120da04f213530d8d35043031be167cb0f04da4f4240cf5a1
-AUX zygrib-8.0.1-proj-6.patch 578 BLAKE2B 739e753682fc28b050bbb4412ff7a2e244327a13cd82591bf1e2cb20c63b7f198bf6af7273bb8475ae434c6fded58ff1c92966b0ed23636be4098e90c6e521ba SHA512 4055d93aafbb9cf449c6bd9366e7927bb6ed88607abfb2ed2035eec60704cded6540d244046f4937b89b9b4e6bc650ead0dbfd633907e7658bceec4c1df95e74
-AUX zygrib-8.0.1-qt-5.15.patch 956 BLAKE2B f01b71bdbd5061c9214d69064ddc5ae847194a7f53fd4badc16a44376be61ff813a9e198dc45b9c1487d1fb4150933802be3692102120aa1e139b0f3898a862b SHA512 6c98ab47f9b5512d5dcd442d796f94fc06ebc5050fad43a0c5bac6ef33c4c05b3554fae2b9bceaa4685d4f66dfbd71db6bb4228a6392c9bf768ac12ae2ea119e
-AUX zygrib.desktop 210 BLAKE2B 0e340f8c9ae1da700e694ac2c0a973fc00264c4981376fd0aa67587a248f27f0940a80c9937cc71d52b42429d9ec891f3837344730706ca1adab4237d8df464d SHA512 fd88b992d248d0ad01374f291d792682e6ee2b5625fc792ba002f2d912bd2982c8d20aeb9bed5cf5e43a92344f1c580573e4bcf0f949cd6cebc09eff6e407b9d
-DIST zygrib-8.0.1.tgz 19759812 BLAKE2B f7f73cb54b18e510b0097fae27400efef081fb66f2bf361d5929d69c69087107ecb1d88fe83495571fe85edbd2464910776797e5c6700505acac9585951f0854 SHA512 bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
-DIST zygrib-cities_0-300.txt.gz 517620 BLAKE2B 74916674c84b171d34f882d15a244349940e2ccad5e408f7420484b400357945cc78339c2db70eb05b428f35f4b35695b9ec655a42a23779f66649e1b7432274 SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80
-DIST zygrib-cities_1k-3k.txt.gz 495119 BLAKE2B 16bfe2d5ff4c67c8e9858fa352aea23ae13ffa7668183d0cb3fe5e98cc6683e8a969c802c9297a29e9773dd471f233a900f2fca2e5e58f4090e0999107e9a72c SHA512 010d6688b9c381f0ace549c53a45f8bd43f1d6846dc01241ab7bfdf30b0629f39ef2a9a715c55a534634ad8480bc2edc2796a09f0c369406027f35f6b4ba8c08
-DIST zygrib-cities_300-1k.txt.gz 512733 BLAKE2B 2e480411ab8278c57f1368e809166820d9e1f5bf931e6eaf053a2448ec808b2b60d20ad5d5517cc590fc0c3c074b41a5b388856ea6145d5f6f5938d0ed50967e SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112
-DIST zygrib-icon.png 851 BLAKE2B 15a300726e4ee486aa49116fe7ca74b655fe316ef0c1fee116e83cd949d273744d7e76ed3f4d847a40d74e6bbaa0d3ace71fea2ad7cd86f041576b6ab986c698 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b
-DIST zygrib-maps2.4.tgz 105735981 BLAKE2B b3d666481d374cadc50ec979ed8a2ed9920bd80e2bf8a01dd2aded8a39df12e335515e84e666aeb8b01f37bc37126016bf8dc63d90a0492903c6436cf5c56a87 SHA512 0f10786ef81141299fd9550e36d976ce126b0d3523b56c10b19a839d56e17697ac93915b46f31d6691950f1e6d13c368fa1d198a5e2d830768fcb9e63034b487
-EBUILD zygrib-8.0.1-r2.ebuild 2157 BLAKE2B 8f997ed3409fb4523e343e5526bc0ed023d12c67946595a99b4ca18e551c74715711207269a16cb5edce4d0e5916451b8d9af675db3d0b671bf96d771c3ed74e SHA512 f51856e1566653b487e56ab82baa7492594467438eeed2822e352c7acd51dcc697ce14417c9c1b492cf859c0312563eb323009cc0d3fab6e981e9b2ba82af264
-MISC metadata.xml 338 BLAKE2B 797981ba44aadd243b1fac3eaaa09ca41fd5beb90bc0ea23dcfdfb655357753872bdc8e73a025db4a5975d3d3b2863e0f619b7fff6292d8212fdbd7df5f4861b SHA512 95c9d7bfee14c51cbabb6ca6055ee4fd1ac39fb6a75b2bd6e001524656a24a62db37c49c66e120ee3930a9508927fca483a93b4c26b0781316dc36ee43a4eeda
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
deleted file mode 100644
index 41df41830d9d..000000000000
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/zyGrib.pro	2017-01-16 21:55:32.459388028 +0100
-+++ b/src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
-@@ -8,7 +8,7 @@
- TARGET   = zyGrib
- 
- DEPENDPATH  += . util map GUI
--INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
-+INCLUDEPATH += . util map GUI curvedrawer /usr/include/qwt6 g2clib
- 
- # ----------------------------------------------------
- # platform specific
-@@ -35,7 +35,7 @@
- }
- }
- 
--LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
-+LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
- LIBS +=  -Lg2clib -lg2c -lpng   # respect order!
- 
- # ----------------------------------------------------
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
deleted file mode 100644
index d76a89b5e517..000000000000
--- a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001
-From: KIVACHUK Valentin <valentin.kivachuk@irt-saintexupery.com>
-Date: Tue, 10 Sep 2019 11:29:37 +0200
-Subject: [PATCH] Fix proj build error
-
----
- proj_deprecated_api.patch | 2 ++
- 1 files changed, 2 insertions(+)
-
---- a/src/map/Projection.h	2016-11-09 17:27:38.000000000 +0100
-+++ b/src/map/Projection.h	2019-09-10 10:20:27.440134499 +0200
-@@ -21,6 +21,8 @@
- #include <QObject>
- #include <cstdio>
- 
-+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-+
- #include "proj_api.h"
- 
- class Projection : public QObject
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
deleted file mode 100644
index 7f641bd0b9e9..000000000000
--- a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 73b1e8a9b622a27a03425db03bdbaee0eb88b8b7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 15 Jul 2020 14:21:13 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/IacPlot.h | 1 +
- src/SkewT.h   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/IacPlot.h b/src/IacPlot.h
-index dab76b6..59f6deb 100644
---- a/src/IacPlot.h
-+++ b/src/IacPlot.h
-@@ -30,6 +30,7 @@ Lecture mise en mémoire d'un fichier IAC (fleetcodes)
- 
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QString>
- 
- #include "DataMeteoAbstract.h"
-diff --git a/src/SkewT.h b/src/SkewT.h
-index eb70372..36d4df8 100644
---- a/src/SkewT.h
-+++ b/src/SkewT.h
-@@ -16,6 +16,7 @@
- #include <QMainWindow>
- #include <QFrame>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLayout>
- #include <QKeyEvent>
- #include <QPrintDialog>
--- 
-2.27.0
-
diff --git a/app-misc/zygrib/files/zygrib.desktop b/app-misc/zygrib/files/zygrib.desktop
deleted file mode 100644
index 92873a1b87a5..000000000000
--- a/app-misc/zygrib/files/zygrib.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=zyGrib
-GenericName=GRIB File Viewer
-Comment=Weather data visualization
-Exec=/usr/bin/zygrib
-Terminal=false
-X-MultipleArgs=false
-Icon=zygrib
-Type=Application
-Categories=Network;
diff --git a/app-misc/zygrib/metadata.xml b/app-misc/zygrib/metadata.xml
deleted file mode 100644
index bdf79679ac79..000000000000
--- a/app-misc/zygrib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="maps">Installs additional GSHHS maps for high resolution coastline data and cities</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/zygrib/zygrib-8.0.1-r2.ebuild b/app-misc/zygrib/zygrib-8.0.1-r2.ebuild
deleted file mode 100644
index ec457d480dc5..000000000000
--- a/app-misc/zygrib/zygrib-8.0.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="zyGrib"
-inherit desktop eutils qmake-utils
-
-DESCRIPTION="GRIB File Viewer - Weather data visualization"
-HOMEPAGE="http://www.zygrib.org/"
-# zygrib.org has a DDoS protection and only allowd interactive downloads,
-# so we mirror the tarball...
-#SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz
-SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${MY_PN}-${PV}.tgz -> ${P}.tgz
-	https://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png
-	maps? (
-		http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz
-		http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz
-		http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz
-		http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz
-	 )"
-
-LICENSE="GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maps"
-
-DEPEND="app-arch/bzip2
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	media-libs/libpng:*
-	sci-libs/libnova
-	<sci-libs/proj-8:=
-	sys-libs/zlib
-	x11-libs/qwt:6[qt5(+)]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libs.patch"
-	"${FILESDIR}/${P}-proj-6.patch" # bug 686078
-	"${FILESDIR}/${P}-qt-5.15.patch" # bug 732732
-)
-
-src_prepare() {
-	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile || die
-	sed -i "s,QMAKE=/usr/bin/qmake,QMAKE=$(qt5_get_bindir)/qmake," Makefile || die
-	sed -i "/QWTDIR/d" Makefile || die
-	#use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
-	sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile || die
-	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro || die
-	default
-}
-
-src_install() {
-	default
-	rm zyGrib || die
-	doicon -s 32 "${DISTDIR}/zygrib-icon.png"
-	make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
-	domenu "${FILESDIR}/zygrib.desktop"
-
-	if use maps; then
-		insinto "/opt/${MY_PN}"
-		doins -r "${WORKDIR}/data"
-		insinto "/opt/${MY_PN}/data/gis"
-		gzip "${WORKDIR}"/*.txt || die
-		doins "${WORKDIR}"/*.txt.gz
-	fi
-}
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 82b1f11c5ca4..d563ed59deee 100644
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index c3583f7e0640..189054286ce5 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,5 +1,3 @@
-DIST OOoFBTools-3.0.zip 5371699 BLAKE2B 1288a6915aeaad89b7fdc07b584b02bc7387edfe14d0fd51c30c7c8b061ab4967f7e16ea407f8be658739c64ce266a24f1404cbdf88d7d0d479bacf4bb9bdcf7 SHA512 af257febd4a2c2361586567e5d48205d31f517a7142a6da358ef4e0261c27d19cfb594417c06fce73811ae8e4e69812bec00d4ed8a0acd6881011f46d4dfadab
 DIST OOoFBTools-3.4.1.zip 5279862 BLAKE2B 9a95ed4956a5deb58e53202b587b573579b966e43c052164d3a4b20cc2ee7fd1532bb9dab9ab2c486629000a212de752d75fb4f1d77afece1bd130b079be7beb SHA512 1ec04cbf32824d884fed7ff12a59b43486c96a1b4580a0a24fcc73ebbe7d565ae87e8f7600eb19846f34b1a4c94dacf7ebe755e70692501cd87d12ea470ca8d8
-EBUILD ooofbtools-3.0.ebuild 774 BLAKE2B 4e60be4d47e73924c5ac2b61ce5430b270af4a817da2839426dbf1fc5feef2d9bdf354bef73e0e43f2d7fb1e144a174f389385c34349ecd68a57fa64617411a4 SHA512 6bbe7820cb4c61fe545daab990e2b894770ce1a016fa663dfb510e179b7d1c15a6388640244a5b1ee9a53cc5795e712acde7e4105ace1116ca5bce4d18d45a42
-EBUILD ooofbtools-3.4.1.ebuild 776 BLAKE2B 4e5e01bc1e491af88fd415610a74a395f3b69de94eba4923f1339f2791bc17f8e00a3840796183a0c56de6f8db035adcdca8c6aa1c236fe7f3ecd445d9d33cef SHA512 16ef655bcafa26a3adf1ae6af8de674edaa17cee36d1c6a61d522c0ab528eeb4681f7f16fba33846f7a81bfeaa223daf37c22aa9d7992492ceae841307b3f11b
+EBUILD ooofbtools-3.4.1.ebuild 774 BLAKE2B 095f8c810695dfc737a9a5600c414e26f8b8bb09449b259208a31d382403a998abf1e6e38c73e1655a0cca2012fd3d37f8495aaacca31b230b288a6e75c46450 SHA512 5e26e9186eed3649ead9af74ff894f7aa819ce8a80bde3ad2e4e02d71b930f8cc2cf40affa9b511f4b1b9991dbb51dff9d5ef66680cec014436ea5c12fe39317
 MISC metadata.xml 589 BLAKE2B 5508984c093c7b7eeb1693b180ae42a9ffc25b66a4f0cf90d8bc563db39ada4645a6e03085d619a01f70915de97329a5c9b0ee2fc60b3b895836fe127d3d5df3 SHA512 c8404f2a5c7b8d3f503120c646042bb2578c67f5706a9f02ff42d74132b3145a01e816e85c37457623c08716d515d5cefee58f9bedf4a5d1c86a1d1aba9012b3
diff --git a/app-officeext/ooofbtools/ooofbtools-3.0.ebuild b/app-officeext/ooofbtools/ooofbtools-3.0.ebuild
deleted file mode 100644
index a8093cb53fae..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OOoFBTools"
-OFFICE_EXTENSIONS=( "${MY_PN}.oxt" )
-inherit office-ext-r1
-
-DESCRIPTION="Open/LibreOffice extension for the FictionBook2 format with validation"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/zip
-	dev-libs/libxml2
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	default
-
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" &>/dev/null || die
-	rm -r win32 || die
-	popd &>/dev/null || die
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild b/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild
index 2c7d9a6b92df..8e80afa657fd 100644
--- a/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/zip
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ae492d4f8a03..a9877cc2a839 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 1f140374dbc9..ac407ad7e435 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,8 +1,6 @@
-DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1
 DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
-DIST portage-utils-0.94.2.tar.xz 1804152 BLAKE2B 416e72851744cfe595ff11dc3c39b4b7a2ed243fa59e1b94ba1e94072e8c63382a29256f918af229f4bee0543509108cc7a3f1222a7810e0a9e47a89726cd8e1 SHA512 d4fc9d9cbb9ecca3269c1e4bc192e623e1f671be072bac57b6be0a885fa99344f313644d17533f3c062591d2709d36d88f0370479fb488fd4636b42724b8f15f
-EBUILD portage-utils-0.93.3.ebuild 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
-EBUILD portage-utils-0.94.1.ebuild 1527 BLAKE2B 151daa8796816527ddd518cc5be942f1026a199f9e75938b9932fc7742e7b5666b8162cacbcd6183fc150883e6823592271fcb8897e732a7fdd7064fe616620f SHA512 84e4c36a170e9d3bfe23f5d8349c9fcee4da28fbde075722060703729c9dcf0417592350c6c03474d376cde7c23646cdd81d8f156d68cdaabf45dec626973892
-EBUILD portage-utils-0.94.2.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
+DIST portage-utils-0.94.3.tar.xz 1804720 BLAKE2B b0239a26d878db6dd73c9ee54f586526f8812921775126ef74afbe089186fdc5ca7197847e204c6ecbf9d79b6e2a6173cb0c39d4a26653ed0db2d7f9b10e88c5 SHA512 bf8fcccc26bb985bf7664f6ab0227a5251c3f918199de0c4e4c95b7107eb72eee367d1d524b5d9608b3c7eea9b1fae789456390cbb0d375297b807bb98644e01
+EBUILD portage-utils-0.94.1.ebuild 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
+EBUILD portage-utils-0.94.3.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
 EBUILD portage-utils-9999.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.93.3.ebuild b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
deleted file mode 100644
index 294c81e74145..000000000000
--- a/app-portage/portage-utils/portage-utils-0.93.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
-else
-	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-RDEPEND="
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			app-crypt/libb2:=[static-libs]
-			dev-libs/openssl:0=[static-libs]
-			sys-libs/zlib:=[static-libs]
-			app-crypt/gpgme:=[static-libs]
-		)
-		!static? (
-			app-crypt/libb2:=
-			dev-libs/openssl:0=
-			sys-libs/zlib:=
-			app-crypt/gpgme:=
-		)
-	)
-	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			dev-libs/openssl:0=[static-libs]
-		)
-		!static? (
-			dev-libs/openssl:0=
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(use_enable openmp) \
-		$(use_enable static)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.94.1.ebuild b/app-portage/portage-utils/portage-utils-0.94.1.ebuild
index 43041ae05599..294c81e74145 100644
--- a/app-portage/portage-utils/portage-utils-0.94.1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.94.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-0.94.2.ebuild b/app-portage/portage-utils/portage-utils-0.94.3.ebuild
index b07e43f8a485..b07e43f8a485 100644
--- a/app-portage/portage-utils/portage-utils-0.94.2.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.94.3.ebuild
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5ce1195eb52d..295988dbc37f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 232abddf0202..9a33c4dac9ec 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,6 +1,6 @@
 DIST html-xml-utils-7.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460
 DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
 EBUILD html-xml-utils-7.7.ebuild 706 BLAKE2B b6eb99787e84991903117b2b40bc75aea37751b36fae817bcc13c60aec820ff607097860ba1c0088922344755dc483cd9d9ea48eceb18022e04d6a5b99ea9fc7 SHA512 07fe7f249953e71fb1a2481dc5f69b518ff74bc02760101dc508087f9d45bf1be9c267d07a9f53d72e2784675222d721b5b493ff3273786ad2550171309689f4
-EBUILD html-xml-utils-7.8-r1.ebuild 639 BLAKE2B 6c6833a182538b6f298da6c6c62793ac06d0217dc04bf76d8c2e8b7a3c2c012dbbe5036afa1dea16df761dc6083f1c4c28eb9c5041559785dd51d2c656f1a1e8 SHA512 747878fb67c91ca0577fc79ba33e0ed756c08f93b3def359c5f728354cdc9488ebee2708131bf7272200f9fe505b39b8d87c35e3ea480f56a2c476e4015a75ad
+EBUILD html-xml-utils-7.8-r1.ebuild 638 BLAKE2B a605cc09c4d5fca4dbf3ed87c0eeb76d6befe5e7a73ac5d4a3177980f05014fc7a6e3b8df9072c4bc13e0d1ff037cfea6c3ca1961db15f989ca768dde3af3d75 SHA512 bd39bd68fd180b7ff49abf6e8312dd103ea02fd5f325fa2f0c75114703935b6e81acc67c7496ce613f1205c49f050a0c7f2a160b11de99ab3096b9ac70997adb
 EBUILD html-xml-utils-7.8.ebuild 710 BLAKE2B 80933c3811d0657e262d6d35f7a18e98059a6af02ccd36dcc0ad7b85c69a08f9fc0a1e37651c5886b817cf83ca389f940b0ab71405033f3a3d94eef7527b8fc2 SHA512 8cbce0f907935e8dd9a396631cbd43b803834cfd43d02aad04af2892cd820c40f4d77b3283985be7e91204d456857e9a1e9f9fde91d8b9a7bd98a195b379b857
 MISC metadata.xml 221 BLAKE2B b43b26fbdad8e1ac12cf97bc9bfbf06f5633feefed4f3e7c9623dcf4c45b97a3b753f8c8787d267f6cf6412878f4f5893a5201279401571ca7e53bc255296324 SHA512 5b5336bc7e4015c10967f6a0f8525f2235a438789cfbaa08b8261eea6fa2019191de60e3ec310660e0e5eb931835004b9db604dd18278822cf9d0254469a0bad
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
index 9d64c38d1c9c..e5b326f66ab4 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	net-dns/libidn2:=
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 68707500356d..52f686c616aa 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
index 7e7e9c20580c..7dc73e16d5fe 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -545,5 +545,5 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 EBUILD arduino-builder-1.3.25.ebuild 2824 BLAKE2B b8d42a6e5086df92dc85a3714720140b0aa99ece6035d8356565eb0e9235d4da65206a38559078341576bb5a3dcb77b53dfad115b1f42ce54d132771867c7709 SHA512 0d6a2360afc615db3c1a43600cbe70cc9348035a170727f3ce7097cd7630239a376a095b2b4763c3e9f11d8b915be848d5387d6ae7d29eccaeadbb46e02242bc
 EBUILD arduino-builder-1.4.1-r1.ebuild 2648 BLAKE2B 0066af35c8917dfb8eaf4eec2d272d534301c7ba725d3d75aa79bdc5faa40584961c7dd87b9a463cd27654bb3f9795d3f5c9f1df883d9c6190c4efd6abc99a22 SHA512 87987c3acf7ac7cea649cc21676308dea88cba82e9e6f867a3fcb517244e3a53c718724c22ae9784f8e169334ea1f64604cb931e60e3093b178c6762e6ca5dc4
-EBUILD arduino-builder-1.5.4-r1.ebuild 28790 BLAKE2B 1170fb67774910b0c1226a829a853534443992936265bcea6e67b56b2419433afc21e90828c159afd6db20e98666f2516c185e5460bc3f62c864c7a2d960a6b6 SHA512 593963e3d981560dfe3cd5a25782bd9a8855d50f9b28dad9ad6cf768ca35d14d5f665e607abc28c5e7f6577e09240aaf4473a6a52afda3a3d38160d3045f3492
+EBUILD arduino-builder-1.5.4-r1.ebuild 28789 BLAKE2B 89a507026d387654eaaecc7113911a23107e8e875f98afaf7d3d974c92f1d40b1db1081a0d76e97205edd7f30d6bc01aa4b2d76d55256f8098ecc5b5b5d9333a SHA512 3bc99733f403aa05415f2fbe6b1c2433e29a02542cf4a19bd86a84f0616bf1277e79838a1b34cf8a954b6ff621e55dd821a82d16ba4e2d3ecffe9e88ee9743de
 MISC metadata.xml 340 BLAKE2B 91d82acec49886964e0bfa495b91ccde6d48e43270d19bc21637d3416c1ccdff363713ebf396c7f0eb86363261781d48be0fe73e41666ad6b03c0f909ac1b008 SHA512 86412069178c4361a54267843d4c5e928707015262cd6c1435842e5ddec08b27be518b75cabfbbbe492a3749d1b171a79bb7a155a0fb1912e9b41bd4ac00fce1
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
index 7fd9464f0d2b..e40348d5e8e1 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -539,7 +539,7 @@ SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="sys-devel/crossdev
 	dev-embedded/avrdude
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index df6f53443ed0..e58ddf8d3aae 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -13,6 +13,6 @@ DIST arduino-avr-1.8.3.tar.bz2 4941548 BLAKE2B 48d84a30f3ccf1074df6ec006ccc58d70
 DIST arduino-examples-1.9.1.zip 4810227 BLAKE2B 0781ecb330adc444e660f6db89533dfb01995ec87dec7b5f55e28e65bfaf7f505aa79362f5815193ea6500cb1d6a16a86d5f300acf70fc4eaff0265c2891d371 SHA512 c0e21dd374b2751a1e5f2b790202d4883879da2e26e9a23ccbaec478647e2b8160cbc085e76888deafc05b9b14b1aff4ce2a9b834a7b83e8226c3bc41801015c
 DIST arduino-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
 EBUILD arduino-1.8.13.ebuild 4768 BLAKE2B b9521a75e4b4d70018c9e5c14d311e980a9bdb5065615079ca2e93f6c6150e9b006be254745b76a5b6871434863fc1b03aab5aa376a8a1d625c5f738cdc18109 SHA512 8938afb6a2ec2b3cbd4b2ccf6cd03049b156beb2ea713a83a627a5d575e074bb19ac6e5ca46d23a999397815ceee06755553baa1f1a9f20a69ddf0d9ab36b223
-EBUILD arduino-1.8.19.ebuild 4274 BLAKE2B 250cd19d5345d44b3c588fd21a29ba8a667247b38f01e234351a1b3449b9a6492934462b21d47ee84dc2ae3c3f5b8e5a34a8408eae9b70cd977b222dfa93fb53 SHA512 eb6dbac4a6fb795eb7f0e04e7c9f5acc70e76165a498867f0d17caaeac226c2f63019ea25e50e58e3ac672baa2079f63d66d95bd92a51eade11603c742219f5f
+EBUILD arduino-1.8.19.ebuild 4273 BLAKE2B 487d4c611bb706f72c5cb6627838342772644d231c11e71dab9af01f963157e95d283bbf7dfa18e8339ea81bc41f2076649057bd4fbbbf72e31274c90ae83dbb SHA512 25c59a70f98a679b6ef8028404f8be3bbf0ffeab92ebb9a94524e99f2983621a9cf74ecd1781affee4fa93e25d96ac6296d17c034c6d08985bb315e9d0fe17f8
 EBUILD arduino-1.8.7.ebuild 4626 BLAKE2B d3c0b14878d02bf2e7ba10e6a492270309d75513cce22c912ff539bebdcd16887e9e33179a3bd0df4cea2888607aed987bcd9b0592db2a4453fae106027249de SHA512 4d0858e3d88eb66d4e561251598b2b7d7840b2e252b3738303009b740ffb8df3e7c69123116750332db1ad522c4e13869417bfd6243d7e15bed4797a791dafd5
 MISC metadata.xml 332 BLAKE2B 384c8751a6538aaca49c8fd242c5493d8321e957a1d186c9c6cf8db579ab74fe9bd25c96dda56a19afa063ade2833fe4b6d307163be7a7681421c65620fe40b7 SHA512 1d58a915f882ee70c55b5541e66cd33a1367e2f686949e1a13d7dcad62d1f1ec180d433898e5ba41f52ba9630a116b92c52cb5ad3be02127c144c1d37cfa35a0
diff --git a/dev-embedded/arduino/arduino-1.8.19.ebuild b/dev-embedded/arduino/arduino-1.8.19.ebuild
index 30c6edc9d7ab..ae754850d3b5 100644
--- a/dev-embedded/arduino/arduino-1.8.19.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.19.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 CDEPEND="dev-embedded/arduino-builder"
 
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index b5ded0b8fb11..02df95bbc25e 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,3 @@
-DIST u-boot-2022.04.tar.bz2 17772787 BLAKE2B 5d2035130c0631f8f1b7f7963bedf71578a66994e3950eb103a404a08e85686cd971ba51e8172093ccb75d975101024bf2a94d4064763ad57ad8950c11092319 SHA512 113056e542db049eea3b1d1ccbbe52c79539a2f9bb6129d284ec9200dcffec7bd5969821913a9899631575b80991c84ad01bc845b4bba614e42e54466d9f0d64
 DIST u-boot-2022.07.tar.bz2 18087759 BLAKE2B bb78c7ccd56f12ebc622fb73d29cbf0a5db9d421133b191a6591845b4842b111145d2df649bae69011284bd468b8219ee0df20b61660ea4ec52006a93e14f09d SHA512 e1b3621dafac876c644ffb3d24b6e2380f5a78454c420a5b17d174e3f0b57731a95cfbff28ae7d0af4493f4bbf8d21e7f9236d61bb2414ed12295332b3d557b6
-EBUILD u-boot-tools-2022.04.ebuild 1546 BLAKE2B a91038ee3eeed987d2f2345c83c976c83712b27b54598815ee3f6a6661ff3616247e3156b85301aa5b6cbc26b5459a36d0ab008629538cf39f7d2b0c749b9def SHA512 d46bd2cf77587e5af7985da97ee8e6bc61513d33ec2cc2ed5605164ea194c40ccb6e327645fa307244d7f91fc034f8e74af5cf54a06d665f20f89d94cec3b98c
-EBUILD u-boot-tools-2022.07.ebuild 1546 BLAKE2B a91038ee3eeed987d2f2345c83c976c83712b27b54598815ee3f6a6661ff3616247e3156b85301aa5b6cbc26b5459a36d0ab008629538cf39f7d2b0c749b9def SHA512 d46bd2cf77587e5af7985da97ee8e6bc61513d33ec2cc2ed5605164ea194c40ccb6e327645fa307244d7f91fc034f8e74af5cf54a06d665f20f89d94cec3b98c
+EBUILD u-boot-tools-2022.07.ebuild 1561 BLAKE2B b7e6e1bd690440c0af7085fa7055eff9823a8aafe179dd6b4412c93988a2abe04f52f152fe3eb2d8aa6f2feac311892e61c84d106db90645d2b6d1e082167a86 SHA512 3e9a1d07ad0767d96042ed5e4b7145ac5f1264de2d5a748c8a22052fb941a162a4d968e08ab848fbc0d13c4eec955118d0f07d5c08ce80c70f5ce16d61a3edb6
 MISC metadata.xml 451 BLAKE2B 8634c7b8cd333dadddeb3622fbe298d19b5a470b85743717fb972e310869ee2a897110a9fd7b5781de016ba9a8c9baf7c6b5ed89279e98f086a4d326cdcce807 SHA512 981503c1d3a7dd42ca141b00a29fac43eb379603140767f0e0de94f54fd4180b498cebea56692c017ab7dbf9a2afdfb222edc5942c58429490456c064b5fa41d
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
deleted file mode 100644
index 7bf924633a93..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
-IUSE="envtools"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
-		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
-		scripts/kconfig/Makefile \
-		tools/Makefile || die
-}
-
-src_configure() {
-	tc-export AR BUILD_CC CC PKG_CONFIG
-	tc-export_build_env
-}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	local myemakeargs=(
-		V=1
-		AR="${AR}"
-		CC="${CC}"
-		HOSTCC="${BUILD_CC}"
-		HOSTCFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}"' $(HOSTCPPFLAGS)'
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" tools-only_defconfig
-
-	emake "${myemakeargs[@]}" \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		CONFIG_ENV_OVERWRITE=y \
-		$(usex envtools envtools tools-all)
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-
-	if ! use envtools; then
-		dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	fi
-
-	dobin env/fw_printenv
-
-	dosym fw_printenv /usr/bin/fw_setenv
-
-	insinto /etc
-	doins env/fw_env.config
-
-	doman ../doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.07.ebuild
index 7bf924633a93..4b8ceb9f6cd6 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.07.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.07.ebuild
@@ -19,6 +19,7 @@ IUSE="envtools"
 RDEPEND="dev-libs/openssl:="
 DEPEND="${RDEPEND}"
 BDEPEND="
+	dev-lang/swig
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ba94efe51979..5cf520c1656b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index ee37783202e9..7f130f10721b 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -2,5 +2,5 @@ AUX zstd-jni-1.5.0.4-filter-flags.patch 369 BLAKE2B d79c3f5bee1e8faafb96a6d87c03
 DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
 DIST zstd-jni-1.5.0.5.tar.gz 9297542 BLAKE2B 96b2aa09d62c7a45c352d52358aa47a66c95c1b122bfc61b7e2b3aaa829e011a8ed6f71373130700ecdb7d8541ca6971c2cd7fda01be396053532c4aeeca3cb1 SHA512 b63858d58c7d1b2c9d120f49d1289caa7e5b429d0f8c3c95b7f58a5d432f09d41504c5f5b0934f53be8eadf3c1ab02a1a872e292bac465907fffe2a67108267e
 EBUILD zstd-jni-1.5.0.4.ebuild 1628 BLAKE2B af3514aff4b542a30f98f179ccb5bdf7d78d9f1c152e2ecbffb10d585dfbcc9308a5b0a9515574650641eab1654d848ae75fd8d1526b424de4d0b7c463cc59af SHA512 0d5f86d2e2c55e58679b80e8091ba2726da1d37ec286003190b3ead62f645dbae10e89a820d9d501d2a66bdd10c0089d0d861c998aed9b30e6a77c223a8d83a1
-EBUILD zstd-jni-1.5.0.5.ebuild 1653 BLAKE2B deb34bf0b64209f8f1e40e4672eecca6997def1e39706ccd7c6ef523b573d749ec3963e370a984e7bc6a336e1cc552ab5da4c178d5eea5f2437602fe288667dd SHA512 e9a7280291cf5f0849a9e1b429469680dace8349d338a8dc334ebbfa50e396ebe96d599561d7acd2a55a9c14dcc2fc2a002a8e0527a0fcad5fdbe23c426965ec
+EBUILD zstd-jni-1.5.0.5.ebuild 1652 BLAKE2B a20b2c414c27d4fbcf875c5eb8e0ffd9c4683609e9f4e69603f3d464f46dcac1134db81c0b5520592e67ddb44cfc30f164b31f35416e83c21bd3900865dbd7f7 SHA512 262a809193d540e71d96527e3e82e3652f2f68735cd0d2afb92e6a144aaeff409c06de3a18f5f71ba4874077354dd1296d7b1a19f4086d3909a1487c6709b6d0
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild
index fd0b9e85ee37..48428ef6e0cb 100644
--- a/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 48f1a17fe99f..1ffee17fd702 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index a78d4c373029..f398a627f3e1 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -11,7 +11,7 @@ DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b31317
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
 DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a695f52c4712f3b28733648fcd7dac5a599613f4c3d2cfa169266dc62b65619b7f28c0e06d32317adb8ec0056ca79c87e9f6 SHA512 3c81dadc9bf74207c4e361605127ef6141d77700c5c54f1f9cd5ad3be13df9f73c6eec2f51d779558e4bdad1e7395c6aa8943a93415bd1786d461042bc03550a
 DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96
-DIST firefox-91.12.0esr.source.tar.xz 379877004 BLAKE2B c00e5cc219c59d8347a69e5236a4a4f439d9caae6ab7dabc3ed8c8f9a096ded26ec1ffb53b015b86481f1d43ec4f263bb8acbd841ebf36e8a741d73e12a0a914 SHA512 323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042
+DIST firefox-91.13.0esr.source.tar.xz 380053584 BLAKE2B 75d0daa512b3a2d41974a0169778be9ef19a100de2bd382add9831860ca93976585a41e760b6a7ec753268fb78f9f61049780fa7961834248bc8157cfdcc2827 SHA512 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
 DIST spidermonkey-102-patches-03j.tar.xz 5208 BLAKE2B e60cd2f201530a1e0f635af2c7be7f966f1c4ed32b5ede834fd89006c3314c82548f970799d50fb379eb5a808edd773d4d92a3df9bda2efbd238bec77bea23f7 SHA512 ad5968e33846fe3012e0f1b1d73d3383ba691e72db71195a80e07ced038916abe07431fb82ed20c08fb806508910ae4c11504cdb4774c0ff31569b7519ed9de4
@@ -24,5 +24,5 @@ EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13048 BLAKE2B 2934c9570d692e80dd5684478b9ce72894a77fb5a80a3ee0bb2f6190a513247a1183a2dc5d832e2c7c83b658fe4aac51d05b691cb78bdd4279563e3e8587e9cb SHA512 eab195173ae5ee5b73143974ddfffda0e45267f8770cee29c6990b0359796d71497c0231ae08ef503623bc8c6fd8611de03ed218b68807bb59a407fc5dd14b2d
 EBUILD spidermonkey-91.11.0.ebuild 15073 BLAKE2B 95e0ee862be50ad1d6543ee4466a40ea73715bb7dc5b9e101c613cc9dff72d88c6448d0eaabad578492596c4ce3f25c9eeebf40b795e7603d6b6b822f6ffab36 SHA512 7ca5e1cee8c04039663cdea7462bfdf7b51b461e56fa25b4c06ddb638b85188bdfc5992c383b3a19fdf9593ffde82dbbf841dd6dddeb1a74116e4949cc9d41e7
-EBUILD spidermonkey-91.12.0.ebuild 15078 BLAKE2B 55dc6759554809c2b6c9232689e892166541bad27be7fafec13e35c185053369eed5c61b014fea23404c822641ebe38030dc1cec9c7e88b5cff929eef43f1b2c SHA512 62144ba5c276d40b9f4603f295cbf794b55296e6c1afe9772f06c925ceec2cc9284d3008df59ad5d093e977181295787073b806c7694b6e0751c47f0c2eaeb61
+EBUILD spidermonkey-91.13.0.ebuild 15078 BLAKE2B 55dc6759554809c2b6c9232689e892166541bad27be7fafec13e35c185053369eed5c61b014fea23404c822641ebe38030dc1cec9c7e88b5cff929eef43f1b2c SHA512 62144ba5c276d40b9f4603f295cbf794b55296e6c1afe9772f06c925ceec2cc9284d3008df59ad5d093e977181295787073b806c7694b6e0751c47f0c2eaeb61
 MISC metadata.xml 869 BLAKE2B 79d6ea91e84e3bb666797cde6b2993282ff1b4266dfa835eaf02d8aa65d5d000729b149a49c9fa5c8dbf12e4b97b46d976243c888834db9df73a8a5c814aa610 SHA512 f78399a1ad88583c50ad1e967f5ba293cdfff7d58cf26b87bd8888c7102b62d42ef1982d1b8462f3d31f0806b6cead8db28b7f0c7b12c08d3871607b5a4c63cc
diff --git a/dev-lang/spidermonkey/spidermonkey-91.12.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
index dce597f04a64..dce597f04a64 100644
--- a/dev-lang/spidermonkey/spidermonkey-91.12.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0ec4c9196943..9140fea49861 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index 1bddcb0d79f0..6ea41d034570 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,4 +1,4 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
 EBUILD dotconf-1.3-r1.ebuild 648 BLAKE2B ba6a92aa94c89a3ed304aed18475d9d417bb680b658e9a67c7de6b005fa35438c1fa83990a0b3031a3f9b72f43254607649b7ac581180123b5666f85246678ec SHA512 b138e5343c0a2046c2551f9c9f71b13eb691dbfa1f040e637e446ee74f54786e55da03710cb4390b726edbf8fc19f8d7f0fb8c0014e221d05498c3f070b1a980
-EBUILD dotconf-1.3-r2.ebuild 630 BLAKE2B dc5b42a4afc9eced7d34544e0cfd2ef35fa0f2fe13a24547b9d15e30e13c551716515a2e23994c26868279eecf6d04b62caabccd1062fa3aef79233af6d08b21 SHA512 84d9544f0dc3bbd4bdb281c9be5d9fb9d9a611b40e7f90a0176d27d57ffb378f2ecfd281b67461c850a011bd61d89d6eb910a81f525f86b65982580ed2851604
+EBUILD dotconf-1.3-r2.ebuild 626 BLAKE2B a599bf3b0b61378b4802522789d3bca3d678690f4e9612648cc71a48e6d193c8b7bbe25625d72b198a0bba1d6049dcbfea9823d48109650caf794d52839333e7 SHA512 2abb3034d41581504fd6215949e1dbd4c03f292c635812ba95f56aabe605ee2f7fad5a63d064e20c54c8d8b1a63fc5b289424d151861136db6dbafccca570b79
 MISC metadata.xml 445 BLAKE2B 2c3daf69f3893a6cef9c473c24b8a998fc566c1e0fff66ce5e9d780859bd1cdae789616b443f007903e6dd1372fd8494307680fbcf775863adcab5437b933b0f SHA512 46c77d13292b855f78b096d42406733af924d90ed8687ea4fa541902084367d1c830ee4500f03bc1662c545922c32ac136d4f08ec06d51da05dc88ef7689459d
diff --git a/dev-libs/dotconf/dotconf-1.3-r2.ebuild b/dev-libs/dotconf/dotconf-1.3-r2.ebuild
index ad10a4396ea4..9d0d505092f6 100644
--- a/dev-libs/dotconf/dotconf-1.3-r2.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=sys-devel/autoconf-2.58"
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index be10d7238c9c..4ffa447e10a7 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -2,5 +2,5 @@ AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d8
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
 EBUILD judy-1.0.5-r2.ebuild 872 BLAKE2B e06791a078ffea4e1fa25e3227bccaa09122c42ef84cdb1746f80abbd532f1bdae86f0491d532d91ef0280cd77d5c19d96faf58759b8535981692eb00dbf810a SHA512 5f042295feac44af7fd58445b77f6f22e2e2a5c3c60944d5dd8dc2d212db5cf992d18219cf18f1d032191679ab466bf9b61cfc631e1942535233c6dc7812c52a
-EBUILD judy-1.0.5-r3.ebuild 881 BLAKE2B 3fec917a99c56a69437d579794d75fd44da90210587cc95c55b25fcecd5d26f8b6449327b6d0902565fffb8039471c5cde507a2c30d9a195c9f54ea693927d35 SHA512 88d39d3b3e0a1f155930af987811787922ff1ddfd0582eb8c423f07799dcadb937d645e6268e4c853e2684cb13406b2629fd327b76a7505af7bb8b6b86cf227c
+EBUILD judy-1.0.5-r3.ebuild 880 BLAKE2B 56b07fb8c2922c2df2e6d5b7221950d7733b50c4e7012a24f2b3c9d2ad355e9fbc9ac9f01ca100d8f2bf4c5f8a19198bfd2dcaa315948a6972ad6168290356d0 SHA512 64f191fb61e0399a3ae568206deffea4f7e17c5d4fbc8ac550eecb782a4011fc5d969a96f21a194c32a8824ead3bd9fb2e5c959eccbcfa243079c89ff02d4830
 MISC metadata.xml 321 BLAKE2B 6d6ab94e382db122f3ad8e94e456763f32616c09b1c0bc339b1115f0c7e90c43056fdc48b192f2d1b66e4df563b3b15eab4b76a19498d6ee70b718ba0d5edf3b SHA512 1ec5626e3a8ff786a4d192738e918859f670cf69d432e1769214cb0e5cd69741a4b54ca4ae2ede93fdc69b6a864ed897f0328f193829096dc7664e2bb0285189
diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r3.ebuild
index 3df2afd00123..64ccddafbdd4 100644
--- a/dev-libs/judy/judy-1.0.5-r3.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
 
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index f0837ed3271a..ff1d872f12eb 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -2,5 +2,5 @@ AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 EBUILD libdbusmenu-16.04.0-r1.ebuild 3881 BLAKE2B a98ac44ba760b367bfb0473ece2d77419d6ba659700e412a8b6a6d335e7cb9d3e680a496621c2ac2ff0df2cb4d90345484a17b3f81feba56a549db6e3a1cc9a3 SHA512 23ff195bf5c1eb0e37f7dc7de5adf6e242b287c843d192544fca5234978c093bfea4a5159dd0dfe1db34d9c0aa91f86375e18baea1b9254a2d1678c677dd4e39
-EBUILD libdbusmenu-16.04.0-r2.ebuild 3865 BLAKE2B ccefdffa17b17f4b6afa0f8c3339f9086475cf3072c559e3f2909dac8440d44fdb3a2716775ed35d7258d3bf61aedfe5cc61f6c8200b538e156b5d8d5145c0ff SHA512 d0b138633f98802b0cc83bb3d56c48c8f6990dd889331b729bb041d7d2b1ddacf4f20efca9585e2daf5de51ef2d6660b38aaabf306a2ab57b5c8109f8d1756e1
+EBUILD libdbusmenu-16.04.0-r2.ebuild 3863 BLAKE2B fe8da60412d4416e9c115dc124db70d34d790f985c88ec8a90dca96aa01819be31742abcb3a20483fdefad314e87c0d42f255e44f8628fbb7d3702d90c87f1b8 SHA512 cce543b8ad6182e67b6033cd64ccb09babdf3657552b38a3ccff1913afd1734615885768d4116ee163d896efc52e394519a0334c24dc9a890a45fb37e1aa6a7a
 MISC metadata.xml 362 BLAKE2B 30fac8611210ba6263d5a91f9975741f1c799d5b841d278ccdf440e67f7dc3040f9937a79bbf6028b1ff6d1f2389eea6746e0772048b7c9b71978cc75fbac20f SHA512 80dff178352278089470bd2465f750e336056cba3321719b18dce1188c5dfde302c6bc0efcaa84fcc049840616a9949fd1a39e143ca2c61e7a8eaeb317b74c4d
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
index 7f712ca9cf8b..3cc0f3b85dec 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index c4fa00b9f406..1875c4c5a80b 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -6,6 +6,5 @@ AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d2123
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
 AUX log4cpp-1.1.3-fix-version.patch 314 BLAKE2B 27dabdf67a2c3a53ff1f10b1c4b2b1796e144213b2ba545ffd800d21bcae22e8248cf53da73d951a3e712b45e2fcac97f4c5d131bf260ca9680699df8ba527ae SHA512 1ecba987f5295d507babff49f3d0d37d7e998ac2014ee430a981f7c64c35f1d10f2a3810bcfd7e8ca037a0fdadac61972ff93bf37cf6f543d7cedc6b836edb49
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
-EBUILD log4cpp-1.1.3-r1.ebuild 1499 BLAKE2B 9669f7c3ef7437c1cd14066db6b14c179609fee8fa12ba5e078380b3f8d8c14d8f84cd46cd1d8843d2734e36633af1278f75c87c37f7dfaa10c8a579c88e7f67 SHA512 aeb1cd193f5289cfb9745861732a91400e205af7fb8658c03441f56d4728c1fe631beb7652906c76aeb29667862071eeec9a8845095b678883fc59f502976726
-EBUILD log4cpp-1.1.3.ebuild 1264 BLAKE2B 914800599aeb18dd35d0c6b9246b7d69df9f742f85d444cfa887ede2f562a6f7c5abaa4daa20c635931963ddb66bce62f640bfb5533eda359f756d32e0c936c0 SHA512 0c4dc5a1a772d5f051ee4b7de5eac4afba20d24c4eadf7b75c6c0c8e322ebd9f58a0708ab35873c0f97d9979750a9c3792762895321575d6ba25a38ce3b038d2
+EBUILD log4cpp-1.1.3-r1.ebuild 1496 BLAKE2B d0ba979a87f49e917b1fcd1f6dada3484419d8fd2a20e67eb911d7e522791984a134f824d3ac9fdd23343ee661e52478ed3f4120ca1acd7911a5cdfb3eaa8182 SHA512 f3010aa99abac93bdd497dd3cb1569ef391fc2944013c72d4711d2c3d1b6fa4155c809d49e77cb757e0e621eba58ee5834616a77da88945218df3b4198ac53ff
 MISC metadata.xml 245 BLAKE2B fc64c325a442c85782c437edf7e7835b640d7d42d6161da3d4e803c0e81c7e1df99baa33c812e6da007a7286084aa97678109e21c72f684a4b7ab5903f1d281a SHA512 8ae4a6eeb33b2013ef7200430fbd5e9e24c72b8c1f02a7b36d7c62a122c5a10a184e4b86645f1e5ad3ee0b384fd786b2d7d063cdd1befb911f6d4bad7506862a
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
index e84b5498cc10..6c98c3b76d2a 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ppc ~riscv ~s390 x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
deleted file mode 100644
index a8a7106a7709..000000000000
--- a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
-HOMEPAGE="http://log4cpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm ppc ~riscv ~s390 x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/1.0-doc_install_path.patch
-	"${FILESDIR}"/1.0-gcc43.patch
-	"${FILESDIR}"/1.0-asneeded.patch
-	"${FILESDIR}"/${PN}-1.1-cmath-fix.patch
-	"${FILESDIR}"/${PN}-1.1-automake-1.13.patch
-	"${FILESDIR}"/${PN}-1.1-glibc-2.31.patch
-)
-
-S="${WORKDIR}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/log4cpp-config
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	# Build tests conditionally
-	if ! use test; then
-		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--without-idsa \
-		$(use_enable doc doxygen) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7b7ba6b25b74..4e6103d4e165 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index 71dbcb67a5ae..be0d701b0e2e 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1,4 +1,4 @@
 DIST twitter-7.0.0.tar.gz 831181 BLAKE2B aeb888bf1551116916cc10a4c0278dcee541e953c6e1be09bd95f348b8a2a08075d44c4b8beb736b13564d550b5797184c725141c5c3866f5423afddfdfbea19 SHA512 4b0f831ddb1f54fc5894a15010d17b54c62f6caa3eadd6a1f0e0ef37235f29f53f6315c49213244d79ab3708d5a7b1e1b9735d1f35fa291a66d439db916d3ec7
-EBUILD twitter-7.0.0-r1.ebuild 1386 BLAKE2B 0f1433ad65416a8a1955848087e44460074d34ce423526962d91a89df74c4f941c45d51a8106a9b8b80a234202bfbbde7cec97b63a4ed81e287f525de1e36c15 SHA512 96945184f77c8c1983615b0807430128f7caa93a96f86fa6989d96762fee7803b92af15f637bde482dc4a7988f9de10ccfcc7ebb24d06a60aa4839235814716f
 EBUILD twitter-7.0.0-r2.ebuild 1379 BLAKE2B 9d2224d52b6f76e6dd2f944ea85978f85648278381f68c9f5a6c40bac6ad66c885a68682b486a75e5649ba146588deca47fe738ac33d3231adedc3c2fd5509a3 SHA512 2da92e14e04d2834cc8ca4d48865d3681e7c7da211afad78e2cd3bba724efc062ff3a6f1f6bb1aade6568ab76c36ed541d19063f2b17aab8de7e28c6a20f1885
+EBUILD twitter-7.0.0-r3.ebuild 1377 BLAKE2B e79f4bb0e7694517b0abec7bcc0fee805a04b3543f0acd5f6582b14c218f466e95f831df2d9fc33bacb5c2b74a36196f0f0fab92a278d232145491446137464e SHA512 a7ebbc922453affae072e7dfd41ae198cbdbc6f7e0ea161a0664eefe6ca84617546a78dd220095cbe70af1db56e0748d06a576accaa0ef3f4c4d28ff98e2b78f
 MISC metadata.xml 341 BLAKE2B d211a35d4bbfa5dddb3da3a247504abf3bdc657b241631b612487dff7e38497dc681ffbdcf87c4b45f790ea33d6c738f472b8f2965ef7a43633b73146bfb665f SHA512 08d23d7c0d21e14aff124d637f17c50368f6821360323edd3c2885945192aeee64189ad33aaac85810ae0dde359c8da338d0a87ab14f3ebcd812ddb3fd0a6c20
diff --git a/dev-ruby/twitter/twitter-7.0.0-r1.ebuild b/dev-ruby/twitter/twitter-7.0.0-r3.ebuild
index 306bdaa160d4..a85f120ce7d6 100644
--- a/dev-ruby/twitter/twitter-7.0.0-r1.ebuild
+++ b/dev-ruby/twitter/twitter-7.0.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -27,7 +27,7 @@ ruby_add_rdepend "
 	=dev-ruby/equalizer-0.0*
 	dev-ruby/http:4
 	dev-ruby/http-form_data:2
-	>=dev-ruby/http_parser_rb-0.6.0
+	=dev-ruby/http_parser_rb-0.6*
 	>=dev-ruby/memoizable-0.4.2
 	=dev-ruby/multipart-post-2*
 	>=dev-ruby/naught-1.1
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a7808f520b69..2d63f83af456 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 426bea1db4df..e0d3aadd5a57 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -6,6 +6,6 @@ DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79ed
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
-EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9328 BLAKE2B e91bd2477f615bf385b3fda1b35e3628848e33d3bcf8182c9d7726d91f1f10e2ba987b9beb4c3a241c2bdd9d61cc7bba430374ecad823db89ce34038035f915b SHA512 69bcac9b4199e037814465fae9aea75cf6197e6bc02f810ec55a57455d740a893f77332afb33fa12168ed6735039e8a7829b18d1838be00cb1afba6979495cc2
-EBUILD mingw64-toolchain-10.0.0_p1.ebuild 9312 BLAKE2B 9ff31f32c8d33d0934f72e1d5c6e1425523ab5a7175d7def1d3030fa828e61229d4364fe98e4eda69ab2332f0e65af8c5d586840ff896785d3698b5ccd7ac6c9 SHA512 0838259a07e7331bbad432ae25aa832b7846406e722959436268e4c9718dcc07dda4ac4a21230497ca23e7ac63daf2ef07a6c003dcde600e2a421640f60067da
+EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9371 BLAKE2B b548c0bd45d41351440a8fa865b3c1a5d10e8c99d7a045d10c1b4884a02349c6c8887b7f69f7a4f84f4ccdffd3ce367a0dbac74a319c909dcc15f219c95486cc SHA512 17d959e20c2dd38e7acd3b7837ef164ec32d5e4b206351b827e68323f57483e0b301d07223419f8b6ecbc517648455257a38e90e15fab1aacbc89936cf67f7b8
+EBUILD mingw64-toolchain-10.0.0_p1.ebuild 9354 BLAKE2B 14d5d8d971a33ef2baffd00bad8e0a8cbd2db532c2f9cb7209af947e51ef81f7ad3daed918c08d32dc2d13748a4b77ba65a3c58b9e7b72d2e8caa8a2ceef3307 SHA512 820dab603465230009ac601e896cdea613ea2911ab920f8467f6fad61ceebec5ad8cc416cdc8f3f5a6e69a7809319cb01f97ab7e67446617c083c0fe110a73de
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
index 2ae2ce9b80cb..0bfc818d9698 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
@@ -199,12 +199,14 @@ src_compile() {
 
 		# econf is not allowed in src_compile and its defaults are
 		# mostly unused here, so use configure directly
-		eval '
-			local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-			[[ ${conf_'${id}'@a} =~ a ]] && conf+=( "${conf_'${id}'[@]}" )
-			[[ ${2} && ${conf_'${id}_${2}'@a} =~ a ]] && conf+=( "${conf_'${id}_${2}'[@]}" )
-			conf+=( ${EXTRA_ECONF} ${MWT_'${id^^}'_CONF} )
-			[[ ${2} ]] && conf+=( ${MWT_'${1^^}_${2^^}'_CONF} )'
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
 
 		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
 
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
index 2f07f8f08e07..3b878de762bf 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
@@ -31,7 +31,7 @@ LICENSE="
 	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
 	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain"
 SLOT="0"
-#KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="+abi_x86_32 custom-cflags debug"
 
 RDEPEND="
@@ -200,12 +200,14 @@ src_compile() {
 
 		# econf is not allowed in src_compile and its defaults are
 		# mostly unused here, so use configure directly
-		eval '
-			local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-			[[ ${conf_'${id}'@a} =~ a ]] && conf+=( "${conf_'${id}'[@]}" )
-			[[ ${2} && ${conf_'${id}_${2}'@a} =~ a ]] && conf+=( "${conf_'${id}_${2}'[@]}" )
-			conf+=( ${EXTRA_ECONF} ${MWT_'${id^^}'_CONF} )
-			[[ ${2} ]] && conf+=( ${MWT_'${1^^}_${2^^}'_CONF} )'
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
 
 		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
 
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9d99b2d9c226..0ebf7930ddde 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 8e3a309af601..2a184b7f4194 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,7 @@
 AUX hatari-2.3.1-caps5-include-path.patch 500 BLAKE2B 9462c680cf22368e06f37d313d0d0917b5904977ab0001fc3427bb8532d611481e0414c7a9c76a83f8c3a00691dd702c22a4c27eb3d1ef0a8bfbd5d48d636895 SHA512 53230cfbfc1904fba1af3d9a7554425d76e75f4a4fa51906ebfe12c9f178633bc63334036f3192643dfa2a3d51e5729c7932a58ca009902585a1653b44c28457
 AUX hatari-2.3.1-cmake-include-checksym.patch 388 BLAKE2B 45bc03fc6be8feae6d16083ea6fd5c2fbe1f63103c8a274e9e2104d39cb4050dd5cb0ac51e679fbb65c17d0e2df080245e0e5800f14578e956cbff2dd6c3e9f5 SHA512 b9afa6022e7be9dfe9ab47b791d5e7a64e835ae2098f5b04737b2ffc952598bc0e90a181609629d03f9568c8dcd4e5772cb96bd1416531ccba6c66a1d33c439e
 DIST hatari-2.4.0.tar.bz2 4452205 BLAKE2B fe53b4dac688720372386fc83a83996e2cc83d74fd20f71db5e60f773561dc51d33f3560c1625913a896a9592650460604e821c9f7f07e5bd50d1775b49dfea5 SHA512 8ec542b2f7e27cd185ff8725e8d31ba7f1de709fa638b6162d17b6f1163158cbd16fc2738aa6b073a71cd990a72f305b5322f754faef34399cdca8685a7bf08c
+DIST hatari-2.4.1.tar.bz2 4446656 BLAKE2B 0844f14f2161de931ba098d290655152ecde354a80cc9c18b460fda77149759386cf7ed46d0ce1dd36dc303f1f3cfe421f37f169e06d46a06589cef1d601dbc6 SHA512 90c555150b0fa86b88e4ba3360384edf6afa05d45b82b3260853178b77fd542da6f31bd2e80c8307380fff9c61f0230545ec987e6e74b8c3d708bc5ef5ca8f42
 EBUILD hatari-2.4.0.ebuild 2450 BLAKE2B 307f2a6995a4c51ad8b30ee1a618be15f883e0fdb751d72f71930243cd957c6bafd7bfe574e9f66b9c7c5fb746ef13b74c42240cb18291586f37f134e7a30487 SHA512 536959b1800e71fc12347a27ea01920b1db8f596d20bc86907f4b9be81f0866985f808bcdaed72f89d1723af8a8e1e552510f6b7848a72c3c196ab321c46027d
+EBUILD hatari-2.4.1.ebuild 2450 BLAKE2B 307f2a6995a4c51ad8b30ee1a618be15f883e0fdb751d72f71930243cd957c6bafd7bfe574e9f66b9c7c5fb746ef13b74c42240cb18291586f37f134e7a30487 SHA512 536959b1800e71fc12347a27ea01920b1db8f596d20bc86907f4b9be81f0866985f808bcdaed72f89d1723af8a8e1e552510f6b7848a72c3c196ab321c46027d
 MISC metadata.xml 551 BLAKE2B 345a7f3e8e1b73d6b6b95e951ee6eab25c2f681ce68020261b3d4ccad07215905b4c726707bcc16db0624d8d04ebe58c31de7ae502999661ce007fd8041ccd63 SHA512 e516f8d601cb654527b4590b865a621df0a661dce8bb40c31a43233995f28188efd1a9babe9b616ee394b7f7eef1fd667d3bb425382017e2f79c870979e1d7d7
diff --git a/games-emulation/hatari/hatari-2.4.1.ebuild b/games-emulation/hatari/hatari-2.4.1.ebuild
new file mode 100644
index 000000000000..db2b63faf515
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.4.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="Atari ST emulator"
+HOMEPAGE="https://hatari.tuxfamily.org/"
+SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X capsimage gui png portmidi readline udev zlib"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	png? ( zlib )"
+
+COMMON_DEPEND="
+	media-libs/libsdl2[X?,joystick,sound,video]
+	X? ( x11-libs/libX11 )
+	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
+	png? ( media-libs/libpng:= )
+	portmidi? ( media-libs/portmidi )
+	readline? ( sys-libs/readline:= )
+	udev? ( virtual/udev )
+	zlib? ( sys-libs/zlib:= )"
+RDEPEND="
+	${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	gui? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+	)
+	>=games-emulation/emutos-1.1.1"
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-caps5-include-path.patch
+	"${FILESDIR}"/${PN}-2.3.1-cmake-include-checksym.patch
+)
+
+DOCS=(
+	readme.txt
+	doc/{bugs,changelog,scsi-driver,thanks,video-recording}.txt
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i "s/\.1\.gz\b/.1/;T;s/gzip[^\$]*/cat /" {*/,}*/CMakeLists.txt || die
+	sed -i "s:doc/${PN}:doc/${PF}/html:" python-ui/uihelpers.py || die
+	sed -e "s/python3/${EPYTHON}/" \
+		-e 's/mkdosfs/mkfs.fat/' \
+		-i tools/atari-hd-image.sh || die
+
+	# use emutos package rather than bundled ROM
+	rm src/tos.img || die
+	cat <<-EOF > hatari.cfg || die
+		[ROM]
+		szTosImageFileName = ${EPREFIX}/usr/share/emutos/etos1024k.img
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DETCDIR="${EPREFIX}"/etc
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package capsimage CapsImage)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package portmidi PortMidi)
+		$(cmake_use_find_package readline Readline)
+		$(cmake_use_find_package udev Udev)
+		$(cmake_use_find_package zlib ZLIB)
+		$(usev !gui -DPYTHON_EXECUTABLE=false) # only disables python-ui/
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc
+	doins hatari.cfg
+
+	mv "${ED}"/usr/share/doc/${PF}/{html/*.txt,} || die
+
+	python_fix_shebang "${ED}"/usr/bin
+	use gui && python_fix_shebang "${ED}"/usr/share/${PN}/${PN}ui
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 329377a52a50..9acd82bdb015 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/postforward/Manifest b/mail-filter/postforward/Manifest
index c6ab322545b5..909407923038 100644
--- a/mail-filter/postforward/Manifest
+++ b/mail-filter/postforward/Manifest
@@ -1,6 +1,4 @@
 AUX postforward_apply-sendmail-path.patch 722 BLAKE2B b8585995206ebe6a608200b85a3eba3df3deae1682f22e4171be9c2f055593e827cfc4753b276d544da5a59f71f374575fcbf8544e4d12738280fcdb770bf8d4 SHA512 17685c2bde9ca3057f4da06553b19e2dde556788c009e9ea005b7b87af687643f9233decf4fa30f4fbd885317f4b3fa283af3d2b1b98c5621df90616ae8751aa
-DIST postforward-1.1.0.tar.gz 5707 BLAKE2B 2dc994628820b40caf3b9c65ad6be48e220abff8f5a6d6054b109600d9d368fab3e6e642dbc5a98235f440359600a3f4bbc19f7ead06fd84802a8900fa465dc1 SHA512 39d7a33c454b1529a691b24fd69b311ba368caf59168d39146654cfe319ebc3cf73835e66e6c95a43747f389a6b954ac8da0d7e934e562c16cb85dc20c0f4804
 DIST postforward-1.1.1.tar.gz 6086 BLAKE2B ecf344af646b745fa9860279f6c91ba5ab74a5dc93a1cb09168091b01ebe5e804062afa32a51b34f65c5c89c08e401a8a4e1beb145c07bcfb848c970f6f4e1f7 SHA512 1f29e1731ef9fd1292f932a8e195577ce238f69c2e6ae1ffac81a577607fda98563b454564841011ce077cc8453e5ad78d2ab904fdf0fea67c15a69f6b2a3d92
-EBUILD postforward-1.1.0.ebuild 1223 BLAKE2B ba7309c39a6e897fbd034976a4d76918a671e20e6845b52f6e9246578bdb556b3d3d4b276f0e4d8df3e848b134473a4f5124163aa9e9e29b41aaeec37dbc2fca SHA512 3efaaeb4b093895dd94a9a8bc3221bb457abf146ff26d177dc128c810b1e300215a34db3ec349dc8d5048450a12ee7dcd43a351df03faa287c4652b440bd742d
-EBUILD postforward-1.1.1.ebuild 1221 BLAKE2B a2ed2666cec751cef0f1c1322d9d53559e055f5a2ab7bc3b0600adf5a778e496da930e1f70297f241969ec2dd42638bab1839031aee834aa077d4de9e88a49d1 SHA512 4b9add52a203c7139960aba668abe613e27349bac9da5f7d486c630a9a7cdbcdfd7b31f523438d586cef0e3936d98a0a36ea005fea3dae74681d14b71fcf9a88
+EBUILD postforward-1.1.1.ebuild 1219 BLAKE2B f4c0ec858c33a6a890f144a40feeaecef122cffed14de1005c7a592a3d2db5d4c9fa7fee4d5d20c0e4196331869343eccfe45977e1cd259cc0b6d432d60b9681 SHA512 d2d305eaa039becea6f9cf7cff49cca3778cbbb5b63fd7024b8aa487b0e0e76d497d8249569c0336275632badb1c58e10b3df74be1ca018fdb2e838e0747e84c
 MISC metadata.xml 517 BLAKE2B 2232a2fb44dd759f0426351988e6c293888346dee2da08ce2da0026eec703b81b73f273427472b0373098af583ecc6a529b21693947bb3c89614d962596340f6 SHA512 454193de85a6a3f5fa16adb73bfe86679a42d7263f1a74735da61f93ef33531baa91bf40da0a7e0208d6e25b1612f7f219bc9373b88a5797ce9c95864a993d62
diff --git a/mail-filter/postforward/postforward-1.1.0.ebuild b/mail-filter/postforward/postforward-1.1.0.ebuild
deleted file mode 100644
index 2e0462535529..000000000000
--- a/mail-filter/postforward/postforward-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-DESCRIPTION="Postfix Sender Rewriting Scheme forwarding agent"
-EGO_PN="${PN}"
-SRC_URI="https://github.com/zoni/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/zoni/postforward"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-lang/go:0"
-RDEPEND="
-	mail-filter/postsrsd"
-
-PATCHES=( "${FILESDIR}/${PN}_apply-sendmail-path.patch" )
-
-src_prepare() {
-	default
-
-	# Dynamically fix EPREFIX lines made by ${PN}_apply-sendmail-path.patch
-	sed -i -e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" *.go || die
-
-	# go build assumes files will be in src dir, but
-	# source files are in root in this package, so move
-	# them.
-	local new_src_dir="${S}/src/${EGO_PN}"
-	# Freak out if there's already something there because
-	# it means the package has changed and we'll need to
-	# adjust to it.
-	[[ ! -e "${new_src_dir}" ]] || die "${new_src_dir} already exists"
-	mkdir -p "${new_src_dir}" || die
-	mv *.go "${new_src_dir}" || die
-}
-
-# Standard golang-build src_install complains about pkg not
-# existing, so we go custom.
-src_install() {
-	einstalldocs
-	dosbin "${PN}"
-}
diff --git a/mail-filter/postforward/postforward-1.1.1.ebuild b/mail-filter/postforward/postforward-1.1.1.ebuild
index f9f2be8689ca..13e50547a484 100644
--- a/mail-filter/postforward/postforward-1.1.1.ebuild
+++ b/mail-filter/postforward/postforward-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/zoni/postforward"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-lang/go:0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 645b7e1cb216..b833a2e26c14 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index aacbcacceefa..5ba69ded40cb 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,5 +1,3 @@
-DIST jp2a-1.0.6.tar.bz2 306975 BLAKE2B 284925e791423a1871347f8dfc9574c209192c8a583a0b3221142adb35ad32c2d00a47412c85df038237f4e1adf604324fb15440c33ca06290ee382fd90930ff SHA512 00c7f7b62a3d1f4238d7513167eebd6ead9447ac90b66fd3f9529f6e99dd1a021385ff970aabd005a88db1614636be57547494dfe00c7e687a11953066a6ecce
 DIST jp2a-1.1.1.tar.gz 628052 BLAKE2B 7f999ff1c7f32b02007a8d0a2d5f1aed4d77a3e9ed6711566faf0169e8d0eb842b3b118c36671a98abd8ccbad100eace4f1053b6dc795071f30e70052488f141 SHA512 898141c4b2847049cc312995a4b18d0de3f62bf9cf5c45050df01007de42486c706ab4b63a30f13828807d7bf01680a0e391304d03ba2087a481d86668773dba
-EBUILD jp2a-1.0.6-r1.ebuild 526 BLAKE2B a160c878c48b3cad1f39de403b5bdb1287af5eb913a66bc8be06d52a906ba44d038595a4b4d242594eca23b3849209740dee6c9c7cf95c167b9a705b75562678 SHA512 01792bef0209bdd3c5f6161b29b0e421aa70eece0312ae7573f903d4b692cfd393f721b7b7dfb261e0b88335127c38b3b4f2c0c3074acf451015d9f54eb960d4
-EBUILD jp2a-1.1.1.ebuild 636 BLAKE2B a1ccb43941c58673e44aa403611de796b5ece9220d1e384b658fa2e221af2ded304e08efa3272493b3db0a6f8463260d0cfc277401d6428cdf7a6bcdf55c534a SHA512 3d1207ace3e9cb041ebae838ba9dc3da9d8dd65d8f6180ef9627c0d43ef40e71fb5ab3ff206511db26b5ea4f34dce782371fc7b1fdaa8867356924a8f9200252
+EBUILD jp2a-1.1.1.ebuild 634 BLAKE2B cd50b1dae411b391b64165ac68dac1b5bb397ca0f4097ed2855c0159e3b0ff46d11304af30bc5f707c22ea275d1a85f2eaec3296d2baa2995d5555f1ff86aafa SHA512 a7e518d3149925f6f40a08a68f06db2ed07d0b66d03f3f6fa819ce9c473dfb63f80861f3b3b545d4a52e38f5605ab25b533fdef5bd115e132f83460c28f1ba78
 MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842
diff --git a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
deleted file mode 100644
index 50869054faa0..000000000000
--- a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="JPEG image to ASCII art converter"
-HOMEPAGE="http://csl.sublevel3.org/jp2a/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
-IUSE="curl"
-
-RDEPEND="sys-libs/ncurses
-	virtual/jpeg
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( man/jp2a.html )
-
-src_configure() {
-	econf \
-		$(use_enable curl)
-}
diff --git a/media-gfx/jp2a/jp2a-1.1.1.ebuild b/media-gfx/jp2a/jp2a-1.1.1.ebuild
index 6e96d47ef711..b5d30e113fdf 100644
--- a/media-gfx/jp2a/jp2a-1.1.1.ebuild
+++ b/media-gfx/jp2a/jp2a-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="curl"
 
 # TODO: restore ncurses support?
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index 663625615faa..e77c8734829a 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -13,6 +13,5 @@ DIST Propaganda-Vol-09.tar.gz 1664869 BLAKE2B 48baf8efa75f18141a557e0f36a982232d
 DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db7b96942ffa49f193ac86bba76c2394fa451718e611e8697ccde3ff02a6ac649d0ea85a04fad76a940c3769418b9751 SHA512 080d563442050f1266d09fbb2148d14173555a213ce1fb110ce4aab2d85a18563543705227b1e68146dd2f1a5b1bb7cc75f9512f823a4970f92b55eb9251b1fd
 DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
 DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
-EBUILD propaganda-1.0-r1.ebuild 1200 BLAKE2B d0f29c2ef8d257b0d0bfe8d09926456a548d85cbadc8224ac90805e8788f4f75aa69af9991d603d40d4450ac7118c874f04f5cb7e80d04700e9fe0027ce1472d SHA512 b30d65a468330bcdadf91863bb41e6e36dba1957b2ecfc7a3199ad1921f1d0f2ce65114d01ebac86749f1c6c1e9ee3844af9c6822f4e5fb3cbb2cb0a929d934f
-EBUILD propaganda-1.0-r2.ebuild 1195 BLAKE2B be66603e2275966fd3844272d2fd6559a7f5833378837947cd66f5dde7b4e3709b8b47a335cbeda52df8a784eec77da997d2924fd7bd7181d1b8788d2e28d740 SHA512 30934ea7bcfb5253a988b4acf95df3b0c701301b4209084bc7e392c561b64d0a2c0955cbdcc4dff0d0a6c5b693081318f2838a8c0ce531554f201af3c8b74ebc
+EBUILD propaganda-1.0-r2.ebuild 1193 BLAKE2B 65381680ceb891d293a50aeac62685cdd259a3513cfe5049098b8ea627a547276f7d7f5e1b593a2ba2f75b8d25d642f37f4564143df0945b3466d4273e0c3196 SHA512 ec9564150e67af1623410be2ea8c601d4ca502719872c1cf266dba69e505249510f2a39379338b9f556523d5f0f4d800e2320125844e846944d4055044f92fe4
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-gfx/propaganda/propaganda-1.0-r1.ebuild b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
deleted file mode 100644
index f683c1bd6279..000000000000
--- a/media-gfx/propaganda/propaganda-1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-S="${WORKDIR}/Propaganda"
-DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SITE="https://dev.gentoo.org/~andrey_utkin/distfiles/"
-SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
-	${SITE}Propaganda-Vol-02.tar.gz
-	${SITE}Propaganda-Vol-03.tar.gz
-	${SITE}Propaganda-Vol-04.tar.gz
-	${SITE}Propaganda-Vol-05.tar.gz
-	${SITE}Propaganda-Vol-06.tar.gz
-	${SITE}Propaganda-Vol-07.tar.gz
-	${SITE}Propaganda-Vol-08.tar.gz
-	${SITE}Propaganda-Vol-09.tar.gz
-	${SITE}Propaganda-Vol-10.tar.gz
-	${SITE}Propaganda-Vol-11.tar.gz
-	${SITE}Propaganda-Vol-12.tar.gz
-	${SITE}Propaganda-13.tar.gz
-	${SITE}Propaganda-14.tar.gz
-	${SITE}Propaganda-For-E.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-src_prepare() {
-	default
-
-	mv ../Propaganda-Vol-11 Vol11 || die
-	mv ../Propaganda-Vol-12 Vol12 || die
-
-	rename JPG jpg */*.JPG || die
-}
-
-src_install() {
-	dodoc README-PROPAGANDA
-
-	local VOLUME
-	for VOLUME in Vol* Propaganda-For-E; do
-		insinto "/usr/share/pixmaps/Propaganda/${VOLUME}"
-		doins "${VOLUME}"/*.jpg
-	done
-}
diff --git a/media-gfx/propaganda/propaganda-1.0-r2.ebuild b/media-gfx/propaganda/propaganda-1.0-r2.ebuild
index 77eaa13762f4..764db3933a3e 100644
--- a/media-gfx/propaganda/propaganda-1.0-r2.ebuild
+++ b/media-gfx/propaganda/propaganda-1.0-r2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/Propaganda"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 src_prepare() {
 	default
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 89494c44eea6..52f94dc45df0 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,5 +1,8 @@
 AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3836 BLAKE2B 92bd4d4e43eceb67a1356552ee75431d05d61f5983986d109f6601b3fb86b195a39d18f26add58426fa535200af778864ff643a38d6771cb5e7de6a3a91f0192 SHA512 3a13e2e0fb0fd53571ea2b44403c810729b80c715a8fcaa5c596f680eb9c67e9f86c2194e09af4de54baa5bd95023b32f27cb475ccfe9ac71ea583b5ab02aba5
+AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1691 BLAKE2B e8886bdd4a22ac215203422cd9dcc88972d61fcd522f65506a206f23849204175bf56b537f9984bc82b38528b3f08ee9f62020ee0fcb817f237a6b1b33a11be5 SHA512 d8b32d653bc1a21bf12dd75449ee018f04063536d0a519409bf520913b8e89ef3acd185a5351ec7a1225188f2d669d1cfcaf9a2552c509689d24d605aac56209
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e SHA512 8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
+DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d SHA512 5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90
 EBUILD prusaslicer-2.5.0_alpha2-r1.ebuild 1752 BLAKE2B 439d0db2496b075d674bfa74e8284b347bdb170b1b1d0f60fda0ec40c9bb0c578d93bb2a2307e4f077b6b1820bdb5ad830ede7066ee96a5761eecae0f1b19db6 SHA512 2bfd12ae34d061a0c0f8545813361a980929e0997064307ec791ea8b33e0ea26800f975a5da672947c465e8f6fcce4c186ddd2280230b79eaa3f3430307e26e6
+EBUILD prusaslicer-2.5.0_rc1.ebuild 1748 BLAKE2B 29aed6919880bee74596c4b3fdf8f3dedbf37a734d4218a8857bff4618dc1eddc9f68eebf2d8047eaf6086c0406932f0342ba0a8eacfef422db6b846f3fea402 SHA512 d31946306e37652d027deaad4751fa47588d0fcc47b7b0e4aa3c97cbe4f248e5eb5b4dfad4b317cb1dd2ce120db5775347fab4326bcc2b697b0630a37e748a9e
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
new file mode 100644
index 000000000000..29e01422b41f
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -0,0 +1,48 @@
+--- a/src/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/src/CMakeLists.txt	(date 1661704655632)
+@@ -127,7 +127,7 @@
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
+
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+--- a/src/slic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/src/slic3r/CMakeLists.txt	(date 1661704724566)
+@@ -260,7 +260,7 @@
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+--- a/src/libslic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/src/libslic3r/CMakeLists.txt	(date 1661704699199)
+@@ -395,7 +395,7 @@
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    cereal::cereal
+     libigl
+     miniz
+     boost_libs
+--- a/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/CMakeLists.txt	(date 1661704556468)
+@@ -446,6 +446,12 @@
+
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
new file mode 100644
index 000000000000..f99c7d8cc487
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+MY_PN="PrusaSlicer"
+MY_PV="$(ver_rs 3 -)"
+
+inherit cmake wxwidgets xdg
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"FastSweepingDomain
+SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb:=
+	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl[adns]
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
+	"${FILESDIR}/${P}-cereal-1.3.1.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+
+src_prepare() {
+	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 59543bc6a406..c368f0969a2d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 15cd1004b785..584b54183d03 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,6 +1,4 @@
-DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
 DIST ffmpegsource-2.40.tar.gz 140356 BLAKE2B 57fbc3d979f31108b257b6720045f4e157fca6714bf0f8601e8123c0026a14bb55d343549ff6b246b55a44b4f69c541c58f4b19f1051e338f1f97b2b7557b6de SHA512 407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67
-EBUILD ffmpegsource-2.23.ebuild 889 BLAKE2B d78b543265e46b59372205fe536cfbb6bb89241b50e5398b3791f118bdbed7785441f26da0343ce312a8c07026b1744030a0e8cb37ff423e3812ea2ca69d6837 SHA512 c5383f24b5aa3e15099986b01923b979c627a12e970706e1d86da64c71e7bbf57487dfd894ce753b102d79bc7b475b26eb85a1570df478e64221d139cba11b9f
-EBUILD ffmpegsource-2.40.ebuild 824 BLAKE2B 01f59dfb928ad0fe748e9042de2ae6020f753f94cd9c979c9a57adbccdad5de712936d8cd9c28b9b68a1481b99d4c4f06554ba7f2b5a68957d421dce114433fb SHA512 f7170484b5166eb6f5fa88f028499d92d049fc48394481e45f5037f71e8e5858d6ddfa3f3881ab40e455547f966174423cce78825c705e6f9a94c77170668d5a
+EBUILD ffmpegsource-2.40.ebuild 822 BLAKE2B dde5f2a6b754db83248b3475e57e56422305227d99578ec15c8e7602b8e79ac1fe8d677a0743cc68194a096be00016b4b3ca8029855180c37d005b05dcef0e15 SHA512 48465ee0bf07625a81c43efaa667bd270535db3c31005f68257ab305693242b373fcff0ece6de7b854cd0af2bb9eaaa61af7213e46ce2331334dbb3a1c059ec3
 EBUILD ffmpegsource-9999.ebuild 824 BLAKE2B 01f59dfb928ad0fe748e9042de2ae6020f753f94cd9c979c9a57adbccdad5de712936d8cd9c28b9b68a1481b99d4c4f06554ba7f2b5a68957d421dce114433fb SHA512 f7170484b5166eb6f5fa88f028499d92d049fc48394481e45f5037f71e8e5858d6ddfa3f3881ab40e455547f966174423cce78825c705e6f9a94c77170668d5a
 MISC metadata.xml 309 BLAKE2B e5aabf12d7ca299430ffa834802b671bd6462fd9b0ecbf2fad095f34bedc11514558fecdd2546f627165574bbde8c8e595c08de6bb7eab0aec9d6fa4ade3e10e SHA512 5a8b3d4291d5cd988162c1819c5febf3bfdd1be55b6ec7fba6608fe66ce503bb8c1d243dbdc33dcd94b7ade36bdf80590c4dc1adab895c34950757f9d487a699
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
deleted file mode 100644
index 4356ad9fb866..000000000000
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic vcs-snapshot
-
-DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
-HOMEPAGE="https://github.com/FFMS/ffms2"
-SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	sys-libs/zlib
-	>=media-video/ffmpeg-2.4:0=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-ffms_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
-	fi
-}
-
-pkg_pretend() {
-	ffms_check_compiler
-}
-
-pkg_setup() {
-	ffms_check_compiler
-}
-
-src_prepare() {
-	default_src_prepare
-	eautoreconf
-}
-
-src_install() {
-	default_src_install
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
index 1ea646b97aa7..156ad2599e29 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/ffms2-${PV}
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index d04954b30e94..7c9f72494635 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index b2f8a158b794..349b29c76a96 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -3,6 +3,6 @@ DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7
 DIST dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2 272870 BLAKE2B b9672235ad2ed826205278ffd06ed793126f743fe2b0b8af4369c1cb24825662e579f9246a287df1d61efad7985e2e18d59097d359fe84626149464bfc253bc5 SHA512 c15c07937cabefad731f4b3f8b6e9f993e500f7c59b17ef5e5c46f9bb86f9cbdf748f7d875c363c641ed9f3333a03b5033cc7d0272e96323d36be944ea35379d
 EBUILD dtv-scan-tables-0_p20171003.ebuild 737 BLAKE2B 239cd08dda04b32e1090c15edbea043c5319af646256c89389bb28f1dfaf32051365ee54b395932bea67fc31f13b0ed28b66edda834b0884c88bd0c1cbc3c821 SHA512 b75a884494995705e88bd2a5808e0671511487c3e3d9d891816034d24d285b31aad5a0d580e62a990c2ed158226da3f993babe6b75cdc71c10bb1489561610f6
 EBUILD dtv-scan-tables-0_p20190922.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
-EBUILD dtv-scan-tables-0_p20210430.ebuild 745 BLAKE2B 5414b2207d57e8b475641302178849c578542cd9f5e602447849173db7b60636350b6a89e4545a786014197d02ee381c62310625cc477487fbe665494a04fe2f SHA512 de155cca135d59a4936353f7e92b0c330eadf083a1547544abd3c1e491424a8bbce66b0fc958baee99a3e92ca3f835cfc883e84c4396324d4be475d2ec09d725
+EBUILD dtv-scan-tables-0_p20210430.ebuild 744 BLAKE2B 71e1188eaa705c884d6ed2a6a0716d3dce2ea97e140a1d499e2cf6fee4c0c4dd5de7d56ae6760c471ea3523bc9e6918460fb08ccc43a51902e36ff45a446d06c SHA512 b530ebab3b5d664dcbd0d41581d95ae73733d9b0b6e53806a2b6fb0cfc8cde4f578cf7100c346f30df90ab9a32bbf035374f506a50e0dd21cde66999f16a2f8f
 EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
index ed209bd82845..cf480e07e488 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="4181e93a30ab"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~ppc x86"
+	KEYWORDS="amd64 arm arm64 ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fe9249b015ab..dd521e5d4a3e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 75c5ba1e7651..faaca4eb0a4d 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,4 +1,5 @@
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch 1831 BLAKE2B f46889a5140423f29095e79a0a5778dd1b21d812570c8c5e444473266527ee3808a07d578b8aff4ce91d6ca665c230d66bcbf810851fa31a95e625c32e8c0fc6 SHA512 97623b47828b0db7dfcde2f8d9f00d835cb98dd8be2d9b727f1d4a3b73b13b5e3bc0c3f40ae41d6b21fadaab14b019a788a2b55a84fb365ad23bb75e76387df8
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch 3842 BLAKE2B 8e03d10f2cc1231ee6c89a81b3eec93a5b4c9bd2100aae0fe2eeb903bef08d9f6704010085e6f7a666ed9269130ecf01345cd109cf4d2796de2b1b65dc8813dc SHA512 35d8f0d2f7bf1bcd6602be9e53914e430ed64e779233245e8d0d8ea4ea8ebdccee23a405f92956e641052f6243027cf34d1ffa7ae47f3d15ed35d625be5fe2cd
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch 1490 BLAKE2B 6b3fb8f98348585dc15fd92e992b231fb83f94dffd3ed97cf0d41323e28bd6c48a77e6e7eecd9e79a1f85ab933eee93f31feebf08ed2d18488d519dbe47b57a3 SHA512 59ec5d28424f9b2ab1d63b00c2e237263f6816d42baef977ab9494fa696aace7d3b7e949c672aa77c799dbb255c69fcd3acdc289413dd5b3f8569e28ba528cef
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33e646f71ced61c5411ddc871ff42fb61d5e89d068441e72c33a99927a27cad206068eab70563db94d21f4aa9516e69da8c34d0e78c46f15b1561b2170d8d5ff SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
@@ -10,7 +11,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAK
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
 AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r102.ebuild 4135 BLAKE2B 1ec4c91862a27fd6997048724488c867d1f7ce689d71cdcb3efee366fe6e4c02de75d5f97b27f3d338c22bfad209ac3816d7de53f0e52c14def33588ddd5ce54 SHA512 50e82d347ac0171589c75c753be393bca249b14cd540b74de6573bb39dfdecdb578a2d1545f516173d334110e7df2504909bf8cee8ab5043176c0939c3bd52a0
-EBUILD aegisub-3.2.2_p20160518-r103.ebuild 4184 BLAKE2B 79bca74372ae8a6aded4a26dde795dcdff7202d8d2a9ad7d0e753cbe11619f039348d19132c9615149788163717a65c9e891d66328412a99d329b02c0e2f7d17 SHA512 84d1475bae544b5ab779078bbc2a6ee4cb217844dea7eda8e3cea0c3fa47c9b960488d53cc4fbb6471cdd6017a8812df07c9e74601f1c2872caa7ccbdde86f50
+EBUILD aegisub-3.2.2_p20160518-r104.ebuild 4236 BLAKE2B 3b9e22096eb5c3a25bf2440c70cccd97a4d609cf22b990be1f57f7ff14411d93b13ba4e54bf68df3d04885c6e58d53d5b7570ca6ee49b58e36263c0baf9e5b86 SHA512 a270f24e6de85fe0683e7723d4ff8460b03aba23cf12db9d4625ba58ab9fc7a80c77aed615d9e0422c8424cd319a2348cf59b88753e15a01a92c89cdbdfc324f
 EBUILD aegisub-9999.ebuild 2872 BLAKE2B ce61183420d6421c5f4ca0da927d766be7eec273495cac2823d69a511a1a75850d680592b6902d346da69f1b1998396bdd32cff847ee2b142e2120737110a30b SHA512 4f8ffb4fc3c95a07e1ef9f3c9d6b5f5a43f01c189a26efbcd1200d52141c93508dce31d92442617db26416b3e0ac107cf371cb7a0ae3200008cba57383b01638
 MISC metadata.xml 490 BLAKE2B 1f9546d336e50825e1490d8f0b54a21c076ec000427f0c319781e702ec0a58966bd4193e26c0c7cc4e677bea67a865a9a2f040fd4f58356d8e5539c5c7592665 SHA512 7717dcf3bbe125775a8a93682cde4477294649cbd6d01dcccc132b51880d7a58a61314134cb83f7ffd43e104f4818d9d27c1b90685f988ebe78ecdd9156db9eb
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild
deleted file mode 100644
index a9ce3414a7ab..000000000000
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-LUA_REQ_USE="lua52compat"
-
-WX_GTK_VER=3.0
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
-COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
-
-inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
-RESTRICT="!test? ( test )"
-
-# aegisub bundles luabins (https://github.com/agladysh/luabins).
-# Unfortunately, luabins upstream is practically dead since 2010.
-# Thus unbundling luabins isn't worth the effort.
-RDEPEND="${LUA_DEPS}
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-	dev-libs/boost:=[icu,nls,threads(+)]
-	dev-libs/icu:=
-	media-libs/ffmpegsource:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libass:=[fontconfig]
-	sys-libs/zlib
-	virtual/libiconv
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( >=sci-libs/fftw-3.3:= )
-	openal? ( media-libs/openal )
-	portaudio? ( =media-libs/portaudio-19* )
-	pulseaudio? ( media-sound/pulseaudio )
-	spell? ( app-text/hunspell:= )
-	uchardet? ( app-i18n/uchardet )
-"
-DEPEND="${RDEPEND}"
-# luarocks is only used as a command-line tool so there is no need to enforce
-# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
-# bounds in order to make sure we use a version migrated to Lua eclasses.
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		>=dev-cpp/gtest-1.8.1
-		>=dev-lua/luarocks-3.4.0-r100
-		$(lua_gen_cond_dep '
-			dev-lua/busted[${LUA_USEDEP}]
-		')
-	)
-"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	|| ( alsa openal oss portaudio pulseaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
-	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
-	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
-	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
-	"${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch"
-)
-
-aegisub_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
-	fi
-}
-
-pkg_pretend() {
-	aegisub_check_compiler
-}
-
-pkg_setup() {
-	aegisub_check_compiler
-	lua-single_pkg_setup
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Remove tests that require unavailable uuid Lua module.
-	rm automation/tests/modules/lfs.moon || die
-
-	remove_locale() {
-		rm "po/${1}.po" || die
-	}
-
-	plocale_find_changes 'po' '' '.po'
-	plocale_for_each_disabled_locale remove_locale
-
-	# See http://devel.aegisub.org/ticket/1914
-	config_rpath_update "${S}"/config.rpath
-
-	eautoreconf
-
-	cat <<- EOF > build/git_version.h || die
-		#define BUILD_GIT_VERSION_NUMBER 8897
-		#define BUILD_GIT_VERSION_STRING "${PV}"
-		#define TAGGED_RELEASE 0
-	EOF
-}
-
-src_configure() {
-	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
-	use openal && export agi_cv_with_openal="yes"
-
-	setup-wxwidgets
-	local myeconfargs=(
-		--disable-update-checker
-		--with-ffms2
-		--with-system-luajit
-		$(use_enable debug)
-		$(use_with alsa)
-		$(use_with fftw fftw3)
-		$(use_with openal)
-		$(use_with oss)
-		$(use_with portaudio)
-		$(use_with pulseaudio libpulse)
-		$(use_with spell hunspell)
-		$(use_with uchardet)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake WITH_SYSTEM_GTEST=$(usex test)
-}
-
-src_test() {
-	emake test-automation
-	emake test-libaegisub
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild
index a9c7d950a82c..e37b9b04b183 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${LUA_DEPS}
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
 	dev-libs/boost:=[icu,nls,threads(+)]
 	dev-libs/icu:=
-	~media-libs/ffmpegsource-2.23:=
+	media-libs/ffmpegsource:=
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libass:=[fontconfig]
@@ -75,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
 	"${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch"
 	"${FILESDIR}/${PV}/${P}-luaL_Reg-not-luaL_reg.patch"
+	"${FILESDIR}/${PV}/${P}-ffmpegsource-2.40-compat2.patch"
 )
 
 aegisub_check_compiler() {
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch
new file mode 100644
index 000000000000..17dc3f2dbabc
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch
@@ -0,0 +1,106 @@
+commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37
+Author: Thomas Goyne <plorkyeran@aegisub.org>
+Date:   Wed Nov 21 16:41:05 2018 -0800
+
+    Update ffmpeg and ffms2
+
+diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp
+index 8bd68fbbf..f4ed6a2f2 100644
+--- a/src/video_provider_ffmpegsource.cpp
++++ b/src/video_provider_ffmpegsource.cpp
+@@ -44,6 +44,23 @@
+ #include <libaegisub/make_unique.h>
+ 
+ namespace {
++typedef enum AGI_ColorSpaces {
++	AGI_CS_RGB = 0,
++	AGI_CS_BT709 = 1,
++	AGI_CS_UNSPECIFIED = 2,
++	AGI_CS_FCC = 4,
++	AGI_CS_BT470BG = 5,
++	AGI_CS_SMPTE170M = 6,
++	AGI_CS_SMPTE240M = 7,
++	AGI_CS_YCOCG = 8,
++	AGI_CS_BT2020_NCL = 9,
++	AGI_CS_BT2020_CL = 10,
++	AGI_CS_SMPTE2085 = 11,
++	AGI_CS_CHROMATICITY_DERIVED_NCL = 12,
++	AGI_CS_CHROMATICITY_DERIVED_CL = 13,
++	AGI_CS_ICTCP = 14
++} AGI_ColorSpaces;
++
+ /// @class FFmpegSourceVideoProvider
+ /// @brief Implements video loading through the FFMS library.
+ class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider {
+@@ -78,7 +95,7 @@ public:
+ 		if (matrix == RealColorSpace)
+ 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
+ 		else if (matrix == "TV.601")
+-			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
++			FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
+ 		else
+ 			return;
+ 		ColorSpace = matrix;
+@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) {
+ 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
+ 
+ 	switch (cs) {
+-		case FFMS_CS_RGB:
++		case AGI_CS_RGB:
+ 			return "None";
+-		case FFMS_CS_BT709:
++		case AGI_CS_BT709:
+ 			return str + ".709";
+-		case FFMS_CS_FCC:
++		case AGI_CS_FCC:
+ 			return str + ".FCC";
+-		case FFMS_CS_BT470BG:
+-		case FFMS_CS_SMPTE170M:
++		case AGI_CS_BT470BG:
++		case AGI_CS_SMPTE170M:
+ 			return str + ".601";
+-		case FFMS_CS_SMPTE240M:
++		case AGI_CS_SMPTE240M:
+ 			return str + ".240M";
+ 		default:
+ 			throw VideoOpenError("Unknown video color space");
+@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
+ 
+ 	// set thread count
+ 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
++#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0)
+ 	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
+ 		Threads = 1;
++#endif
+ 
+ 	// set seekmode
+ 	// TODO: give this its own option?
+@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
+ 	else
+ 		DAR = double(Width) / Height;
+ 
+-	CS = TempFrame->ColorSpace;
++	int VideoCS = CS = TempFrame->ColorSpace;
+ 	CR = TempFrame->ColorRange;
+ 
+-	if (CS == FFMS_CS_UNSPECIFIED)
+-		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
++	if (CS == AGI_CS_UNSPECIFIED)
++		CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG;
+ 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
+ 
+ #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
+-	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
+-		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
++	if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
++		CS = AGI_CS_BT470BG;
++		ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);
++	}
++
++	if (CS != VideoCS) {
++		if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo))
+ 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
+-		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
+ 	}
+ #endif
+ 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index fcb9a4734cb8..d7797fd2e622 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e05b08e45fb0..428dba7d8bb4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 03:09:44 +0000
+Mon, 29 Aug 2022 09:09:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 5e9863c359f0..90dd0fe959f7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 524322 BLAKE2B 3983f62074c223717c76ae7cd44857f5de5972e245bd5f084c8632e144cf7a950ad3ddd53324db99f9b82eb9e76e49cd3a84bf1f531314d7660db91335a05cb9 SHA512 9b6be0313a2999bb5ad817a373c95ecf8d02d687a3d707b14136357c7bc684ea302f0ccdb228be1e52484b458ecca78cec7150915afe09c096106aa055c4eae2
-TIMESTAMP 2022-08-29T03:09:47Z
+TIMESTAMP 2022-08-29T09:09:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMMLftfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMMglhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4shAAirrwGFSYtxN1Bm2cf39gSbp9PWqrn3kR+/+6P6AQkr8/O78sHwsGhyfo
-60s1UU2xYnC+GDlxz3XpklqTISBhk/+C/0TUV+TsmGaPgMN0NZpZOSZ+ATig3GBx
-e3uIWc2FazJ1cdgQa0o7w26HnOI0un15BewWpz3fVeI3wla8VUmRqVLSSEkNFtBi
-BHM67Mkqhg6ouHzaf7Zw3yisJgY6U+c1NOwVY5KBahD729U43Ry004Ch14R7qMD4
-Lm23Ju6y15/rzJNL2/fFs/J8bwuDRIiIEqVdDlyEkiuYnyz1cBvPmYA5q77fxbOP
-1KQgk9u4QemW5QZTDRVgyWx2OYul3Iry3FRLK2YoRiDZ3wzzT5NqZOOPYbJ2hmce
-rXzTyy/KKUztQpVOqtuEz2TkpNiGjNgq8rNgDpWr/RNTeg6TkpMZ9byUbCkGEyuZ
-8Pe8f8lIb1brP0miZVfCjU++R/5wADwj5lbpNS973HhUNMsKlQF4VTcITGMMgLxm
-2y4X7KGKF4XlgSUjDMxgFNfR5HVbwSPwHWIst5j+gnxcY8vz6Uguqph2+GJf8NuR
-1j8RBEI/+lck9W5c+6OGEdwq0AB4Xl8WpViPL6Wz6JdvUjixPuubqkH1z45kCMs4
-T6YslA7YYbQKEcWqw4ckdnA3fk11sfbY46XE7wR50scT+oP5DOc=
-=69ZT
+klAElQ//WRFGFakVj7R8BaaRlUjuJdQi5r3mCJMDFKESWJfJgDRgfvKxrFINSjI7
+T5qr1ouLeapdGF/c1cN/DnXVH+0EeL9zHNJ80rGkTHm85YHOzV+LOeRfECqaGRsp
+SdMnahRWtfS6hjGASqLxkBCTX2JQ5tzM54NR66c1eh0xQxk461MDxPZSq06r39FY
+nBbzjppOxA2UnGXqFMpCqluCGY1Qit7oEccCFCRL5SYQb0L0n/onfZIRlTIW6EDC
+2++3l8Ygyp2tIOj+chJokzgTLCfLHr5DTqSvyDzdRS9dKAwU069dyjLN0NUoMIyy
+4JbZxAroxdLe0fIS6VFZfwXoP6DzUzuQ6kcKf7/Ecl8BAIr8gu+YHgQ4knZeXfX3
+2yw2wsFRwemxzcPRg/AwOpL5wno1R5nduF64ZiBH1FntrDLQYMooz38v1XKrWM33
+BO+gNZHx6MmyHPskrOjwy6Uo2sTC9uMtwIaPgCYXOZfqHiWppegGEUxUDfi3nL89
+AeR4hAexZ/oFEh+txQODooub6Y7jfq2ftQJ98pUBqJU3TsJOrQbuwBzJEOm0i60q
++YAPGNGcLh+yv2kYPoMQJEdAPjAk7olVSSM2vwAmeFIJBunAD8B/Jv75LlyOb2+f
+f51g0XeiNQeP0YHSsjQh2nmREaGVWo2I9kwQvLKnXJ2XBeSM7wE=
+=1aR9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e05b08e45fb0..ef97e41f8357 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 03:09:44 +0000
+Mon, 29 Aug 2022 09:09:39 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 628dd14eb7c6..3c2f6d1b4312 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f3715a84d970..573c63b9b1ac 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22-r1 b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
deleted file mode 100644
index 7f667b47849d..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.5.22-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A system automation and configuration management software
-EAPI=7
-HOMEPAGE=https://puppet.com/
-INHERIT=ruby-fakegem systemd tmpfiles
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d07c205871037987c092e998b820c4ec
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0655b10fa1fe..157cd0c5e6d9 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.22 b/metadata/md5-cache/app-crypt/libscrypt-1.22
index 98c665b2cb2a..730911782c0f 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.22
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.22
@@ -3,9 +3,9 @@ DESCRIPTION=Shared library to impliment the scrypt algorithm
 EAPI=8
 HOMEPAGE=https://github.com/technion/libscrypt
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/technion/libscrypt/archive/v1.22.tar.gz -> libscrypt-1.22.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bca137f8c9476e14d2e3ae5966c65358
+_md5_=21b9cbe306730cbcaa9226d22f46110e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 7c79e4ee5a78..b86a9cbccbf1 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/moe-1.12 b/metadata/md5-cache/app-editors/moe-1.12
index 05724396ed74..f63b99207663 100644
--- a/metadata/md5-cache/app-editors/moe-1.12
+++ b/metadata/md5-cache/app-editors/moe-1.12
@@ -5,10 +5,10 @@ DESCRIPTION=A powerful and user-friendly console text editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/moe/
 INHERIT=toolchain-funcs unpacker
-KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.12.tar.lz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
-_md5_=9569419a0c481db5af2b3fdf3525e9f9
+_md5_=d5076322733a5270d70c27ef2467b9a7
diff --git a/metadata/md5-cache/app-editors/scite-5.2.4 b/metadata/md5-cache/app-editors/scite-5.2.4
index 9ba9cc47f1b3..7b52b1d99256 100644
--- a/metadata/md5-cache/app-editors/scite-5.2.4
+++ b/metadata/md5-cache/app-editors/scite-5.2.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.scintilla.org/SciTE.html
 INHERIT=lua-single toolchain-funcs xdg
 IUSE=lua +lua_single_target_lua5-4
-KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango lua? ( lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://www.scintilla.org/scite524.tgz -> scite-5.2.4.tgz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=223f6b8bc68be00ac11ed305571bf7e3
+_md5_=037991a144022fda444d75f9d196a975
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 5d1ba3ef057f..970d7d1c2fa8 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/zygrib-8.0.1-r2 b/metadata/md5-cache/app-misc/zygrib-8.0.1-r2
deleted file mode 100644
index ccac23d4d2d1..000000000000
--- a/metadata/md5-cache/app-misc/zygrib-8.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/bzip2 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 media-libs/libpng:* sci-libs/libnova <sci-libs/proj-8:= sys-libs/zlib x11-libs/qwt:6[qt5(+)]
-DESCRIPTION=GRIB File Viewer - Weather data visualization
-EAPI=7
-HOMEPAGE=http://www.zygrib.org/
-INHERIT=desktop eutils qmake-utils
-IUSE=+maps
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 public-domain
-RDEPEND=app-arch/bzip2 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 media-libs/libpng:* sci-libs/libnova <sci-libs/proj-8:= sys-libs/zlib x11-libs/qwt:6[qt5(+)]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/zyGrib-8.0.1.tgz -> zygrib-8.0.1.tgz https://dev.gentoo.org/~mschiff/distfiles/zygrib-icon.png maps? ( http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c459943d463074ca07969edbe480d71c
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index 29ba0a1470ec..93fb40173abb 100644
--- a/metadata/md5-cache/app-officeext/Manifest.gz
+++ b/metadata/md5-cache/app-officeext/Manifest.gz
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-3.0 b/metadata/md5-cache/app-officeext/ooofbtools-3.0
deleted file mode 100644
index 7960805ae10e..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) app-arch/unzip
-DESCRIPTION=Open/LibreOffice extension for the FictionBook2 format with validation
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-INHERIT=office-ext-r1
-IUSE=office_implementation_libreoffice
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-arch/zip dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) )
-REQUIRED_USE=|| ( office_implementation_libreoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-3.0.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	office-ext-r1	b5be3c6af06cb88d8439841fc5dcaba1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8bd7b6c1b9c58e0e48367f2e0f9d8589
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-3.4.1 b/metadata/md5-cache/app-officeext/ooofbtools-3.4.1
index 062475357c4b..730ee74045d2 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-3.4.1
+++ b/metadata/md5-cache/app-officeext/ooofbtools-3.4.1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/fbtools/
 INHERIT=office-ext-r1
 IUSE=office_implementation_libreoffice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-arch/zip dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) )
 REQUIRED_USE=|| ( office_implementation_libreoffice )
 SLOT=0
 SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-3.4.1.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	office-ext-r1	b5be3c6af06cb88d8439841fc5dcaba1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4ebab7ace239d5dedd534e9aa2c59f33
+_md5_=557b6f7a4992357152cdba6dea564013
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index e9c2538ec4e7..17eb7ce2e67a 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.93.3 b/metadata/md5-cache/app-portage/portage-utils-0.93.3
deleted file mode 100644
index 797d24c9935f..000000000000
--- a/metadata/md5-cache/app-portage/portage-utils-0.93.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
-DESCRIPTION=Small and fast Portage helper tools written in C
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static openmp +qmanifest +qtegrity
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.93.3.tar.xz
-_md5_=5a417295c693dff6cbe7ecb51d79163e
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.94.1 b/metadata/md5-cache/app-portage/portage-utils-0.94.1
index fb64a7d6f2a1..ec2845c9541c 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.94.1
+++ b/metadata/md5-cache/app-portage/portage-utils-0.94.1
@@ -4,9 +4,9 @@ DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static openmp +qmanifest +qtegrity
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.94.1.tar.xz
-_md5_=aad87b2267ed14f7de955d65599922bb
+_md5_=5a417295c693dff6cbe7ecb51d79163e
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.94.2 b/metadata/md5-cache/app-portage/portage-utils-0.94.3
index 61a09b281879..bf09d65daa87 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.94.2
+++ b/metadata/md5-cache/app-portage/portage-utils-0.94.3
@@ -10,6 +10,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=GPL-2
 RDEPEND=qmanifest? ( !static? ( app-crypt/gpgme:= app-crypt/libb2:= dev-libs/openssl:= sys-libs/zlib:= ) ) qtegrity? ( !static? ( dev-libs/openssl:= ) )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.94.2.tar.xz
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.94.3.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=57d61e7b07df65a218f64c719222c78a
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 91b9e464a444..f5944177fbe6 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/html-xml-utils-7.8-r1 b/metadata/md5-cache/app-text/html-xml-utils-7.8-r1
index 619dd33f9233..473f7ebdd889 100644
--- a/metadata/md5-cache/app-text/html-xml-utils-7.8-r1
+++ b/metadata/md5-cache/app-text/html-xml-utils-7.8-r1
@@ -3,9 +3,9 @@ DEPEND=net-dns/libidn2:= net-misc/curl
 DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
 EAPI=8
 HOMEPAGE=https://www.w3.org/Tools/HTML-XML-utils/
-KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos
 LICENSE=W3C
 RDEPEND=net-dns/libidn2:= net-misc/curl
 SLOT=0
 SRC_URI=https://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.8.tar.gz
-_md5_=525fb8a4f53d121ee2e672a463e724ea
+_md5_=e73bd8173d1e7282694677b5f633d803
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 04622bcd64fe..04eff7154e75 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.8.19 b/metadata/md5-cache/dev-embedded/arduino-1.8.19
index 4b1275b6718a..3f7ef9b6438f 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.19
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.19
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source AVR electronics prototyping platform
 EAPI=8
 HOMEPAGE=https://arduino.cc/ https://github.com/arduino/
 INHERIT=java-pkg-2 java-ant-2 desktop xdg-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/arduino-listserialportsc >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.19.tar.gz -> arduino-1.8.19.tar.gz https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2 -> arduino-avr-1.8.3.tar.bz2 https://github.com/arduino/arduino-examples/archive/refs/tags/1.9.1.zip -> arduino-examples-1.9.1.zip https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.12.0/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip -> arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0902fbd242b3230b433e9608ae1b0908
+_md5_=260a3944412786b88b42c624cca73dc2
diff --git a/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1 b/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
index cc66e91e2584..57b4993ef246 100644
--- a/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=A command line tool for compiling Arduino sketches
 EAPI=7
 HOMEPAGE=https://github.com/arduino/arduino-builder
-KEYWORDS=~amd64 ~x86
+INHERIT=go-module
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/arduino-builder/archive/1.5.4.tar.gz -> arduino-builder-1.5.4.tar.gz mirror://goproxy//bou.ke/monkey/@v/v1.0.1.mod -> bou.ke%2Fmonkey%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.zip -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/arduino/arduino-cli/@v/v0.0.0-20200612152641-f7a6d63d208a.zip -> github.com%2Farduino%2Farduino-cli%2F@v%2Fv0.0.0-20200612152641-f7a6d63d208a.zip mirror://goproxy//github.com/arduino/arduino-cli/@v/v0.0.0-20200612152641-f7a6d63d208a.mod -> github.com%2Farduino%2Farduino-cli%2F@v%2Fv0.0.0-20200612152641-f7a6d63d208a.mod mirror://goproxy//github.com/arduino/board-discovery/@v/v0.0.0-20180823133458-1ba29327fb0c.zip -> github.com%2Farduino%2Fboard-discovery%2F@v%2Fv0.0.0-20180823133458-1ba29327fb0c.zip mirror://goproxy//github.com/arduino/board-discovery/@v/v0.0.0-20180823133458-1ba29327fb0c.mod -> github.com%2Farduino%2Fboard-discovery%2F@v%2Fv0.0.0-20180823133458-1ba29327fb0c.mod mirror://goproxy//github.com/arduino/go-paths-helper/@v/v1.0.1.zip -> github.com%2Farduino%2Fgo-paths-helper%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/arduino/go-paths-helper/@v/v1.0.1.mod -> github.com%2Farduino%2Fgo-paths-helper%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/arduino/go-paths-helper/@v/v1.2.0.zip -> github.com%2Farduino%2Fgo-paths-helper%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/arduino/go-paths-helper/@v/v1.2.0.mod -> github.com%2Farduino%2Fgo-paths-helper%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/arduino/go-properties-orderedmap/@v/v1.0.0.zip -> github.com%2Farduino%2Fgo-properties-orderedmap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/arduino/go-properties-orderedmap/@v/v1.0.0.mod -> github.com%2Farduino%2Fgo-properties-orderedmap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/arduino/go-properties-orderedmap/@v/v1.2.0.zip -> github.com%2Farduino%2Fgo-properties-orderedmap%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/arduino/go-properties-orderedmap/@v/v1.2.0.mod -> github.com%2Farduino%2Fgo-properties-orderedmap%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/arduino/go-timeutils/@v/v0.0.0-20171220113728-d1dd9e313b1b.zip -> github.com%2Farduino%2Fgo-timeutils%2F@v%2Fv0.0.0-20171220113728-d1dd9e313b1b.zip mirror://goproxy//github.com/arduino/go-timeutils/@v/v0.0.0-20171220113728-d1dd9e313b1b.mod -> github.com%2Farduino%2Fgo-timeutils%2F@v%2Fv0.0.0-20171220113728-d1dd9e313b1b.mod mirror://goproxy//github.com/arduino/go-win32-utils/@v/v0.0.0-20180330194947-ed041402e83b.zip -> github.com%2Farduino%2Fgo-win32-utils%2F@v%2Fv0.0.0-20180330194947-ed041402e83b.zip mirror://goproxy//github.com/arduino/go-win32-utils/@v/v0.0.0-20180330194947-ed041402e83b.mod -> github.com%2Farduino%2Fgo-win32-utils%2F@v%2Fv0.0.0-20180330194947-ed041402e83b.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cmaglie/pb/@v/v1.0.27.zip -> github.com%2Fcmaglie%2Fpb%2F@v%2Fv1.0.27.zip mirror://goproxy//github.com/cmaglie/pb/@v/v1.0.27.mod -> github.com%2Fcmaglie%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codeclysm/cc/@v/v1.2.2.zip -> github.com%2Fcodeclysm%2Fcc%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/codeclysm/cc/@v/v1.2.2.mod -> github.com%2Fcodeclysm%2Fcc%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/codeclysm/extract/@v/v2.2.0+incompatible.zip -> github.com%2Fcodeclysm%2Fextract%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/codeclysm/extract/@v/v2.2.0+incompatible.mod -> github.com%2Fcodeclysm%2Fextract%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/creack/goselect/@v/v0.1.1.zip -> github.com%2Fcreack%2Fgoselect%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/creack/goselect/@v/v0.1.1.mod -> github.com%2Fcreack%2Fgoselect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.zip -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fluxio/iohelpers/@v/v0.0.0-20160419043813-3a4dd67a94d2.zip -> github.com%2Ffluxio%2Fiohelpers%2F@v%2Fv0.0.0-20160419043813-3a4dd67a94d2.zip mirror://goproxy//github.com/fluxio/iohelpers/@v/v0.0.0-20160419043813-3a4dd67a94d2.mod -> github.com%2Ffluxio%2Fiohelpers%2F@v%2Fv0.0.0-20160419043813-3a4dd67a94d2.mod mirror://goproxy//github.com/fluxio/multierror/@v/v0.0.0-20160419044231-9c68d39025e5.zip -> github.com%2Ffluxio%2Fmultierror%2F@v%2Fv0.0.0-20160419044231-9c68d39025e5.zip mirror://goproxy//github.com/fluxio/multierror/@v/v0.0.0-20160419044231-9c68d39025e5.mod -> github.com%2Ffluxio%2Fmultierror%2F@v%2Fv0.0.0-20160419044231-9c68d39025e5.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.0.8.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.0.8.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.1.0.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.1.0.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/imjasonmiller/godice/@v/v0.1.2.zip -> github.com%2Fimjasonmiller%2Fgodice%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/imjasonmiller/godice/@v/v0.1.2.mod -> github.com%2Fimjasonmiller%2Fgodice%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20181118221551-089d3ea4e4d5.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20181118221551-089d3ea4e4d5.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20200330140219-3fe23663418f.zip -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20200330140219-3fe23663418f.zip mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20200330140219-3fe23663418f.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20200330140219-3fe23663418f.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.zip -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190429233213-dfc56b8c09fc.zip -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190429233213-dfc56b8c09fc.zip mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190429233213-dfc56b8c09fc.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190429233213-dfc56b8c09fc.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/leonelquinteros/gotext/@v/v1.4.0.zip -> github.com%2Fleonelquinteros%2Fgotext%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/leonelquinteros/gotext/@v/v1.4.0.mod -> github.com%2Fleonelquinteros%2Fgotext%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/marcinbor85/gohex/@v/v0.0.0-20200531163658-baab2527a9a2.zip -> github.com%2Fmarcinbor85%2Fgohex%2F@v%2Fv0.0.0-20200531163658-baab2527a9a2.zip mirror://goproxy//github.com/marcinbor85/gohex/@v/v0.0.0-20200531163658-baab2527a9a2.mod -> github.com%2Fmarcinbor85%2Fgohex%2F@v%2Fv0.0.0-20200531163658-baab2527a9a2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mdlayher/genetlink/@v/v0.0.0-20190313224034-60417448a851.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv0.0.0-20190313224034-60417448a851.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190313131330-258ea9dff42c.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190313131330-258ea9dff42c.mod mirror://goproxy//github.com/mdlayher/taskstats/@v/v0.0.0-20190313225729-7cbba52ee072.mod -> github.com%2Fmdlayher%2Ftaskstats%2F@v%2Fv0.0.0-20190313225729-7cbba52ee072.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.5.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.5.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/oleksandr/bonjour/@v/v0.0.0-20160508152359-5dcf00d8b228.zip -> github.com%2Foleksandr%2Fbonjour%2F@v%2Fv0.0.0-20160508152359-5dcf00d8b228.zip mirror://goproxy//github.com/oleksandr/bonjour/@v/v0.0.0-20160508152359-5dcf00d8b228.mod -> github.com%2Foleksandr%2Fbonjour%2F@v%2Fv0.0.0-20160508152359-5dcf00d8b228.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pmylund/sortutil/@v/v0.0.0-20120526081524-abeda66eb583.zip -> github.com%2Fpmylund%2Fsortutil%2F@v%2Fv0.0.0-20120526081524-abeda66eb583.zip mirror://goproxy//github.com/pmylund/sortutil/@v/v0.0.0-20120526081524-abeda66eb583.mod -> github.com%2Fpmylund%2Fsortutil%2F@v%2Fv0.0.0-20120526081524-abeda66eb583.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rifflock/lfshook/@v/v0.0.0-20180920164130-b9218ef580f5.zip -> github.com%2Frifflock%2Flfshook%2F@v%2Fv0.0.0-20180920164130-b9218ef580f5.zip mirror://goproxy//github.com/rifflock/lfshook/@v/v0.0.0-20180920164130-b9218ef580f5.mod -> github.com%2Frifflock%2Flfshook%2F@v%2Fv0.0.0-20180920164130-b9218ef580f5.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v2.1.0+incompatible.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v2.1.0+incompatible.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/segmentio/fasthash/@v/v0.0.0-20180216231524-a72b379d632e.zip -> github.com%2Fsegmentio%2Ffasthash%2F@v%2Fv0.0.0-20180216231524-a72b379d632e.zip mirror://goproxy//github.com/segmentio/fasthash/@v/v0.0.0-20180216231524-a72b379d632e.mod -> github.com%2Fsegmentio%2Ffasthash%2F@v%2Fv0.0.0-20180216231524-a72b379d632e.mod mirror://goproxy//github.com/segmentio/objconv/@v/v1.0.1.mod -> github.com%2Fsegmentio%2Fobjconv%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/segmentio/stats/v4/@v/v4.5.3.zip -> github.com%2Fsegmentio%2Fstats%2Fv4%2F@v%2Fv4.5.3.zip mirror://goproxy//github.com/segmentio/stats/v4/@v/v4.5.3.mod -> github.com%2Fsegmentio%2Fstats%2Fv4%2F@v%2Fv4.5.3.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.6.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.6.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.bug.st/cleanup/@v/v1.0.0.zip -> go.bug.st%2Fcleanup%2F@v%2Fv1.0.0.zip mirror://goproxy//go.bug.st/cleanup/@v/v1.0.0.mod -> go.bug.st%2Fcleanup%2F@v%2Fv1.0.0.mod mirror://goproxy//go.bug.st/downloader/v2/@v/v2.0.1.zip -> go.bug.st%2Fdownloader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//go.bug.st/downloader/v2/@v/v2.0.1.mod -> go.bug.st%2Fdownloader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//go.bug.st/relaxed-semver/@v/v0.0.0-20190922224835-391e10178d18.zip -> go.bug.st%2Frelaxed-semver%2F@v%2Fv0.0.0-20190922224835-391e10178d18.zip mirror://goproxy//go.bug.st/relaxed-semver/@v/v0.0.0-20190922224835-391e10178d18.mod -> go.bug.st%2Frelaxed-semver%2F@v%2Fv0.0.0-20190922224835-391e10178d18.mod mirror://goproxy//go.bug.st/serial/@v/v1.0.0.zip -> go.bug.st%2Fserial%2F@v%2Fv1.0.0.zip mirror://goproxy//go.bug.st/serial/@v/v1.0.0.mod -> go.bug.st%2Fserial%2F@v%2Fv1.0.0.mod mirror://goproxy//go.bug.st/serial.v1/@v/v0.0.0-20180827123349-5f7892a7bb45.zip -> go.bug.st%2Fserial.v1%2F@v%2Fv0.0.0-20180827123349-5f7892a7bb45.zip mirror://goproxy//go.bug.st/serial.v1/@v/v0.0.0-20180827123349-5f7892a7bb45.mod -> go.bug.st%2Fserial.v1%2F@v%2Fv0.0.0-20180827123349-5f7892a7bb45.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200610111108-226ff32320da.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200610111108-226ff32320da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200611194920-44ba362f84c1.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200611194920-44ba362f84c1.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200611194920-44ba362f84c1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200611194920-44ba362f84c1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=bd7015f0b43a5911a666999ab4687369
+_md5_=1c938d66874945dfc29fcb9c0f688cc2
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
deleted file mode 100644
index 8cfc2a38777e..000000000000
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=utilities for working with Das U-Boot
-EAPI=8
-HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
-INHERIT=toolchain-funcs
-IUSE=envtools
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.04.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b2982399e7fe1b80378094bb5025b2d4
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.07 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.07
index bf021ca115f3..f69a64c9549f 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.07
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.07
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+BDEPEND=dev-lang/swig sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/openssl:=
 DESCRIPTION=utilities for working with Das U-Boot
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.07.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b2982399e7fe1b80378094bb5025b2d4
+_md5_=00ac39f1eebbbe41917fb3445150650f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4158857bf9ad..e92e0945422c 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5
index dc51c3d74093..16a1aeb3d3e6 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=JNI bindings for Zstd native library
 EAPI=8
 HOMEPAGE=https://github.com/luben/zstd-jni
 INHERIT=java-pkg-2 java-pkg-simple cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/v1.5.0-5.tar.gz -> zstd-jni-1.5.0.5.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2e68b39559ffae96f221ff7f5afc2580
+_md5_=69f93606175170226db43e9b4192fd0b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e18d0191473c..62468d7214b5 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-91.12.0 b/metadata/md5-cache/dev-lang/spidermonkey-91.13.0
index e557f08f93ca..a478eebc4174 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-91.12.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-91.13.0
@@ -11,6 +11,6 @@ LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/icu-69.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=91
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.12.0esr/source/firefox-91.12.0esr.source.tar.xz -> firefox-91.12.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.13.0esr/source/firefox-91.13.0esr.source.tar.xz -> firefox-91.13.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5f9f4951443104f1296b6655a2263ffc
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b090a4450ced..9eda37183125 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/dotconf-1.3-r2 b/metadata/md5-cache/dev-libs/dotconf-1.3-r2
index a1243d5238f9..34d4ed6bc11a 100644
--- a/metadata/md5-cache/dev-libs/dotconf-1.3-r2
+++ b/metadata/md5-cache/dev-libs/dotconf-1.3-r2
@@ -4,9 +4,9 @@ DESCRIPTION=dot.conf configuration file parser
 EAPI=8
 HOMEPAGE=https://github.com/williamh/dotconf
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/dotconf-1.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aa0f81591b5efcd94626d85669541798
+_md5_=1e83f167fa51541bbb230ff84ed724b8
diff --git a/metadata/md5-cache/dev-libs/judy-1.0.5-r3 b/metadata/md5-cache/dev-libs/judy-1.0.5-r3
index 83bffc20edec..560621758ef3 100644
--- a/metadata/md5-cache/dev-libs/judy-1.0.5-r3
+++ b/metadata/md5-cache/dev-libs/judy-1.0.5-r3
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://judy.sourceforge.net/
 INHERIT=autotools multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/judy/Judy-1.0.5.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9a21bc306324ea2b4c71cd574c81056d
+_md5_=c34e3e0c5ed14ecf6593c5e7f8907734
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2 b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2
index 8df0cd396528..5271962f30c1 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/libdbusmenu
 INHERIT=autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
 IUSE=debug gtk gtk3 +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.35.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( x11-libs/gtk+:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	1c07e7167d9ef851ad187f5f3f02d34d	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=669c6e2bc9c12f74bcbc33d0d118ed49
+_md5_=0ba31e6ce7d9d9d27b64323a744ecea6
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1.3 b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
deleted file mode 100644
index 1f3aed78ead3..000000000000
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=C++ classes for flexible logging to files, syslog and other destinations
-EAPI=6
-HOMEPAGE=http://log4cpp.sourceforge.net/
-INHERIT=autotools multilib-minimal
-IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ppc ~riscv ~s390 x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.3.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7ea5958ddca3287712dc70e457242599
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1.3-r1 b/metadata/md5-cache/dev-libs/log4cpp-1.1.3-r1
index 03676a1716ed..3b196b23e608 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1.3-r1
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1.3-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://log4cpp.sourceforge.net/
 INHERIT=autotools multilib-minimal
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm ppc ~riscv ~s390 x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fae4dfb92636780c9bfaea70996624da
+_md5_=332d9d0d83f3ac735bc4d9eda92a07ae
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 26962fb59be0..623f235ec210 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
deleted file mode 100644
index 918d60449380..000000000000
--- a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] =dev-ruby/buftok-0.2.0*[ruby_targets_ruby27(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby27(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby27(-)] dev-ruby/http:4[ruby_targets_ruby27(-)] dev-ruby/http-form_data:2[ruby_targets_ruby27(-)] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby27(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby27(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby27(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/webmock:3[ruby_targets_ruby27(-)] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Ruby wrapper around the Twitter API
-EAPI=7
-HOMEPAGE=https://github.com/sferik/twitter/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] =dev-ruby/buftok-0.2.0*[ruby_targets_ruby27(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby27(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby27(-)] dev-ruby/http:4[ruby_targets_ruby27(-)] dev-ruby/http-form_data:2[ruby_targets_ruby27(-)] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby27(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby27(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby27(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7
-SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4b47587694be8ff98cb71e24831cf222
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3
new file mode 100644
index 000000000000..6c47e68bfff0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] =dev-ruby/buftok-0.2.0*[ruby_targets_ruby27(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby27(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby27(-)] dev-ruby/http:4[ruby_targets_ruby27(-)] dev-ruby/http-form_data:2[ruby_targets_ruby27(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby27(-)] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby27(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby27(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby27(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby30(-)] =dev-ruby/buftok-0.2.0*[ruby_targets_ruby30(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby30(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby30(-)] dev-ruby/http:4[ruby_targets_ruby30(-)] dev-ruby/http-form_data:2[ruby_targets_ruby30(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby30(-)] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby30(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby30(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby30(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/webmock:3[ruby_targets_ruby27(-)] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/webmock:3[ruby_targets_ruby30(-)] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Ruby wrapper around the Twitter API
+EAPI=8
+HOMEPAGE=https://github.com/sferik/twitter/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] =dev-ruby/buftok-0.2.0*[ruby_targets_ruby27(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby27(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby27(-)] dev-ruby/http:4[ruby_targets_ruby27(-)] dev-ruby/http-form_data:2[ruby_targets_ruby27(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby27(-)] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby27(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby27(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby27(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby30(-)] =dev-ruby/buftok-0.2.0*[ruby_targets_ruby30(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby30(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby30(-)] dev-ruby/http:4[ruby_targets_ruby30(-)] dev-ruby/http-form_data:2[ruby_targets_ruby30(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby30(-)] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby30(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby30(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby30(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=7
+SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e79d0400bd85fd473fdaf771d48fe234
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b2b5ad30bb7b..18859f598015 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0-r1 b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0-r1
index c349ad3682d2..b413d2a31d32 100644
--- a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0-r1
+++ b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v10.0.0.tar.bz2 mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz mirror://gnu/binutils/binutils-2.37.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=72b433987ea73a63f8e3252584e36d15
+_md5_=14bb11120137cf39738829b856ffd094
diff --git a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p1 b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p1
index a1933b821f28..7a74db0e49e7 100644
--- a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p1
+++ b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p1
@@ -5,10 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.mingw-w64.org/ https://gcc.gnu.org/ https://sourceware.org/binutils/
 INHERIT=edo flag-o-matic multilib-build toolchain-funcs
 IUSE=+abi_x86_32 custom-cflags debug abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
 RDEPEND=dev-libs/gmp:= dev-libs/mpc:= dev-libs/mpfr:= sys-libs/zlib:= virtual/libiconv
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v10.0.0.tar.bz2 mirror://gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz mirror://gnu/binutils/binutils-2.39.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f7924a77f6f55922d3406e00cdb6b4cb
+_md5_=428e6712956af0dbd8d5e3651c10621b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 4c50fe220a49..a8a2bf96718d 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/hatari-2.4.1 b/metadata/md5-cache/games-emulation/hatari-2.4.1
new file mode 100644
index 000000000000..c2d35fc56925
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/hatari-2.4.1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libsdl2[X?,joystick,sound,video] X? ( x11-libs/libX11 ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) png? ( media-libs/libpng:= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:= ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Atari ST emulator
+EAPI=8
+HOMEPAGE=https://hatari.tuxfamily.org/
+INHERIT=cmake python-single-r1 xdg
+IUSE=X capsimage gui png portmidi readline udev zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) media-libs/libsdl2[X?,joystick,sound,video] X? ( x11-libs/libX11 ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) png? ( media-libs/libpng:= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:= ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib:= ) gui? ( python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] ) >=games-emulation/emutos-1.1.1
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) png? ( zlib )
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/hatari/2.4.1/hatari-2.4.1.tar.bz2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=afacff31a7a0a5af7951bd6a2c80efa5
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 4847c3d5960c..3e794f5b5312 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/postforward-1.1.0 b/metadata/md5-cache/mail-filter/postforward-1.1.0
deleted file mode 100644
index 1a63cee48f31..000000000000
--- a/metadata/md5-cache/mail-filter/postforward-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/go:0 >=dev-lang/go-1.10
-DESCRIPTION=Postfix Sender Rewriting Scheme forwarding agent
-EAPI=6
-HOMEPAGE=https://github.com/zoni/postforward
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=mail-filter/postsrsd
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/zoni/postforward/archive/v1.1.0.tar.gz -> postforward-1.1.0.tar.gz
-_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-build	0bd4f7f8de6ac61b4224cb690c5ea321
-_md5_=92290cd3a500e08cbf7e84da02deb7c8
diff --git a/metadata/md5-cache/mail-filter/postforward-1.1.1 b/metadata/md5-cache/mail-filter/postforward-1.1.1
index f14e4954a895..5a31c1400f77 100644
--- a/metadata/md5-cache/mail-filter/postforward-1.1.1
+++ b/metadata/md5-cache/mail-filter/postforward-1.1.1
@@ -4,11 +4,12 @@ DEPEND=dev-lang/go:0
 DESCRIPTION=Postfix Sender Rewriting Scheme forwarding agent
 EAPI=7
 HOMEPAGE=https://github.com/zoni/postforward
-KEYWORDS=~amd64 ~x86
+INHERIT=golang-build
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=mail-filter/postsrsd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/zoni/postforward/archive/v1.1.1.tar.gz -> postforward-1.1.1.tar.gz
 _eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-build	0bd4f7f8de6ac61b4224cb690c5ea321
-_md5_=11d6aca16ee7344a533b876db5e386a4
+_md5_=0e85d20e50ff18124c1b856224527015
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 18e8e2fd4516..bf5442927ccb 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/jp2a-1.0.6-r1 b/metadata/md5-cache/media-gfx/jp2a-1.0.6-r1
deleted file mode 100644
index ddabba041c25..000000000000
--- a/metadata/md5-cache/media-gfx/jp2a-1.0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/ncurses virtual/jpeg curl? ( net-misc/curl )
-DESCRIPTION=JPEG image to ASCII art converter
-EAPI=6
-HOMEPAGE=http://csl.sublevel3.org/jp2a/
-IUSE=curl
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses virtual/jpeg curl? ( net-misc/curl )
-SLOT=0
-SRC_URI=mirror://sourceforge/jp2a/jp2a-1.0.6.tar.bz2
-_md5_=38c9be44be9ed851878c1324d6c426ca
diff --git a/metadata/md5-cache/media-gfx/jp2a-1.1.1 b/metadata/md5-cache/media-gfx/jp2a-1.1.1
index cc5d8ca3ef63..f200bc8e4963 100644
--- a/metadata/md5-cache/media-gfx/jp2a-1.1.1
+++ b/metadata/md5-cache/media-gfx/jp2a-1.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=JPEG/PNG image to ASCII art converter
 EAPI=8
 HOMEPAGE=https://github.com/Talinx/jp2a/
 IUSE=curl
-KEYWORDS=~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/libpng curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://github.com/Talinx/jp2a/releases/download/v1.1.1/jp2a-1.1.1.tar.gz
-_md5_=d5da12a584657d3572ee009eec4979fc
+_md5_=c07785d1413cbf8cdebe23ac195d296f
diff --git a/metadata/md5-cache/media-gfx/propaganda-1.0-r1 b/metadata/md5-cache/media-gfx/propaganda-1.0-r1
deleted file mode 100644
index bc8dd043e1cb..000000000000
--- a/metadata/md5-cache/media-gfx/propaganda-1.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Propaganda Volume 1-14 + E. Tiling images for your desktop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-01.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-02.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-03.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-04.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-05.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-06.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-07.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-08.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-09.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-10.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-11.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-12.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-13.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-14.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-For-E.tar.gz
-_md5_=8c3330ff7c3e672dda357dc6029ebee8
diff --git a/metadata/md5-cache/media-gfx/propaganda-1.0-r2 b/metadata/md5-cache/media-gfx/propaganda-1.0-r2
index 940f7d3ea340..6c6a2aaa4001 100644
--- a/metadata/md5-cache/media-gfx/propaganda-1.0-r2
+++ b/metadata/md5-cache/media-gfx/propaganda-1.0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Propaganda Volume 1-14 + E. Tiling images for your desktop
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-01.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-02.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-03.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-04.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-05.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-06.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-07.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-08.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-09.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-10.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-11.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-Vol-12.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-13.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-14.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/Propaganda-For-E.tar.gz
-_md5_=4a54297f6d80c98f8623eb20aab18531
+_md5_=036931ad4fe97310fb210920ce49ff34
diff --git a/metadata/md5-cache/media-gfx/prusaslicer-2.5.0_rc1 b/metadata/md5-cache/media-gfx/prusaslicer-2.5.0_rc1
new file mode 100644
index 000000000000..2a57c4ea7903
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/prusaslicer-2.5.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= >=dev-libs/boost-1.73.0:=[nls,threads(+)] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/libigl sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl] media-libs/qhull[static-libs]
+DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
+EAPI=8
+HOMEPAGE=https://www.prusa3d.com/prusaslicer/FastSweepingDomain
+INHERIT=cmake wxwidgets xdg
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
+RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= >=dev-libs/boost-1.73.0:=[nls,threads(+)] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/libigl sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_2.5.0-rc1.tar.gz -> prusaslicer-2.5.0_rc1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4c968cc9d759a8952d72b31dd877fd89
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a422f6595859..a7a885fb3b10 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.23 b/metadata/md5-cache/media-libs/ffmpegsource-2.23
deleted file mode 100644
index c95c436db281..000000000000
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare pretend setup unpack
-DEPEND=sys-libs/zlib >=media-video/ffmpeg-2.4:0= virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=A libav/ffmpeg based source library for easy frame accurate access
-EAPI=6
-HOMEPAGE=https://github.com/FFMS/ffms2
-INHERIT=autotools flag-o-matic vcs-snapshot
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=sys-libs/zlib >=media-video/ffmpeg-2.4:0=
-SLOT=0/4
-SRC_URI=https://github.com/FFMS/ffms2/archive/2.23.tar.gz -> ffmpegsource-2.23.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=49c4142e3410417cdb7e7859c29f0c15
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.40 b/metadata/md5-cache/media-libs/ffmpegsource-2.40
index f940f10c12be..db9188e93543 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.40
+++ b/metadata/md5-cache/media-libs/ffmpegsource-2.40
@@ -5,10 +5,10 @@ DESCRIPTION=A libav/ffmpeg based source library for easy frame accurate access
 EAPI=8
 HOMEPAGE=https://github.com/FFMS/ffms2
 INHERIT=autotools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=media-video/ffmpeg-2.4:= sys-libs/zlib
 SLOT=0/4
 SRC_URI=https://github.com/FFMS/ffms2/archive/2.40.tar.gz -> ffmpegsource-2.40.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5255feef36a2ed87fe077d22930b9f2c
+_md5_=36ac917e80fc0ec301eb60a9f3facf8c
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index ad572db00289..98bb56dd1242 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
index 3cc8e4a9ce1c..981a1ad40a19 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -3,8 +3,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=7
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=amd64 arm arm64 ~ppc x86
+KEYWORDS=amd64 arm arm64 ppc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2
-_md5_=dfbd4e8ce21c7e56cf2f57c617199ea4
+_md5_=6d9e125d60c2b56c51d61a92a515475c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 22eb2cfb1c4c..573b85e9ecbf 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r103 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r103
deleted file mode 100644
index 0c2c82b972da..000000000000
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r103
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= ~media-libs/ffmpegsource-2.23:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet ) >=dev-cpp/gtest-1.8.1 >=dev-lua/luarocks-3.4.0-r100 lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure postinst postrm prepare pretend setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= ~media-libs/ffmpegsource-2.23:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
-DESCRIPTION=Advanced subtitle editor
-EAPI=7
-HOMEPAGE=http://www.aegisub.org/ https://github.com/Aegisub/Aegisub
-INHERIT=autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
-IUSE=+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet +lua_single_target_luajit
-KEYWORDS=amd64 x86
-LICENSE=BSD MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= ~media-libs/ffmpegsource-2.23:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
-REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7e2032180915da7d4a72b256f6dde38c
diff --git a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r104
index 0f9b6a2bc373..e8f6285cc5b3 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r104
@@ -10,8 +10,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls,threads(+)] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
 REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3822a61116663e19651b14767f40b23d
+_md5_=11032d22b298532c7211cd6427843531
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 57dabe28ca2f..cc206673b78f 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/shairplay-0_pre20170118 b/metadata/md5-cache/net-libs/shairplay-0_pre20170118
deleted file mode 100644
index b3eb9f763579..000000000000
--- a/metadata/md5-cache/net-libs/shairplay-0_pre20170118
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=tools? ( media-libs/libao ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Apple airplay and raop protocol server
-EAPI=6
-HOMEPAGE=https://github.com/juhovh/shairplay
-INHERIT=autotools vcs-snapshot
-IUSE=alac static-libs tools
-KEYWORDS=amd64 x86
-LICENSE=BSD LGPL-2.1 MIT
-RDEPEND=alac? ( media-sound/alac_decoder net-libs/shairplay[tools] ) tools? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/juhovh/shairplay/archive/498bc5bcdd305e04721f94a04b9f26a7da72673f.tar.gz -> shairplay-0_pre20170118.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2d27c2971d18fb89c35ac25af41eae74
diff --git a/metadata/md5-cache/net-libs/shairplay-0_pre20180824 b/metadata/md5-cache/net-libs/shairplay-0_pre20180824
deleted file mode 100644
index b716812d01e7..000000000000
--- a/metadata/md5-cache/net-libs/shairplay-0_pre20180824
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=tools? ( media-libs/libao )
-DESCRIPTION=Apple airplay and raop protocol server
-EAPI=7
-HOMEPAGE=https://github.com/juhovh/shairplay
-INHERIT=autotools
-IUSE=alac +playfair static-libs tools
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD LGPL-2.1 MIT playfair? ( GPL-3+ )
-RDEPEND=alac? ( media-sound/alac_decoder net-libs/shairplay[tools] ) tools? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/juhovh/shairplay/archive/096b61ad14c90169f438e690d096e3fcf87e504e.tar.gz -> shairplay-0_pre20180824.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e79d7870766d919f0e0c88ff4f349a99
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3702128dc036..46a8e2488a7e 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1 b/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
deleted file mode 100644
index 439e28781937..000000000000
--- a/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Client for NoMachine remote servers
-EAPI=6
-HOMEPAGE=https://www.nomachine.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=nomachine
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0 || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.24_1_i686.tar.gz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ccd98baf69b53a76e6564788b399a323
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 93aace59579a..a48d2363bc99 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1 b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
deleted file mode 100644
index f980ee8ed531..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.1.0 app-crypt/libsecret ) dev-util/gdbus-codegen virtual/pkgconfig sys-devel/gettext dev-util/intltool
-DESCRIPTION=Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/sstp-client/
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.1.0 app-crypt/libsecret )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/sstp-client/network-manager-sstp/1.2.0/NetworkManager-sstp-1.2.0.tar.bz2
-_md5_=1bc4c5342c4e6f0a7ca66d53dc3e1fca
diff --git a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.6 b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.6
deleted file mode 100644
index 6be4fc300ba1..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig sys-devel/gettext dev-util/intltool
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.2.0 >=app-crypt/libsecret-0.18 )
-DESCRIPTION=Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/sstp-client/
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.2.0 >=app-crypt/libsecret-0.18 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/sstp-client/network-manager-sstp//NetworkManager-sstp-1.2.6.tar.bz2
-_md5_=55db176119c31bcdfd5afbdcd5078b0d
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 9846e781ddce..83fe8f2581d9 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/numbat-0.999-r2 b/metadata/md5-cache/sci-chemistry/numbat-0.999-r2
deleted file mode 100644
index 78b1e31f8249..000000000000
--- a/metadata/md5-cache/sci-chemistry/numbat-0.999-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=gnome-base/libglade:2.0 sci-libs/gsl:= x11-libs/gtk+:2
-DESCRIPTION=New user-friendly method built for automatic dX-tensor determination
-EAPI=7
-HOMEPAGE=http://www.nmr.chem.uu.nl/~christophe/numbat.html
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=gnome-base/libglade:2.0 sci-libs/gsl:= x11-libs/gtk+:2 sci-chemistry/molmol sci-chemistry/pymol sci-visualization/gnuplot
-SLOT=0
-SRC_URI=http://comp-bio.anu.edu.au/private/downloads/Numbat/Numbat-0.999.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df1e675b0c125ce11088c4e66c658685
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index f30b07c35f07..0d77fdac94a7 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1 b/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
deleted file mode 100644
index 7e40f9f61921..000000000000
--- a/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sci-geosciences/libtcd-2.2.3
-DESCRIPTION=Calculate speeds, equilibrium arguments, node factors of tidal constituents
-EAPI=6
-HOMEPAGE=https://flaterco.com/xtide/files.html
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=sci-geosciences/libtcd-2.2.3
-SLOT=0
-SRC_URI=ftp://ftp.flaterco.com/xtide/congen-1.6.2.tar.bz2
-_md5_=b0db619a15eb04ecd6d4ec21b8fb2571
diff --git a/metadata/md5-cache/sci-geosciences/congen-1.7 b/metadata/md5-cache/sci-geosciences/congen-1.7
index 242b787e8c78..71cd62c25910 100644
--- a/metadata/md5-cache/sci-geosciences/congen-1.7
+++ b/metadata/md5-cache/sci-geosciences/congen-1.7
@@ -4,9 +4,9 @@ DESCRIPTION=Calculate speeds, equilibrium arguments, node factors of tidal const
 EAPI=8
 HOMEPAGE=https://flaterco.com/xtide/files.html
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=sci-geosciences/libtcd-2.2.3
 SLOT=0
 SRC_URI=https://flaterco.com/files/xtide/congen-1.7-r2.tar.xz -> congen-1.7.tar.xz
-_md5_=da8cb0c164c2c9de735ac18be9e38dcf
+_md5_=b299bf700353556677938d46d492697f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index dd2152e564c6..eb9ad4797530 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/caffe2-1.11.0-r2 b/metadata/md5-cache/sci-libs/caffe2-1.11.0-r2
index 4e5593c52490..0e1353181540 100644
--- a/metadata/md5-cache/sci-libs/caffe2-1.11.0-r2
+++ b/metadata/md5-cache/sci-libs/caffe2-1.11.0-r2
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
 INHERIT=python-r1 cmake
-IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ffmpeg? ( opencv )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ffmpeg? ( opencv )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v1.11.0.tar.gz -> pytorch-1.11.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3b2a74d56704876e4f73d3abdafe94e2
+_md5_=72f56a7fe96c32788f93f5a38cd48321
diff --git a/metadata/md5-cache/sci-libs/caffe2-1.12.0 b/metadata/md5-cache/sci-libs/caffe2-1.12.0
index 0b78a42249f2..f838d7aeca69 100644
--- a/metadata/md5-cache/sci-libs/caffe2-1.12.0
+++ b/metadata/md5-cache/sci-libs/caffe2-1.12.0
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
 INHERIT=python-r1 cmake flag-o-matic
-IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ffmpeg? ( opencv )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ffmpeg? ( opencv )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v1.12.0.tar.gz -> pytorch-1.12.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4c95120e7dae879c8083add105a93695
+_md5_=fcd1f19d34b31716a2bd33d3fa60792b
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index d111a0e1652a..b0e13fedad92 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/autocutsel-0.10.0 b/metadata/md5-cache/x11-misc/autocutsel-0.10.0
deleted file mode 100644
index 385fcc3aa3fd..000000000000
--- a/metadata/md5-cache/x11-misc/autocutsel-0.10.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=Synchronise the two copy/paste buffers mainly used by X applications
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt
-SLOT=0
-SRC_URI=https://github.com/sigmike/autocutsel/releases/download/0.10.0/autocutsel-0.10.0.tar.gz
-_md5_=88cbd004ea4d94144a91ef528856f60a
diff --git a/metadata/md5-cache/x11-misc/autocutsel-0.10.1 b/metadata/md5-cache/x11-misc/autocutsel-0.10.1
index 6b28a800f742..7ac10532882b 100644
--- a/metadata/md5-cache/x11-misc/autocutsel-0.10.1
+++ b/metadata/md5-cache/x11-misc/autocutsel-0.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=Synchronise the two copy/paste buffers mainly used by X applications
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel
 INHERIT=autotools
-KEYWORDS=~amd64 ~ppc sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=https://github.com/sigmike/autocutsel/releases/download/0.10.1/autocutsel-0.10.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3ca4ea8b0fff348abe84d28592195eae
+_md5_=965dc9e0d0de7d0e67e440d6ae77770a
diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
deleted file mode 100644
index e463b3ceabee..000000000000
--- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
-DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase
-EAPI=6
-HOMEPAGE=https://github.com/sargon/trayer-srg
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=MIT GPL-2+
-RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.8.tar.gz -> trayer-srg-1.1.8.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=732d85de6272d15fadd7608ce9306621
diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8-r1 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8-r1
index 76600e23e6c5..3557a8110efb 100644
--- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8-r1
+++ b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8-r1
@@ -5,10 +5,10 @@ DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase
 EAPI=8
 HOMEPAGE=https://github.com/sargon/trayer-srg
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT GPL-2+
 RDEPEND=x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.8.tar.gz -> trayer-srg-1.1.8.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b3c9083b482b74d9ed2fc569594d52d7
+_md5_=84d51fb15ef7342b775ccb09374977e0
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 3c736d9a81fb..c94209572d2a 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0 b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
deleted file mode 100644
index ce2cff941cb4..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] net-misc/wget virtual/pkgconfig
-DESCRIPTION=an Image-Watcher-Plugin for GKrellM2
-EAPI=6
-HOMEPAGE=http://gkrellkam.sourceforge.net
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] net-misc/wget
-SLOT=0
-SRC_URI=mirror://sourceforge/gkrellkam/gkrellkam_2.0.0.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2e869fd0f33ceb8e5021d0de944bf841
diff --git a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1 b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1
index daf9a0021818..3553b9c4bed1 100644
--- a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=an Image-Watcher-Plugin for GKrellM2
 EAPI=8
 HOMEPAGE=http://gkrellkam.sourceforge.net
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] net-misc/wget
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellkam/gkrellkam_2.0.0.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f023e562f7c4a585f547b97ed88f1e7a
+_md5_=ef623417ff0d2e7bfe6109c4039eef02
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
deleted file mode 100644
index 1d996bc19e0f..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=A simple countdown clock for GKrellM2
-EAPI=6
-HOMEPAGE=http://freshmeat.sourceforge.net/projects/gkrellm-countdown
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=0
-SRC_URI=http://oss.pugsplace.net/gkrellm-countdown-0.1.2.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8a71c25a527809ac9bc32bdb8a68256a
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
index 72711dd03639..be794af141f2 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A simple countdown clock for GKrellM2
 EAPI=8
 HOMEPAGE=http://freshmeat.sourceforge.net/projects/gkrellm-countdown
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~ppc sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://oss.pugsplace.net/gkrellm-countdown-0.1.2.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=462bc476cb25b4d373cb6bd878129c03
+_md5_=527197bdbb4a9a3bb90a97c3eb4ec693
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
deleted file mode 100644
index f451efc230b7..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A GKrellM2 plugin to control a fli4l router
-EAPI=6
-HOMEPAGE=http://gkrellm-imonc.sourceforge.net/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/gkrellm-imonc/gkrellm-imonc-src-0.2.tar.bz2
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bd7ae86a8f9f85078cca1766cef9f9bf
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2
index df95e83365ae..e3926fe71eb7 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A GKrellM2 plugin to control a fli4l router
 EAPI=8
 HOMEPAGE=http://gkrellm-imonc.sourceforge.net/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellm-imonc/gkrellm-imonc-src-0.2.tar.bz2
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=874fd4cf2def80fa0a10ead80b581422
+_md5_=d8278da029d97a3b44605225da1a3e29
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1
deleted file mode 100644
index 347fd6aad832..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-admin/gkrellm:2[X] x11-libs/libXtst x11-base/xorg-proto virtual/pkgconfig
-DESCRIPTION=GKrellM2 plugin for monitoring keyboard LEDs
-EAPI=6
-HOMEPAGE=http://heim.ifi.uio.no/~oyvinha/gkleds/
-INHERIT=gkrellm-plugin
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] x11-libs/libXtst
-SLOT=2
-SRC_URI=http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/gkleds-0.8.2.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=43a15ffcd89798f5c96f7deced07da36
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2
index e20e0f1fe6d5..09c3ed08b1a3 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=GKrellM2 plugin for monitoring keyboard LEDs
 EAPI=8
 HOMEPAGE=http://heim.ifi.uio.no/~oyvinha/gkleds/
 INHERIT=gkrellm-plugin autotools
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] x11-libs/libXtst
 SLOT=2
 SRC_URI=http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/gkleds-0.8.2.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f8508dbc58bce0e629189f90e4ba8efa
+_md5_=99871cf0e0c59491d318fc35370e55a2
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4 b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4
deleted file mode 100644
index d73e3af435c1..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc ) virtual/pkgconfig
-DESCRIPTION=A minimalistic GKrellM2 plugin to control radio tuners
-EAPI=6
-HOMEPAGE=http://gkrellm.luon.net/gkrellm-radio.php
-INHERIT=gkrellm-plugin toolchain-funcs
-IUSE=lirc
-KEYWORDS=~amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc )
-SLOT=2
-SRC_URI=http://gkrellm.luon.net/files/gkrellm-radio-2.0.4.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0c9980255c1cadb677f720ab088b7e37
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1 b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1
index fbb9e8ffb433..c0b219378960 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://gkrellm.luon.net/gkrellm-radio.php
 INHERIT=gkrellm-plugin toolchain-funcs
 IUSE=lirc
-KEYWORDS=~amd64 ~ppc sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc )
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-radio-2.0.4.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d8398d0f147a478e0849bad80df5dd90
+_md5_=38c33bf13b7576b063fcbce02c935f56
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1 b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
deleted file mode 100644
index b89a0c989841..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=Configurable Tray Icons for GKrellM
-EAPI=6
-HOMEPAGE=http://gkrellm.srcbox.net/Plugins.html
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=0
-SRC_URI=mirror://gentoo/gkrellm-trayicons-1.03.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=829735f9798a7830fe693b7ee5b5add2
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2 b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2
index 7b05a2371dfa..130fd587b348 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Configurable Tray Icons for GKrellM
 EAPI=8
 HOMEPAGE=http://gkrellm.srcbox.net/Plugins.html
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~ppc sparc ~x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=mirror://gentoo/gkrellm-trayicons-1.03.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=104e18f7a359fc505adbcd78326aa88a
+_md5_=75f34f8d9e78ca762fd66800b6ac6dbc
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
deleted file mode 100644
index 6eccc585b6fb..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Superslim VAIO LCD Brightness Control Plugin for Gkrellm
-EAPI=6
-HOMEPAGE=http://nerv-un.net/~dragorn/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=2
-SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=975e2a12be3f249bebbf214f589b15e0
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3
index 3fec190c7f33..a79d271be44c 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Superslim VAIO LCD Brightness Control Plugin for Gkrellm
 EAPI=8
 HOMEPAGE=http://nerv-un.net/~dragorn/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=068dfa825a349755fc60ebd3c80a8240
+_md5_=9c88c0cadde043a45d18ba88a2fbc330
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2 b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2
deleted file mode 100644
index be11c32277c5..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] alsa? ( media-libs/alsa-lib ) virtual/pkgconfig
-DESCRIPTION=A mixer control plugin for gkrellm
-EAPI=6
-HOMEPAGE=http://gkrellm.luon.net/volume.php
-INHERIT=gkrellm-plugin toolchain-funcs
-IUSE=alsa
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] alsa? ( media-libs/alsa-lib )
-SLOT=2
-SRC_URI=http://gkrellm.luon.net/files/gkrellm-volume-2.1.13.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d49bcfb33b07b3798bae1200f28e6c27
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3 b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3
index 5d5cfb5d67ba..0c26d5313132 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://gkrellm.luon.net/volume.php
 INHERIT=gkrellm-plugin toolchain-funcs
 IUSE=alsa
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] alsa? ( media-libs/alsa-lib )
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-volume-2.1.13.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0525fd1bfa1483c6903a30e455c0168e
+_md5_=72a96ef8494aa5d71552fe1619b3490d
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1 b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1
deleted file mode 100644
index 5a56504d48e1..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=XKB keyboard switcher for gkrellm2
-EAPI=6
-HOMEPAGE=http://tripie.sweb.cz/gkrellm/xkb/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=0
-SRC_URI=http://tripie.sweb.cz/gkrellm/xkb/dist/gkrellm-xkb-1.05.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aab5d01d1d29e51876f01d1e9aacedbb
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2 b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2
index 65f22a4c8e30..ff07ea86887b 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2
@@ -5,10 +5,10 @@ DESCRIPTION=XKB keyboard switcher for gkrellm2
 EAPI=8
 HOMEPAGE=http://tripie.sweb.cz/gkrellm/xkb/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://tripie.sweb.cz/gkrellm/xkb/dist/gkrellm-xkb-1.05.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=615772fc175aa2a4d3e0932b54eb488c
+_md5_=6d17370297faf8f7353ff52df46adb8d
diff --git a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5 b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
deleted file mode 100644
index c287074baee8..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=A Program-Launcher Plugin for GKrellM2
-EAPI=6
-HOMEPAGE=http://gkrellmlaunch.sourceforge.net/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=2
-SRC_URI=mirror://sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bb8f1a1f23db035fd41be2ac7bbb7f73
diff --git a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1 b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1
index 76c0b120d754..c6f9a042ca77 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A Program-Launcher Plugin for GKrellM2
 EAPI=8
 HOMEPAGE=http://gkrellmlaunch.sourceforge.net/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0212facbea1956dfd49aae0305e4a4f9
+_md5_=87be39f52440013e1e9f4c995ee49140
diff --git a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2 b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
deleted file mode 100644
index 04ff53333353..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-admin/gkrellm:2[X] media-libs/imlib2 virtual/pkgconfig
-DESCRIPTION=A GKrellM2 plugin of the famous wmMoonClock dockapp
-EAPI=6
-HOMEPAGE=http://gkrellmoon.sourceforge.net/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] media-libs/imlib2
-SLOT=2
-SRC_URI=mirror://sourceforge/gkrellmoon/gkrellmoon-0.6.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0c561b39e837a2cc92a6d00fcddef862
diff --git a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3 b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3
index 8b25ee5165b1..b1f7605a91ca 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A GKrellM2 plugin of the famous wmMoonClock dockapp
 EAPI=8
 HOMEPAGE=http://gkrellmoon.sourceforge.net/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] media-libs/imlib2
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmoon/gkrellmoon-0.6.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9558e823a3a46dad0f361b0af7d2ef1a
+_md5_=44876f791f1940c3e14100023c29d4e6
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
deleted file mode 100644
index db7f6f0fd3fe..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0= virtual/pkgconfig
-DESCRIPTION=A plugin for GKrellM2 that has a VU meter and a sound chart
-EAPI=6
-HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
-INHERIT=gkrellm-plugin
-IUSE=nls
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0=
-SLOT=0
-SRC_URI=http://web.wt.net/~billw/gkrellmss/gkrellmss-2.6.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a000b109cae984e0cff3a099d3b12fdb
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5
index 94ef2b95f3cd..9ff42ce392f7 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5
+++ b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
+BDEPEND=sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0=
 DESCRIPTION=A plugin for GKrellM2 that has a VU meter and a sound chart
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
 INHERIT=gkrellm-plugin
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=http://web.wt.net/~billw/gkrellmss/gkrellmss-2.6.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=516d3b0f80d94500a54ff9576cd499dc
+_md5_=212a63ab76bed65a0e27b685ea4dbf9f
diff --git a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2 b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
deleted file mode 100644
index 5f0fb205779f..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=A plugin for GKrellM that monitors your wireless network card
-EAPI=6
-HOMEPAGE=http://gkrellm.luon.net/gkrellmwireless.php
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=2
-SRC_URI=http://gkrellm.luon.net/files/gkrellmwireless-2.0.3.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2cf39a00f4fb28ec76904904828f9fa0
diff --git a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3 b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3
index 88e20a888984..d9e9dfc9e8c8 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A plugin for GKrellM that monitors your wireless network card
 EAPI=8
 HOMEPAGE=http://gkrellm.luon.net/gkrellmwireless.php
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellmwireless-2.0.3.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2559fd252c442c3061725d441b5b5028
+_md5_=a8829f832f3e465cea5e3d8f7349ab0d
diff --git a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r3 b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r3
deleted file mode 100644
index 10129dc3be59..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=GKrellm2 plugin to take screen shots and lock screen
-EAPI=6
-HOMEPAGE=http://gkrellshoot.sourceforge.net/
-INHERIT=gkrellm-plugin
-KEYWORDS=~alpha amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] virtual/imagemagick-tools
-SLOT=2
-SRC_URI=mirror://sourceforge/gkrellshoot/gkrellshoot-0.4.4.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f672858fa5b50cfe3c3e0837641b245e
diff --git a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4 b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4
index a8838007bf59..4d9a0604f720 100644
--- a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4
+++ b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4
@@ -5,10 +5,10 @@ DESCRIPTION=GKrellm2 plugin to take screen shots and lock screen
 EAPI=8
 HOMEPAGE=http://gkrellshoot.sourceforge.net/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] virtual/imagemagick-tools
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellshoot/gkrellshoot-0.4.4.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=248ea71c2062be4f6166134cabc22b72
+_md5_=89aa8f667703b3046cee81c8fafa0c86
diff --git a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4 b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
deleted file mode 100644
index 30baea04d7ee..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A GKrellM plugin that shows sunrise and sunset times
-EAPI=6
-HOMEPAGE=http://gkrellsun.sourceforge.net/
-INHERIT=gkrellm-plugin
-IUSE=nls
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=1
-SRC_URI=mirror://sourceforge/gkrellsun/gkrellsun-1.0.0.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2a2754e11152ff5044a03a5bd13a5f60
diff --git a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5 b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5
index 936c531b9295..42c17218b30b 100644
--- a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5
+++ b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://gkrellsun.sourceforge.net/
 INHERIT=gkrellm-plugin toolchain-funcs
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=1
 SRC_URI=mirror://sourceforge/gkrellsun/gkrellsun-1.0.0.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4e0cd311e08db890e670d4406026d40c
+_md5_=ddd4f80d0b4c03b977aad140e2990c13
diff --git a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2 b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
deleted file mode 100644
index 0d22a61bcdcd..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=a GKrellM2 plugin which displays the top three processes
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/gkrelltop
-INHERIT=gkrellm-plugin toolchain-funcs
-IUSE=X
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/gkrelltop/gkrelltop_2.2.13.orig.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=09b666281b3dae02bcce6bc0ade7687b
diff --git a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3 b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3
index 1c8f34b3dccb..e7f9ccfb2ace 100644
--- a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3
+++ b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/gkrelltop
 INHERIT=gkrellm-plugin toolchain-funcs
 IUSE=X
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrelltop/gkrelltop_2.2.13.orig.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=413d127d91fb49a9cfa59d3603b28744
+_md5_=6e3282a24a4c4247951cf6afd5213adf
diff --git a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1 b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
deleted file mode 100644
index 794f88f30b38..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-admin/gkrellm:2[X] dev-lang/perl net-misc/wget x11-libs/gtk+:2 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=GKrellM2 Plugin that monitors a METAR station and displays weatherinfo
-EAPI=6
-HOMEPAGE=https://sites.google.com/site/makovick/gkrellm-plugins
-INHERIT=flag-o-matic gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] dev-lang/perl net-misc/wget x11-libs/gtk+:2
-SLOT=2
-SRC_URI=https://sites.google.com/site/makovick/projects/gkrellweather-2.0.8.tgz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=090ccb1db4d7b33def6cb5c3e138ba93
diff --git a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2 b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2
index ca0fac3c6449..521c9d608427 100644
--- a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2
@@ -5,10 +5,10 @@ DESCRIPTION=GKrellM2 Plugin that monitors a METAR station and displays weatherin
 EAPI=8
 HOMEPAGE=https://sites.google.com/site/makovick/gkrellm-plugins
 INHERIT=flag-o-matic gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-lang/perl net-misc/wget x11-libs/gtk+:2
 SLOT=2
 SRC_URI=https://sites.google.com/site/makovick/projects/gkrellweather-2.0.8.tgz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a5e6c1a919b0f4158eb3be0f6c1d5863
+_md5_=5294d099259ec2ff9428efb56e9b2c3e
diff --git a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2 b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
deleted file mode 100644
index 76dab9fa5199..000000000000
--- a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0= virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A web monitor plugin for GKrellM2
-EAPI=6
-HOMEPAGE=http://gkwebmon.sourceforge.net/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/gkwebmon/gkwebmon-0.2.tgz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d45d4257d158aab1598b8be947948f41
diff --git a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3 b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3
index 3cf6574fff0a..2a84f025d8d2 100644
--- a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3
+++ b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A web monitor plugin for GKrellM2
 EAPI=8
 HOMEPAGE=http://gkwebmon.sourceforge.net/
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 dev-libs/openssl x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkwebmon/gkwebmon-0.2.tgz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d938c42fb20182422e7f333ae8d7b708
+_md5_=57e28fc6ed203b19ee5c4b5f71da5e4f
diff --git a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2 b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
deleted file mode 100644
index 906479e5d625..000000000000
--- a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-admin/gkrellm:2[X] >=app-laptop/i8kutils-1.5 virtual/pkgconfig
-DESCRIPTION=GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
-EAPI=6
-HOMEPAGE=http://www.coding-zone.com/?page=i8krellm
-INHERIT=gkrellm-plugin
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] >=app-laptop/i8kutils-1.5
-SLOT=0
-SRC_URI=http://www.coding-zone.com/i8krellm-2.5.tar.gz
-_eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1cd25cff53e4bd65e61b6c87c55d3afb
diff --git a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3 b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3
index e0c21710315b..90fa8568251e 100644
--- a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3
+++ b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3
@@ -5,10 +5,10 @@ DESCRIPTION=GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
 EAPI=8
 HOMEPAGE=http://www.coding-zone.com/?page=i8krellm
 INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] >=app-laptop/i8kutils-1.5
 SLOT=0
 SRC_URI=http://www.coding-zone.com/i8krellm-2.5.tar.gz
 _eclasses_=gkrellm-plugin	44870b869ece4d2afff1e3169c00c367	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=64255276ac148083555aebccc879cdd2
+_md5_=065f0875dc8c9942ced472dc12dca80c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index d88547f9b500..1490cff841da 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-0.26.0 b/metadata/md5-cache/x11-terms/kitty-0.26.0
new file mode 100644
index 000000000000..be0438684100
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.26.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/ncurses virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] ) ) wayland? ( dev-util/wayland-scanner ) verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.0 ~x11-terms/kitty-terminfo-0.26.0 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland ) X? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=Fast, feature-rich, GPU-based terminal
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
+IUSE=+X test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.0 ~x11-terms/kitty-terminfo-0.26.0 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.0/kitty-0.26.0.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.26.0/kitty-0.26.0.tar.xz.sig )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d2ead6637d7c3c790abbb35c49d3b77c
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 71cbd10f8440..2bd502cd9b34 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -1,16 +1,16 @@
 BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/ncurses virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-9999 ~x11-terms/kitty-terminfo-9999 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland ) X? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) wayland? ( dev-libs/wayland-protocols )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-9999 ~x11-terms/kitty-terminfo-9999 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland ) X? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=Fast, feature-rich, GPU-based terminal
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-INHERIT=optfeature multiprocessing python-single-r1 toolchain-funcs xdg git-r3
+INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg git-r3
 IUSE=+X test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-9999 ~x11-terms/kitty-terminfo-9999 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-9999 ~x11-terms/kitty-terminfo-9999 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
 REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=326423448d637edc8d1e6b1f8f32f4b5
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d2ead6637d7c3c790abbb35c49d3b77c
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.0 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.0
new file mode 100644
index 000000000000..10462aa68c71
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.0/kitty-0.26.0.tar.xz
+_md5_=469ce3d113ca8a046e780aa7f7d5ba3d
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.0 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.0
new file mode 100644
index 000000000000..8e1c1c07f9a4
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.0
@@ -0,0 +1,11 @@
+BDEPEND=sys-libs/ncurses
+DEFINED_PHASES=compile install
+DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.0/kitty-0.26.0.tar.xz
+_md5_=96d958882b65a1b8fae9dfaa54af8e62
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 7f6184f3dcf1..1191678fcd1d 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1 b/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
deleted file mode 100644
index 2cf8beacefc6..000000000000
--- a/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libXext x11-libs/libXrandr x11-base/xorg-proto
-DESCRIPTION=A minimalist, no frills window manager for X
-EAPI=6
-HOMEPAGE=http://www.6809.org.uk/evilwm/
-INHERIT=desktop toolchain-funcs
-KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
-LICENSE=MIT 9wm
-RDEPEND=x11-libs/libXext x11-libs/libXrandr
-SLOT=0
-SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.0.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a4b4276521df67d34ea927691fb2bbd4
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.1.1 b/metadata/md5-cache/x11-wm/evilwm-1.1.1
deleted file mode 100644
index b6244c5ca9b6..000000000000
--- a/metadata/md5-cache/x11-wm/evilwm-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=A minimalist, no frills window manager for X
-EAPI=6
-HOMEPAGE=http://www.6809.org.uk/evilwm/
-INHERIT=desktop toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
-LICENSE=MIT 9wm
-RDEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.1.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=86c96e8546f84c0b478191f4096c4547
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r1 b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
deleted file mode 100644
index 5d288f1a214a..000000000000
--- a/metadata/md5-cache/x11-wm/windowlab-1.40-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=small and simple window manager of novel design
-EAPI=6
-HOMEPAGE=http://www.nickgravgaard.com/windowlab/
-INHERIT=toolchain-funcs
-IUSE=truetype
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3dc3e5c99555070b14594201fc517dec
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r2 b/metadata/md5-cache/x11-wm/windowlab-1.40-r2
index 7b4ee248a361..229302fa5ac5 100644
--- a/metadata/md5-cache/x11-wm/windowlab-1.40-r2
+++ b/metadata/md5-cache/x11-wm/windowlab-1.40-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.nickgravgaard.com/windowlab/
 INHERIT=toolchain-funcs
 IUSE=truetype
-KEYWORDS=~amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b40f257c5f2d01ccc022c1a8b7493959
+_md5_=4cd40ea8e8ffa5dbacb47228fe6e8493
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4265282e2444..fc29b052416c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-29T03:09:47Z
+TIMESTAMP 2022-08-29T09:09:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMMLftfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMMglhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD6NQ//aoNGAgNXC+In3a7Zx1o1qMb5obo36rO0cn8lu6hO2vtJNZ7P7TkPtMRq
-ywTwk+CAsQKhCAhzybH1tb6V0ZtpVgEn/EZoMGavtnf9sgU/jg8nY8+ifKYjtvtN
-oGeEiKPjiLGqNctdyGNkGRTAai0kltE8e/l7ED+igT02ofRX3wMUhBOl1iOQ7EqZ
-whiFQIaFePIqV59aip8PfBT7MQCxGp8pqwAPY1QErctted6mB5F6wJ7JFxe9RhUA
-AxWWy80QtBulTC7tV2TTF7J6RicginPOC7Q1zngv1k32n4v6dKvjH1HWWvt7vBhz
-uJnsSMhZaSi6RjePy7h5ONKcHfW7BPMYksrhowkT1CVuaRPsPpZNP70Pvjcuh/qj
-dzRFAnPjzKQF7tJsA8OcDnNk5y07myV2TX6mSh+/RPUERTKAnX/4rvy5esQNtkYs
-uQJ9If2DftQDYVe5D5gUW6kd4ajF6tS4PFbTPMRHBW41NfMdZ3bA+Lwlwggpsybo
-PlSmFpvvv/+nH9ggDOr9MI5u0iok0fSlw1fkieukFNxFBFDgwgCmuBl0lzJO3IJ6
-PBKWFrzJpgdixSdyMF4CMKjdDVFfEMGOsZsVwzIw1O0w+cKCzCLFMXMA3JsbsUap
-gpvrnNJ21VxAkQfeC9mYOgbuAOi2HjXkbCkaV3VnxdbHVTfT5bQ=
-=ZVYo
+klC80Q//fEF6zS2e6VO8e3az0nlqDOTbkZM1m8obv/Pd8h65AWnj+KquiC/+zU9e
+VUNC2qeRyTouiLeNGxzGm1GW7ulF/jIlPB7aiU1f/kskoqFIFYwK2YyalYdJw63g
+vh46mzuHyJL+YfRIqM9TufMwqrSPp8RCNRjiefs63WPUD8/ZGbz8ta0do4jz40Fu
+Uqc4mE0rmTioP3VYesigVRJdKjH5X373XY+OH/aWpEIlhukhN8iUa8ZpiKQ/icqr
+GphD2QkjylbjHvxjY/Y/JX/D84qJGCid/quYphmeqdCWjhXazVRi7FJF9Xwn6HL4
+9jsacgCYu+KjQyI2UVdU7C0btJ5/XsDAegRVRzCbLbzvauA+SlRrgEN1ZbLJASWA
+qOeP16q5FlLEyW30XoLyHG4akH4W+3n3XAyHE/woxHNSF/eJbzvVx2X2BZDAtQyt
+yHtjlm6+SeN+Ea0Wjej79w8t7hEfyTDp7fr9A37ZTv+WroDdMZUqRiuHjfvr3X75
+GerpV14aKQTPXWJLKK36HqGtUzCBOvOr6Ds3iePFJlf7SD378x2dwBPjW446qie8
++8/gj1qLgp/cdr+S+Ul3g8iW5mASCQiIT2zXLxzvUIfDiUt1bT2ieVZ0lsMVHciM
+kVP7KGCiPH98J47pzMOnojRh4J4g5LevUX3STGwPVmH/B2xcE+4=
+=ZF3f
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e05b08e45fb0..ef97e41f8357 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 03:09:44 +0000
+Mon, 29 Aug 2022 09:09:39 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 90a15662eaa0..6ca4d962ee1f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug 29 03:09:44 AM UTC 2022
+Mon Aug 29 09:09:38 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ed767d87afa4..84404988efbe 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 03:15:01 +0000
+Mon, 29 Aug 2022 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8bf8db2ee68c..1fe5da1f5845 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ed6c9adeaf6338594bb4d403cc3462e82979527f 1661740609 2022-08-29T02:36:49+00:00
+dc3b136d8132cff8423cf9c9e024613f75e3e65f 1661763583 2022-08-29T08:59:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index dd790524ad40..4de4af8b22d8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1661742601 Mon 29 Aug 2022 03:10:01 AM UTC
+1661764201 Mon 29 Aug 2022 09:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e05b08e45fb0..428dba7d8bb4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 03:09:44 +0000
+Mon, 29 Aug 2022 09:09:38 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8db95afc6ee1..6eebc07fb846 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/shairplay/Manifest b/net-libs/shairplay/Manifest
index 4d104c1df0bf..ccbae039027c 100644
--- a/net-libs/shairplay/Manifest
+++ b/net-libs/shairplay/Manifest
@@ -1,7 +1,4 @@
-DIST shairplay-0_pre20170118.tar.gz 291352 BLAKE2B 0eb1a60e7cd3511d24d7f6fc910afa85df4488a96ffca80d98bf00b8544b05630f8edb2f5204bc93e8901c4d8efa752f2eef94ed625e2bf7d77cd74ed3053572 SHA512 05a8ac399659235e88d3b1a7fbe8364ba526881b24ee082c3b7a5709b9b63eac376071d44028e4758ab22ca56d30f8e996b12dc9d3bd99bd38fe453e00a4a18b
 DIST shairplay-0_pre20180824.tar.gz 554332 BLAKE2B cbebe272a15a602b79f384c7497bd849145bf065a9b2c6fd335c5536dd0cbefef332945662ad4962e69273d64a23c1f2ace3edcb7c38362607414d27a61397fd SHA512 38d947740da85546cccc4186dfd6d1ab0be71463107b24beb374b17a9e557fc7e4c97e34bfd69e962ddb3e481ecc8e37070e225761d8543588cf047be25ca3a6
-EBUILD shairplay-0_pre20170118.ebuild 960 BLAKE2B d8dd128013d9402402f489d81c6f9d44b70c3b4283852643a9fa1b313538fb48f0900e254faed5ac100e480d7021dca2a776056ab30f977b9dd915314e0b32eb SHA512 3ce15525ded41e9ffd2d6ac3134a73a8bc0a8bea1d018d3e93f42c5aa35a9b983e3848806fad8089f20e9ca7fdaab1c1ba7ad7697423872b1a9f4c89be48018e
 EBUILD shairplay-0_pre20180824-r1.ebuild 942 BLAKE2B 6e065aa48ce6dd71c07b53257cf501beb3d3a0b0d25bde461a77b1d0427cff2494948dc8492849213c4b546dc0db753e49cc45e95e430b9ec8700dd7586ca9f7 SHA512 106524bcaa5fb5063653692e2384baca9b9ad5d17c0b1a69936d1e734b41463507a368ef6b9d7539a01f535d9e202acba9b4afa583e622c60c58e6e2c7fdd821
-EBUILD shairplay-0_pre20180824.ebuild 1040 BLAKE2B 576832bd080175c2a5e4b02b46a27bc2ceab31b40ec276aa1cf0e2a0c7c6ed3b80b939142fad3817750f6fe5bf61ba134c950188f2a88ac5c1d98cf7c63bec14 SHA512 eb25be13b23aa3c0f25813bf7ceea0f95dabf79d020178ae846cdc44e264315cd85bb06a8ce28aa92a03be22245e966801247bf8fd4aad024dfabee0e664649a
 EBUILD shairplay-9999.ebuild 926 BLAKE2B c6a518f8deff81b1072948c6be8376cec5827da017e721b1179681fe7797db542fd009aeba277c5aee83997d183fc0c9f7f5ea8fbbb7e9dab0ab9b9247331d70 SHA512 4b76ddc7c46d1712831b1cc5cbb5a03e9727b28c7839a3b4a511ae4a3c16a15fc6d4b3d700fbb9d9356394b472c5023dab128923d446ebce34d973c2dfba32cf
-MISC metadata.xml 729 BLAKE2B b6eda610245a0ca0e331a495741b9c9f853002bd84669695e06a1e8426a2bc1a43c7719fe6138f4f3ffe9ec171f90c8a4961bd6c0c9347c932bd4eb3fe19a1d1 SHA512 471b81db3b2a013047f0d257a5491e0cdd02edc5dfb451c76c8b313097b69bf9ff36145a381eb4d6ae6e5cd7e29d2ee5d38ec20047e1ebc2987c1732c3c248c7
+MISC metadata.xml 564 BLAKE2B a9d69b782fa3b795ca366cdb4b3788104b10fa3ec4a651b5c10d006812cd54e3f25076bec73fe35c3d66f70c19477e37ae8a10e8c94fbed3c1b73b2d3007b7cd SHA512 1419b70305aa6c021b688fe6e47a76a150ed8603db393fde377f05fdfb88b88f29a73594bfd7fa85b51c03a24e2fbcb61da6064dbdcb5980a0c1e0aeb5c96f49
diff --git a/net-libs/shairplay/metadata.xml b/net-libs/shairplay/metadata.xml
index 08b8ba3d740e..6c95395c2a6d 100644
--- a/net-libs/shairplay/metadata.xml
+++ b/net-libs/shairplay/metadata.xml
@@ -2,9 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <use>
-        <flag name="alac">Add support for Apple Lossless Audio Codec files</flag>
         <flag name="playfair">Add support for handling fairplay handshake (used in for example screen mirroring)</flag>
-        <flag name="tools">Build and install a binary shairplay in /usr/bin</flag>
     </use>
     <maintainer type="person">
         <email>candrews@gentoo.org</email>
diff --git a/net-libs/shairplay/shairplay-0_pre20170118.ebuild b/net-libs/shairplay/shairplay-0_pre20170118.ebuild
deleted file mode 100644
index 0df35df053a7..000000000000
--- a/net-libs/shairplay/shairplay-0_pre20170118.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vcs-snapshot
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/juhovh/${PN}.git"
-else
-	EGIT_COMMIT="498bc5bcdd305e04721f94a04b9f26a7da72673f"
-	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Apple airplay and raop protocol server"
-HOMEPAGE="https://github.com/juhovh/shairplay"
-LICENSE="BSD LGPL-2.1 MIT"
-
-SLOT="0"
-IUSE="alac static-libs tools"
-
-DEPEND="
-	tools? ( media-libs/libao )
-"
-
-RDEPEND="
-	alac? (
-		media-sound/alac_decoder
-		net-libs/shairplay[tools]
-	)
-	tools? (
-		dev-libs/openssl:0=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/shairplay/shairplay-0_pre20180824.ebuild b/net-libs/shairplay/shairplay-0_pre20180824.ebuild
deleted file mode 100644
index f4af8a0449c9..000000000000
--- a/net-libs/shairplay/shairplay-0_pre20180824.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/juhovh/${PN}.git"
-else
-	EGIT_COMMIT="096b61ad14c90169f438e690d096e3fcf87e504e"
-	SRC_URI="https://github.com/juhovh/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Apple airplay and raop protocol server"
-HOMEPAGE="https://github.com/juhovh/shairplay"
-LICENSE="BSD LGPL-2.1 MIT
-	playfair? ( GPL-3+ )"
-
-SLOT="0"
-IUSE="alac +playfair static-libs tools"
-
-DEPEND="
-	tools? ( media-libs/libao )
-"
-
-RDEPEND="
-	alac? (
-		media-sound/alac_decoder
-		net-libs/shairplay[tools]
-	)
-	tools? (
-		dev-libs/openssl:0=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with playfair) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d935a1a5b41a..40452cfe36f5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index 1fbc6d9ae5a3..513a47c52f87 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,8 +1,5 @@
 AUX 50nxplayer 41 BLAKE2B 167a5992f3bc1df0a78297938e652d9413037e9398ae9787d425e07b4dfbefa1932ba18bc565f3eb7a14e61cb1f49c3810581b21e282d0e00009b70c21215b3f SHA512 2ca064c30ac4934403150e07488eb17469815d958056c7da913c5dbaf94f7b5cddfbda4c3b240ef62337960ccdba44b535f174f20c8a1643bb8a2738d92ee6b0
-DIST nomachine-enterprise-client_5.1.24_1_i686.tar.gz 28378074 BLAKE2B a377dca915d6955d10d517754675a85a674e12088c1205adc6b99cc86685ec3551221cdd897f51f7f9da519388f9bd214c9828e530555202e1dd7506f1a02f42 SHA512 9ac3ee63a2c9dd7d6a110924a92718c7a9738e5bfbc7a3a30b2060a64c5eaeab3597e0d0532890e0e463869e47781528b6c7006d96634bf819cdd2415e35015c
-DIST nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz 29381273 BLAKE2B 491224421978a687a65a440ac069dfdef23cb8802872d51b1d2ae2e729696d85f082cfb6faf04e5dabf1bacb05849423003424738c755c1e043292d7b678d2f6 SHA512 18bbba7d729fd1ade04ad2d4812bd4b1bbe806036b44cbb8f9648e8bfa32008d72bc85d380fe1fc352ce92de50104fc43da030d56349502ac46a7ed6fa6afc42
 DIST nomachine-enterprise-client_7.6.2_4_i686.tar.gz 146288 BLAKE2B d42d67c8d774fa532dfbb29b537804958fe0aa4f71af964ce1828cd5359b9a67c846448aa2bf7d580a7b4bcc765f0d443e2d4c5a41a8cce968cc0a4fc77694c6 SHA512 8faa599b3f942038262eb60845a28886566e6b8c2b39dcf92de5cd9a0cde6a539fc5d04c8b8fab39c6a6970028f1707988228809a402a8274555ce88715369a1
 DIST nomachine-enterprise-client_7.6.2_4_x86_64.tar.gz 36964725 BLAKE2B 6c1320cf2bc153597800b0b191fff8152fd7205a0646451102101602dac8c8868cf89fcd32f678d8424df3f10af3c26a0b08aa70e7e2f117474f5e7779ca24c5 SHA512 467f816f67dc6cec352abbf29af8c1a6991ce9b105d3b944682afdeb4b74121a57cb2059cd8a1dca107fec38b53aaf65fe7be01ffbf020ae2c813e0b0df5ecdf
-EBUILD nxplayer-5.1.24.1-r1.ebuild 1128 BLAKE2B 2c117c5816382b05d2ab63c51f108f7abf8f3a970f27f55942a907e8f22ccc53f93634f126b518c2c226307b754fcdb874145b305e5980dcaf2b095779f4ad07 SHA512 a092ca8e134c104adba317d17d5f863513210f887c5084b73bad742d281a418b1a3ece86519347ec0e5164aeb59330f82506f7df8a0929aba42dc8aad7ea62d9
 EBUILD nxplayer-7.6.2.4.ebuild 896 BLAKE2B 93a6eaf317aa9abb61fca8a30e4afc68157acfa33d57907b03c6a25238e25dd74f6208e4a9de2481f47a66c01189b428de42c8f43a696e5844475df30077756e SHA512 6a7795da4b8ef521ef247c4aa9f73b3c6150c5aab028406e4d526ae5419889344c5d867a6b9133b3073ddab942e30b50397881dd7a8b6c08f75f1fe693a8f9eb
 MISC metadata.xml 666 BLAKE2B 766e00d8b6f8a58922bad5d60cd2f809814074e324d659b1f223670e149de79fec5591a595d31f128af724d79d4f5ec4be26c9ee9c3b322fcd324365f609effc SHA512 e065fc33af29b41de2ebecb8ddeadb04e5d6d9636e2303d6823ab7babcbc5a38b07a8eba05cebd083feef8dd6014102fe2cfe897facb84c2ed1c66b4556e0b47
diff --git a/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild b/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
deleted file mode 100644
index f367d114833e..000000000000
--- a/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator wrapper
-
-MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
-
-DESCRIPTION="Client for NoMachine remote servers"
-HOMEPAGE="https://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
-S="${WORKDIR}"/NX/etc/NX/player/packages
-
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/openssl:0
-	|| (
-		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
-	)
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	local NXROOT=/opt/NX
-
-	#dodir /etc/NX/localhost
-	#echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
-
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${ED}"/opt
-	tar xozf nxplayer.tar.gz -C "${ED}"/opt
-
-	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 46e9988b52a2..c3bf1f9de498 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest
index 34cffa103119..e9f3258d4b92 100644
--- a/net-vpn/networkmanager-sstp/Manifest
+++ b/net-vpn/networkmanager-sstp/Manifest
@@ -1,8 +1,4 @@
 AUX networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch 5579 BLAKE2B f47cdac48099067340ae0723b011dca385711ed9f7651105e14541f2f799d96d8476604d20c747f43651ece043e11c857edf86acb5b99fd7a37db544020a953d SHA512 c9ef2c096d887f9a06c0bf64fe78d4dd2713997ecf5cf103c154f95465b40bf706b842483979df86ffa4efda208788bdfeb5015a39110568fd05ce951cca1672
-DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 BLAKE2B 170221842c25945da09f94364642be94993ac4ef7bbaffebefc463e18eeff78f3a58d95607a6f0be9fb5ecdabee244d64abb02eb56deb213ac089019089821f4 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776
-DIST NetworkManager-sstp-1.2.6.tar.bz2 450813 BLAKE2B 9eefc73a676c825fd56b36085385fc382616059b82f8c14394e315b657162baa608f15046cad584d088774af1432a4e4d3751ecbecc6e779af7080c4bec9034f SHA512 60f5636e73d40ad3e16e5751a22ec12616e8d1fcffe63cba2ae1d04a13edd553c8c72a336ec52d353be6df5431a8a27a74e6e056b1a1a18ed050d5ec226bbe8e
 DIST NetworkManager-sstp-1.3.0.tar.bz2 548907 BLAKE2B 97248268a781033bc960f930c5a55102e9fa76efa4be6477ffd277fd334649625b6c88418f00d678afa4412fb088cd201ef6711ef6f48b516daaa38fac02caa9 SHA512 9a26c737601990b913d9506ecaac957c4f6d2a4c64a3a0eb8beaf93eaef797ed134b2ddfe2421006a7ffe0dbd18800d49501836f3671f798132a1df707da138a
-EBUILD networkmanager-sstp-1.2.0-r1.ebuild 1218 BLAKE2B 119d67bc269a808cbc0c6c29f90ce8f0de9140376eba85519746903154551ca6475aaebc0360ac044106edcf7e9d51a5652e45c75f984024bb090217ed6cf1be SHA512 fd8156aee6ab86c21f73216b0efc2c910c263149b679ab261533af456579f1929e223cdba29331a321ac4f318d9ad0f818464a654380faf1dc3adbde909363a6
-EBUILD networkmanager-sstp-1.2.6.ebuild 1331 BLAKE2B 331a5d08bc755700906e57d1b7b3bee2d1a20cce4d28a610d4030e13c9a0e31a13b34ba59d7f3b917c459bd592f0a903883cf653dbf7cdd05ba3fe25ac8816f8 SHA512 3278c9f7efef3aff1b911e12fbb65a75b9a6158074e90bc678c4d20e54af94361db915a3c96e8da372c72a64a6a576e68e041cc87977c31479684988ac0221fb
 EBUILD networkmanager-sstp-1.3.0.ebuild 1908 BLAKE2B 65db01a396d8586734dae6633b2e08b5f57481b62edbb1491eeeaa5e8c9df77a4f66bc8cc531868696ff70b12de5828cb6333d7230dac05e101aa19f7b019e27 SHA512 3783edf78594d49a4f0765822929918bd12a2acde2dd6a317632bc4c7f5115e140b19c2f87d9c02e024949a49c99fb8d2a70645714dc6da140a338e82bc3e39e
 MISC metadata.xml 334 BLAKE2B fb4c9de0fe5f5bd6fa7ffd7786b3f29386a5071e8d52cbbea5f0c92c32e8104b40f9d569e5c2d4201a10a477afebc4f49a82529d54e06b541edb06d5ecac88b3 SHA512 3d0a617092ceafe03e1aca6a044c0e4b1f5e80f319932be820472d2a8fb81bcdddf763a5649578786d8296d33cb57b955bd19ba273b92c15f78c120ee2687801
diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
deleted file mode 100644
index e3d6d9c1d49b..000000000000
--- a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="NetworkManager-sstp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
-HOMEPAGE="https://sourceforge.net/projects/sstp-client/"
-SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	net-misc/sstp-client
-	>=net-misc/networkmanager-1.1.0
-	net-dialup/ppp:=
-	gtk? (
-		>=x11-libs/gtk+-3.4:3
-		>=net-libs/libnma-1.1.0
-		app-crypt/libsecret
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local PPPD_VERSION="$(echo $(best_version net-dialup/ppp) | sed -e 's:net-dialup/ppp-\(.*\):\1:' -e 's:-r.*$::')"
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \
-		 $(use_with gtk gnome) \
-		 --without-libnm-glib
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.6.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.6.ebuild
deleted file mode 100644
index 9d5cf1c5a99e..000000000000
--- a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="NetworkManager-sstp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
-HOMEPAGE="https://sourceforge.net/projects/sstp-client/"
-SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp//${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	net-misc/sstp-client
-	>=net-misc/networkmanager-1.1.0
-	net-dialup/ppp:=
-	gtk? (
-		>=x11-libs/gtk+-3.4:3
-		>=net-libs/libnma-1.2.0
-		>=app-crypt/libsecret-0.18
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Bug #741108
-	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
-
-	default
-}
-
-src_configure() {
-	local PPPD_VERSION="$(echo $(best_version net-dialup/ppp) | sed -e 's:net-dialup/ppp-\(.*\):\1:' -e 's:-r.*$::')"
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \
-		 $(use_with gtk gnome) \
-		 --without-libnm-glib
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 328983592d09..3ddcca40f440 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 2f7af388d673..e081bb867239 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -291,18 +291,6 @@ dev-qt/qtwebsockets:6
 # Removal in 30 days (Bug #)
 <net-analyzer/suricata-6.0.0
 
-# Matthew Smith <matthew@gentoo.org> (2022-07-31)
-# No updates since 2010, dead homepage, and incompatible with newer
-# sci-libs/gsl. Bug #862486. Removal on 2022-08-31.
-sci-chemistry/numbat
-
-# Marc Schiffbauer <mschiff@gentoo.org> (2022-07-30)
-# No update since 2016, compilation and build system
-# errors
-# Bugs #637150, #686078, #733066, #733068, #828986, #854744
-# removal in 30 days (2022-08-29)
-app-misc/zygrib
-
 # Marek Szuba <marecki@gentoo.org> (2022-07-13)
 # Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them),
 # which have seriously messed up dependency handling and trigger several
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 98516dbdcce8..bccff543a087 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -937,7 +937,6 @@ app-misc/wildq:hcl - HCL support via pyhcl
 app-misc/wildq:toml - TOML support via pytoml
 app-misc/wildq:xml - XML support via xmltodict
 app-misc/worker:avfs - Enable support for sys-fs/avfs
-app-misc/zygrib:maps - Installs additional GSHHS maps for high resolution coastline data and cities
 app-mobilephone/gammu:curl - Enables curl support
 app-mobilephone/gammu:irda - Enables infrared support
 app-mobilephone/gammu:mysql - Use mysql for data storage
@@ -6140,9 +6139,7 @@ net-libs/pjproject:webrtc - Enable WebRTC support
 net-libs/qxmpp:vpx - Enable VP8 codec support via media-libs/libvpx
 net-libs/rabbitmq-c:tools - Builds cli tools to interact with brokers
 net-libs/rtrlib:ssh - Enable SSH support
-net-libs/shairplay:alac - Add support for Apple Lossless Audio Codec files
 net-libs/shairplay:playfair - Add support for handling fairplay handshake (used in for example screen mirroring)
-net-libs/shairplay:tools - Build and install a binary shairplay in /usr/bin
 net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farstream
 net-libs/tox:av - Adds support for audio and video.
 net-libs/tox:daemon - Enable the DHT Bootstrap Daemon.
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index fbbefa2fce1d..0b685cbb3d24 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/numbat/Manifest b/sci-chemistry/numbat/Manifest
deleted file mode 100644
index 52761be094e4..000000000000
--- a/sci-chemistry/numbat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX numbat-0.999-gnuplot.patch 2048 BLAKE2B 662ff2337d8a56ba21d1037911dab787ce3faead57a692310e694be4435875c1c7b66a6b756b28c2a2bd8ee29c29b845b794c6f70720c9f7b31810cd8296a083 SHA512 dd646e8f6652a63cb4e1c97830a755629e45d20fa13431f628b66fe8a5062b7bd7ebacddb3dbcca5aeeac3ae0d89f59c61036c1a3639d25fe0426ada77a888bb
-DIST Numbat-0.999.tar.gz 1791471 BLAKE2B 7f6536533fdf6bc3860dc1a7c03ade4896e782c5ecadf1c6a7d70896f4c6ef9f0571796c171012497d7b47b3342c215a5302ed210d7dde3ecdbef170c3f55dbc SHA512 0887f77905bbb476b0d12a7015d5d5745023740acc974ea9cd452de7d38a75a92e6090015127588b38ba62353d38c2be20f57be5df3011b51050c4934dfd206c
-EBUILD numbat-0.999-r2.ebuild 1007 BLAKE2B e65d5f9eb640f0f9f87a928b63b61e21f1944f7f57799dd98459749fe503ec5812a8190bed700f2747325220f3a54d935f16200adf5177180ceb11eab5c971a2 SHA512 f9f92be8144897cc537d218a944b88a98c240933153b7d1e2a5ba16e8657fe3cdc8b4dac2eaf33b411c8849e0dfbe6036898b59dc4fc81544041062bd0a29cde
-MISC metadata.xml 853 BLAKE2B 2ab072c2f2afc1af3d37ddd39e7cfb38bc2b88b962e30889392add26ce34805262c7cc317a2b22f23550c15916f9ea012f2e65fec31c8a5d62828351e510a00e SHA512 b08a5455fc22e7da72cf7122238356059d12746a18c8704e35de8b4485e3e3c1b6d3fb7601b5c7698494189d7763357fdcd3225c5694d3313b597dfd11c18892
diff --git a/sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch b/sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch
deleted file mode 100644
index 942f5871e50b..000000000000
--- a/sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- src/error_analysis.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/error_analysis.c b/src/error_analysis.c
-index eb86a6f..c0edf5f 100644
---- a/src/error_analysis.c
-+++ b/src/error_analysis.c
-@@ -848,11 +848,11 @@ void write_sanson_mac(FILE * F, char * name_plot, char * name_world, int number_
-     }
- 
-     fprintf(F, "reset\n");
--    fprintf(F, "set noxtics\n");
--    fprintf(F, "set noytics\n");
-+    fprintf(F, "unset xtics\n");
-+    fprintf(F, "unset ytics\n");
-     fprintf(F, "set angles degrees\n");
--    fprintf(F, "set nogrid\n");
--    fprintf(F, "set noborder\n");
-+    fprintf(F, "unset grid\n");
-+    fprintf(F, "unset border\n");
-     //fprintf(F, "width=40\n");
-     //fprintf(F, "height=width*(3./4.)\n");
-     //fprintf(F, "set xrange [-width : width]\n");
-@@ -867,12 +867,12 @@ void write_sanson_mac(FILE * F, char * name_plot, char * name_world, int number_
-     fprintf(F, "YC(lat,lon)=(lon-long0)*cos(lat)\n");
-     fprintf(F, "plot '%s'  using (YC($2,$1)):(XC($2,$1)) t '' with lines lw 0.1 lt -1", name_world);
-     for(i = 0; i < number_of_tensor; i++){
--        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points %d", name_plot,
--                6*i+2, 6*i+1, 6*i+2, 6*i+1, 3*i+1);
--        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points %d", name_plot,
--                6*i+4, 6*i+3, 6*i+4, 6*i+3, 3*i+2);
--        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points %d", name_plot,
--                6*i+6, 6*i+5, 6*i+6, 6*i+5, 3*i+3);
-+        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points", name_plot,
-+                6*i+2, 6*i+1, 6*i+2, 6*i+1);
-+        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points", name_plot,
-+                6*i+4, 6*i+3, 6*i+4, 6*i+3);
-+        fprintf(F, ", '%s' using (YC($%d,$%d)):(XC($%d,$%d)) t '' with points", name_plot,
-+                6*i+6, 6*i+5, 6*i+6, 6*i+5);
-     }
-     fprintf(F, "\n");
-     //fprintf(F, "pause 2\n");
diff --git a/sci-chemistry/numbat/metadata.xml b/sci-chemistry/numbat/metadata.xml
deleted file mode 100644
index 273753c203e5..000000000000
--- a/sci-chemistry/numbat/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <longdescription>
-Numbat is a user friendly software that fits dX-tensor to a set of PCS 
-measurements and a structure from a PDB file. It has also been designed to 
-assist in the semi automatic process of PCS assignment. A detailed description 
-of the software can be found in this publication: 
-
-Christophe Schmitz, Mitchell J. Stanton-Cook, Xun-Cheng Su, Gottfried Otting, 
-and Thomas Huber (2008). Numbat: an interactive software tool for fitting 
-Δχ-tensors to molecular coordinates using pseudocontact shifts. Journal of 
-Biomolecular NMR. 41:179-189.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-chemistry/numbat/numbat-0.999-r2.ebuild b/sci-chemistry/numbat/numbat-0.999-r2.ebuild
deleted file mode 100644
index ddfec41ed12b..000000000000
--- a/sci-chemistry/numbat/numbat-0.999-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PN="Numbat"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="New user-friendly method built for automatic dX-tensor determination"
-HOMEPAGE="http://www.nmr.chem.uu.nl/~christophe/numbat.html"
-SRC_URI="http://comp-bio.anu.edu.au/private/downloads/Numbat/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	gnome-base/libglade:2.0
-	sci-libs/gsl:=
-	x11-libs/gtk+:2
-"
-RDEPEND="
-	${DEPEND}
-	sci-chemistry/molmol
-	sci-chemistry/pymol
-	sci-visualization/gnuplot
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-#	"${FILESDIR}"/${P}-glade.patch
-	"${FILESDIR}"/${P}-gnuplot.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e '/COPYING/d' \
-		-e "s:doc/numbat:share/doc/${PF}:g" \
-		-i Makefile.am src/common.h || die
-
-	rm missing || die
-
-	emake distclean
-	eautoreconf
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-
-	default
-}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7e7607b5f37a..fc0eae2041cc 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest
index 5b58bff1c121..695d48157c0f 100644
--- a/sci-geosciences/congen/Manifest
+++ b/sci-geosciences/congen/Manifest
@@ -1,5 +1,3 @@
-DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6
 DIST congen-1.7.tar.xz 263496 BLAKE2B 0b17d2ef917d088ec179d18dfea7ebec52293f77fdf3e650bdf06a243a739d31db35145d78bff187c9509dfd020c4297cb88b18d5b982edebc064b5790a70a7c SHA512 a98311e410e928a0072c0fd8724f2f67b256e3e2116070cc538c22ac6cc203d9a9b7a7584a32c862ae51f9c06fab5abdfc6cddfcd10d6b18f1bd05d09fdc5dc8
-EBUILD congen-1.6.2-r1.ebuild 660 BLAKE2B d43d9caf9e96c0f62078358d1709d071746f21c9370025614846df9472e9a57d16618a6f229a4dde0eab98a39e63d90bc99754154a108dedf50dec3f491cfc76 SHA512 6133578621ae850e629186249fe9bf7cb999dcd38e4dbb3f73ed03b7b21634838541e07dcd0570275b90d750f0dcbce2896ba11f97b8bf3318a4874ee06ea07d
-EBUILD congen-1.7.ebuild 623 BLAKE2B fc182262c8836e5f00851903b95f393daeb8f6b39d3b32f51fe92558c5a9423a46f4330d40db63ef2623524849d71c5bcffcb06ba2f69cd0cec4ef1d7a002ca7 SHA512 c8b5fa961972d0ea7b242457f6513a5387500a1bdb203c48bf38809dc44f71c8c2eca55aa05ee81a9aabad9b3a97c57f0c6622f87a4116bb6355b1897d712dde
+EBUILD congen-1.7.ebuild 621 BLAKE2B 79a8f90e22eaefed1cace24e621b94b581dfdd1c529bdc57cdc87c2afbc455b3b3d50f2e4de25e7f12a101d27916746c4a4269e5e86cb4a92c89c2e25d3c68fc SHA512 6e4b9f52d74389679d4d50aef95c82986d1e1d7d2506d6fbfa54c9dc8afdd5d0d191ed867f46382515e112a474a96243c78e4cb02c59420103d48bd8a392ed94
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sci-geosciences/congen/congen-1.6.2-r1.ebuild b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
deleted file mode 100644
index 849f25286c12..000000000000
--- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/_p/-r}
-DESCRIPTION="Calculate speeds, equilibrium arguments, node factors of tidal constituents"
-HOMEPAGE="https://flaterco.com/xtide/files.html"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DEPEND=">=sci-geosciences/libtcd-2.2.3"
-RDEPEND="${DEPEND}"
-
-MAKEOPTS+=" -j1"
-
-S=${WORKDIR}/${P%_p*}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-geosciences/congen/congen-1.7.ebuild b/sci-geosciences/congen/congen-1.7.ebuild
index 9a4d999ca845..5e066073d560 100644
--- a/sci-geosciences/congen/congen-1.7.ebuild
+++ b/sci-geosciences/congen/congen-1.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://flaterco.com/files/xtide/${P}-r2.tar.xz -> ${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 DEPEND=">=sci-geosciences/libtcd-2.2.3"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b1bb24e1f696..8819b5bd1969 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 83f2fad3ac3e..67845501bc2e 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -2,6 +2,6 @@ AUX caffe2-1.11.0-gentoo.patch 4842 BLAKE2B aab88c5abb64aad74d5c6119dbf6a1e72c32
 AUX caffe2-1.12.0-install-dirs.patch 7214 BLAKE2B 16571277e481d71ed63e71793b0aa3179de1ab9fe86483f5af3f6b13cb1eef188925b92579a84989429315edffc9189b25603fb478e505b76bf2923f7aa00566 SHA512 3c247897d0c2471d7c79b0ba05a8786807ff466f3e9c3388175df29c49b5498b0a0e6f3aefea68a8dd36b3fdec3e561799f5d664f8125b6846d00e5f05ced16d
 DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
-EBUILD caffe2-1.11.0-r2.ebuild 4129 BLAKE2B 8b822d3f2ec0eb35130963408bc10cd11ba81b4c83079756c5f88eadd5882e80d0825bc5172c37a47a04ee186c77cc6bbd2ab6f54f62578c25550b4700625c2f SHA512 ce0bf23ac77ea43ac17de4799e5eb79d7d21653300bca0c88df3ee1ed49428027ee77757fa41221d114841ce9a906b0bcf933e9c2324b45d4f56969b3e5b343a
-EBUILD caffe2-1.12.0.ebuild 4138 BLAKE2B 7dbd2cea70702face191c3d860193c0603a7fcf05e81f443643dbd6ab07da3048b5d800be3fb788328e613d9571992aa17f70b3b4be4a98eee508fc283b46af1 SHA512 58cde40fa74ead67d356fa4fcbe6187c65f90a99e486e93cd488997cdd2a2e6fd42532a77c4f0bf40adc1f164987eecce690949a316ae69caca66e5fd2117738
+EBUILD caffe2-1.11.0-r2.ebuild 4129 BLAKE2B c6c24a81a6ac13e4d0b3601bcdb15656ca4f522fedb9f2c04d2e00fc0639043dc84c7a60a336bf3929e75fb2844e0a6fe632e67d70507ac622b32381b3b3a5dc SHA512 3fa1271831a3d8207e2bb2c1bea79bd16a5590981c0e9d81cee4ce8cb09dbe7bbdf21cc3b88030a04df3025a7de5b6413af81043b888c8b2511d396b0f484e7d
+EBUILD caffe2-1.12.0.ebuild 4138 BLAKE2B adfcd1f830c28990784e56bfc45212cb9dabb0ef56f6c614ace9e2a4de480fe1abacee7a9d295b52f2d8c1ab55e07f1a137f630be0ba050507783c3228291329 SHA512 23d0c33dc58780639f547d31ca5a56bc587a4b95d26e871c8ba77c7690a5e9ede76f43ad203b05094b6a5a658e1b233e9597a9e329b01df6dc013b14addf86b7
 MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9
diff --git a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
index b5c92d8e88df..6ae8a8dc9187 100644
--- a/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-1.11.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 cmake
 
 MYPN=pytorch
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index d8b678dbc4e8..08e81ce1c8ab 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 cmake flag-o-matic
 
 MYPN=pytorch
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 761c2691ac39..be58bab7d091 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest
index 44a7e935e314..44c74df2b6af 100644
--- a/x11-misc/autocutsel/Manifest
+++ b/x11-misc/autocutsel/Manifest
@@ -1,5 +1,3 @@
-DIST autocutsel-0.10.0.tar.gz 329527 BLAKE2B 1ab17fec1dde40fae6a98a9cc079f7080add2a30b3384e7a4cfbe7e85ca13a7394ce96ba1dd32a9d147f123ce44fc4ff7fbbf77a02eacd2301b91fafc3096232 SHA512 2d9b7114fde67ee217ceee673e32b407eef5b266a9d457a83b35d1c6227e5873cc7928aa10f7d84ce5e8c78d4940ee29985696f49b4015269584f1559f6b6d1d
 DIST autocutsel-0.10.1.tar.gz 337872 BLAKE2B df1d924bf61c5e2b3dc2930b85f5b3b2f906892fa84932cfb4511be3e94dcc8763a8af1d4a6685da013d65b82e8f003f194fcb0522c35e43bc88269611132109 SHA512 a4f68342b389ef94fde8052f5d9e4b4585bab8fa8364985a2b0a3ec3e6f81ed58ba45be9349aa6e16c70ca623a7c315796cf0440ef6f4ffa9606ed7b7981a4a2
-EBUILD autocutsel-0.10.0.ebuild 560 BLAKE2B 5d57760c665817d9db399f69abbb197366ed9d8d6e5d1fd2a6f0049fa1a2bf7c22b4b796ae211ebbb3cae352bae7629b0579c2d15d8d9f9ad6add4612d064fa6 SHA512 479f2f5731d11912373e86a8a266d738f1169bb1dd08625404439134e4b97dcbac41dad4b4d2dc4fb197bdf359a0679abe2dfbf70f89355036ee281a6b192c12
-EBUILD autocutsel-0.10.1.ebuild 620 BLAKE2B 2ecf6a7488c7450a9a4136e052ff58e0811c945ef86cdaa1b3e41a7aced605e9bfdc0da985164ff54bb5ca06b6e97cdf6b3037702e61e1c3855125bae3e9e9c4 SHA512 4013f2def2b2cfd2e389a1c2bc7d72847cb9cdb1f3d26be27234a7ca41afc318f4f98c3d62eda77cd551082bc27b7acdd2bc4a45e6ef78e0d018e234f3ca1913
+EBUILD autocutsel-0.10.1.ebuild 617 BLAKE2B ff1088bdde8998b8508adbb7f82d1be9435b3595a7e64a4f91b83a1a5f9a91120352d5c000fb13e786a84c9caf63933b7e08102999bb20f4183ac2bb07eab215 SHA512 42cb86f817c0f143f1d0c08031bf3d579fe6880ceb76f257507b2d8c880c79c5dfc81986b2ccbeb54f94af829b021a4d07fdd7f57ec271d376f6e5bdecafa19f
 MISC metadata.xml 425 BLAKE2B a62b8ddf014018e899466ec5fb38ae300b39cc829e1164fc0cdc4aa7b6807bfb2f8189440bf0caedb05b30bd5f1d95e75567b53ce35d8ce4d451640200559f7c SHA512 18f4e52a69d0bbd945a3daa1dae65aeaf0cd886b4d861ca96725ff93951a3404c47170e44fdd09a579af4be927e4fcba109c26d2beb5a054ba494d495bfd12c8
diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
deleted file mode 100644
index f7dec4fbc608..000000000000
--- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications"
-HOMEPAGE="http://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel"
-SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/x11-misc/autocutsel/autocutsel-0.10.1.ebuild b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild
index 714a541d45ff..4f5b4c05363b 100644
--- a/x11-misc/autocutsel/autocutsel-0.10.1.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index 05e2ae154d17..d6927440a156 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,4 +1,3 @@
 DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310
-EBUILD trayer-srg-1.1.8-r1.ebuild 735 BLAKE2B 476a7e17f61a8715bb184bdfa1a4bb6e2d89ec9035ad24bfcbf716dd734be99d33ca752e02d95cd9f9a4914cb4e218f97a951168fe58aed51b96220299adaef6 SHA512 2a8bb681a9f846eb2cd318de2fd3a65991def69888145884b55243aa1e851fa0259ef6ffd4a7d8c4b3e6bc9dc4579d7ec99beb9ffefbd32f02145f23a9bb6549
-EBUILD trayer-srg-1.1.8.ebuild 751 BLAKE2B c28bb22c25f7f8193003ae7a6a7651c6b9abbc22cba56da51861f1344c7a9626ed110bb7cb3753c502a0b330edec5771200f6c555de79725430b736b0a1bc57a SHA512 ebb0a9169a3119a715003c0b6a0edc79b5a4cfe5f4cb23ff073b46f1e990c472fda0cef02e8f9ae8f8f3ba4b2b038fb68eae206b5ae1190026b9637693e5a03d
+EBUILD trayer-srg-1.1.8-r1.ebuild 733 BLAKE2B 059bb4b8896fd03bd4dfab5501afd14b12807c313649fb45de429649bb47f5df6935f0125831c7575f3156f874c83ae2b38480f844e936f917eac76e944d66d6 SHA512 e1368c5aa91c982d864f671b4072b84d5a999a191b97e696c744a9220e5a85f3055ba6f4b58ecdf5b062ba6661da5bba1ef1881377d438c5eea433af8c3edda1
 MISC metadata.xml 250 BLAKE2B 183552a2f861b4003230edf6c0eb30cf21c4fcb91ee7ab4df15980e9d75162431aa6e3fee0849aa657ce63c4234b9e453f702e8a6bed3670942290fba9c7cf3b SHA512 a01fbd281bd274d9714e95cf2d59840bdb983b5eebd9ddbfdfea6b2144cb15ef48919a0974c73f28c87d5b4a91f4b5e071665ef3ab0ee827a27414362b674613
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
index 5e24fffa7f07..857f7def615b 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	x11-libs/gdk-pixbuf:2
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
deleted file mode 100644
index d8bdfca96e17..000000000000
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
-HOMEPAGE="https://github.com/sargon/trayer-srg"
-SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${PN}-trayer-${PV}
-
-src_configure() {
-	# Custom configure script
-	./configure --prefix="${EPREFIX}" || die
-}
-
-src_compile() {
-	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3f5383d03b8a..2e66b53acdc2 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index 2779c71a10da..c8140ff57e44 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellkam-2.0.0-makefile.patch 664 BLAKE2B 314b6971723bd4342aa4640d685eecf3e247d43849d3d9d05fc8acfbf8c4eb5f0a04d35eb054bd5d35103d195c3f4e3486469023234414fd8070921fa2d36acd SHA512 0bd0cfb320119eb32019616f4e52a1c821116b6abfd0b0d45c7fa06a642cb980fd6f0e62769388885691e5a4ecb06d812541b7b7b6ac37c9dd2042fdc6fd3898
 AUX gkrellkam-2.0.0-r1-pkgconfig.patch 400 BLAKE2B 9c65c7d9e0eee676151a7d00559fddbb847e88926d6f09f87f646f3d326be3dd677dde1a86e502a0e5ba6dcd9afeb0fe89078b8d1b2d48f2dafc18c49d53ef48 SHA512 9abc516f95037de9d6591d1a4b774d04b50953ece4a384a1f03193261c4cf9b7e46741aab0ce4e180a4f98b929ebf61c63b491514341d9f0e4f0a44f62ef70a8
 DIST gkrellkam_2.0.0.tar.gz 27028 BLAKE2B 4bdfb89e2aa0f9001fbaedacb095e868497564612982cd3743547e1070bfbf173be5a441339d32e1be5146a511b840f6fd9a5450edad641895630d33eb5eb554 SHA512 a5a5d0a41de37b006c42150f0388ba573c968679f3f15c6b1d4837361d136cb529c2152723382e99bb46a76be5f1bde641137cea22e07a502402560dcd18699f
-EBUILD gkrellkam-2.0.0-r1.ebuild 808 BLAKE2B 830314f91ca206c9fd157a2814d0ad9e75b390624b41d59b329cd1b018828b020ec850b84ad6a344f667202de70ffaa6ff2d09e1178a9ae0d19e4be0ca1a11a8 SHA512 5e64c6507928cb41441cd2bec8e571ac77ff13afcd0e8cad9af0b2d144f0ce1f69d0dc6775ffe50261a9eb7e6a8b15d7e7dbef692ba364d6e292f88ce541938d
-EBUILD gkrellkam-2.0.0.ebuild 726 BLAKE2B a9b1714fa15f12a2c930af5a659cca8b7b071b206dd33987ea5f7a81904f36253c57fd92496c199963fd17b77df2eea46a0c8ac55e5b49ffe05cf98e2dfdf8c6 SHA512 57ed198e4ddf418706cc3c200be753116b1e1ba3c4f3b34448b33ebb0f389189b91c1b1756366c931fbe36c851578c81045252c4abc33fda42926054980fb0b3
+EBUILD gkrellkam-2.0.0-r1.ebuild 806 BLAKE2B 9eeb7357c06782115921c7f8bd1aa0915411b88f51c71d3cb255563b381faf8f842e130c44ad9e838a898f3e37df567b672ae66127e68d60c2576b8c62328149 SHA512 432d44a4c14e0c2dc3f461e148624958081a9bc62e8742de11068c34490c9cb9599ce91672ae2f1d9843eae6ee7a078bd41f7eb5852e649616f90d321ed975b3
 MISC metadata.xml 247 BLAKE2B bc8a671dda571420b2fe59f271b65f7467459e7dc02f13c2c3d4ddbc2c9385473f6ebb735b90dffd21a4e2eb3d2035d34e23b0c01c621b724d5183eb4e34165f SHA512 5abf93f2dc4d80fecfce931af945e3c45fd7fc7e4e84ccf238a6aa8b2ff0d60e6ccd7b943d32613bdfdf3a9fdaef9aad7a4dbfe9f8040b6045134b003bd7e407
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
index 25fd15750759..df6c139e400e 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
deleted file mode 100644
index 3831e4e1f7fb..000000000000
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-MY_P=${P/-/_}
-
-DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
-SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
-HOMEPAGE="http://gkrellkam.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-	 app-admin/gkrellm:2[X]
-	 net-misc/wget"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local PLUGIN_SO=( ${PN}2$(get_modname) )
-	local PLUGIN_DOCS=( example.list )
-
-	gkrellm-plugin_src_install
-	doman gkrellkam-list.5
-}
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 3465888ec277..4a311df9f75c 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellm-countdown-0.1.2-r2-pkgconfig.patch 476 BLAKE2B 7c55e464e84285c9a60c7752e1bcc0e35270a19680c936660672daa70bf2e4927b616635a22384c3b688d28299bc919d121604b00fbe2e83feab5ddc3893ff70 SHA512 7903e803b930deca0a114c29169507b117b5dc0f581098a3cf9790f2ebc1c62fed2be147fc0dfeac061f68b49722aeda47713929a3d07e3c977e87868ba063f5
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
-EBUILD gkrellm-countdown-0.1.2-r1.ebuild 575 BLAKE2B b87e4ff7307adc9a3e022ddfb3dfcb856107d75f33a4985133f1af3618664cf00aeec9bf018096f14c86771c42ac0dc56298b462b28737d4973e5f52a129518c SHA512 36d6c163872f5397c88e184ffbdfe4c9b9e86aa7e63f5f479e66d8fe9b66af2a859802f6850c6cc955ec02c9a49837cb1621857b287ff899757d87c237209520
-EBUILD gkrellm-countdown-0.1.2-r2.ebuild 660 BLAKE2B 6ef6d15a7b58af14e69086b692c7d287f6465ffd551646109f27b99d4cbdc1727a830f0d667db716bdd938254943b1d2bb1f85b0196d764ce2afc746311d23ec SHA512 2ee37e4e4f068629978319ad04dd6461a0188b1893c6b283d1491496dcb1a699e81d0ac40cbf8f6c269d25d59365961e24c3f13af958cc4cfcf62dcc15e4a26f
+EBUILD gkrellm-countdown-0.1.2-r2.ebuild 659 BLAKE2B 8117cbf44682decd1212bc438f8c9e9edf254b7c9c5cccb5e5cdf4badecefe0a464a3831731e6ad9f439618ec48b096d1403a889a45f859fe6f56f6aa20f5eb5 SHA512 54d3e2f33077000ab23ef9e423e68742d225443898ab506f1ee5521b2e2aa2b8d1e7ba92dc50e4764797978e60e6498dc8acc6f1f2af013c95d462e0ce964e86
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
deleted file mode 100644
index 965055c8df49..000000000000
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A simple countdown clock for GKrellM2"
-SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
-HOMEPAGE="http://freshmeat.sourceforge.net/projects/gkrellm-countdown"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
index 73abd8db5e00..5dfcb6a4155f 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
index 89e4766ee713..b3db2ad9c445 100644
--- a/x11-plugins/gkrellm-imonc/Manifest
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellm-imonc-0.2-r2-pkgconfig.patch 401 BLAKE2B e9d194209da9648d17ce606ed09379025d01f83154c5fa2c9b36da9adbb32904cdc7472b8ea8c1d306e86da49f6666621591df140d300f628c3a2affa015264c SHA512 ebef200c5371f9f478a85ef68417db66d9f3dde2df141cf4f53b9ca550a7ff86f389e6fcc3bf63e23ce001a6c68021df133d3671d0c3285356eeb2411669bb60
 AUX gkrellm-imonc-makefile.patch 672 BLAKE2B f29982a0461ae9ffd8b6c1cec43a220ea06d2d39397746cc4cee4140ca5a678dbf95ec3079465cbb26a16d91f64e789fc483ab0c64981fa1380090d7a21559d2 SHA512 76919a21b7dc38b56d31f94e718a5e66125712ebf70551c1ae522da23689bb9d6a5086010fbd3b072ae8612a878d8f32f0c621ef09ece2f3d44ad1d026656f59
 DIST gkrellm-imonc-src-0.2.tar.bz2 19189 BLAKE2B a0a2e48eca12dcdccedbc347e15f3cf72ae7be050e8f4b1ff71a48a2f53b6991119b413333620e9544f25337f966dd16742b280990364a69f9ef45a1a141cbaa SHA512 b6f5d8cfa90c708ed6e43d676c965ef0d850d12497adae35122fe07ac4ea235dd024b8415fbc40cf153e1bbcbeed1e632984b6f1e5ec9079a1fcfce915ace36e
-EBUILD gkrellm-imonc-0.2-r1.ebuild 670 BLAKE2B f6e7af7868efbd91ccb9576af79991f056d131486b8364ce2ce449d8bf380617a8b1ca34bb25f23729a31fc15f73520306f146d4084c3849b6084353ca380487 SHA512 b531895e7813ccb426ff4c0b7a6e15d240847bb499d6cf17bb0e7d0c837ce04e6b167fe8efc861362843fe53e2552de3fd7d07e49906b01db4eddba553d1a546
-EBUILD gkrellm-imonc-0.2-r2.ebuild 733 BLAKE2B 3331538c4ef7292835b481d7c45fcbd7e66a3de45012b6bf33c51d771745b0f182a068ece6ef260d7f0f9a433a1c9a485cfcf9216a865e55c01e438b563326e6 SHA512 0d16e49caba8ed78f3d0682ba512145c9f8baf0c911e16beaf5fd43927c4c12d1d0b0affd462a681ce683074d48e735811ea04521a1122e236243c4eba6cbffd
+EBUILD gkrellm-imonc-0.2-r2.ebuild 732 BLAKE2B 616dd75acd8e6de04826796331b613c06cebe31ee9407ec0c438eab3b56211dba048c9a09f54d2996407290459754055649aa970742227e4b1786fbb7d6619cb SHA512 c2e2be84533fd88ac9a20b0b5552c6c694202ebc0639dce598916769a211d1807ad805a0df623eced540a6a60b3802280c13f311fb04f4766e194870defd15e8
 MISC metadata.xml 251 BLAKE2B c569e245a84951e1da3acf2bc7bd4fddff868eb57c521be45f4437bb6aa834c7ff2a265d2fbaf841346a0c24f9addd1d196d8108fc877bd0eb9f3914f0f21f99 SHA512 912f4e9536eb42b728644472bdb0ac3ab585d97d67d256c1a305a92b69bd582bc4682df888aa393930a3a35e85db663a0cc5618a9163729434c7275fa71184cc
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
deleted file mode 100644
index 42c94a2c151c..000000000000
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
-HOMEPAGE="http://gkrellm-imonc.sourceforge.net/"
-
-# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
index a06fa4d4fd66..4805ff89832a 100644
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-src-${PV}"
 # The COPYING file contains the GPLv2, but the file headers say GPLv2+.
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
index 580020033cb7..534fd8605beb 100644
--- a/x11-plugins/gkrellm-leds/Manifest
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -1,5 +1,4 @@
 AUX gkrellm-leds-0.8.2-r2-ldflags-typo.patch 533 BLAKE2B 78ed173b9c322cc90c625ed4d303240e94cc63eeda44e22aba10b4df49265f431b4386b3e3ac361c63d68fb19104413ce963ffba27854c7ef913882285c9328f SHA512 f53f26d6e35bcfab83a54709fd30a14aa6093ee73235701c62f5ba4f61c1bd93f04a72a498d1b6f9601f1bb302adb911764994ba41816e90bf2ebe88b93961af
 DIST gkleds-0.8.2.tar.gz 322409 BLAKE2B f5b3303069e923d69ca4c61261428c0d938aa1ed881ea7095ccacac2e01501cd6ec8b71724dc3587c64d79fd7d385532fa296d7127163037415778311f22c0c9 SHA512 0db2f7c62b799c262f1ef3af4bf3eb147717c567862d30c07033b77bc890a33afc40389afd1d4f0a5e05c344d4bc3b12a0b7d2c42044eb4c5be00c5ca5aa7191
-EBUILD gkrellm-leds-0.8.2-r1.ebuild 615 BLAKE2B db766e15847532f1c9cfc4910dea1e62a440075d70dcfe6184cd43ef35188b9e1923368b55e4d86f27a218e43db80bfa99178edf2eb4a09486852f7a560d1b8d SHA512 97d4d5ac0f264a827372ef21099cce58dfb52a495c27db2f2a344ef24924e04801e282c01eac4f29edb3c29ec4b7a5c0d85083ca0f0a54040460d9af64a2ed52
-EBUILD gkrellm-leds-0.8.2-r2.ebuild 758 BLAKE2B 2e47891e8e53b76d7758781472defef6f5a75706e2e777be802cbb0b86651a632eaa3b58132d0f8960235ab486cbba41181e2f225ca866aadf06c7508f3a13c6 SHA512 f83482843d55e41c5a924bcfcb5352512951e1301e60c416b741b113eb26bbbdca771b1c0937d249db761d700ee075bd6a8b1e624b421b0fa51cf400a4805187
+EBUILD gkrellm-leds-0.8.2-r2.ebuild 756 BLAKE2B ec967d3c1115ebd6510cbd25a0460644393c5d47ff96e97434cf130b7da6ac22c43755a62e58f2050569544db0ff9263d9151f25486d66eb9d9db77bbbd4cf68 SHA512 af06e2cb5934f1f2d92149477f570fa5805e473ff4125ae8ba998ffc691b7876093c057281cd3392197d6b8e7ad49b8ec018536af3801d625697ec3856b04026
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
deleted file mode 100644
index ee631d42e276..000000000000
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-MY_P="${P/rellm-/}"
-
-DESCRIPTION="GKrellM2 plugin for monitoring keyboard LEDs"
-HOMEPAGE="http://heim.ifi.uio.no/~oyvinha/gkleds/"
-SRC_URI="http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	PLUGIN_SO=( src/.libs/gkleds$(get_modname) )
-	default
-}
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
index 6cb881e555ab..06896ed09df3 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
index aca23ae4c1ef..27b60e0d38bf 100644
--- a/x11-plugins/gkrellm-radio/Manifest
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellm-radio-2.0.4-makefile.patch 554 BLAKE2B ed67079c01041db8fe8e5d53e96469286d9f04ca02fc65d380665622ae3060e9b9289caf1617c952f4476a516a3971e9f5a760cac48dd0221466d35b9b410e41 SHA512 a994bfb44d8c3d1844d309d792c1084ffa5c2bb37769b714511fb90f626ed9d636d8720bb32dd536c3ce616dd25ae460ae831099f8a5b5dc6880d382b2d949ff
 AUX gkrellm-radio-2.0.4-r1-pkgconfig.patch 578 BLAKE2B 413c85c649fb5e6bc2de13930fdf73a122cc6edce40681d0fdaa8abb6df0038dde448a7f149936070c17ffd39ce2f4946417739b686836d15d6914e1b745b8bc SHA512 c5b31868595d8adcc8992afe439a7805557dd9e0322d653a9c2dac7b4e9134efc96e17bc802cd8c4bd0cea2f803d6d899491db0b24dffb06474b7beabbf1fad7
 DIST gkrellm-radio-2.0.4.tar.gz 15685 BLAKE2B c23d9627e503f0853bfd403cbb17c5550cc572540f1e7544179a57501e5793fe19aa654d2b622d34aa68765d89cbc45810b0fececbe9e9a0cfe810795b918406 SHA512 0e5de0cc114c915dcc78f3588766a0a6d9c7bd75da5626fbf7959e539c1f505babc94a0054cceb5a67c8145174d49adb331eefae69ba1637c9121ebd630998de
-EBUILD gkrellm-radio-2.0.4-r1.ebuild 771 BLAKE2B c27f2c1d35a736d83611d23569896edd0668fa64e1fa5575fa32651d2f24334585aafd303c0eb15f1a1e4d1785826800d0f9356948f10a1444f6de8e358d4835 SHA512 cf9373f5decb3606c219a25716ce3ef9b1ebe6a54dd9b5412428f0196691f2197dad67919f27ff3fc05152ef4b940ed9d05e7ad1db2284405be922d2bd894c1f
-EBUILD gkrellm-radio-2.0.4.ebuild 728 BLAKE2B b30b5a74fd283e7f875c606f5bf3597caa6a77a9d0732389d07fb88b54dd8cddb353cd9e3db909eb6a9a021d794e0e9698790b0b850d79f067330078bee5e301 SHA512 4e7a3a60d4f69d44ad7c4e1c3ce7300ae326eddbfc4c5b88bb57d2640a6dbea8ab9c397b607f14708dbd140e1c2dcaf898fa8b012ab56c547d18045b9893473e
+EBUILD gkrellm-radio-2.0.4-r1.ebuild 770 BLAKE2B 9bc5ef68102a630488977ec8daba00922641c152a39b3c35da3adc0cebdc31d0b8885555ebd64366858fb8dadd9cd231db91dada7b079128e7ec9b74dca33097 SHA512 ccf439c6e37d029c135ec6914cb7f715d9d6ce443b71806341e1cc7eddb7b6299ed75d20a37a184c3e48d609ba36e22d31c77b47974d8c3ec535bad744e33062
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
index ede1053a00c5..f46b39d00e72 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="lirc"
 
 RDEPEND="
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
deleted file mode 100644
index 37e9b9d77ffe..000000000000
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE="lirc"
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_configure() {
-	PLUGIN_SO=( radio$(get_modname) )
-	default
-}
-
-src_compile() {
-	use lirc && myconf="${myconf} WITH_LIRC=1"
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
-}
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
index 50a623d496d2..48fbc03bc0c1 100644
--- a/x11-plugins/gkrellm-trayicons/Manifest
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellm-trayicons-1.03-ldflags.patch 743 BLAKE2B 078ee5216b432592b136f812e24282c4e001d2399a11ce6768cf2122f24b0a90e169f51a7b4aa0b44b4e3b02b28669f0008df0177e1b0aedbd58deeb19318b1e SHA512 e122db6d9ae37a17d58c3a065f4b2210bf7e8f6832f8687c60efc54145fddf2e1f6898927b699f64194382dadd035710c7e3540221c3e229ec26d2ca8e01e785
 AUX gkrellm-trayicons-1.03-pkgconfig.patch 574 BLAKE2B 40208feccf98cba8682bfad297117a71d33ecfa613ba00c3a52233a6845dd5065c109c93ea5ff31e0c3dff51ace4eadef9e80fbe2d8f7b433771db84b3fc199e SHA512 87f246a1e8265ba8c8a33d9675fd91f8b1b18b5f299bc17e9dc6c7e9a062a8e7e542aac089faec7d6a671880cf0df054e102b5f49ca19bbde17ba837bfe17ca4
 DIST gkrellm-trayicons-1.03.tar.gz 185474 BLAKE2B b291c13785e7c42e3e14ef987b4c29f47d91f993653653215afb254415827c437be32aec55b2c1465a8c6de9f08bd575c4b394b1d72fa46f5573ff29b57fe31f SHA512 2f80c7b18453b3cd9694dbd9854ab88fa94f4b4de52e779bc2fb7c13633deec096d0ed0146da3d52567569df9466aa64512f870b6e142a784779444a3e6a4a4b
-EBUILD gkrellm-trayicons-1.03-r1.ebuild 590 BLAKE2B 56d71333d4ab869c6be03c5408ea39a75df95616420efc33501c8796a02cd648f5c88483317ffdb3cb15aac50255347d4fcb52c3b56f26c13ef061d39eda8a1f SHA512 0d5c176e1ff1450ee303eca6dd28b614bb47cd5b1e01475d3abcbcde7b4634399fbd3460dfbf85244b37bc9dc2e971c62a57a1012bbcf41457d937247c392401
-EBUILD gkrellm-trayicons-1.03-r2.ebuild 671 BLAKE2B c47140c471cf21a1f10aadffe9093837b776ae09d9d4b741211288fbed5d71b791fee3b6dbaaa1eb0e06b97d81b5fcd6da861e715e80332313df982d030d3d20 SHA512 cb7e219da351ae19372b88b1025eb70fe91e746c8a80124421ff4e48f2deedd6f6f602c52f86f05ef62d546fb479c52f44df3fe22bcfd607c67ba24b119689ec
+EBUILD gkrellm-trayicons-1.03-r2.ebuild 669 BLAKE2B cb20ad846e87e95ccc2f4005c091f7ebf8374bb11eeaaa3233531a24c8288379d96d162befc34ce4dd338814a68b1a685e59111c0f8228ff16aa0bb1e5c60f97 SHA512 06de2d29311126000dea31bacf8d557213c2c2ce44e60a54f4629bbf841f0e36204c231bdf7b49c7872fd0ab8e1ca5a0d01faf55ab06083ddb497d53c16f27d9
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
deleted file mode 100644
index 7dfa3d5636f2..000000000000
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="Configurable Tray Icons for GKrellM"
-HOMEPAGE="http://gkrellm.srcbox.net/Plugins.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_configure() {
-	PLUGIN_SO=( trayicons$(get_modname) )
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
index 5db20a5199de..80ea1b4a86d6 100644
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index 883559a36b01..bef809b5866b 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellm-vaiobright-2.5-fixinfo.patch 1428 BLAKE2B 268b0f1f335941be1d9b943f9f3412d1884cd4f82ce27b3ba899e6c2cd925c7a81b60c23df1f45a0ee34ae275151260f3d0640cf3220be22e635105114d8f3d3 SHA512 240b8876afbd843d47b6327fc8cffff639939182a9e1e18ce251ec3c905b1a14d063ebe6a02fef72887daeb24cd8c9d128e63cf2aecbad586182d3ccd54bad8b
 AUX gkrellm-vaiobright-2.5-textrel.patch 956 BLAKE2B 9016fef53211827fd6e2ba4aed4572bd6ad070e3c27035ee4e03e33795aaddee4893ab32d6e0cf3f1a1412a9fbd77c46352ab325c09fb3888e501bd4d8251466 SHA512 957bf1ef6fb8658c91886d495cae9f8ca9c40d7a61e0c54b9c93d0bc3bc8b62b4e37130ad548b59b4d89442442eb880dd0a915ae73f449c0c7d0f0c148d09f02
 DIST vaiobright-2.5.tar.gz 6178 BLAKE2B ed7add9147db7676e66cd51eee89e60a071896aeb33d1246b45918c2d63bf1b3cb074cb85b404a411e1cf93ffc244b8847b888a4b2f89957e282d4d41757fc0e SHA512 e58b74fe5dedd8ccc69cbcadf4b273aeb0e52fb2619e148121f79c53e41dcbff36e6ddf748b0c24a33e26c6d84ec84cf5e2cfa4d655443b9fe03d6e0150b5c3d
-EBUILD gkrellm-vaiobright-2.5-r2.ebuild 667 BLAKE2B 1cbf7032679325aa86c3a110a722a05716d2047a88ca4d1f24c4334cf78fc12031bbf785edac4b7efaa489d7ae8f0a2df3057264c55b1662f857e9530ea90285 SHA512 fc90befe324d7aea29d438d9a525229734f2f0031c2465aeee32ef3e79a3fab91baa83799bc209fede70b676632ba94dd7a65991c48bef1c22c0c0ffb8d568cb
-EBUILD gkrellm-vaiobright-2.5-r3.ebuild 674 BLAKE2B 6e6f1cd86c4b7014c37d7f022de258d121dd6646d37f1a469b3f582fc7b5373d2c2c7eb9bda77de03f74b259f5785c816a72590c4bdc269062907d50533de74a SHA512 06918eded5021694996612c275d082dc668bb3dba88eaa84f68b7e1cf798e9032d51a02f304a58e7732ba22f246b467acf0d22085e3e5fd8222984ea4b0a6128
+EBUILD gkrellm-vaiobright-2.5-r3.ebuild 673 BLAKE2B 2dd117add6422035ccce79845f6797125b178ea97bd20856b3c8c3d44fdac9096636381830ce10eb44a95f66dab9dd9dc3fc853abb272e288067ae73c9c14643 SHA512 6939d3ad7c37f6963023fdb22d98c80882ddcf68eb060c1e5fcf2c452f3df7a44f63f2c4d20e038a32658b1dbd1fa049b0c3923f45be0add93099f88f899a70f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
deleted file mode 100644
index 878c46863e63..000000000000
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-MY_P=${P/gkrellm-/}
-
-DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
-SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
-HOMEPAGE="http://nerv-un.net/~dragorn/"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 x86"
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-textrel.patch
-	"${FILESDIR}"/${P}-fixinfo.patch
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	PLUGIN_SO=( vaiobright$(get_modname) )
-	default
-}
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
index 8593c3874109..e3118369b6b5 100644
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
index c401e81a766c..d78597c694bc 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -2,6 +2,5 @@ AUX gkrellm-volume-2.1.13-makefile.patch 1293 BLAKE2B 1372f887a00955ea23789a9ff0
 AUX gkrellm-volume-2.1.13-r3-pkgconfig.patch 744 BLAKE2B 3ef577e7a47fdcee80a54f88edc88ce40fb0c0b7374c0a6c05793ca83f63774f0b943c06c3c5937e2b981a2ea2d6578d0c29806ae3ac65b8ed04a2a8cb31e8a8 SHA512 a116b37631924c1151d8ddbff030826f043f14bbde715b26fba6e397674825efff770f9f99b83e59ac15fd7af371e51c072432a5b636dcd08714f0a0258fe8c0
 AUX gkrellm-volume-2.1.13-reenable.patch 463 BLAKE2B d20017a62eacfa42a9186697d98b02ea2924eb018b71cec952f5b7bf459f8ce20014ca6aa24de8f41bc08a295658596eef14faf2fef8bdbf9869d15311074c40 SHA512 e3d37f60094da39717309d3cfa644f51c0802dac624ab18e97a1303731f3c9c62561a9ab01e56d70af133fa0b8720fcd88eec0e4cc4bf53b312df997174b1a8f
 DIST gkrellm-volume-2.1.13.tar.gz 42087 BLAKE2B fa4641a9a618ad341c81069231e7edb69390b82f2959f416d1f2c9cb757fd554a942c8e002330af06cca9a53b01525b17a2e913a86bd7a53d3875e43a95c8c5d SHA512 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
-EBUILD gkrellm-volume-2.1.13-r2.ebuild 749 BLAKE2B 66751c446e5ea3c9da25f043da365f4302721533599644831694f77c44a4184ff8c06737c1aada476bed74a47bb80f06bb8e2cef1a1a90998de25b48e0f71da6 SHA512 a1c5c2995f31447b0b6ba5d4a4bba400d0bbb263ce09fe731c50c1c8095d6ca98a8c3aa28ed8ebe0999ecee721be30169bb735cef87c9387f8141904b51be2d7
-EBUILD gkrellm-volume-2.1.13-r3.ebuild 841 BLAKE2B 55136ab26deeca31099fcab4f5927163f90b1646c524e4ea5c6f2fbbee26ccfbb31755f1cf125c8687b85036575331292730192829bdf04ceb0a420d250d3327 SHA512 1e08f5a6fa7d3f4abe256a7c66b032810a1a7aaaea4b7382c194e38d41cd1d58ccf727f719aeee7f0465c1ddfb082f5e37491c49eb2a8d746287f9dd5f6fbeb4
+EBUILD gkrellm-volume-2.1.13-r3.ebuild 839 BLAKE2B f9cea61f732a903c6bad939d421601971a510a07d327d4ae9ddffe9900be9ccc8a05b7d1e17625f9367bad897854ac3bdf51e780eb315ae993f72475b4a830c8 SHA512 82a3c5208a0a0ca43a47d377ca615d79d93b5a8b65344bd849b6c7c4790e2bbbb9a3d4c887e9dfab1bbd843ed1181274e82a83f7e69539c857a3c90a63ac7942
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
deleted file mode 100644
index e330327d324b..000000000000
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A mixer control plugin for gkrellm"
-HOMEPAGE="http://gkrellm.luon.net/volume.php"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE="alsa"
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=(
-	"${FILESDIR}/${P}-reenable.patch"
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_configure() {
-	PLUGIN_SO=( volume$(get_modname) )
-	default
-}
-
-src_compile() {
-	use alsa && local myconf="enable_alsa=1"
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
-}
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
index b3affa03f88b..13e56eab4fa3 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="alsa"
 
 RDEPEND="
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index 7872888185f6..d0dd700fc601 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellm-xkb-1.05-r2-pkgconfig.patch 822 BLAKE2B dd522a931ba9fa01917afb9b1939078acc1dd65186bdccb63d3b861718290fa6765f69b37f2550f8d79088492688c01b6471f0700ee3266c91ec12c09ebaebad SHA512 e20e30a46e62a0f81b33a23eb0e120032eecdaa3f793c9bca9bf29e0faef4b277182c80b8f7ebf54b1675d57026ec79cbcb5d39fb200f3d13761402f432cfb47
 AUX gkrellm-xkb-makefile.patch 1030 BLAKE2B 24b53321c36b974541f77347a38da677a4b8b91408e7cdfb5de6f44bc07c3be9ff338937a957c3e9dcc1c6795d96addb020f4e5f4776d1c048dac549be9fd6de SHA512 2a9e3959ad0920126f1c93193f76b087590f5428fe2b8d1cd66670343547ed8030937723b4a0a71e620d1ac518ae4a36231aced63d88171976ea1cf1d3c2c4b7
 DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
-EBUILD gkrellm-xkb-1.05-r1.ebuild 593 BLAKE2B 7f167d781e0eba76e6dfe4bf62e939f380ac062543cbc471e3c3a4061583b7d5e8c172e2ea3e26f1fa8f75e9582c9283792296ca51a831f123d9d7562144037a SHA512 7ca25520f0919d3482c577ab22bb5f76db74b67ad9527379e37e6976bfa4cc049521a7d13fce95c5317652361a14936b53963e3dd015aaebc7963ef7262a6331
-EBUILD gkrellm-xkb-1.05-r2.ebuild 677 BLAKE2B f36b9df5f570ae39f7f165ff2e8be708eda15bfd8182e6d2bad65b929c01756dea69c0d62bf8ae151f3ea1767d9ad3c0fab950c7b5f824a3b22f590197eb584a SHA512 91a26d5b2a7bb9d858a098bbc5a8d446da98a7813d4bee321f38e3d7cc46198963e1ab90eb83de77f8c699cd2d54ba0935eb65131f10ec13e5447df1fa53c311
+EBUILD gkrellm-xkb-1.05-r2.ebuild 675 BLAKE2B 4f123b3f914026e6f530ab0dc92232b9e89996d14ec2cc4418410fd231cc95cd34cc6abf915fed402c3d411a12f65ce71c4892bf06b71a56c8ef2689d5432e03 SHA512 4f2516e75db70d7fb2b62b2a46404e8b192887688d38cd149ddfd4443f57fb83cf30e9fe582e3f6fe4ec7bc1312466b44009356888949cce5c9d4aa8a0d770bc
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
deleted file mode 100644
index eb076714e07d..000000000000
--- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="XKB keyboard switcher for gkrellm2"
-HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
-SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-
-src_configure() {
-	PLUGIN_SO=( xkb$(get_modname) )
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
index c148d04e190e..310f806b149d 100644
--- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index bca71d600091..5d9ff8857ce8 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellmlaunch-0.5-makefile.patch 736 BLAKE2B fef75b45fe35864a6d39c7c521c270d15593a391272984a10a0a268c417c6dc8faf9a79f8276dcba030c8904abf086302625598c0ce3e3a6c27190fe7a36f2c0 SHA512 8222a135c201cca99d9d7a03aa583f1a731e2d9ae7f131b3dcc22edc47f3d2cd6b1e751571f9f74fa0140380b099b7dec98d471a3a6de1f7240c8460721c3175
 AUX gkrellmlaunch-0.5-r1-pkgconfig.patch 522 BLAKE2B 58131e54d657a6d96cad835b78a6e788e1f74e7cae974f94b4eb5f257a11989228facacd992e8c8a8f9ca528635e9a42ba41a9fe890bb570892812a830f79866 SHA512 a4daf4967d6124b542e1d9be435791dedc8f7c8263b85882d3a0971e0852c238d4d492df08dd4fd7824a4a163cd9c2b52ae248176ab6c049cc9aeb6927f2eda3
 DIST gkrellmlaunch-0.5.tar.gz 22035 BLAKE2B 444dbd76c4bba420d7bd9977f2ce25b9d0260168ea6a730d1fd009eaa0ea064804028c2103efee3afe58b928d858475886fd90c6d77e5a03b3c97ab8bd8c79d2 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693
-EBUILD gkrellmlaunch-0.5-r1.ebuild 634 BLAKE2B a831a99ab3d53a5c0ac500c15535ccf250f99f239d707abff46d594839c2e4b339864d05bc7fb0027de7eb13f80ebeeb2b56022797066f64a0f11bff83492b1f SHA512 68d55ef41cbfeabed9b5a770967c60fcc00098147754cc7643b99ff6f83b6201d34f69e0a7abd5b766786ffd4dd0adfafbdcffd7de95d37518843fa4895048d7
-EBUILD gkrellmlaunch-0.5.ebuild 550 BLAKE2B ecf5eb52c7a74ca09fc5bd4730bf39dbf7aa4f70b11d6bb1c21aa50f3967d1e77c41e4c6fa5b7f91c9c48cb1144dbb3bab6e31b514100dade28a4cacae0ce255 SHA512 c9baaee8ccd293fafdbb20a974e57a428d167f06e84cfb518758e6c12c77bb71336bf06e0ceef03d8d673b519de2978f06ea73cd07402bdbf3d6dc591f3fffcf
+EBUILD gkrellmlaunch-0.5-r1.ebuild 632 BLAKE2B c772ee402398cc4c75781b74a0b796211c07e2d8ca1fd22a62aa477171a83311b236da3c8f1c8b36c0ff8924cd40b698ac5870f714da161008f4aaa188c9104a SHA512 ad92d830989cf0ab8e12ec09ad5c5612a91388e279267cbcbe8d888c421e75916cd4146e16aad6d9097e8c7925f9a22e162c1aaf27f1f5df29d49aae5270211b
 MISC metadata.xml 251 BLAKE2B 09c88cd076345aaa3b80d5c3ddbccfce98bb684204d4aea0ee36216077a36ffb2027dd0ec5f9e9cb5a54578aec14245bd882d971e3742f3e95b3af747984811a SHA512 24ce090eda7993b4d5b28108664752950ee5db54e2628f43b8f73df213b593f8fdd6989fee948d104ff21d3cb332da5a770c793cbe40eb4ec48a56f238489d77
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
index 211389e40c8d..63baf176087c 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
deleted file mode 100644
index 410946fe33dd..000000000000
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
-SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
-HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
index 5951c711e98a..40e6c249f305 100644
--- a/x11-plugins/gkrellmoon/Manifest
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -2,6 +2,5 @@ AUX gkrellmoon-0.6-makefile.patch 798 BLAKE2B 2d1925d08e44e7fecab8bbf2c810e47c08
 AUX gkrellmoon-0.6-r3-include-stringh.patch 215 BLAKE2B cf7aa48b23f2196828b4e0d23a89c5f6074f5c6468d060e590fb175460ebcfb47c14096d0e1238d99f956092048df472b2a804f0dda56d3a746a77929ca4b56c SHA512 206fc699886bcfeb7c95c78a3cd3a958104c90fc981613af449183c5fa8c0993024063d9a7a43a3f389e7acbb8193403b5e4ea5163672ac5e26b813f8a8f9f61
 AUX gkrellmoon-0.6-r3-pkgconfig.patch 343 BLAKE2B 9dd91d5211957afa35070754e395ffd1efcfda5bb3631eeecb03f0bb6ced9de4f41d6938bedd8a1036502cb9fec38228e1a466e94f35997b39bae13f97cc49d4 SHA512 158a50c8569fbc012e7395b3858905563c258b0009666b4a7abb78d36cc5e4949ce6d97a10a01c4bc74fdaba4c095a819a750a0833350511a033a5b2fd285ea4
 DIST gkrellmoon-0.6.tar.gz 55035 BLAKE2B 1b72ffbb3f08bc7264d86cb1ff76ec65d79a5552c4857758ea5caffa8023fc1be4ff9fdfcc812ac48284af66c97fd4e4c6e3c19c0725cb422664621e3bd3a40b SHA512 d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
-EBUILD gkrellmoon-0.6-r2.ebuild 680 BLAKE2B 4a897690763097c88a1894c2da2dcf2f5730d3af143cb8440a424662631a23124643e403a88d6c806cc825648b94204643648649502c2aaecf1c812911ec4364 SHA512 61910e0b9d8d4cebdcfdd119f4aef6b2c3e48f0a3b109f255d15c0045efeb3c4ab3179b94e7c5e09256480a4319042249084bca3ff52d0b457692ff35f39d143
-EBUILD gkrellmoon-0.6-r3.ebuild 707 BLAKE2B 3774db81393665770b52efa3c0249250fd59c038944e777950452d5c69d98419ffa264506522ef1d78d483f3fe2a1e627cb8ecc3d22e9b38e8b71c371e54222c SHA512 11978013475defc9fea20a5ef33c7c926b15bbc80822ef889af203cebdca9ac8a16b1420e65e8efd8e2635b7512bb95f59c958782fe3f39d07a6139509b9ae57
+EBUILD gkrellmoon-0.6-r3.ebuild 705 BLAKE2B 040e5062b6cf5abfae39aa80ea1edfa9d83359554bb1b31b4c8fe52074f06267e86e158e493d68dbd107b124cfe43d8664fac895541a3bcfdfc6e8bc65104952 SHA512 cfbc1b981cd8a07ddad6f0bfec65eef42dc7fa7732f0232a082ee42929aeaa0878f06792806f9d46547fa9b55086aa7723af946cc364f1a8063acd74fb91de3c
 MISC metadata.xml 248 BLAKE2B 8dab82a6d0236055e054f2bc7f36caea9e7b113b0aab998e374681ebd8ad271bdc8588c4ad5bf11eb413e0984cb7cff7633c821bbfd2a6fbf25822f2ed9e5ac7 SHA512 a473fc9e669adb26f81e0223e6849d9afd5fcb0561ed81b6576d7b330184b6d2a1a92e32208155d8c405ae7f8eedf887e007b2fdb010ffe9011665cad26489c2
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
deleted file mode 100644
index 15a6d866c2d2..000000000000
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
-SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
-HOMEPAGE="http://gkrellmoon.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	media-libs/imlib2"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	sed -i -e '/^#include <stdio.h>/a#include <string.h>' CalcEphem.h || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
index 8533fbf46741..fc0bc2407693 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index abae15590710..1200ab83b5d0 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -2,6 +2,5 @@ AUX gkrellmss-2.6-Respect-LDFLAGS.patch 498 BLAKE2B 2eb34f01a8f20325f34ba6176d68
 AUX gkrellmss-2.6-fno-common.patch 195 BLAKE2B eaf45029a236aa63ac216d3a2d6e7f8481626b20f4caf3e5d24f83a09608c967cf162b261e87148911a72bab933ca799b0698f82971f90cbe156e1849d737e7d SHA512 40efc369491339139f8b54652aac155a995a078968b19d3a445d593510a655cbfc67098c0c8656ff22e5a3662824b3e9049d50a90a2a4c87b204887ad369206b
 AUX gkrellmss-2.6-r5-configure-makefile-fixes.patch 1656 BLAKE2B 37e96fc95069e98b8cb50ee7724b1ce733051d7ca9a6e500f3de00277ce7af8739ace3b9f3364fbe0e2f578894e684c2029fc4d66ef3f9e1baf184bfaad07894 SHA512 8a25784b09b35055c1c46f6310b8d71d009c9b95998119d562db93c43e57bce76a7dbfc8fe810243cea632e6ea6f197825932b59fbde718f4001f1d20ebeb464
 DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
-EBUILD gkrellmss-2.6-r4.ebuild 783 BLAKE2B f3ee89bcce9b1a9887cd65025ab8aea00a39595d7826bbc37e759ee5150c39a98b0b622d010ee9727a5e8a7e99e4396860b40aec766f6d53a4576f2bb56d7c1d SHA512 dd6565f756adaa5eb320849cedbd3c89201f6347e78fb4ba5972ffc1d4b3ac39d57c287dcfa8c865f388e9530c94229a3d5a36a62b38ae487f1a47f7acbcf65f
-EBUILD gkrellmss-2.6-r5.ebuild 892 BLAKE2B a78df295f0222e402e44e5435b10bb39ed1691f0fe3cd619037b6a530f629535b51395b60227c45ce0915eb6e219b55cb6fb7c7630a9e5371c93adf67a514dcc SHA512 922baf139c354c744369291308f23930f29ec791989461f519eaa1b41ea7b9a1cebd62844ef3873abb288239d7e1d527bcb7002ee76c83a3d64e5fe1a8f19782
+EBUILD gkrellmss-2.6-r5.ebuild 907 BLAKE2B 39c467cbc112f9b4dcdcee5c1ab64c32ff6a2728da42ca9c91a461d783b6b2ae0e846b21e51f339cb55a5a7d8c65d38381d625db0da0a72a9bf42aab30c09611 SHA512 54b349fe646f458a0fe4d288b2c863da3e5a8099674f2b7e93a65a0f32957a5eeb68ff758ee852b37e352e597bd36dffc1b5fd77cbad0453253492a404c27e0d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
deleted file mode 100644
index cfd3b71cfb01..000000000000
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
-HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"
-SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	media-libs/alsa-lib
-	sci-libs/fftw:3.0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-PLUGIN_DOCS=( Themes )
-
-src_configure() {
-	PLUGIN_SO=( src/gkrellmss$(get_modname) )
-	default
-}
-
-src_compile() {
-	addpredict /dev/snd
-	emake enable_nls=$(usex nls 1 0)
-}
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
index 33ca3455e91c..44913edd1d6b 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
@@ -11,15 +11,15 @@ SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="nls"
 
-RDEPEND="
-	app-admin/gkrellm:2[X]
+RDEPEND="app-admin/gkrellm:2[X]
 	media-libs/alsa-lib
 	sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
index 657f2a273e22..6e22f5318bd4 100644
--- a/x11-plugins/gkrellmwireless/Manifest
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellmwireless-2.0.3-fix-build-system.patch 581 BLAKE2B faba9c577d0bb7f72458999481e9181933fa0103e2e55a6d06122dcf9546c2a9e269153962bab7bc0177a9b1eb1bf2f6e6651b3110038361550b46e6e592faae SHA512 0e4725e1550487d9305f2f2500c12401558e9a1509852276fa3f7e49a516459f70e189c15a25a6320d24b77decba9749184e0a5a39ccc43ccd17f5e1392f0f96
 AUX gkrellmwireless-2.0.3-r3-pkgconfig.patch 620 BLAKE2B e11fc16f5ebf8c27665f9a433bee03a1f68d6354e6aa7d547146c5a8e72ba054d79848ba5fdd776fdffdf9647c6652a5cc445f0aa8b29cdc9094d1515ef1fcfa SHA512 4bba4e34e18d4e6bef622c5718127b99e0ec336256b1720e12ec2bb4b35add76518dbbde829d1373d84faf262a38fe1a827be6afdd30ee8fef857b5bef0234ea
 DIST gkrellmwireless-2.0.3.tar.gz 9557 BLAKE2B 74ad963540597bddadc8a8e110ad441a2341a36b10f8620c392179909fe4582d973f51a4f0ffc2fc552ae1917e1c70373992a3801c9e1fec1f162194749e788c SHA512 7d005502bd65ea16f589f94fba38e67dffec69974177d4e7b83bf50d805e431d64a8cd0795f21547100487a9cb4ed7c01883514cb2d66165f0a7b8aa91162ab1
-EBUILD gkrellmwireless-2.0.3-r2.ebuild 621 BLAKE2B 61abd813de331e43f2754f5cadd262c66309dda023ca10f0bc6bdb1dde3666cd12a230c2de56e3c1cc3008db45d3c05d77f11bda4e4512826560cd46ec1dbf9b SHA512 dad24caf5e92e3b3b6f3cf142477e8da2ab945064b055ab12986c208fcabe08382db942d9fc301136307699c62acd491ebb4ab8c78cadcbc6206567096886a31
-EBUILD gkrellmwireless-2.0.3-r3.ebuild 703 BLAKE2B a483a25987e75f74daf552a3823b08cd28af2a2287cf74eeff655643d70ec8989e4d345dd76d9fc716c63e5d09812fe43d536c4ef878d827f87c6f0f3e52c35a SHA512 30eccd8a8d76ebaceb6ba63a23ec62cb4bc3a9ea43abe2622032b41754b0f9f81d55f3dc92d2dfee705370560962b4b5079a55f42eadcd29c195288bfb293b5c
+EBUILD gkrellmwireless-2.0.3-r3.ebuild 701 BLAKE2B 98bb771b709359789ba3272d04831375bbc3d406e14102afd9d712e1bbd3ae69ba1d1ec2958ca2aff345a716638adf9904e8fa3241544786339cb653f219ddd2 SHA512 9a74d6d5b0ab64665b073d86aad85dc22fe8ca08b9288a742cac155931bc25a4915c00fa0410e80b0876d3ab0b8f574a85ea72fdda23ba51dfb08dc833887866
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
deleted file mode 100644
index 1edfe3999836..000000000000
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch )
-
-src_configure() {
-	tc-export CC
-
-	PLUGIN_SO=( wireless$(get_modname) )
-	default
-}
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
index 45819d00691d..e20fd3092da4 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index 57a3e71191b8..87e392c407b6 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -1,6 +1,5 @@
 AUX gkrellshoot-0.4.4-r4-pkgconfig.patch 657 BLAKE2B 83d9168314c216241894fc7ef354c8e271d1a551d4809bb03aedc7265314778ec3ae08f9bcf5070742fe45e40b90769cf7691bc27223cca7facdc3fb429adfb1 SHA512 02afe801966bc62dbd90cf573a25c196e0b4f4b3c31c98a464214cdf52dd6b09d5e686e04226160c90dfc392005e0ba9d8e4b1beac83f54693d7af6c520a3f87
 AUX makefile-respect-flags.patch 663 BLAKE2B 1129e147524560fd8a5ff2979453ed9aa0a8abb03b940d989106f18f887b571cd09a72454da05325b94c369ee72c4bfca2981945910ddd6e7c3e9ab1fe35b0cc SHA512 a58b16f0b95533be587f2fe1a63ba7c19ade8dfd9b432d2423aee3ff7b99789d662cb7ed0e04854ed1b315c106586c4cd527427b5ce395b3bbeffedf2c5fff80
 DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
-EBUILD gkrellshoot-0.4.4-r3.ebuild 541 BLAKE2B 746f277ca038103ccb9c7b98c847491fe6e9f3ca6cda44cf90b4470bd7dc19bfbb20b6b773ada9aa8147fb12c45d4f75540fac087aac70bca0fb0bb895c157eb SHA512 8ea26318ee2156ec26d4cbe03bed76aa639440e02c1759a893328bbbdea0d45ccd79035ca915574369c9e8c5a9426f523ae0e3b5f2bbeec0930046a0a5f919e0
-EBUILD gkrellshoot-0.4.4-r4.ebuild 669 BLAKE2B 67872e2fbe16db2041a1ef167086c61046fd872baedb2edc528577e8ee37aaa8087f4c1ed333a545a107d337313e95ef2f5afdbbefaa64726237a5f73fc8e9f9 SHA512 ed362b9bf861c0ae431f11cecfed83ea645ba488352e25a492252a47346cc7743220204750ed0354faa6976b664493637912aeaef1f50e7b95be6ddf6a06dbef
+EBUILD gkrellshoot-0.4.4-r4.ebuild 667 BLAKE2B 11ed230548f847cc54c2e92ac257d8fbce8ca8bf6f043b7601c2629824ee7d12f93c84ca696ba233a09abe71f21b292d9d79166e5f35d2c48ca776cd3d1699e6 SHA512 65a5c296d64ccf7f43b2edc643bc3da84713b7d3357f43dbc87e8a40cf9f1e4c81c6daf3b999924b6cdf11af411c75373800e7c5c928239c8e8f870939ce51d7
 MISC metadata.xml 249 BLAKE2B 3035b160871880c8efce1239c00a3560c8c7b2b8eda5ebe8dab078c77496de9815444cdb9e7440687681828490e7684c2794406444eedf71fa380f5cd3c35b05 SHA512 01584093d9f32130ab091c0101ca41fba98d46fc3670c9598f052ef4393659bc8fc964d4b6232c7724eb7d0e03e32901b231799a595fa7f6626b3367dd116a68
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
deleted file mode 100644
index e6674a3e30d4..000000000000
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
-HOMEPAGE="http://gkrellshoot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND="app-admin/gkrellm:2[X]"
-RDEPEND="
-	${DEPEND}
-	virtual/imagemagick-tools"
-
-S=${WORKDIR}/${P/s/S}
-
-PATCHES=(
-	"${FILESDIR}"/makefile-respect-flags.patch
-)
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
index 11e4c6eb7840..dff19004a2c3 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/s/S}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
 DEPEND="app-admin/gkrellm:2[X]"
 RDEPEND="
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 124cdbefffe3..beb83c6d5ade 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -2,6 +2,5 @@ AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 334 BLAKE2B 18bc916fd4d6834731cc02a720
 AUX gkrellsun-1.0.0-r5-makefile-fixes.patch 1508 BLAKE2B 558c23011152de5e63dd2238f489d34a06b20026a21a75b5b7bcb1f5757c826d1853a384949bc56622cdb98e39e0c5d7dfc816514e70ee6bb6706e85fd572556 SHA512 b2288158dcaaf1d9df341d7cac5b5e1448ed85d81384efb7e5f4b8dc2bcd28765be315c27cf35523ca5bd7b233726821a16f3b86b5150ff5c7faad88633dfe04
 AUX gkrellsun-1.0.0-reenable.patch 520 BLAKE2B fab0e90b893620b8d1724e21953845fbbc990948712f25ff0f4903ef51bcbcb00f3d3989cc8f9cbbc515daff3391c14a37a260f07309f3fe400915c293a8eefe SHA512 e4cfba81e20e08f2fc5fd005e5ff2e630a90f2cd1743334440b7f78f2de256959347d93f9e1c25416b9d151dd5465087dbf3e39a30429023cd9e9c635dcda229
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
-EBUILD gkrellsun-1.0.0-r4.ebuild 713 BLAKE2B 9805d4325f1fd913da2669f9571cd782bb79efe745136255ba54daf7ab40e7b9067313e5a7d8b957997204fd1b2b3a726f39d4515411421d2f9cf775690f3217 SHA512 be3a78bcaa82881393be99866a905bb93bd3d4462ae89002a49eea90f999bd792bd8c2d4cf4f98bcc2e3881482bffd6cce817f0c90a9edead5cab0b659a0a937
-EBUILD gkrellsun-1.0.0-r5.ebuild 842 BLAKE2B aa20027808efffef2051b21a30fa5ce8e94a85b5ad56e1fdcf54e0423f4ac40b27de3bd004226acd4113f0a818806d4b01af34e759189fa5c852f6e1de5dac55 SHA512 7a5aabd1afc55394d458c391b399cd25ae946a85786554f5f1d4710d981918f97c73c9a9ccc3727a174e92784a81bad476e48964490dcff251296aed0328fb3b
+EBUILD gkrellsun-1.0.0-r5.ebuild 840 BLAKE2B 57000d9e534b6b040b84a414ac44a376fa48f98771339cf48c43a7c9e38be420da7a55cae62c9f8e6c16da007a98b86c56f8e458a31d9eea55ccb9c10de5ad08 SHA512 fe0fad9ca89f929337728196a1d6e7e108e0909d62404436ef9fd8be7fc386e7c08cf9710ac5e4a6ba6c7e431499dbf023558336d7942dca563ef9803f3b061e
 MISC metadata.xml 247 BLAKE2B 2a5e52fe46bb870c82fb6f16e032fca8d7ee30da5d39bc7deae966d57cbb8d79d2efa4b36da3c415e74cfd49a9e7553254fc9c575838c86f433a53283fe74254 SHA512 fe10588aacdd43055f05ef7a9fd5147056c5de9d813740995e152972185872b30a1781a5b7096085fac3eea6bd80a45cc1679904052dfc701a0885344a5ca599
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
deleted file mode 100644
index 3e9401aa303e..000000000000
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
-HOMEPAGE="http://gkrellsun.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
-IUSE="nls"
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-reenable.patch
-	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
-)
-
-src_configure() {
-	PLUGIN_SO=( src20/gkrellsun$(get_modname) )
-	default
-}
-
-src_compile() {
-	use nls && local myconf="enable_nls=1"
-	emake ${myconf}
-}
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
index 7901504327fa..17262d6e9998 100644
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
 IUSE="nls"
 
 RDEPEND="app-admin/gkrellm:2[X]"
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index e0195ca97df9..9674fd90d136 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,6 +1,5 @@
 AUX gkrelltop-2.2.13-fix-build-system.patch 1088 BLAKE2B 8b8b00fde60ace4fc98848eb436224419f7ec1a13a5da232a28081ecb47825be039aa9a515768478d1bc0fb7114ba040929d9ac05edcbd78bcd0b24562e824fc SHA512 d53dcd1cce67b6b18c5e6ab3cf679a16510cfb8f811d90f47315a5d2161364ee47f1c975c85b26886145c40a95ef7c77a944a0056ada470c176d8791b2b0f2b0
 AUX gkrelltop-2.2.13-r3-pkgconfig.patch 1993 BLAKE2B 96ed9ff7e38513586dfcdecf7e714e53867c50eadebd96061cd99f743add1c0571c00ec0ebe1431e78889ed1142e6c98bb538f483ecb81453ffbce435eb16767 SHA512 edfe721f4a184dd0dee5d23c3bf13444f9a5fc4a54df414461ddf8098a3ff5e07d1b38ac54d7c3311b1131e8683b24795bfb42df5e02625f7aeb47ce6f5efc6f
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
-EBUILD gkrelltop-2.2.13-r2.ebuild 945 BLAKE2B 73554d39c2cb6085814aa2fe940ee4d5e410aca555db717d1460aac8644c9e8b65aa525f937ff25b33bf17f09dba6345042e2003aa9b682d54b00509c34f006c SHA512 94bd96cd7100d8769e447d98689a8e9fca101fac5117d10133065064dabcb2d195ca0c4738a72dc77d159dea1b0a1d0cbdeb640a9d37a0e05f071e99c986eaee
-EBUILD gkrelltop-2.2.13-r3.ebuild 1035 BLAKE2B d213cb7ffe8ad0ca10f2037fc7d09b416d5be174ac47d6cbb4484d88c1a4554746ce608917a30cf4d4e7f14e36848f7d3417d5ba298792de711d1d3fe1856481 SHA512 ad8c5743ad1fa86bdca730644c1567c21f8c76c67aa66c638a00be5d15297ac8b2f0f49d3d8320bd79389a531f6709d0a4e1a1a03619ea316d777308338e1f06
+EBUILD gkrelltop-2.2.13-r3.ebuild 1033 BLAKE2B 1badd5a8b37f4323ee7b9d33f49fc927301c25468876a0df20a3a10ca3caff38a8ad97b8554687644e141220c9549d155750c94856bc0b38c68c46103000affe SHA512 57fb73b4a65c452f91e99e3db6bd7ab84f9ff17853d6d03c8b22ecd38ccd5f1de05bf4666ebeb9e38bf2721da5034f342fc8cdd0c9305cdc69170129ae100314
 MISC metadata.xml 247 BLAKE2B 4c2928903af2aef15b40f59ae2cd005af84ac0552409301181fcededae0eedd5f7a7986106c9b25b25f6a170e18c9e5115ea14711a0639b351dac2cd6205bfbb SHA512 14c94ed4ec200fdcc265fbd2a1012c9cb143d98a6a28bfdad509c834a742803b1a62398034a36e4160b216f250f01292e642dc05621162008633e3ae4484faf1
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
deleted file mode 100644
index 337fb6a341b3..000000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="X"
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}.orig
-PATCHES=( "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch )
-
-src_configure() {
-	tc-export CC
-
-	PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
-	PLUGIN_SO=( gkrelltop$(get_modname) )
-
-	default
-}
-
-src_compile() {
-	use X || local target="server"
-	emake ${target}
-}
-
-pkg_postinst() {
-	einfo "To enable the gkrelltopd server plugin, you must add the following"
-	einfo "line to /etc/gkrellmd.conf:"
-	einfo "\tplugin-enable gkrelltopd"
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
index c9faf9266655..20a5fe01ba0f 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${P}.orig"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index 0918b190ff89..fe03fd3c8649 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -3,6 +3,5 @@ AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 398 BLAKE2B bfcabffaf7c27dfeef1806
 AUX gkrellweather-2.0.8-r2-makefile-fixes.patch 597 BLAKE2B 7f2f3a6718dce714203d02a42c04721c591c49b7ed4c1faeac2e190d700ae87b0edf5a0568984295c1763e620db8849c05673d73cb7c1877e7d19ff8af345097 SHA512 43a0f81a7884a37f7a3436004aa32ccffdcebbedd19027a01edb87e2e3447485d1eee33607787bf75586177e051c171435105a9e661ce1ac701d6800d5925eb2
 AUX gkrellweather-2.0.8-update-locations.patch 567 BLAKE2B aff5c3d4bb291d0a97c21c946c81aca539fed0076f553a8570d5a76ac597061fde58a4dcefcd3de6e5d2ecafcf3aabdcd7392fe3c07649534a09809e357ae318 SHA512 963e81b73812fb1bc18e2c29bb8f69b655032441b537dc7a3a083e2331e0337a5faec86940f2779546aa024d59944fd6d5fb7f88f474d2e22532bd85cbe37c6b
 DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
-EBUILD gkrellweather-2.0.8-r1.ebuild 1009 BLAKE2B 2bbc1ad4813f494603f36fea6299b4638b434a82ded3c68847d374d30816aa37dc9ecbf16c659a944351058e0c5860be86d77af3a6234f029bf74bafbf8f1fa0 SHA512 ba2136390538be84ab3c7351b9fdcd4f3c573445ae2e2285a6a3750083eb039d71e11a9a5f42a32d366c22e3c41c54dddb8b3979491c00eb489bdb2f908aa91f
-EBUILD gkrellweather-2.0.8-r2.ebuild 1076 BLAKE2B 07e0d18a50dafa92c8be53a43c9f854535892fc51a83958507b0e7ddc24ccdc0e0d7c2dab90ab17a4adb10d87bff3c963b039a830cbecb94ac018faf12f9ec4f SHA512 82ebf77294bd4c25bdaf45e8c00fc80dab8e005ed7553cc37130f3f5eb209b86421d48165b8938f9d8f66209177d9192c2acbd02dce8d6558bf467a34158ff16
+EBUILD gkrellweather-2.0.8-r2.ebuild 1074 BLAKE2B 338e37db6fbdc644b4144936ae17e63c7b53a9c235efb88de9088c8ffda62845515248ca7e78efeb902aa5c29e05ff4479d4ce4e1f651d6bec0e5a1401958626 SHA512 8a77fdebe5e9172a9e3e07fd202776551b77d0b6481ef698dc69753c30f46b70bf86c59725c705611a136f6105fea5798dc0aec7b3092e3f5c074b323681f6eb
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
deleted file mode 100644
index 4e0e596730f9..000000000000
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
-HOMEPAGE="https://sites.google.com/site/makovick/gkrellm-plugins"
-SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	dev-lang/perl
-	net-misc/wget
-	x11-libs/gtk+:2"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
-	"${FILESDIR}"/${P}-Move-GrabWeather.patch
-	"${FILESDIR}"/${P}-update-locations.patch
-)
-
-src_configure() {
-	append-cflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
-	append-flags -fPIC
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	gkrellm-plugin_src_install
-
-	exeinto /usr/libexec/gkrellweather
-	doexe GrabWeather
-}
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
index 1a70885d8d3c..eb3d8f00ee1f 100644
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index ee113e9efa7e..496b901e577f 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,6 +1,5 @@
 AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1238 BLAKE2B 49429c7abc390c47b4ddb145c5535c231449d159ff7513c1cfd5f43d163e1a2654d7ef17697cf9cab88f777791a54ed734747d7271af79634fc08e84d8d5de40 SHA512 a8b360331362b8e7e8bea301be2867728568297c16981eea0e66a002e7195aa97bc12346597ddc676d8bb7c2bef686bd1285447c405046de0ad3e308404d7b87
 AUX gkwebmon-0.2-fno-common.patch 1058 BLAKE2B 68205c69c36e48678886c3bea5b0b14d4755d05a389daa6c2ee450f4fb543eb3fbf30618ec99d315b34d0de379af4c7ad13174de364ca4b46ce09c3be49a7176 SHA512 225b7767284aebfbc1437810930442c342f977abfe8cd3af8ac1b8122cb17964bf63388a56265febe20914bf4893a258d4fddb9d895abe0048239d8ab78e208f
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
-EBUILD gkwebmon-0.2-r2.ebuild 650 BLAKE2B b1638457a53d8386585cdc1d5c16e8b97f64e609847777be5f7aa9af7a3a8146f34779ad6b83ff61199ac73321350a24c426bbbcd861e9407fda0e13be5621df SHA512 9b272149667e072861b7456129ae21c5e41e3e9596fbaf5cece5bb9e23dea8c3eacc1c31aa000c63de6d20957a201252e359b2f58832c48c25b7d67c48a04a1d
-EBUILD gkwebmon-0.2-r3.ebuild 686 BLAKE2B c9486d3af791ed0578e797ff65ec841c807f2006eed4a6ddbee009808ec0629f16635dcfadbadde0da5a135c0ecb50ff6e105a8def8896f68dec609f326a11ca SHA512 7b59ad82eff80c24548cbeec129ad27010675d403e624ba75b7c45067a72f866d9fb2497dee76fadd2f9b8fbeec3db41887f990d251929cef8f72b63c12bf20d
+EBUILD gkwebmon-0.2-r3.ebuild 685 BLAKE2B 704f0acffb3d66b9bce11aa6a4264bfdd59d5ab228af204a61a725ddbce3cd90f6e4a79214365e16f7ba873fb5f660d01baad5d44c4732fd582dabb4d9cf7c89 SHA512 22dd74fa240b4349d60075e9db212f39795972ceefb3a0bb13752365b5b1fbbf340fd9d3ee8b218de042c1923984f8acc271ab7cbd97a751dc760198ebc358e5
 MISC metadata.xml 246 BLAKE2B 6e3f7cdeb1f95de89856a15ffdc5dbfecfdc2dec3a2df23741cee8039e308606e83ad6dd8a6cef5ebea03a6190ca8187862a25cc5190e6d87fad9b61f5a4a64f SHA512 5f0130c08de0233452c1eaa9d1686604a809fde5603e4cf40d5b1bb8fc6168a1915e3d01c305987dfa630cd85c3c8999100ffd0f69d75c22849dedfd89b5b44c
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
deleted file mode 100644
index b915fe941137..000000000000
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A web monitor plugin for GKrellM2"
-HOMEPAGE="http://gkwebmon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
-
-# The Makefile links with -lssl.
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	dev-libs/openssl:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cc-cflags-ldflags.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	emake CC="$(tc-getCC)"
-}
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild
index ed50957c7417..47a6c69f5225 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 
 # The Makefile links with -lssl.
 RDEPEND="app-admin/gkrellm:2[X]
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index 96d23f5cc4e1..9b951627824f 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -2,6 +2,5 @@ AUX i8krellm-2.5-Respect-LDFLAGS.patch 187 BLAKE2B 20c7ea678a56d705c2289bec2690e
 AUX i8krellm-2.5-r3-makefile-fixes.patch 1459 BLAKE2B 3cc267b4ff16d339430d1d19dcc011a65dfb03c5db86d0806fe41f05f9c73736d9ec0dd4bcc541923fb9fb8aa796e942d030436fbb442ab8b04737d63c0a1b2f SHA512 7824a0682c25933152398f3e99f771db9f778e09a63344bffa8dda86968a862cc6b4f8d89893a9856bb133483b2437feb8c20d04644579ae25f0fb4f841e4aad
 AUX i8krellm-2.5-r3-rm-gkrellm1-support.patch 1319 BLAKE2B 825df0a3e71a48c84d79552090c4f3fb0fdca803f2420381c9caaf401f5f089a482cf7f54ecde086d5820f797ed204a9525d07d9e57c1c7a2fd0c52acf9f6daa SHA512 d5c6f417cf7486e05e621054c84dba13b174e33684e32a0d3554cb5c64477661691f9388904329ba71c928e5c580193ecb82a7fd2be9824ad1d675cdf08d582b
 DIST i8krellm-2.5.tar.gz 15378 BLAKE2B be6af7ce0ee2986fd5463fba2b747721407fe3d06bcd1ae7e30dc273a883fd2f9a092ab73b97b6f7d20dd87454eec28db9e12d701dcaec4dda9267af889e662b SHA512 d1cd452fc83c24369b4773d959e0182bd5c7fe317bed6a1df716c1576f5ba078a4e82d202ff641f0784532b77a51d466e57ffc675895a1875a868d92caf79576
-EBUILD i8krellm-2.5-r2.ebuild 509 BLAKE2B fece596d5c46ac1b92a0a2db1ffedaa01a8501cab672a4983c267e0b5a221fee4ce20c9b2d442db5f66006e2d0c09f53723223a8a0b57b8c160031d9a9e3587f SHA512 dda3d7d3a229cb49908a9d2a9b828b95b9361dbcd20c9a2c2c1de0cb477672aa605aa42f64498ca125959afa668233074d06c6995624ed223700df1e2ec0b7d9
-EBUILD i8krellm-2.5-r3.ebuild 703 BLAKE2B 7fe6be4964ff3b2f220c43859c3bc5a08e082c06d439132671c3058a587b35361b48ed8c88c473ca4f06fd63b30ac3738943e7664ec1b8ee784c8926d3eadff2 SHA512 12bb2e69f2176a508e26895bf02cf86a88913de1f42f600f0c91e92a414e5b176ffc7a1ce06295308060a7b3d9d0fc4f23a939a01f6c30b6d226201b4ca9a420
+EBUILD i8krellm-2.5-r3.ebuild 701 BLAKE2B 431a406a6c759c1596e02877ee7ff8914256aa0bb2e6ffa0f91385a5316c40d347c92644b054e5ee6a160c689995c47f5d4e458680a6e76785276a6fa1bee710 SHA512 e951526eb93486ae9dba18a63cbbc694f49def754eab0be50bc5c1d91ed02986727edcbda2247033ef98d1f889504e296b229cc27b7b0c379a5cd128b74839bf
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
deleted file mode 100644
index 3940327a3c51..000000000000
--- a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin
-
-DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
-SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
-HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-admin/gkrellm:2[X]
-	>=app-laptop/i8kutils-1.5"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
index 5bdff0ee4969..480e35751f2f 100644
--- a/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 601fe1c54c64..a6588328eafa 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index eb1913486b48..985b3857a4cd 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,4 +1,6 @@
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
+DIST kitty-0.26.0.tar.xz 4719488 BLAKE2B 02e06ed8dd6bfdca789efe53211a27855582b2baa845558efd454a9ee8d2d6a71749f8baaad6ac6ba3f5b0878b2786302a26be190dec544488c3918de70ab581 SHA512 e8e041cb8cbe8560e35126d9f717111e0094ef9dd260ade07017f36d8e8e18fd4198cf186198b78089b8a05baa98a512d273b24b7f3f0d4f9f6d06107eb76c58
 EBUILD kitty-shell-integration-0.25.2.ebuild 1476 BLAKE2B d07578dfe48ab8aa3ff01b4ed91e0e9e1d357f00d0931d2a4beaa8659c843b130108ce925bb37fdb4679048e1d9bd90a64aaa95150eabb3e6c9b195e504a1bc3 SHA512 0f74797060755fdf9430efbbe5e7d56182b38dafd1d9c8bbf25d01e932e1bc95fb5e774064667b66f8beb8ab1e0772174746506bb9b156b88131dd23a14d82c4
+EBUILD kitty-shell-integration-0.26.0.ebuild 1478 BLAKE2B c9751a6a82bf10a629f06b6099dec2b6d08c0e4d961e6c8105ce7e975e849161bb09a8990a0ed971f96e4ea0787b87e64074d705e807fba6dbef3c3494ea495b SHA512 7f5f6d48619adeb300727cc9b30ef97403a2f6da00a45661cb8cec489ea9ccab02a48ba502d8099175342d832ec9ad98f82aff87bf5ef5d1df50ab7971d8fcea
 EBUILD kitty-shell-integration-9999.ebuild 1403 BLAKE2B 9f1e4aebc1103678d42ba5809c41848b2ace36e2ed0137bdb0f30048cb4372c61f80e509a8087a52b149fe25115ca8aaa511d4697459e1087bee65788055dd85 SHA512 d7674435c3d3d9cfd04d47889f9e0f1cb4e60a6dc3506529829b3782e958fc3cb18fe8b0a25463725128106d6ca8308a17ae961b184e13682a1b05852e22ce4e
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.0.ebuild
new file mode 100644
index 000000000000..4c3e987c411b
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+src_compile() { :; }
+
+src_install() {
+	# install the whole directory in the upstream suggested location
+	# for consistency (i.e. less variation between distros if someone
+	# ssh into Gentoo), then set symlinks to autoload where possible
+	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
+	insinto /usr/share/kitty
+	doins -r shell-integration
+
+	dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash
+
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
+
+	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
+	# zsh integration is handled automatically without needing to modify rc files,
+	# but may require user intervention depending on zsh invocation or if remote
+
+	# this is used internally by the ssh kitten and is not useful there
+	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
+}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 94cbbf0e0946..f9adf0961772 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,4 +1,6 @@
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
+DIST kitty-0.26.0.tar.xz 4719488 BLAKE2B 02e06ed8dd6bfdca789efe53211a27855582b2baa845558efd454a9ee8d2d6a71749f8baaad6ac6ba3f5b0878b2786302a26be190dec544488c3918de70ab581 SHA512 e8e041cb8cbe8560e35126d9f717111e0094ef9dd260ade07017f36d8e8e18fd4198cf186198b78089b8a05baa98a512d273b24b7f3f0d4f9f6d06107eb76c58
 EBUILD kitty-terminfo-0.25.2.ebuild 618 BLAKE2B f28c7bc4aff671b8f2df8094f8abd881b9bfe0580fd84e302fea050235f5932c34636e407d87afb34ee1fe2e7006e1dc1a1902d9a914cfe4aa7372fb7d18d368 SHA512 971734b7d326df234fff57c14a17ce6da9e9f97dc86ea412b9521c76e0c06fceadffcb708db781d85d5529a6ec9c829dcd5f8210c36c06b73f6ce05b9be729b3
+EBUILD kitty-terminfo-0.26.0.ebuild 620 BLAKE2B 84d17d934610d200dd4d556462255c9f6ee5fa90553b81db4dc764a9bb4026d74b874f19ef92e3aeaaaf2856021870199518b66e633212896aa5b9d4f5255b8a SHA512 a9dca5ba4c276df302fb5df4507294bdac4609398ed441b242dba8459d2d58306c29a49373278f428c1d86a3e9e426f3605153252aebe9bfac5af00e088fac18
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.0.ebuild
new file mode 100644
index 000000000000..35ff98034a87
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+BDEPEND="sys-libs/ncurses"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/terminfo
+	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 0e06843da6b9..386d2a92d0a8 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,6 +1,9 @@
 AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
+DIST kitty-0.26.0.tar.xz 4719488 BLAKE2B 02e06ed8dd6bfdca789efe53211a27855582b2baa845558efd454a9ee8d2d6a71749f8baaad6ac6ba3f5b0878b2786302a26be190dec544488c3918de70ab581 SHA512 e8e041cb8cbe8560e35126d9f717111e0094ef9dd260ade07017f36d8e8e18fd4198cf186198b78089b8a05baa98a512d273b24b7f3f0d4f9f6d06107eb76c58
+DIST kitty-0.26.0.tar.xz.sig 566 BLAKE2B 9f05eb2083ea59f41284dcbf405be46f99fdc910167b522c4d281d8626e59d2e843f82f4526c17d7370e17bf72c3c372e490704702dc851fb3623fae7210db76 SHA512 c9057512767a6a93cd2ba1e621a10a1979aa4788a2fb16e5747df915647efe4a981cc1db772588a8f331d1988bb6f4918cc5e071bcd4dbbe86a7fc228d0856c3
 EBUILD kitty-0.25.2.ebuild 3564 BLAKE2B a1399f7f37f98dff758acdb95099abea500b529dff0be0b7a2d37f40b1f3373c4a5b4527a846b89cd194cf01eb52122e3487446066bdcae317f1ae399cfea167 SHA512 b37438a48ae27c198a9e7be0f8d8b3f3735b77329939630122601013d57fea8e9e4d7d821601ca3444bb15526c2afdc7ae0b3aace48a1305d78df7a0a0b4e909
-EBUILD kitty-9999.ebuild 3534 BLAKE2B ab8d87cc0831f3099955d353f8f89974523e5fff0ed3b7aa8f9c4c375f64769696a33f4f3c232d53e4d2cd38f48e4b6f5a9a3594918eca170c6b49fec58ece49 SHA512 b9f4807ae45fb4e43a95434fec45cfb5a6598007c0ec5404fd58fd513e29a313e5ee60c918065ab19dff42d6d46240c11ce9bd3ddd78c237510dfa508f748dcc
+EBUILD kitty-0.26.0.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
+EBUILD kitty-9999.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.26.0.ebuild b/x11-terms/kitty/kitty-0.26.0.ebuild
new file mode 100644
index 000000000000..3ee9cbb30121
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.26.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
+		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Fast, feature-rich, GPU-based terminal"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+X test transfer wayland"
+REQUIRED_USE="
+	|| ( X wayland )
+	${PYTHON_REQUIRED_USE}"
+RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
+
+# dlopen: fontconfig,libglvnd
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/openssl:=
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libglvnd[X?]
+	media-libs/libpng:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/libxkbcommon[X?]
+	x11-misc/xkeyboard-config
+	~x11-terms/kitty-shell-integration-${PV}
+	~x11-terms/kitty-terminfo-${PV}
+	X? ( x11-libs/libX11 )
+	transfer? ( net-libs/librsync:= )
+	wayland? ( dev-libs/wayland )"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	wayland? ( dev-libs/wayland-protocols )"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-libs/ncurses
+	virtual/pkgconfig
+	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
+	wayland? ( dev-util/wayland-scanner )"
+[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+
+src_prepare() {
+	default
+
+	# seds unfortunately feel easier on maintainenance than patches here
+	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
+		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
+		-i setup.py || die
+
+	if use !transfer; then
+		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
+		rm -r kittens/transfer || die
+	fi
+
+	# test relies on 'who' command which doesn't detect users with pid-sandbox
+	rm kitty_tests/utmp.py || die
+
+	# test may fail/hang depending on environment and shell initialization scripts
+	rm kitty_tests/{shell_integration,ssh}.py || die
+
+	# skip docs for live version
+	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
+}
+
+src_compile() {
+	tc-export CC
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+
+	local conf=(
+		--disable-link-time-optimization
+		--ignore-compiler-warnings
+		--libdir-name=$(get_libdir)
+		--shell-integration="enabled no-rc"
+		--update-check-interval=0
+		--verbose
+	)
+
+	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
+	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
+
+	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
+	rm -r linux-package/share/terminfo || die
+}
+
+src_test() {
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/.
+
+	fperms +x /usr/bin/kitty \
+		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+	optfeature "opening links from the terminal" x11-misc/xdg-utils
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 92a0509aac27..3ee9cbb30121 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg
+inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -32,6 +32,7 @@ RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
 # dlopen: fontconfig,libglvnd
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-libs/openssl:=
 	media-libs/fontconfig
 	media-libs/harfbuzz:=
 	media-libs/lcms:2
@@ -67,9 +68,10 @@ BDEPEND="
 src_prepare() {
 	default
 
+	# seds unfortunately feel easier on maintainenance than patches here
 	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
 		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
-		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
 		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
 		-i setup.py || die
 
@@ -92,8 +94,7 @@ src_compile() {
 	tc-export CC
 	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
 
-	local setup=(
-		${EPYTHON} setup.py linux-package
+	local conf=(
 		--disable-link-time-optimization
 		--ignore-compiler-warnings
 		--libdir-name=$(get_libdir)
@@ -102,16 +103,15 @@ src_compile() {
 		--verbose
 	)
 
-	echo "${setup[*]}"
-	"${setup[@]}" || die "setup.py failed to compile ${PN}"
+	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
+	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
 
 	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
 	rm -r linux-package/share/terminfo || die
 }
 
 src_test() {
-	PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \
-		${EPYTHON} test.py || die
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
 }
 
 src_install() {
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 57ffaf3dbb5e..efac5c84b610 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index 1c10c80ce0cc..729599e83e49 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,8 +1,4 @@
 AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288
-DIST evilwm-1.0.1.tar.gz 31468 BLAKE2B 64ee8c0e429c4eefd908a700e727845f2de1e7531cdfb51133014c05cb350eb0bed02476f8a81155b5f70b6b164279ce220aa82d2e9ec8d017b54076a7158f6e SHA512 f9a5abe13ce7ae9fa9a72962316dd7a847419f29a6ab7270315da5a71058c51bde620d34fa690f9de29838490e1da68efe72c6ef33745d69e3e026de98ed3938
-DIST evilwm-1.1.1.tar.gz 40150 BLAKE2B b595e9267fb7421bdcf1ce1c6f37559ab62e58beb11aa755bd21a141ad66387a7e95106231277caff84579bfd61183a554427319c7d85ec20716c69fc3cd0968 SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d
 DIST evilwm-1.3.1.tar.gz 64824 BLAKE2B 1145662c1907d27c39e55a4eddbc37c51a7b8d92dfa39b98c98eefdf419ebbee1bfc8889725ac38158f2b15e78e0d1a5a202584bc248cb93797c2ba05fbae5c2 SHA512 551ed96884792a6e607b0abb582bed68e583e7790773960a9f5ef6d974a7695752b4f2286d1549c2ca2d8f99b6401deb4e6da11e56bf6ce1fcf828370b072d75
-EBUILD evilwm-1.0.1-r1.ebuild 1221 BLAKE2B 306aacb8aa62d6714197febd6330a0a665329efb02fd8cddd2b479a2f28917dc8cfb89341b3164c0e3f108cdde20408ae67b9772e2833cc9eb92809273a712f8 SHA512 c556cf1863f411413adf27d93c8fbc38718cb4ca8ce9e82f2615a7ee02eef6e047867fd39f31b042345472443d6404f8bcb0eb7fd97264b4cd09c386b3d17baf
-EBUILD evilwm-1.1.1.ebuild 1116 BLAKE2B e9bea1716873f640641cf308013c04461b410ca13f974cdea94f73145f83c7cf8895919a204d15af4cd5dc8460e017d75561211b2df7c7b4f230e02de3ed8797 SHA512 52926c749e4adcfaeda8b2e4917c506f9400dcfcf1e49c24e63b7b6182825a4c98fe9596c47aae00b23b139d727a90a9dbb13b81cc262f99fa596ebf8cddfb0b
 EBUILD evilwm-1.3.1.ebuild 1110 BLAKE2B aa50b0ce7d793dee20020b132d0c426380246acc8f6c7a56c9b2a4d4bd1f28bcaa3715cce81233b38944afaee15f4a0f690e7ba16b74ef83b98a19298b0b506f SHA512 b47f6ce8919728c01086479c94068638c73d57d62bf9647073673fb27187d0af5d2a276fd3d8149e46c79c99e5976fc63b1448f1668c9682a1411b9cb4cdfdd5
 MISC metadata.xml 660 BLAKE2B 6c35fd17e5e7e2fa617f985cc191443aca66ccb0ee73f2d08977e44dec5ace90a46b0d8ac8a3cf9b8b40c4e327f817915bd1bdb154b6f7a2dee127edf4cbb1a2 SHA512 decc23b07fbe6e3b6ee2c02edfb9951e962aa8e8fabc7bde178e4db52925f782a95c13afd3ceac0432eac1f9ef2d6e0e77ac5de53bdb505088f5a9da06d5a17e
diff --git a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
deleted file mode 100644
index 43bdc21161b8..000000000000
--- a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A minimalist, no frills window manager for X"
-HOMEPAGE="http://www.6809.org.uk/evilwm/"
-SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
-
-LICENSE="MIT 9wm"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXrandr"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
-		-i evilwm.h || die "sed font failed"
-	sed -i -e '/^CFLAGS/s/ -Os/ /' \
-		-e 's/install -s /install /' Makefile || die "sed opt failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" prefix="\$(DESTDIR)/${EPREFIX}/usr" XROOT="${EPREFIX}/usr" LDPATH="-L${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="\$(DESTDIR)/${EPREFIX}/usr" install
-
-	einstalldocs
-
-	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-	domenu "${FILESDIR}"/evilwm.desktop
-}
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
deleted file mode 100644
index 3b606f61497f..000000000000
--- a/x11-wm/evilwm/evilwm-1.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A minimalist, no frills window manager for X"
-HOMEPAGE="http://www.6809.org.uk/evilwm/"
-SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
-
-LICENSE="MIT 9wm"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
-		-i evilwm.h || die "sed font failed"
-	sed -e '/Encoding/d' -i ${PN}.desktop || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install
-
-	einstalldocs
-
-	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-	domenu "${FILESDIR}"/evilwm.desktop
-}
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 84e265a8083e..90166902ba52 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -2,6 +2,5 @@ AUX windowlab-1.34-fixed-font.patch 385 BLAKE2B e137d399ed40bda9776316f0b2fd5be9
 AUX windowlab-1.40-gentoo.diff 1621 BLAKE2B eee189cfc54178f850225c4226a1cb70d131ad9417e9f8e000a1a56aaa3ddcf35dc65f4958937a0f40e020be966776a2f61f4797fc4217e128189b3bda4eb771 SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd
 AUX windowlab-1.40-libdir.patch 579 BLAKE2B 2dfdb96da3e156df9865afff8ccdcbe3c0bb677c4c28a47579868aa787e140cb15aacff38b87a92d3f03748a7a754dc1cfe2c8bc1f57236490b244002aaf873f SHA512 3c7784bb0d75cb9e491f918fceae4123f7c5f669e78e3a626a1784b9083f542f6dacbf94908539e3da647511bf658240796794dc4df092300e1898f79fe0a8c1
 DIST windowlab-1.40.tar 174080 BLAKE2B 9091565b40e886f921f33251c293b39ad4ec544a98d91046e52fa4e1aae66141934645e724ee224750dd7c50fba5a45fe2b4482c46e860c752a10c2b00dd05a5 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d
-EBUILD windowlab-1.40-r1.ebuild 1056 BLAKE2B cf7eca457b2b92aa2c98e75b58ef968776a04d0a20d2bf35831d34afa6957ae0b158009c6d4dff7366338e10287eacb1153e8a284485ca9e5e1cbd36026af451 SHA512 94fb9dfcb2b13c3c591036d05b6fdac34b0972cbd06fc779b8aad08e8ee2c5bd0e0e51c63e86b9f2e30337f383a379711ca8f7b3054abfae20e7adc2783d17f4
-EBUILD windowlab-1.40-r2.ebuild 1127 BLAKE2B f6227751587578f01b5f6d9dbf0532492af1afbb9913d0caee26eeb84f9ee477b6cf0407d39b958d4c3f63d15d04ac0addb4af2a6afbb1ea01ad1566df583508 SHA512 794d7dd96389921c721c969e29c3dcedef5b122ebc2c16bb787324f9ed6b0bb255ec7dc652f0280fa0556e33d77d7903b71c040800eecf94bb750683eeedb77d
+EBUILD windowlab-1.40-r2.ebuild 1124 BLAKE2B f194c1c5090400b48cfa79ee4c7f4180f5684aa150f82d4ee5e37e19eee5a9c555692746e3d6bf2ed3b617121671f7c4baf71fe916ad02ced696e551e02f5461 SHA512 1ca8746dd51e1288c8df355da3a46b626656814e3c6fdd77626e89a3f7e5e1983849f69f80685d79fe0e4d1704f6682b75d960d86a1a3c65f76ba5e26bf8c3ea
 MISC metadata.xml 746 BLAKE2B 0ea6f7861ef16880dc5e900f1a5164b42c70e9d4808e5a19fecf6cf6ed45cb4a6aee10ac1e94e9a0458e46aa14705c01c505e61afb1bc1b8412d46efe11ced1b SHA512 417ec354ef36d2cf99373fb8b88ea5aecf75158c4e5135467828fe56e5763d19d37af6b9728c74a089230eb66036bcd0b8c89508ae7cbc49bc1b503f890e32c1
diff --git a/x11-wm/windowlab/windowlab-1.40-r1.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
deleted file mode 100644
index b8af8cf8cf79..000000000000
--- a/x11-wm/windowlab/windowlab-1.40-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="small and simple window manager of novel design"
-HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
-SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="truetype"
-
-RDEPEND="truetype? ( x11-libs/libXft )
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/${PN}-1.34-fixed-font.patch"
-	  "${FILESDIR}/${P}-gentoo.diff" )
-
-pkg_setup() {
-	if use truetype ; then
-		export DEFINES=-DXFT
-		export EXTRA_INC=$($(tc-getPKG_CONFIG) --cflags xft)
-		export EXTRA_LIBS=$($(tc-getPKG_CONFIG) --libs xft)
-	fi
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	cat <<- EOF > "${T}"/${PN}
-		#!/bin/sh
-		exec /usr/bin/${PN}
-	EOF
-	doexe "${T}"/${PN}
-}
-
-pkg_postinst() {
-	elog "${PN}'s menu config file has been changed from"
-	elog "/etc/X11/${PN}/menurc to /etc/X11/${PN}/${PN}.menurc"
-}
diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild
index 521a807b40c7..250ff0d6f450 100644
--- a/x11-wm/windowlab/windowlab-1.40-r2.ebuild
+++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE="truetype"
 
 RDEPEND="truetype? ( x11-libs/libXft )
author	V3n3RiX <venerix@koprulu.sector>	2022-08-29 10:46:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-29 10:46:12 +0100
commit	d3fc35858ba4bc0c8038a8c536246b00fe648358 (patch)
tree	416e79067bd12fc0b43e12f1b73ee15a62b8a5bf
parent	2512faa12f58e69a2f3e27e13e10fd0aef3ab384 (diff)