Sync with portage [Wed Apr 6 13:17:10 MSK 2022].

2 years ago · 1b921f2e09
parent 690e426256
commit 1b921f2e09
1768 changed files with 13438 additions and 5633 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29618 BLAKE2B 1de539449d50aa0263569adb67502c812aa7a60d7f10a2301460b5b1a1d89d5deade44147a9bb5cc0cf142ca31238fdf98d88107f1bf62b60ca5dee6e4cc71e4 SHA512 919e7b19c36565e387ec93c6914b9e7f920c22681ff971d2da31e5df4f6a6c84e001f3de862333d65d187734504403de865cfecbee50d1850c3f017e406d9b0a
-TIMESTAMP 2022-04-05T07:09:14Z
+MANIFEST Manifest.files.gz 29645 BLAKE2B 398b4bd2999b87b6694a962aea63e04ca8c3dada5b9b6f88d12d586aa22dfa76ce45ca557b4ae32686466df7d5a67890854e53d2e726998b47c6a40139a4e06e SHA512 86b4525f80b3504b5a0918d33c79ef0411dbaab69ebcf2e87e5c1a19e0b864f98e7aefd1c5246e63ed51fe2cae66011b708e49db291a032b31b55c5160e6c30e
+TIMESTAMP 2022-04-06T09:39:11Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJL6xpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJNX79fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDOCxAAklCbWrOCT+9gh47DZcvEphaQ6kA7rEEWJyO4vAZOt9+NA2sikDHtpVly
-4pvJFxy1C9dILALo668GpeIkohFzGtww9iSC8sS4rB4zACMqyAL/FkwQ6cRu7CdT
-oQEyOQjTAgvoi3sXMQ/Xjk3tp1r4+lpN4FfttYwEPxnzazr9yx0EH9+mVXMrR5LT
-cOgZ13ABuiMFIGaoo+7cenIa9HwTwGp5UtQfH1r/mUdWtuxP31rcntJDH6Q7Bl/l
-t8O7rJM4T2H2Vd/gPVi0jocFtexUtUpFlN1p/QYJu/TatNF2IdIVaKR2N83PS8Vn
-limk9/8XEppv04LyhZfQ1lf2xhrseqbXNGtmQQxtVJDPYYX7RNBp/uRJpJL7hmpO
-HuMAg2sv8nV2JzAnwJC+zPTf3BGsdgNvNUtlxCLbUYWcWACUk1++D5miTgpl1QhP
-XC92UThLs8h9U9VKc0sO1PAsl6gQ5i8Du/H76Wizpar3yrtiYam0VI4dH2fo5qgU
-v7ZdDzYuJtjIC5jzR+LxlSrsvCdmb8+kgZLREftYm0Cy0ELU23JozGzdzTaapdre
-AhipT9934w8WpteyDyVE/kdLFBRTf+HR0SXw3HnsImDdGWq5mR8XytW8irvCGq0c
-7TII0FyocJ/gxeM7ABuGB2G/G0MRDq4gLpAk68jchqaWz7ICP4g=
-=LCGj
+klB1hg/+I3QJs9Q9p2PLAvx75bM8rzU8VrNfSFajr2MrzeoJPuRqqzGfgVvaEDY7
+bUg0kLtnqJQpbcWUORcUF0PzDF0+0I3lBPgvkIQe7ZP1GqerLNtvH4hLZYDy6Yoc
+4YDIMPClCPMs8LaIM8zH2OHjMYhAc7eYExc9/w1rG00U09yaTz27TfrC1lpnFEM
+2DRcOUVATvZi6ALXd6lKjE6U0WOZcisfI/Bb18VXWXMCQXL094gwEVc893uPgKkd
+TS+xQ671MsnW6Po2j2plpaM4Wd5Sh80YS27DkIO+uIG/WwNZd5zwuRqrfd75T6Td
+/dFu39kSXE7pB5geH/zf9yLlvZhXiAb+awhNV5J2Gs8LKIbNnpuO7gAW5m73OtlE
+hh3e3TRqF+1bS2P5/bnFjMdNJ5DQaDFr80K6ZrRcFKSIfcs2Lbh61QpWFvEGsuED
+J9NgiaPGzCn950hn8wbBL43BHhJxceBsW2b5OBuxz6bfJaViD2HMghecIPkhdaWC
+vTWJtD6E5y/c8fDst2N8VvIOeL/CulYMYwB63Tw7FpiWdfLEkRcqF6GgUdG5yudb
+hvG3kAWz1LV/M56sBmktk5A8cGquv02PgDxWrLzKbJqklnP3JuvBarBYBAIyAhPi
+EOPU1xcDOKKV0zrV++sGpeebs05VvXdFAYokrpT3B5r7HauTMSU=
+=F7K8
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/rrdcached/Manifest
+++ b/acct-group/rrdcached/Manifest
@ -0,0 +1,2 @@
+EBUILD rrdcached-0.ebuild 153 BLAKE2B 312149733bf32026cb4208224efde19970ebe38256d2b47a176525275823dae8bdf00b2d839d8fa12fa9777dd9461e1cec0a97995c9906c51be3fde76a01b9eb SHA512 4b23d3518ab872e4423cfb20edc001da3cdde7ac53f359f9431f242819df9eca8904fb15ca5f76278b471a0f262e34da032120e661d7a8d1dc49d565eb33e28d
+MISC metadata.xml 392 BLAKE2B 96d11acefa9a7cf18f9240f08a5b1c36e769f4e7000632301d3f763169fd15e20fbf3adac95e2e0463d3184ea4baf9792b0f061c95a6b79d3f95da03dfb3fb6c SHA512 c88eb6c28199d5baae394310b0ebcd6ebc186642d4700735eb1f712b176a7750acacf2c8d5a417d2c716bc43d0cdf5f3e11ceec1895f84dd1ea4f0186e3183e2
--- a/acct-group/rrdcached/metadata.xml
+++ b/acct-group/rrdcached/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/rrdcached/rrdcached-0.ebuild
+++ b/acct-group/rrdcached/rrdcached-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="511"
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/rrdcached/Manifest
+++ b/acct-user/rrdcached/Manifest
@ -0,0 +1,2 @@
+EBUILD rrdcached-0.ebuild 287 BLAKE2B 3ef91d2abbe81b891b8aa43edf1d1a35206bae202589bf04f62cc9e9fe65572a88c72fb926b734cb8903663eaa0485f504e0d586fdcd141fb97b5a4f4e8f60df SHA512 846212aad42255a707a17ea4f917e5ce25d4f2099c9f752dc761d736215fcbd1c1914d9fb3eb9cb93e993e375a531a93f1824caa560fffa348fa5806c8cd4c54
+MISC metadata.xml 392 BLAKE2B 96d11acefa9a7cf18f9240f08a5b1c36e769f4e7000632301d3f763169fd15e20fbf3adac95e2e0463d3184ea4baf9792b0f061c95a6b79d3f95da03dfb3fb6c SHA512 c88eb6c28199d5baae394310b0ebcd6ebc186642d4700735eb1f712b176a7750acacf2c8d5a417d2c716bc43d0cdf5f3e11ceec1895f84dd1ea4f0186e3183e2
--- a/acct-user/rrdcached/metadata.xml
+++ b/acct-user/rrdcached/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/rrdcached/rrdcached-0.ebuild
+++ b/acct-user/rrdcached/rrdcached-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/rrdtool"
+
+ACCT_USER_HOME="/var/lib/rrdcached"
+ACCT_USER_ID="511"
+ACCT_USER_GROUPS=( "rrdcached" )
+
+acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -9,6 +9,8 @@ DIST awscli-1.22.84.tar.gz 2182437 BLAKE2B 0b61b6d96da302c95c83bdeedfa14abbcacb1
 DIST awscli-1.22.85.tar.gz 2183008 BLAKE2B c1fe5dd82331a3b1618d34d739803058c7422087b64959bbccdc0408852ae2f0d5b9a423925176468131befeba25cb035b73e6264e3fb17e5237c407b7e7b342 SHA512 fe767ecddf2979af0d817bd4276737c5372293c27ccec1844e54c2a0f46fc061fceb6cccafc5ef47f17f65d5b77d9ac4189e17e077736c4ad5dd72ecef4b556c
 DIST awscli-1.22.86.tar.gz 2184477 BLAKE2B fee34978cef17a0b4f51a9a110836882e11641914f7b2569dc2ce35be705abab16eda68a5706fa8c2bf24ee1c018c97d785296cec31c52aeb5bdf40511475fb9 SHA512 640de79a71459f3532c1d03ce6708a279e3a56e6f13dc3f72d73ced6888d8e30abe02806f6bee1ed04d7d909a667805daeeffaea9829e97b0f1447330d2d0a56
 DIST awscli-1.22.87.tar.gz 2185493 BLAKE2B 5d274e0c9483b22e664ad6de8710c04cc99f854b7c1efdac6dd4164deab47dc55d35520b34b276f8b4de1ee8b1ed10205b1806a31fc776d17b289a5e29277016 SHA512 c117fb8f89680836206f678637fb480ffd06db2225533bff75686eb8c1bd6e450297adb11863247441eeed67744b13930c0f62afce1dd12527d06d4e2eb58a4b
+DIST awscli-1.22.88.tar.gz 2185767 BLAKE2B cf7d161ae781f9a66053a0b0b65c9fdfe9048c924c46b3052ac6c1156bfaa67adba46f36dfa5a7b12686106af1c928450acc10fe03e9c442286a9a5662d992db SHA512 d5d8fcf05322413ba817f9d5f86d8c7e3863d769f9e9ec298ebb686729273ca82a90bf78eb09ac15ba65bc0b68435394d141210ffdcf55bbe7468a62b49a4113
+DIST awscli-1.22.89.tar.gz 2186269 BLAKE2B 8b3019cfc585f53145bdbd4342182747cb34dfb3ec75c3cdf7f01e6d4482ac115cdbcf9f077c07fbe0e7e3b312824b6c635165cfafd6b5e19d87b51350e6fcc7 SHA512 90580cdb7a82a14af5d0abc4b67f6ca3e1cd4a2ab68240e54d23a83b52af512b3452498c3baf2e54f9c24dc1243be66cf3f418dcfa4712e312f6bb41624478ad
 EBUILD awscli-1.22.63.ebuild 1839 BLAKE2B f7e466a4f36db6c84df8c93c9d8ad959a1eb4595325656607eccf73464c93bf49a7d2dae2568bcfe966444117fb9ae68239be0b76a2c83c004a063c483f02862 SHA512 c5c5d8b04c5097135c4ec0bacf1a7a0c9d801af900bd549d76e3da33ab7b8b65d470af5c7420c14e93f867398c7f3ae2ef4e9d8a55328573b2167ce255893697
 EBUILD awscli-1.22.70.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 EBUILD awscli-1.22.77.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
@ -20,4 +22,6 @@ EBUILD awscli-1.22.84.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880c
 EBUILD awscli-1.22.85.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 EBUILD awscli-1.22.86.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 EBUILD awscli-1.22.87.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.88.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.89.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.22.88.ebuild
+++ b/app-admin/awscli/awscli-1.22.88.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/awscli/awscli-1.22.89.ebuild
+++ b/app-admin/awscli/awscli-1.22.89.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1,3 +1,3 @@
-DIST exo-1.52.0.tar.gz 5593768 BLAKE2B e1299a57bfe06050d06d735a6d351a3d913260e0b5fc0183ac9a4cd53ba0d50a39e3e5d796484dcc560d6b8c68ab32420da3d269c48a0a4c6b251b9469fa1950 SHA512 6e18204c9485ce538448a8f000b3c9eea58ae35141cdfed4f9a1671567a58965b907e18efa62524de62d111c5fe0a24ea7b196d20fce5d17ecb9c60fcb757b80
-EBUILD exo-1.52.0.ebuild 703 BLAKE2B fbee615ad22bcdc4efdce1344136056d3366c31ff1240c3c86b1fff39787b18f99f896d455ebde5cc4c2bee05e28cbaf216d1ab973b5f100d4a9957c8989ee65 SHA512 21b1e8bb20a9db8f635374ff64e9724679188cd356f975818e2390d3f369f2ff8886710d9c202cb4e72df39ba900948a392c6da296f95dc18344492d86e56d98
+DIST exo-1.52.1.tar.gz 5594576 BLAKE2B c8cd5011014b9eee899afe7cdd1d45708be221d33772c858c5fb4d62ece0ecec3cdef0aa106c9ce2b0604cb9735cc17674f65274f88becb6c6f7eaaf2643d29f SHA512 25612b8dfd1ce55a1860f75357977ca8cccd0b24860eb091a203c84895c449b59ee5788e6a9e71168cf1927d3d6584cd5f379a3e32565215dcc1ea7210d38714
+EBUILD exo-1.52.1.ebuild 703 BLAKE2B fbee615ad22bcdc4efdce1344136056d3366c31ff1240c3c86b1fff39787b18f99f896d455ebde5cc4c2bee05e28cbaf216d1ab973b5f100d4a9957c8989ee65 SHA512 21b1e8bb20a9db8f635374ff64e9724679188cd356f975818e2390d3f369f2ff8886710d9c202cb4e72df39ba900948a392c6da296f95dc18344492d86e56d98
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
--- a/app-admin/exo/exo-1.52.1.ebuild
+++ b/app-admin/exo/exo-1.52.1.ebuild
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@ -1,7 +1,9 @@
 DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c SHA512 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
 DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 74c4e9c6d06239950f1b8a64c5bce894799fdd73a562ee22d1189c60dedfff3555132c0619488e0682e94de8759e096627520b96d664f472645e4b6375d68ff9 SHA512 0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12
+DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
 EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
 EBUILD keepassxc-2.6.9999.ebuild 2414 BLAKE2B d25231ddef6df71cf2574b46b8c902ba89ad046144a26d011dd3c26ba5061b5e474f80e00d0370fc04bc86e448a377c4dfd1f99535b6e29894b7d951e4a8ed53 SHA512 f3accbf2750712fb4302e7fbd792680b3d3a7094975a56e10bdc205089e8d90520cbc9b29b1cab82196abff1ccd94101d7f49f7ba49ea6ab7cef1fb74b091a33
 EBUILD keepassxc-2.7.0-r2.ebuild 2293 BLAKE2B 9b3113b9b01b59fe34924092539d07db46dbe709b626ed3d3e180810c5e8ed3773fd1fc0c58e51566e1f08f766db97050d4a72423f56fff903351a8456b97142 SHA512 ccb17de9ddfe5b08fb968720c862c915b4edd594aedb8c4e1a8de1f5e9faf00583e643dd0d9e90706931d76e821c7a2c889188d3a08263940cee91e5a1060d0d
+EBUILD keepassxc-2.7.1.ebuild 2293 BLAKE2B 7943b14df4b39ef9fce69f0f7a3f750bfa08f9528cb211efa02c627d04a82188d50c41954d1a67bd4b7a1b2807498860dc7ecf63192c6ba58e099de711bdbfa3 SHA512 254486509b30c1e3ac4926ac4d14986b846131d623c55cbf49ec819f4c5f24f349a718d5c779491aac71a196b2a208dfd4376f7d96a7ecce5a43f8355b2f9edc
 EBUILD keepassxc-9999.ebuild 2293 BLAKE2B 9b3113b9b01b59fe34924092539d07db46dbe709b626ed3d3e180810c5e8ed3773fd1fc0c58e51566e1f08f766db97050d4a72423f56fff903351a8456b97142 SHA512 ccb17de9ddfe5b08fb968720c862c915b4edd594aedb8c4e1a8de1f5e9faf00583e643dd0d9e90706931d76e821c7a2c889188d3a08263940cee91e5a1060d0d
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
--- a/app-admin/keepassxc/keepassxc-2.7.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != *9999 ]] ; then
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	fi
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/botan:2
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-gfx/qrencode:=
+	sys-libs/readline:0=
+	sys-libs/zlib:=
+	autotype? (
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	keeshare? ( sys-libs/zlib:=[minizip] )
+	yubikey? (
+		dev-libs/libusb:1
+		sys-apps/pcsc-lite
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+"
+BDEPEND="
+	ccache? ( dev-util/ccache )
+	doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+		printf '%s' "${PV}" > .version || die
+	fi
+
+	 cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
+	local mycmakeargs=(
+		-DWITH_CCACHE="$(usex ccache)"
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS="$(usex doc)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
+		-DWITH_XC_KEESHARE="$(usex keeshare)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_UPDATECHECK=OFF
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
+	cmake_src_configure
+}
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@ -1,7 +1,9 @@
 DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f
 DIST buildah-1.24.2.tar.gz 14184511 BLAKE2B ad9ee6f332a89038368d9a5d86198f1dfa9cf99a970e85ccf3b272294fc262c68c37004131971b0ec148e999e4d8f192f4955e71673f05188110407949eb3546 SHA512 dada2b65340386355aba3980c38d9be0f43d5c3f9316c6f8e713f299ee2b975e409c1b3a785daa52b59e688c3a9c9016c43d9b0a6443d4a9453aababc0a8afa0
 DIST buildah-1.24.3.tar.gz 14189867 BLAKE2B 18b6eaf0ba54c310c8b946e4763f3b930ff4e0bfd85333767b8baa3320df1f43937d4742404d11de51c6386a12521e3045770d1d19406c163accd9cccc500961 SHA512 74fa6073ddf6b641700f758435d4558fc2d61691172107572dfac3d723f986aa0faf7bb5b5d1e2bd6bed5d118cbed3c78b6faf96972770b304fa28fd363b4700
+DIST buildah-1.25.1.tar.gz 14212065 BLAKE2B ec4f668654011f1b93745e1a1d575fdda0cd5f4d6f9f7f7b3106c24aa7d405951ecd645a54c2dd5a3ad2695069e66ad847bdb15f0e73a9c7efba2a7e283d4f58 SHA512 628f8095eb4488ae2be06a2a92de85dde4f3841e8ed9882132c119f27b0c93f26ba10f5dd259d63654b90539d762f6c1973d460f073c0b2450ac5d9582a6a68d
 EBUILD buildah-1.23.1-r1.ebuild 1196 BLAKE2B afd094d8fbefb9622704992892b8b0050fddae3d01e44275cd26f4d927f5c146cc577f8c374d7594083445ba581f7ef557660160725a977276e96ce5ed2f9006 SHA512 bdb5a798fc980be7e8d0c464784b48279af59b80a19a878f7134bb5344c8c807e5e16032f39a6d236ac653039cbf001fe40f64c9f4d2c26ea6ed7fed4805a588
 EBUILD buildah-1.24.2.ebuild 1198 BLAKE2B feaf84c0d34c256dc99cf2e836bde1c49ec4f719ada774763f529f0102ee77d8fe672375ea8d974788bd29ccb06925125aa5a7d818dad827e42c3e501e2f1f92 SHA512 891c06d40cacf7ba614b8de98cb887de6a10d7955b78569f5b96dbfae9de99b3c46221b47933f3364ae1a70f110e6a8aed4f08a8137856785233f55ce6e5cf8f
 EBUILD buildah-1.24.3.ebuild 1198 BLAKE2B 033bb57ef386ee7ca4cfc600eed3129edf00ede613da8bac92fcd428ebe02a36c286e83344e46f06352515ec591979015a605a06343521695d6f1089c6fec9d8 SHA512 63f6bf6c1a4da92404537bc6191deed663c29928105f39234f30d4f6816bbed355774c87fca055c03650c69ba38ba4a00702c1820552cf883b645b4af7d2ec15
+EBUILD buildah-1.25.1.ebuild 1198 BLAKE2B c44a8369b62c9ee4f24b86a295331092af25c967b01434b8cdabe90b9c1322f754997aabecf73f0b0ab9223eea94fd8f0c8cc0263a0c8ac749ab1b52bba61f78 SHA512 0be1bc3f2d94b644ab0c975f878649256915fc0ae14a0b980f13d035b9f103d6de0cb91d7b2fbe309156b96703c19365244f718bb76522b22720d69d3222ff91
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
--- a/app-containers/buildah/buildah-1.25.1.ebuild
+++ b/app-containers/buildah/buildah-1.25.1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=fcf94e39
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@ -6,6 +6,6 @@ DIST containerd-1.6.2-deps.tar.xz 99095488 BLAKE2B a8ab5b2a506cb90cbadba9461d273
 DIST containerd-1.6.2.tar.gz 8617797 BLAKE2B aaf16dbbd071f4eab45bc94cc50643b33665b5c4a4155ef007b7a974e04660235b69e12d99e78c24b27c09d45c0eb6e9be3d688b41592a54497a0a4e5f577c86 SHA512 3ff280ae0cf5a45b0c21a42290c94bad30d46bf8a5bbcef1024e3c67fde3345a31b23a88cdbb6025d526c93e2a0899e9b341c9b8ccbba381983de3d8a39b1046
 EBUILD containerd-1.4.11.ebuild 1937 BLAKE2B 28d77a75c41972622bd514aebcd0771c3528fa0076834c97f83a7008b258b64785902b6a41d424599022e834a316e4366d89e5108b8d43f017c8769604efc6ee SHA512 e2799565ca0698c214f3a29adbdcdf001af3b7c39e7780838e8a8e7f9b155334a1f7e4ee7d0af61bb9650c2a6a135fa5bfdca1014f7947915b37f86c9aa2dca8
 EBUILD containerd-1.4.12.ebuild 1937 BLAKE2B 4177d3ab1f97f30217835d21421f6ad8c6dab38198e6559efdef57e9f8bef77e0a6719b2dc1182216bbb5b9bda1ef3484f9709bc0ca615edcf8f262fd1e1a856 SHA512 3f3dba551539a584a6d64b1a48e1a3cc892d0e060b734428e5d7c4d9f94e189b8c102f3e637ee07321f8ff637f9db7b93d4a61d87f4fcb6a7b1c47eaaf48ad3c
-EBUILD containerd-1.5.11.ebuild 1907 BLAKE2B d3b37e85b35dc7d24f7fad4de9bb380af6ef6e3f0d7fcc0ec4da087c57964d06120a40566166ea96d669f07a2b085085f1e690e45c077d9f8fc5b1f4b9f18e7e SHA512 71182432747e5c5c8d7fbf04e64040e3aaef94e419e2ebea02c8ebf8ce3c5692704cb87f78005732a90f9560058ac3f33d2a92a8dcee6d4f4b0c9cf226b4e126
+EBUILD containerd-1.5.11.ebuild 1906 BLAKE2B 235c2eb59257362b5bd90e5e089102ce567e3e13e13c94a5365727cff3e4d92efa7332614f120c798d40a65b38623618eef8cbe65c5cdd9588e8555e696758a3 SHA512 0e5dfe10c35d9d7b25110e4f51153bd0ea231b3ebdb10401af84114c5a76e2187ef1df62fccee168d235ad8a03cc8aec9031680e5699e7da6fe6545f32dea5f9
 EBUILD containerd-1.6.2.ebuild 1975 BLAKE2B 3ebbd30a63d3e4fc89491332ac27e0441a611d275746b5fe9dd0ba627ac57af9bf6d71d6ed2b1fbc7bbfa1bedc16fc329cbd9264eee14bd8803c313185b4930c SHA512 49e8aff2be3f9196047f7e502033048de00ea1a4dc8e53b033e0014d22a57755b0156ea21df7efdf307a26344ded7cd2bd1a6f439abce9dbf47b35eb9cb6d80e
 MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982
--- a/app-containers/containerd/containerd-1.5.11.ebuild
+++ b/app-containers/containerd/containerd-1.5.11.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"

 DEPEND="
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@ -1,4 +1,5 @@
 AUX 50emacs-jabber-gentoo.el 206 BLAKE2B c94ea17b7cab171249f24a873af06ef38b586a25870a27557255902a072b5d0995e14141f7d6a9648d9ba5bbe3e7887a319de67ba2429c9b840b6d2d5b29c8e4 SHA512 44c94b318b547689788c60d41ceb8b93ffbb479099fe94933636a9a91505abaf62bfcbddb145d34cb509d35dec3c0f62b2dafc91477a723ce6585a69f45a9cb5
+AUX emacs-jabber-0.8.92-emacs-28.patch 942 BLAKE2B 5c3327422ac06cac61f99a032e0795bb6d506938bb280e5b41ec9ac937286b1ae23a508271e6716913ff484d985d6459b821f7029c770c7a75066dd7d977f7ec SHA512 b66a91e872b78e4cb4b3f27d6eedb8a234c5a95fc4a270d76ff54831d8fa6dc5a9122f06084ca1a1f1fb5d1e5b7aa131031f94d8260771b32288a8b69fddaf6b
 DIST emacs-jabber-0.8.92.tar.xz 293948 BLAKE2B 0de6eacb0ae1487a080a241e9ef4c38a98d96647773b7d35857e958e06f35906963947f7de836d2ea80a1935f96ccbc79de83ab88ce307085017ba229679f0f0 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882
-EBUILD emacs-jabber-0.8.92.ebuild 516 BLAKE2B 9e64081a7fed8fb6d53178014529f521a94f9ca7e1dfdf6f840494eb55c8a1c6a555d01a82eb020a560456ef10012f8ccfdb1f505fc9f9f5d4947c2f3ab868ff SHA512 fa49293f0ab87390ebcb43766800b9e966221a368b65aabe42ea33a2582bbd5938ca40984554d2c48d613c82c41906480022ea728d6f68599289a27914362abc
+EBUILD emacs-jabber-0.8.92.ebuild 562 BLAKE2B 3c4016d912ccbbfaa1c5ff6cfba07895659a7b1642c186a3784913afaf7cb4dfb8fc1edbcadfb3cddcd573d247a947529b83e50360f8f6e81bc2ea60b4544d75 SHA512 14c0c76220b4c1c6f1727e1f9d7bc98374f4229c0de7b8e8d36b23688eba1f1ba80c75451e3b9306a12982e9fa60d95914df776c72661389b261548c36599daa
 MISC metadata.xml 363 BLAKE2B d7b0a56bf9d4ae4eeed84fd0d464644c1d3cb04abea3f4b39273f3d22793a60b7e3d8e21a2e02b7bc454b6a3cf939300a598ebee1cc28d040141a64cf94cb521 SHA512 a6f4b7d9ec08ba628640cea1c990730a0332a9ee6197466b3db16bb761f9866d814c0b264c997ec0423b71e16ef68ee3a50ff00f4b565dcb0324436b27791a41
--- a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.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
@ -18,6 +18,7 @@ RDEPEND="app-emacs/hexrgb"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"

+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="jabber.texi"
 DOCS="AUTHORS NEWS README"
--- a/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch
+++ b/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch
@ -0,0 +1,24 @@
+https://bugs.gentoo.org/836817
+
+--- emacs-jabber-0.8.92/jabber-menu.el
+++ emacs-jabber-0.8.92/jabber-menu.el
+@@ -100,7 +100,7 @@
+   (interactive "P")
+   (setq jabber-display-menu (if remove nil t))
+   (force-mode-line-update))
+-(make-obsolete 'jabber-menu "set the variable `jabber-display-menu' instead.")
+(make-obsolete 'jabber-menu 'jabber-display-menu "")
+ 
+ ;; This used to be:
+ ;; (define-key-after global-map [menu-bar jabber-menu] ...)
+--- emacs-jabber-0.8.92/jabber-roster.el
+++ emacs-jabber-0.8.92/jabber-roster.el
+@@ -816,7 +816,7 @@
+ (defalias 'jabber-presence-update-roster 'ignore)
+ ;;jabber-presence-update-roster is not needed anymore.
+ ;;Its work is done in `jabber-process-presence'."
+-(make-obsolete 'jabber-presence-update-roster 'ignore)
+(make-obsolete 'jabber-presence-update-roster 'ignore "")
+ 
+ (defun jabber-next-property (&optional prev)
+   "Return position of next property appearence or nil if there is none.
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@ -1,7 +1,9 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
 AUX gnuserv-3.12.8-backquotes.patch 509 BLAKE2B 4770c01e4650301d1922b2c87e5cd723feb016fb5d5224aec715761a81b4f66614c7a535101764432a80c26f8e9c13d2fc3cbd1ab8122b5e608d3aeea3de73b3 SHA512 9ccdf8b4fe0ce45528ecec67782785b5d1ec82e5fd14d444b3f091d9c76add8052de3384e0b54fff479f4bc5729966ce520e62343159a7e251fce1e3841b5229
+AUX gnuserv-3.12.8-emacs-28.patch 1300 BLAKE2B b74b904b37af0460682d6c7c5b0b0d79ec41feb646f69bbe38c0db2698d3e8d133b56eb831c6149b0f22725ef5f85c2b27d60100b18ce5c62ce30ec18a928403 SHA512 1cf554a682254ea8c84b8e81e76a2cb08cee18e3b919a9889b745ea97234aad4e3e0099e48fd13a57b881cb2d17a495e59a42d8fbda30d94b2391d0d11ae2ba5
+AUX gnuserv-3.12.8-gnudoit.patch 374 BLAKE2B 9c39f3fd1b881e4a2b4dde712b56824e99da89140d17b5a3996e35eb5d7c0a9d47933e041834c0249010c4932a69633aa93a38ce16bdd3158f52f22549f9db2f SHA512 ba3be5bee1bd23363dc41d77a45028497e1a4a8270358bf4c6eacacaca85e5b52717991885f8d4bb754c613f535d4934d0e199ccd088f78f15bcf78beaa524bd
 AUX gnuserv-3.12.8-process-query.patch 554 BLAKE2B 94f09a1e86ea787a05e51ed5e2742174067b7cca0fbe2fe83619b6f829048172a9e46f70f8e2c22f2787f43390730f07520553e7d659ccfd451869b1a074d707 SHA512 bc01b928003cf5050934972eeb7830b14957693c1484b061dbcf1809176388b75297b6884b7f5c963e59d8ec4a7cc4d9bf9ec265b414574a7de6bb5875f6b607
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
-EBUILD gnuserv-3.12.8-r5.ebuild 1608 BLAKE2B 3a36b4f87937c55c11c8b56f0a7e8dfda7cc3863aa92741c2a59c7509e6fc7f574c150b8634f1e209b3139fc39ff66b7d5f952bfcc40a954bfffd5c8bad8a2be SHA512 9352a1c4a6003527098aafa57c9c766e31e5c1b463f2fe1299b61b8b6c75ddfd8f47c40e261e5880312ae99e4051f6fe87814ef1ea5aa650b000c9c745380ada
+EBUILD gnuserv-3.12.8-r5.ebuild 1752 BLAKE2B affe2261d573ec8d003c89fe509cb52f0d6237db66ae25e8716819e9e097639cd8d96899b119d7bd6058b132ca3cf5375a50083a9dd2d78d90ba201544c89a16 SHA512 5a9ecfb745a7d70da2cf367330a8505654dd0f05f61e884cd086844214689bb7ed7f0ca4f020825483bab6a73ac6b259d928803ba4bb13b4aceeadd7570a5e06
 MISC metadata.xml 260 BLAKE2B a187a6020d68e0ac53c6bb25461b0988c938fb112a8a7e3a906b827269347d70f8366594d404329695b4fa52fff2cde7fbc51d501e674bf8adc821a4141ccfcf SHA512 2ff2d68bb3c552f006474e86ecab8ebbcfcb35588384c045a665d305f79c739c4d80c0ea639a71c39123b8c5c1b3a96977ee8c0c3e973449a732ac3ac8f2c3a3
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch
@ -0,0 +1,36 @@
+https://bugs.gentoo.org/836892
+
+--- gnuserv-3.12.8/gnuserv.el
+++ gnuserv-3.12.8/gnuserv.el
+@@ -98,31 +98,6 @@
+   :group 'gnuserv)
+ 
+ 
+-;; Provide the old variables as aliases, to avoid breaking .emacs
+-;; files.  However, they are obsolete and should be converted to the
+-;; new forms.  This ugly crock must be before the variable
+-;; declaration, or the scheme fails.
+-
+-(define-obsolete-variable-alias 'server-frame 'gnuserv-frame)
+-(define-obsolete-variable-alias 'server-done-function
+-  'gnuserv-done-function)
+-(define-obsolete-variable-alias 'server-done-temp-file-function
+-  'gnuserv-done-temp-file-function)
+-(define-obsolete-variable-alias 'server-find-file-function
+-  'gnuserv-find-file-function)
+-(define-obsolete-variable-alias 'server-program
+-  'gnuserv-program)
+-(define-obsolete-variable-alias 'server-visit-hook
+-  'gnuserv-visit-hook)
+-(define-obsolete-variable-alias 'server-done-hook
+-  'gnuserv-done-hook)
+-(define-obsolete-variable-alias 'server-kill-quietly
+-  'gnuserv-kill-quietly)
+-(define-obsolete-variable-alias 'server-temp-file-regexp
+-  'gnuserv-temp-file-regexp)
+-(define-obsolete-variable-alias 'server-make-temp-file-backup
+-  'gnuserv-make-temp-file-backup)
+-
+ ;;;###autoload
+ (defcustom gnuserv-frame nil
+   "*The frame to be used to display all edited files.
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch
@ -0,0 +1,15 @@
+--- gnuserv-3.12.8/gnudoit
+++ gnuserv-3.12.8/gnudoit
+@@ -27,10 +27,10 @@
+ 
+ if [ $# -eq 0 ]
+ then
+-    exec gnuclient $quick -batch 
+    exec gnuclient-emacs $quick -batch
+ else
+ # I use "$*" instead of "$@" intentionally -- I don't want to have the
+ # arguments split.
+-    exec gnuclient $quick -batch -eval "$*"
+    exec gnuclient-emacs $quick -batch -eval "$*"
+ fi
+ 
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
@ -6,8 +6,9 @@ EAPI=7
 inherit elisp desktop xdg-utils

 DESCRIPTION="Attach to an already running Emacs"
-HOMEPAGE="http://meltin.net/hacks/emacs/"
-SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20160508134736/http://martin.meltin.net/hacks/emacs/
+	https://www.emacswiki.org/emacs/GnuClient"
+SRC_URI="https://web.archive.org/web/20150908031821/http://martin.meltin.net/sites/martin.meltin.net/files/hacks/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
@ -19,15 +20,14 @@ RDEPEND=">=app-eselect/eselect-emacs-1.15
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"

+PATCHES=(
+	"${FILESDIR}"/${P}-backquotes.patch
+	"${FILESDIR}"/${P}-process-query.patch
+	"${FILESDIR}"/${P}-gnudoit.patch
+	"${FILESDIR}"/${P}-emacs-28.patch
+)
 SITEFILE="50${PN}-gentoo.el"

-src_prepare() {
-	eapply "${FILESDIR}"/${P}-backquotes.patch
-	eapply "${FILESDIR}"/${P}-process-query.patch
-	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
-	eapply_user
-}
-
 src_configure() {
 	econf $(use_enable X xauth) \
 		--x-includes="${EPREFIX}"/usr/include \
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@ -1,4 +1,7 @@
 AUX 50icicles-gentoo.el 112 BLAKE2B c4d0e44325f27cb725bce0aff0ac8186807295c9b20642f42fabfa956703836c65a23b3a71221e736d95aefa1e4e188834df53c9a275ddc0ec7389a810bd405f SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e
+AUX icicles-2018.10.15.23738-emacs-28.patch 389 BLAKE2B 5a1cbe178ebeac0cc13bf47f82f56caa0d2beeaa70e71b3f7316d2ef0964a0420180b4ca8d50563b5a044d4885f9c98cdff658f9e5e85b98c7dcca94cf3616b3 SHA512 8c474208b7afe113a13989bff036315cb9f365a1b98f9d088b5d20a7d1ea15fa67c1f25290d9d7fb50eb9c6c7135e052144a9eddbce5a01a84cfca5991773555
 DIST icicles-2018.02.13.23733.tar.xz 697112 BLAKE2B 63b60a74cfcc5b855e9ffbf7a91d0cb561c46ef1a93fb1baca00a0a5462326da983c734bef1943c0f17583aeb065d8fd5d88769eec2dc35f36a59ea4ff86609b SHA512 6c5d2270c735fafa8e2180134fbe7175e1c99cb6ae904a70dbdf1144293bd1ffa84d9e81b1c1b03296348a6b31ebab62ea7981a4b7f5be8bb5238bd143ccb3c0
+DIST icicles-2018.10.15.23738.tar.gz 1007149 BLAKE2B 34cdae2e247fafab9bb6d5472ed15cf108fd0b008a8f19de1742dfe590ff5b1483c5f28eb8e75b92a32c223dfec67d4601ed3392cda5162d1ea84c9d1f940321 SHA512 ede403a53d44451e4f62f54f7da27c6a5632827c4f1985c153f7d03a1b8ea920238dc9ba78896fc416115f53187a6b6d9a0171f8a91fbc7605462eba48e3f5cc
 EBUILD icicles-2018.02.13.23733.ebuild 488 BLAKE2B 0aba0b0c414bd4eae4ff6387374fe4db7cf7c5f74338ce512d1b7ccd64ec3b7492d6f3418116e07ef75d39f61ebfb0adca0424bf21d3066272524fc0e89eb18a SHA512 de723e4123003f1fba99840c9dcdc7c99e329294b96a5650c518bf9cb559abecc2231ec373d76ba121b289e37a8961a3baa4968da25b1e653c4b4e805351488f
+EBUILD icicles-2018.10.15.23738.ebuild 639 BLAKE2B afed60495cbaf8d9400f94e6fad38106cc1b144ed778a3e131cda9e9c20bfa816946a5b5ba307e89e0b518882ef5aa6ebb5f58c7dd62790e1c7e2fdd4250bb42 SHA512 673bd75157958d2e8828c2355dcbc9715ab264930c12ae695da2b5b8ae1510fa600524c887ffa83ba5c54f70f7aa5d2c0e43014b11b1629b8d569dbe98f14530
 MISC metadata.xml 365 BLAKE2B cfac92a5fd13aa5443c5615f88a46dc9d80f1e9bad2012d29e803308008ca44e4dc69623353e0f3aa2cbaf7afb4721675be0d680e89411f8291164df84b5158d SHA512 d745cdb1190a95f83b56d3a001859f8e00ca56f49f283da4220d0e5e3c46f7c32b77ce7fcd8463cfd70d41e1df544a8b0b81f112b3fa65387ac0e6f67bf39f71
--- a/app-emacs/icicles/files/icicles-2018.10.15.23738-emacs-28.patch
+++ b/app-emacs/icicles/files/icicles-2018.10.15.23738-emacs-28.patch
@ -0,0 +1,13 @@
+https://bugs.gentoo.org/836773
+
+--- icicles/icicles-fn.el
+++ icicles/icicles-fn.el
+@@ -4264,7 +4264,7 @@
+ 
+ 
+ (defalias 'icicle-scatter 'icicle-scatter-re)
+-(make-obsolete 'icicle-scatter 'icicle-scatter-re) ; 2018-01-14
+(make-obsolete 'icicle-scatter 'icicle-scatter-re "2018-01-14")
+ 
+ (defun icicle-scatter-re (string)
+   "Returns a regexp that matches a scattered version of STRING.
--- a/app-emacs/icicles/icicles-2018.10.15.23738.ebuild
+++ b/app-emacs/icicles/icicles-2018.10.15.23738.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+COMMIT="9e9c37d2a54771c635d00d1fe171cef5eab4d95d"
+DESCRIPTION="Minibuffer input completion and cycling"
+HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
+# Snapshot of https://github.com/emacsmirror/icicles.git
+# PV is <Version>.<Update #> from header of icicles.el
+SRC_URI="https://github.com/emacsmirror/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/remember/Manifest
+++ b/app-emacs/remember/Manifest
@ -1,5 +1,6 @@
 AUX 50remember-gentoo.el 376 BLAKE2B 1dd3ebb7584b0a98c3897ad3e6b7cdaa2f7ca27099c82eb42c5a9fe44bc1dfb60bcb4a19d16b452722dc72e29f5718ea6ca952f65ed699190e3e9b9ec0b3c948 SHA512 b1424526d7ae0fdea157a123a2030ff47700addbdec3c6d8ae42b0587e3eb028c54cf27a3d5b9298fbac04b4e3216fec0d189df29d3c4076fcaeb64cd9b1edd6
 AUX remember-1.9-make-elc.patch 320 BLAKE2B 65d0f4a1df9b7bbf09ad39830fc20faefd4fd554783758139c4351ce64e4444bc8884f7fe3c4e6a46b029c3543418c24ec050485d079049f8e9e2cf9a5726b82 SHA512 1050d5dea089a7732d8310f6131c2d95037cdc98150ef8cc6113a5a31c16cf0fd730a0d11ff6f3909ad1835419a47e384cc490f529ef38a5b000b6f27bc6112e
+AUX remember-2.0-emacs-28.patch 410 BLAKE2B f8894d77f470bd378a329c7122726214ea62b547c08ce2a2b09a00cf5814acbc3dcb5553f7141164d7b70d338e52fca25757b04333f0d0396d574734c38e2ae5 SHA512 2a889c24669beff44c845769a66b4092e8eed8076bbaf4a994e4e044b17fa6aecba520174e31c275b45a3fb3b64621a60d9396274debb42b2f3cb3d6af4ca1be
 DIST remember-2.0.tar.gz 44481 BLAKE2B 2419ff87c7cf45e86102e02b51e7941e101ea6540d34bf8ad3df1c59c733042bea03d95508e1fb5f724148999e68bd177732bf8748f5ccc0158c36c983816536 SHA512 9744a4f5893f6191de667d6fe5f5fe8d5730b46115f290993a082a14d3bd51ebb4e0ac3dd7f8b29de4db0aeb10259d6bf9f5833fd98b95077fb963683cb0f859
-EBUILD remember-2.0-r1.ebuild 896 BLAKE2B 601e59b1ceb9244af84fd14aafd3032f1f806b828d5600b3aac9fca42a5d1d3b17a8d4d6e6db1e075f92e1566f0d886c03cf3920f7057fe55e18d7e189b53c17 SHA512 73ad30dc1ec96be2089f8091de444bbe6c93235593c5fb72ac4ecab08f6526239431bb2ca6b834693aafc3d674d370736a2ad9f95e069e530487d6e16ed4d633
+EBUILD remember-2.0-r1.ebuild 942 BLAKE2B b68f9f8c0b7b472fb7a7e86e71cc14e08544e76db3b4a01f4ad3582bf657e54b39c9c6c2a74a3a347407e2682b423745b627ed83ae873d4c6daa06c4067c1a0e SHA512 352e6cfcd7331ecb79f998e73dd2b92c11f62fb6bf269edc39c6052923e2478ac64e76664e59746627ae46d68502fcdc15a4af44027bd61d0370ab8eb7cd185f
 MISC metadata.xml 1101 BLAKE2B f55b72d2a1ca36feec7347d5e3814c2a63000654d82b909f8546c7cbabcfb32a51c08ce6d5dba60f52163345d3b39566688b34800cefddc471d1746ac23b2230 SHA512 c3a7bba776d2804edd6ac67c9463131822540559c47872449e855ad3003fdc85d2735ff8dfa9880dcb90acaf88859b38b3fa13d54fdaaa074ab4732ab6047ece
--- a/app-emacs/remember/files/remember-2.0-emacs-28.patch
+++ b/app-emacs/remember/files/remember-2.0-emacs-28.patch
@ -0,0 +1,13 @@
+https://bugs.gentoo.org/836772
+
+--- remember-2.0/remember.el
+++ remember-2.0/remember.el
+@@ -462,7 +462,7 @@
+ 
+ ;; Org needs this
+ (if (fboundp 'define-obsolete-function-alias)
+-    (define-obsolete-function-alias 'remember-buffer 'remember-finalize)
+    (define-obsolete-function-alias 'remember-buffer 'remember-finalize "")
+   (defalias 'remember-buffer 'remember-finalize))
+ 
+ (defun remember-destroy ()
--- a/app-emacs/remember/remember-2.0-r1.ebuild
+++ b/app-emacs/remember/remember-2.0-r1.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
@ -21,7 +21,10 @@ RDEPEND="bbdb? ( app-emacs/bbdb )
 BDEPEND="${RDEPEND}
 	sys-apps/texinfo"

-ELISP_PATCHES="${PN}-1.9-make-elc.patch"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-make-elc.patch
+	"${FILESDIR}"/${P}-emacs-28.patch
+)
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="remember.texi remember-extra.texi"
 DOCS="ChangeLog* NEWS"
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@ -1,4 +1,6 @@
 AUX 70slime-gentoo.el 526 BLAKE2B 6bfd25cf1ef661ac1510d6862d8eea832d1de11d173d7a4c1fc6f12c204c13b641382a23b196c21ad6a4825b620c69244764db65e94060e4b636c5b6702e871c SHA512 94c84b4a91cad91f553c22cc9d61cb6a77aa0dd723571770159237e7d3e6f2ec0e3dc0a3e139a99bd820da67d019891db1e84d384fb96614f086b54e9bd5769e
 DIST slime-2.21.tar.gz 810610 BLAKE2B d5126e60fb04af2c712426dc9b701cfcabb04a16ab4df6ee138c9f77280fa892e608a04f1af1154b42f7063cc85464146e9a9b10f2a223b5d8015ed49eb1ee1c SHA512 6cc0d865bda2b1a4d806564e4e7d0c9cff739aba16d21ffd47c6a7353e45d332506014ba54f6a0fcfbc97d4c2d3d864f02c2d144cd4d8d06b9b19dafa8f8be3c
+DIST slime-2.27.tar.gz 824013 BLAKE2B 65bf6022d4c0df7fd7b3c8325ce0e8db1bd7b39961b88ea3bca846c316db2a6442d87974f9399557e9ea1ac7f10ec32d13832df3f433ab3b38cf3059a9529069 SHA512 e1d4723d62bd6c9cd964bfc5ff2d383999d0c965ba9e0742dd21453e8f660dc5c05b2bb8f009ac895dd7445a77b82b5c1dec19ec195368f8cfa59f651001da6e
 EBUILD slime-2.21.ebuild 1536 BLAKE2B 9a57dbef9d64de8a0a5a53c9dad65a123ffc2d623c7aded7c95db61a519101a7899908fa9be6ce006393e4c15a1a4e11fa311fa4dda7cba7e77bf106221107b1 SHA512 335950f876002fdb3d78530b09fade01e43ea6e4802b6a7a4fa3c2066c5c16068956cf1e5529356e3da46cd40d738248dd0e6a4941ad4fa794dae122b7db4592
+EBUILD slime-2.27.ebuild 1551 BLAKE2B 013b46362dc334a0303cc559c18bb408a7718aa0ec3a4092198894d324668bf5e74cf3987876f377be7939333091cd5f3ad4b5ce5074baa5d6e5292f293ebcc8 SHA512 ff23d8e2f5a43fdafb079932fec091a26a5329c653a6a3d633ccfe94ee7693fb6257288bfef27535d1d01f71dcf482cf73f8abdeea4a7ec2da5cc6ec389b4b45
 MISC metadata.xml 1682 BLAKE2B d8f201e0feeac9cb37096887edb806e4623d9f3941f8e1396925d8c20e9d860e0c65eae943d786919865a0278c18cefe09d9d2186e4956001b3e66b6d93f294d SHA512 fe1f25388ab56b6c64a5e624ea8ec11e88bbac53195775f88cb6d8131a15969340d6eff0fb463a7b2ea1834f0fc14de34773589c1cf65ad3a964cd3bfa104142
--- a/app-emacs/slime/slime-2.27.ebuild
+++ b/app-emacs/slime/slime-2.27.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="https://slime.common-lisp.dev/"
+SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2+ GPL-3+ LLGPL-2.1 ZLIB xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc xref"
+RESTRICT="test" # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+	dev-lisp/asdf"
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-apps/texinfo-5.1
+	doc? ( virtual/texi2dvi )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm xref.lisp || die
+}
+
+src_compile() {
+	elisp-compile *.el
+	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+		elisp-compile contrib/*.el lib/*.el
+
+	emake -C doc slime.info
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake -C doc all
+	fi
+}
+
+src_install() {
+	# Install core
+	elisp-install ${PN} *.{el,elc,lisp}
+
+	# Install contribs
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc} contrib/swank*
+
+	# Install lib
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
+
+	# Install swank
+	elisp-install ${PN}/swank/ swank/*.lisp
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# Install docs
+	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
+	newdoc contrib/README.md README-contrib.md
+	doinfo doc/slime.info
+	use doc && dodoc doc/*.pdf
+
+	# Bug #656760
+	touch "${ED}${SITELISP}/${PN}/lib/.nosearch" || die
+}
--- a/app-emacs/yasnippet-snippets/Manifest
+++ b/app-emacs/yasnippet-snippets/Manifest
@ -2,5 +2,5 @@ AUX 50yasnippet-snippets-gentoo.el 161 BLAKE2B af28f32bcf248a9557c25e4afd50110b6
 DIST yasnippet-snippets-0.3.tar.gz 97229 BLAKE2B 26fe83c35be1b20b6a1e414144149cf1feaf4463833634bbd0a3db6f56b1da46d8e379c3dd19217cfd36f12cb9dc796eac4efef5c2ba472ce79f8c8b8d816969 SHA512 4aaac9d7c880642a1e802abb98bd6d6c94557fe0e609db5ce5b4ce2af921235d3e6bb2488c052adbe2940d41e85297520081ae0847b52642bc97610e6614727f
 DIST yasnippet-snippets-1.0.tar.gz 178027 BLAKE2B 0b44c94c3ad3f2a1208aefba110945aeae74e7278c93078c59677985efc89767b670c99b4b8303b56ea0b748375762ada1e45653e02922b248273af5818514d4 SHA512 2df010f24e51d0156bcb3d488cd6a63a47d2d92e4c5f3cd081e377dc91426d630bde41db6f79d1b5ac1e932e4d0ab11f9be945e94fb35d50b1789adab19bd15b
 EBUILD yasnippet-snippets-0.3.ebuild 614 BLAKE2B 73559131e05601b6a1f80ee513e8a2eef5f718d9b037476adfe2dfdb9d15162ee0dc6e2b249851aa1e3aef2ebf0b9363eab6f9e2996adf1d5c19496d75b3012c SHA512 d9d3d0044e4a527ce6b8b0e93f9ec4e63ac0a331d2834c9d283d9cd5f00c0627ece69b5ae17e346401cd345ec32a2daf97f7c86e1833980de2689b85bf0bb89b
-EBUILD yasnippet-snippets-1.0.ebuild 611 BLAKE2B 78a8ae161f1b000d3a7d17c160767f74a7e9a0b758f419c3aef625347f0a497017585fcb35ce153d7cebc8008cd1f1a2d43693df222d98b61341c7c4c98f40da SHA512 b7ed9b5b6435ce5a70ef8d470db964be6b4f88001569bda80ec3ebf203d2160f74e15bee0a4670f7c45a7f8e310c67cb6f251e9cfb59e047ebcc8752328f054a
+EBUILD yasnippet-snippets-1.0-r1.ebuild 747 BLAKE2B cb4f16c89083b1cd22fc38c6988808a6dd6a7b77fcdf45216503dd13e39ce0e4f162ac357ad7d9aec9c7085969c0416d39f06bd14fa3281f8d18d5829e462770 SHA512 36d4c6c34ec69e8fcbc003abdbff220f24662f403d38c101d386c3a0f830b46a7afedac12ed830fce911a344020e73ac0a2c2fb1812580ff5fd1f9d1c65455da
 MISC metadata.xml 377 BLAKE2B 78f369ac63a6ba16eabfbc21367b0e29221a94a8460b877e58b23e4c4176e3d4393ac7cb657057fe239298fc9836365b8a5d6ec789251ed552e684590b40e6e4 SHA512 72e8f247f2bb604ea52229c1aa68abf0fdd6649c87ffaad7f2893131f522cc3d7283251d8e365def16ac5eea831c98472a0ebe591cb6188132e0d7696b559b55
--- a/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.ebuild
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.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=8
@ -14,10 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"

 RDEPEND="app-emacs/yasnippet"
+BDEPEND="${RDEPEND}"

 SITEFILE="50${PN}-gentoo.el"

-src_compile() { :; }
+src_compile() {
+	${EMACS} ${EMACSFLAGS} --eval "(require 'yasnippet)" \
+			 --eval "(yas-compile-directory \"${S}/snippets\")" || die
+}

 src_install() {
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@ -81,6 +81,8 @@ DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip 1437780 BLAKE2B 3d95c9b416c708e291f63c19f80a0fbf1f1b6b99d1daca5d495af9450ce4788982f7a1d1dafd6e441e61ab5669ef6dc938123d542ff76bdd527052305209394e SHA512 3c3bc0ea9702a6b61675ba257dc83d6388b72dffdd0ca9bef7e485304986775b8e40a5241d1ff3242f1f76ff91202751fd6adb449a0854cd07e5f9fc157b2b51
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.7.0.mod 177 BLAKE2B d4c4f840c16da347b6eacc4c2a0680fd50b07478acfe5320ee97b32b876ec947191902cd1283206995ed0e0930fcb8ec54a35fa77a7dcd01435fdb8cd93aed03 SHA512 000987c748c50caf6be521679870e0a537b7d6c4871dc3a698353ad62534bdd0ededb871066fb6f823634d98fcbab69a68696f27145a613e4dc81a5b40a7d3bf
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.7.0.zip 1472793 BLAKE2B 2ef836fe0dc5a8c108a98bcf3f7ca7170e0489cb5766eb29464203332951356ace120e175bf3bd644fef61346b76281202fe4b3c8098209b32e26403738d480e SHA512 9371f495e20c34f5cde68840b4c5ae1dee8d698282bb4f87ea95f7a392bbfdbf79bd3ceb6b78b63b3c3745d512d8b1bc0a8ec1f52af30ee596eb6c9984cffc84
 DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
@ -126,11 +128,15 @@ DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a48
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip 438465 BLAKE2B d9f6dbbbca901ff7f0d187ddcb5532ae520b78d94011d8331d78ede1fa43930979d2fea6d9ba23cb23741017aa62b279317efc1fb4d20e1eab10ac6349aa1c26 SHA512 cf24e24aa121b5e466ec7d838a3cca691d580163a1ab378a557427f8a5b7399cd11668425c0a9601178b43719bb5dd60029c52421d05720b173ac73f096d6737
 DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
 DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.zip 45063 BLAKE2B e64431d884daf0d8d9f62910ea9970ad2ca5bc7e5684ca2148f03f4c9f4563f5c057de5d0f1b44a12536432f7f5ef019ccec6d113ab7ffa8213de68029e80090 SHA512 c5b1b8d35dc5ef3e18474a42edc4dd103238efa458b70328bc1ac0b3c90abec311719b18dc0c0b9bfcc1cfee77ee8374cb8936568ef62580db17c7d1a5c18f3c
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.2.0.mod 82 BLAKE2B 59d4e37dde7daf55d8a0577ced1fa94dae6e7f19d39fc77c4b07b78f3b6b28238c498f9e4f5b9dc98f0f68b2b5f1c269c60cf7f2e51d1b813ead995fb4c148e5 SHA512 dbab40bfcb46612aa024f7fdddc749595b6d1d26cdde6d8cc57bd00279b5f437b276887d3a958b9012afc3fcfa9d9050474d3d93c8dcce1a5fc554436dfd7973
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.2.0.zip 45218 BLAKE2B 27bd08971af513d59cfd81518024f9d63d591e9587a135a2c37c1048f25e6853bc8aa465ab9f04d898f733cca255717586a3d48a6bd88271e87b7fbdce6da06b SHA512 e1176e4ca33e6726d0e968a30ffc7c171c320c635adaee734377cb776aa1276cb99e0b0206cae5c9356c08bca30a47c631bfc7354f2560cbd1b09277860156d2
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip 17559 BLAKE2B a527ab39ba8646129de4c22303bc8c1c58e9834b8ee898a55cfd6940c665134305290fe531e9c8f5c9a1d8d7171db671e479af5679c8abfc4b60c1200761d894 SHA512 a47e8dfb165764ae38985658525e16d7e0942248aae078d2bed543c355ab177e49743556503b59a27cdb33935954ba5d8f08d890b29e5d7fe5d606f2c5b57bdd
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip 15925 BLAKE2B 66134bbd8bbdb9f4ed2db1a77eafd5a0403916ba2dbed0a0da0f7328d2edd7a16a59cd101efba4b5167ec249388027c3a7152de336d1544b98316ae68cf06aea SHA512 26e1b68fb64eb8830aa1140f7cac6d067c7089ba1ce0f10bd59acf9c906add6f64d7797de2799b33232185b8ae9b611234645c324a814c5be338d39a6c2d3488
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.1.mod 44 BLAKE2B 14144a1a466e70280c0a97be84ecd840602176766df6183d4af85fcd37a5e1f6614ac1ee2f5ae53cbd363e9c251682619d03dc88cc5cfcdc04802dbcbadc2bde SHA512 819c2cf17df3f2d6389e71c993279c4586c70253ca3ed6271db00b3d3d86cbca77e18a23d01d163efcf219b03ca30db5ed85bc4758675a2ab2b5bd8933601d5a
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.1.zip 16312 BLAKE2B 8a57575d920450e1afe785ac0cd4eabed3c02adc8bc69a122992ec7a5d1a4e6362b164ccf2d81e309592d4a7e7a482df19944c7aef8f9e2690dd3521ef0b2571 SHA512 fc71f0c239b0cb8dbf1ef7f8257220f3c2f0525fae94146147f1e1ccbe7837983a4ff27d3abc95dc01a30d17a9097ea53618f80c59c3ed672944e584c52c1ed0
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
@ -216,6 +222,8 @@ DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-envparse%2F@v%2Fv0.0.0-20200406174449-d9cfd743a15e.mod 40 BLAKE2B e673f8ab76756f0ed8e03dd148791bb0b47b3ba759c8057dfcdf3d23473319ad61c7d86e2153616c30ca91935eb816e4d4c0760e813e2b436b4a61691258f88e SHA512 f5ff88b4e90366ad5203ba8ea18cfb60e1daee053a7022dce947336abb953b1669e637c54c0c1f5586306926f68e6d13cb610fa3229d7e2f5412850e85e3a8eb
+DIST github.com%2Fhashicorp%2Fgo-envparse%2F@v%2Fv0.0.0-20200406174449-d9cfd743a15e.zip 14983 BLAKE2B 29d73fdbb1c5090bee399d9a6324be197980889e10cbacb20177345287674ed64d8366364e7fbfe14d22aca3d75f7e2228064e70fbd371bf45822d5a1108af07 SHA512 e2c59d2a980d3068bcac91a0dc699abff7d9b5f7ad761dfcb1564d34a06c3fccaeadafb60a66c17bd327c362256a65a378eb409a18bf22750fb82a50bfb5e390
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
@ -234,6 +242,8 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.mod 142 BLAKE2B 5643e29453ddbe9cf301712f9b0bc225d03a41d87408d34ff5f7462c9b3d24d9fc2fb69631580b0271969afc677f52db6f2cb46132ea24413f3924c16a49633a SHA512 39dd40813b9f0d26ffa0a55d01029d618e5ce62e531f02dec77e220ce1f33cd7b7020c3c7b79ac06a13cceb6d4952fc68502d061b227a1a73f1d8ae3db276b3b
 DIST github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.2.5.zip 26045 BLAKE2B 4ea0852505863d4c6ffd437b28b8ea64b33c3c1388fe0fc4c0f7d6cff98e9feef7a906f5f6d842c468c697c59fecdd5da772ab77e5ca80248cf88f0a2a4f7617 SHA512 4b728fddccc9ad4862daa4f14f4a662db350a9c9660b4e627d1f8a12ae38b321034d752e227ec5fb20bee89645ed77c7797b886e6c4ebe1f48a696442f6a506a
+DIST github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.4.0.mod 178 BLAKE2B bef24dbdf72a8555433f1447d4c82efd1c8c0bf33c0592a5d7ab6f8bace4343c29a7ecf08628a9f0f8259e760bdf7b6d3d7c5836ca5c97014643994d3ea2faa5 SHA512 4bdbaee844937f8d921345b5ff4eb5b4fb736138322cdd9de496a65670322cecc016aa2b904f4c870a98f1b27ab05eaf6ccbb1272efe85820871b0c285f4f561
+DIST github.com%2Fhodgesds%2Fperf-utils%2F@v%2Fv0.4.0.zip 38678 BLAKE2B 68bbd9e0b5500d18ae63658af3cb97702fee1f4ad46887627d3dd9204d9a4679527bc3e90d5b37e220bf7b9dbae44ed63bd110c768ffe3dc3fef2ec2cc31e3c6 SHA512 8972b23fec8ab0c3f2b091b8af4dcaf2ca00f4dd8e575d24fcbeb64358247ccea86a32d8ea77b9bd0db9b114ebceebe1ac2250d38e8c61948feaa76c2af56a49
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
@ -261,6 +271,8 @@ DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.mod 214 BLAKE2B 617126f939ade8b353d6dbd39a6ebbf67f36397ea6d6c7b3909cce060bc714c166a374db47b0b1634575cf9efb27bfe7ed5cd4d2ff554e088f6358ff624d7fe3 SHA512 fdbc92c9f04c07244f8f88dd53328273a2c262059159880ca9c95c881dd596982fa1914d9b0f6e07d2f37c709009884ebdf7559dc150076d02fbbd1b451df06e
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.mod 214 BLAKE2B d64021eb72b423680ee867f38bd7e001063435de4e062fdeef302a6de0eaf80dbf624f51ed6e99d071f0681e8908dfbb04ecd25b6e7ec994cdeca9d8aca0a46f SHA512 492d8a1d683b45d2f93c4253bed4cb8f00db895f335a9163d1a3b503c0020f10f8f674cda0e5e3220d0556463f230fcc127be06630efe2d75f49c0bd622e5c89
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210713125558-2bfdf1dbdbd6.zip 318927 BLAKE2B 9841bb05ae82da8d8d0f5c7f6cd92f976b15eb6a1d62bbe584208f333133d3d82494e4d2f9208fbad23e24d5e4676e7a0e03a0c0c697991b0f0e8a839f922691 SHA512 d0f6630dad6feab7608fc3ed05ccbe81d91fab38f58af3910d19489e09c9fbc3b79eabef3f4a12bf461dc565c59429b0bce934812ffa43c701a0bd81c18a2381
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20211022192332-93da33804786.mod 214 BLAKE2B 51f3690934256327b4c64181d7cec514eedbeb51806a007cdb543c9bea737b69993b1f9140d74d13ac9393aec8f93ee070373c5180ee1249c95d1e1c1d405254 SHA512 25233545f668cdc7345ed2456bc967c56195c2484ed6e4ef69a6f6b25ab9b93c3ceca52ad1edc6a3197664ec20414d5f362f0fc9052841c19c7775a108380ffd
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20211022192332-93da33804786.zip 318872 BLAKE2B 16e4532703156f3160c280210b562fedf3a61e5c83e07939aeb6b44287ab39390697eb73269da1981acfb48c26a602d21ae603b8ad400db36482c610ed3ad057 SHA512 85c10371cb6aa734b5d87b91c6664f71341c228994357c8a3408770ad6857aa9508a69b2ad2a8977915d7edd861dc3d9e5273d561be3a6fdc5597e76b7f189c7
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
@ -289,6 +301,8 @@ DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.
 DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
 DIST github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.mod 40 BLAKE2B 82ff7bc9774063e95de0384f92101029ff869e8f800734c44f6878b8e918a048bc0075f835214d5b690f83dd807ab61b7fc4616f23196cf0ad35845ee659c2b8 SHA512 4a251a1f0215d2a3b5a718d2c1bcb8f668f9a638dfb10ad294fbb111224cbd7a8fcb116ae54b356cdeeef70097db535b86dd9607e63ba613100f08407f66078f
 DIST github.com%2Flufia%2Fiostat%2F@v%2Fv1.1.0.zip 6625 BLAKE2B 7e21b47f14422fac61040cabb7baeb17928fcb7db12d92560b782894b10daddfd2b1ffa655e0343ed6600b06cd7ee771e492192506be92bede56247ffdb4fabd SHA512 4bad7f2821c359cd8c15c7a58f6e31fa3f480f6b82b446860617a22f36249cb59c1b5b4f49fc0af11b7071643f4e685de65251e0e3231414ecc2999b1c73a2f9
+DIST github.com%2Flufia%2Fiostat%2F@v%2Fv1.2.0.mod 40 BLAKE2B 82ff7bc9774063e95de0384f92101029ff869e8f800734c44f6878b8e918a048bc0075f835214d5b690f83dd807ab61b7fc4616f23196cf0ad35845ee659c2b8 SHA512 4a251a1f0215d2a3b5a718d2c1bcb8f668f9a638dfb10ad294fbb111224cbd7a8fcb116ae54b356cdeeef70097db535b86dd9607e63ba613100f08407f66078f
+DIST github.com%2Flufia%2Fiostat%2F@v%2Fv1.2.0.zip 7496 BLAKE2B 18376a93d67f47c1da694e45e7cd6cca2c7bdafaae0220e7f00dfdac884b77e091c3c67943296cc1e26929ca63e2f3a12f2e1c2ef90c07ed6458923394c873a6 SHA512 3daa6225b3c8c36ec890f6a3afc94174868aa79992a5863f73a76421d5bcb9e93511636258678caef32b68a0b962ffde75e3b7309bd33c11326257f52cfff7b2
 DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
@ -405,6 +419,8 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.zip 178532 BLAKE2B febbb971264e16ce01088db8ba77506bac3966fe600d4229625117017bb913df03d51af54905d4f9efd0c35941d0133e7b4eefb489d0e6d9a264ef32824b12ee SHA512 17c617788d1d4cfe4a83e8bbe0772e7e3121d75b144b6751501dba0679dc7924432d9c94528c62052bacb9bd5719a7ebfe515d952a95ef4481cd4e45bce88ab1
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.32.1.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.32.1.zip 180639 BLAKE2B 3f710b2121951ca11b7d5e8c4ce3d1131e679ec414d9881150da8e1117aedd39410ad1b75716a7f5e7ba2f01e2b5081dee36ca14d5aa0190cba0deea4aa3b4f7 SHA512 80533dd4a9a2bc03e8a74b19919e870f447e45cd0edad75822048412616963db9095411fb970d859b583e08b9302d99a75640bab185699d19fff1940b45beae2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
@ -413,6 +429,8 @@ DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod 287 BLAKE2B 21
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 70154 BLAKE2B 70e3dc90ebec9462de8c05e1243bfa5754c1ffe421b5380e75ddef5109396453aeb18a107de3a03c1fc2f23243ba53668338fcfe1b289d85c8526bca5ce8c756 SHA512 f8b3286dbd38591987d4c4d4037d1fe16c5adb5bf971131dcda47c29a5c20286db863412056539829235c306bbb68b184052f26473a30fc8194b46a093881cae
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.mod 286 BLAKE2B 48741f0c3685fb8369151968db19610ce28f2a8341da2f3fc7d74ff221fd9b142cfcab2a336f9abffd69dc384972e14d1f033c5eb7de74013cd0617dab95e2fb SHA512 d736de8570a85068955bed17c17387873336142c02115cea7a257fd176310998cba737e9d121310a8dbb8d5cb98399b7427bc7a19da29ea10ab122efed8514b9
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.0.zip 69292 BLAKE2B 2708f198f1cc181291ac1c6c65717b7e0a071e8036819eed8b2a6437c1793c5ed7519a434d906490d2fb6d9a940d10db583f9f0dac0cbd9641bbc954e05959ff SHA512 e531cf841ed1145d4101484bfbb32f120f331ef81bb2ff3f7e7099f71acc646cafedb5f4d4ed49c7a8ccf2a9c8e292498e65b0b47b31245f28265d593dd185eb
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.7.0.mod 286 BLAKE2B 48741f0c3685fb8369151968db19610ce28f2a8341da2f3fc7d74ff221fd9b142cfcab2a336f9abffd69dc384972e14d1f033c5eb7de74013cd0617dab95e2fb SHA512 d736de8570a85068955bed17c17387873336142c02115cea7a257fd176310998cba737e9d121310a8dbb8d5cb98399b7427bc7a19da29ea10ab122efed8514b9
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.7.0.zip 73856 BLAKE2B b1d1e91cd3a7d5d954d7afa1ab623dff761d19af6218ca41fddbd1c4657e30794132051980b429db0f10bae1be6abbc15440246c708e6e1b2c92c8286f5fe188 SHA512 c5d0dc9cc6891275b9909833811eede61bc4b42860164f6d7720bab18d736e0e8f40a11eb71f151214e1c03df27c12576527a5698d79adda5d92b4548df61695
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
@ -428,6 +446,8 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.mod 198 BLAKE2B 954749eeaffd
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.0.zip 297839 BLAKE2B 3d1fbe9dc0baa55e6a1cab1905954354f4120a4161496e5068ed2a6de888b812dce47b45bc94c3bf7c19ab9dbc42ce0859d2c265851113b2ee046042e426f6fb SHA512 385e2f718593b24b497c5f692992c80c909010acfd691fedde4b33513f23a663a391db6cfc47651ea2f88c0f20232f7ff5484c699eab32079a80566cfb91652b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.2.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.2.zip 298046 BLAKE2B c266103227e97bcebfc522124c3f66995693ad412f4aaeebf80bcee063d75c053a6fe885abb4a30e5e0225d56099ccb3c86fedc59bed1f72308bb62f4740cfb9 SHA512 3d1828e21865853b405a4e3fb2ec268993fddcd8159b50018216d70aba1b5536e8f688462c0f2e4de60125f05fb2d16811330f79adf307b874f09b94f74e28c9
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.4-0.20211011103944-1a7a2bd3279f.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.7.4-0.20211011103944-1a7a2bd3279f.zip 315798 BLAKE2B b7960fbd784d77039fe31808f89a1f090859021d79419cba464b226a708136c789bf0ac3afa001a4db600b2ed0a1119d194ad0cb9819ce7ee18af9af52e7aee1 SHA512 12b62438b91bbaaa4f911e30f1528ce14b4f55561041984b662a040d5d17c388ee3ff93aa279aaedd4088121d842699dc1a96738f9297faa839f9f8a2ee600ac
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
@ -435,6 +455,8 @@ DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbb
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.mod 35 BLAKE2B bcdc10d46ac3b8a6a83e1cf12d688dea82392c2ccb341edbfc922324b689ecdbe9a2c3449030cefa1ad723976364b8f774e3d6f51dd944fefaabd84b3eb203e0 SHA512 96b3521ffde2955dd8ea8b22b14dfdc829fad79e89a4c54e9c243cf34829e650d40f3e176157bde0b3ba3ec89c40c67f51c49d4ab1e08bfed762018e12ab7024
 DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20201023143004-874930cb3ce0.zip 18243 BLAKE2B 88323acba7c2913330746d94cf2aa3e10064cc27781b24a649463103f6945455ee96d7a7083eccea1dd81312cc66136254d5c0b4d77368066f3bc508bbbaf2b9 SHA512 9c958eda44a6379d276e5c800f7dfa93bb1152857607ba20eb63ce7e2b7df2e72e5f85983113daa1e1428c62e07b6541b89d10aa82e4fd73d60b6609330ef402
+DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.1.0.mod 105 BLAKE2B d4fe7017a1eff5cb712abac903f70cbfb77b7866090aadb354d0be73f20fd80044669135805bfe29db5ab8a3a0b07e6b97521980a2b0f650cea456969e8fedbf SHA512 ff2d1c7736607a7591dc0c7e65e9f81ba0636533d798b23ddbbf0d2cb7dcf65b72c3ffccce6d046bc7e0e56e2850917fb6d201273e34dde51b82dc7a97b4e12f
+DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.1.0.zip 18383 BLAKE2B 4500c1979b8af5c06264cb3037404b3aa0d5bbed2fb8a5b71547dd4ba70836c7442ec5f7f12b77d46e98ba1f8d12e34e79743bd72cc626de0e942a4d80115ae6 SHA512 cf8b874a94220e6fb71b7f875c14c7c026c5366148738c0e7f60b513c10aace7c8f392f80663241b1db4b448344874ebf0506fc1f59054abaaa1b84ab1beeb2b
 DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
@ -676,6 +698,10 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210906170528-6f6e22806c34.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211023085530-d6a326fbbf70.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211117180635-dee7805ff2e1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211117180635-dee7805ff2e1.zip 1671839 BLAKE2B 3e2ff1093d43f58efcd29117186e29f8492d6c8e80dceb13759a8ae292c30d8f62c61ec1c68eab6f51f198c55140eb8022739dc62ca3799f14011ef549eecd12 SHA512 9c76beab20503f2f445d57fbf65358a091fafe0b42c93d7e39bb47db248309283bf490931da79e33dbe4e5d05bac2010f375629918db43e677f08e1422d6ec54
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@ -866,6 +892,7 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e
 DIST node_exporter-1.1.2.tar.gz 313873 BLAKE2B daeedd913ae5bf6d2d21ae7a1d496b48850d5f3363f60dc4b1b715f000c412709452568ec33a5b4ade166512698a129866e28a145b66638b81c056f49963c3f4 SHA512 d40ea07fa0bccaa8843e99034af9a4853e7885e6b851c89db8fa49a133a8db6ea75ea8b829a982c0b78961b9ed33b1b9356f5e25d72a7c9e4ce255b32335911b
 DIST node_exporter-1.2.0.tar.gz 320013 BLAKE2B b079e64749db803125d6226b56b4ea1c3c1858429f6df6a35acdb034edee3cbfbce3f351f62c6425f103e61696d6ecacb35006cef86df9701dd5b4b4eaadb63c SHA512 0774cb5c62e03e79fb1ff174d890891952acd743c30803cd915dc090fdfd05a855599d26097ef2378f4a37710897867d63c309ee99447b7f836dc5f0ef0af768
 DIST node_exporter-1.2.2.tar.gz 320098 BLAKE2B 29aa2f01abae1e4689d01f827350e94b9093f87ce459b3deea60a501541550c3bb7cb276a4958bb3ac30ccb094686c7bb44b70af49e980c463eae74b2a453a30 SHA512 a53047e5f434127eadbf065d3fb65fcf83ecd29f34927da03741880b2bf454743326c46af85939185642d810aaa0b334f707ae1ade703b05de1c48cd034a5fca
+DIST node_exporter-1.3.1.tar.gz 299038 BLAKE2B 8c4b562fab36632f6a4bcfc0c7bc65484bd9d44b16691a3d531c3e163ab17bf0fe81712d5ea3115460144be246599fc3430a80dd2244981333f0e1e5b2384c80 SHA512 cd73ca3551b0b52307d8b76aff29bf497609a1729203da9898270d1441d3358e8d9ba907bb8a75b5934ed64a8cf6b360385b1b2d0a3de55e0e149e0f819e0a1f
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
@ -874,4 +901,5 @@ DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcff
 EBUILD node_exporter-1.1.2-r1.ebuild 31533 BLAKE2B 351b3bce7bbacb63922f3dcdc9d71317fdd469919841a2a325b293cbec74da31239f34aca28f80631b38b625bfca9b1e48c9b0180eb8d2b5dee23cb60b977125 SHA512 9c9d54213fa86c046833558e66591a8c701f9cf3e0139a2e3e6f9cb1fc56131ad32e5dcce204e9bebeaf4add6bf698e70d91c47bafc0d861d973c15ab3cbbcff
 EBUILD node_exporter-1.2.0.ebuild 33010 BLAKE2B bbd9056741d896d62429e6e4dfd685d69b0dbd4a90c66d7fe2b8c1ef8d40c6035596224eb74aceb8b84bf0cde117a3afe8fef9d1616449fc7ee126fb26646145 SHA512 e2af91b5a0b9821301cfb11f8b4a94a30c42af4bb91b99800c9b143e97bbf74c71dcea40551b5199dd71905ddc0f36f5020a861c137f771e342f62a44edac3e5
 EBUILD node_exporter-1.2.2.ebuild 33010 BLAKE2B e307f4b90709004789a45c3de1f344aaa391ff8a9c0c9f29dd7b6d7c64e442eb91ce4763b9af2afca0845abb7df8cb3d428f79ceab9212efe8c9ff596b447755 SHA512 e92f2806a296ce174234ea1db11581da75e2848bbb6e8a38cc60b1980a66ec848edbbd54ea70438bd7f652a4e654b5d25a5c6c9eec36426f7f92c9f3c05140f8
+EBUILD node_exporter-1.3.1.ebuild 33382 BLAKE2B 3e40e359cd14020f0b266a3052efb65c1155b542511b7c8445abfab93698036e9413bcb6b7dce89dce238ef4ae53334371071a0a5074b32b72f1f5fcec6ae988 SHA512 be92361ff88a494a95af8669a3c21273386111cd05ab1b7304602220107194ea2f17d914e6f82dcb77f98dd086d0aa0b9c80e8d0a40ec8eb5f1df5f2d85ef737
 MISC metadata.xml 446 BLAKE2B 5ee5309865ccc3868ed6a15b338e7356ce1091110e5f1916abb09a6bfb4d953780245f6389d1288a00bfe759d040e59d0969717dcbf72db8152c9ad3832bbd66 SHA512 dc0619728aab9f18b016b54a592d760978af68b20e657e21b2ddeca1536980fb795f574179937e4b601affa71031303fc33dacd0142f7163642ac066ca4bbbf4
--- a/app-metrics/node_exporter/node_exporter-1.3.1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.3.1.ebuild
@ -0,0 +1,626 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+MY_PV="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT=a2321e7
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/beevik/ntp v0.3.0"
+	"github.com/beevik/ntp v0.3.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/cilium/ebpf v0.5.0/go.mod"
+	"github.com/cilium/ebpf v0.7.0"
+	"github.com/cilium/ebpf v0.7.0/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
+	"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/ema/qdisc v0.0.0-20200603082823-62d0308e3e00"
+	"github.com/ema/qdisc v0.0.0-20200603082823-62d0308e3e00/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/frankban/quicktest v1.11.3"
+	"github.com/frankban/quicktest v1.11.3/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/log v0.1.0/go.mod"
+	"github.com/go-kit/log v0.2.0"
+	"github.com/go-kit/log v0.2.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.1"
+	"github.com/go-logfmt/logfmt v0.5.1/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968"
+	"github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/hashicorp/go-envparse v0.0.0-20200406174449-d9cfd743a15e"
+	"github.com/hashicorp/go-envparse v0.0.0-20200406174449-d9cfd743a15e/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hodgesds/perf-utils v0.4.0"
+	"github.com/hodgesds/perf-utils v0.4.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973"
+	"github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod"
+	"github.com/josharian/native v0.0.0-20200817173448-b6b71def0850"
+	"github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20190830100107-3784a6c7c552/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lufia/iostat v1.2.0"
+	"github.com/lufia/iostat v1.2.0/go.mod"
+	"github.com/mattn/go-xmlrpc v0.0.3"
+	"github.com/mattn/go-xmlrpc v0.0.3/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43"
+	"github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod"
+	"github.com/mdlayher/genetlink v1.0.0"
+	"github.com/mdlayher/genetlink v1.0.0/go.mod"
+	"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+	"github.com/mdlayher/netlink v0.0.0-20190828143259-340058475d09/go.mod"
+	"github.com/mdlayher/netlink v1.0.0/go.mod"
+	"github.com/mdlayher/netlink v1.1.0/go.mod"
+	"github.com/mdlayher/netlink v1.1.1/go.mod"
+	"github.com/mdlayher/netlink v1.2.0/go.mod"
+	"github.com/mdlayher/netlink v1.2.1/go.mod"
+	"github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod"
+	"github.com/mdlayher/netlink v1.3.0/go.mod"
+	"github.com/mdlayher/netlink v1.4.0/go.mod"
+	"github.com/mdlayher/netlink v1.4.1"
+	"github.com/mdlayher/netlink v1.4.1/go.mod"
+	"github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00"
+	"github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod"
+	"github.com/mdlayher/wifi v0.0.0-20200527114002-84f0b9457fdd"
+	"github.com/mdlayher/wifi v0.0.0-20200527114002-84f0b9457fdd/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.11.0"
+	"github.com/prometheus/client_golang v1.11.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.26.0/go.mod"
+	"github.com/prometheus/common v0.29.0/go.mod"
+	"github.com/prometheus/common v0.32.1"
+	"github.com/prometheus/common v0.32.1/go.mod"
+	"github.com/prometheus/exporter-toolkit v0.7.0"
+	"github.com/prometheus/exporter-toolkit v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/prometheus/procfs v0.7.4-0.20211011103944-1a7a2bd3279f"
+	"github.com/prometheus/procfs v0.7.4-0.20211011103944-1a7a2bd3279f/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/safchain/ethtool v0.1.0"
+	"github.com/safchain/ethtool v0.1.0/go.mod"
+	"github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973"
+	"github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a"
+	"github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.uber.org/atomic v1.7.0"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.6.0"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210525063256-abc453219eb5"
+	"golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+	"golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod"
+	"golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod"
+	"golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod"
+	"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod"
+	"golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod"
+	"golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1"
+	"golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND="acct-group/node_exporter
+	acct-user/node_exporter"
+DEPEND=">=dev-util/promu-0.3.0
+	${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix node_exporter || die
+}
+
+src_install() {
+	dosbin node_exporter/node_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	systemd_dounit "${FILESDIR}"/node_exporter.service
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/lib/node_exporter /var/log/node_exporter
+	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@ -26,6 +26,7 @@ DIST bet-1.0.1.crate 7163 BLAKE2B 173f38b378ec7a3bfbe6c180d0988af381cbec39d76374
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST broot-1.10.0.tar.gz 9419669 BLAKE2B 6b8bf45b13d3f95488677f6c5322bb74f0c60d51b6686760a6d8aa0c53e9705c7e2c6120868433be38324f4ec38c2506bfb32f67a645fc9dfd23f49b46807e9b SHA512 24a098eb1f2ff428030e84ca8a875169291b830bf6b64ca4f2442aede80ffbcee9297ca1dd17183b03621a9d6352d9c1fec85db8a3afe7f4cbe630a70a521caf
+DIST broot-1.11.1.tar.gz 10039048 BLAKE2B 5d52bf08658a117d6240f9f0502f6b366fab8516c3e7638611b5397ea1981405c77d788539c6d4c957c64298014980461b97156350c982dc9c0c5097ef7f3981 SHA512 dd8478a904df85999221a8e6466d3025de0d80ad9f7f1d1d0627a103893a6de3f379c1434ac59afe534bb28bda9a3ea0c269efe7d3266bdf87cbc5efcf07421f
 DIST broot-1.8.1.tar.gz 9417690 BLAKE2B 499cd7fc32c7a7151a2ea0599e4c9332162a235a83a22e953b0f4dad098c95320986352f0129eacc4b4feb8d68c81276274bd9d8072ade8158fb89bb5a0c6048 SHA512 ddd84d7dad2416c63bcab2e8e72375aa14b4748a5a29708c47b7df5f4a203691ad8d0587dde1ba961658195fe6ecfea154729bcfd7e757777a53a16cde9f2a09
 DIST broot-1.9.2.tar.gz 9421208 BLAKE2B 15f0df8f69d0a3a70a025cebe2e930381a7b198d2e70f7effb81bc4bec4b5b1f8095167512ae592ae0682abf1cf6853d33415be05bdd7e1e54b24ae573248d3a SHA512 3bd69d58913866a7bad11d97dc50a9eb22b0ceb4536a0a78b1b76bb2b83fbedc6feaf8d0f0500db30191f93e6d7cb369ea440e9857cdfb85f967b29a65053605
 DIST broot-1.9.3.tar.gz 9418812 BLAKE2B 02e007f8ab1faa3d7297b7106166311f7eaa4aa37e13fb82a9200ab84c9cce6bab4c2ae892a75290f2982391a4e55a3ab07cdb0cbc9878c6367ae35b464bb143 SHA512 dec999d5b00dfad7ff7104244774f124b7d4d4e7b9cedbc7c0bbda2df7be01622c65e3fa88abc6483621b697b18868bca481c82a2d4407cac1138a3f7fc5f28c
@ -167,6 +168,7 @@ DIST open-2.0.1.crate 6648 BLAKE2B e39c669e266c3b5b16b05c51cb219a87961d03a970e8b
 DIST open-2.0.3.crate 13262 BLAKE2B e9ef09159ace9aa2ae8df14b32aa6cb208b1c4dc1c9a6e6bde3f07f7491328a1735214a2ce628cbebbd3e1d0d964ec7934860307062e50e4ea27e13e7db25dac SHA512 4d9f7c21b1e6c7b8485057b25005ec2e70c9c6831ad26c03a164f95dc12d75ca2513a3f275b902050de6fc3434dd6602b2947bb23876c7693166d4958c9dd4da
 DIST open-2.1.0.crate 13461 BLAKE2B e3e640592e3c7452db5eafa33ac1c0e8e68f08eaf68290c33b576a9bb9f717bdcbd451a58840a8f71b963a9338e430685e3df043b64e47acebedba30fd47238f SHA512 2aa5369a22eaf20b2454dc56505ebee8fc0c18d7053ad7ad0738071606f1891a79d379d6feddebabe0d42f9c734c754cc3390a64aac329c3cbbe0974a045c2f1
 DIST open-2.1.1.crate 13687 BLAKE2B be1d10d6d43b6f79332aba5c44aeececa32122914313996652c06589072ea154a782ce291a09a025a731ea90ae4e1987e62ceb07071549f886415ed1bf6de20f SHA512 8de337ec58f9037e1635e1efb8b383355da96355c189b90f9940ed251ba9f8f22d50b4077cfecae88f1d00db8ec172efe27b5605273750d728c86314c807095a
+DIST opener-0.5.0.crate 12350 BLAKE2B 5992f6d564ae14b609aff2d0415c4d7414a8cafebdccb9ac0b66056cd2968f346d63855d8251b153414115c6c8d8cc91134ab53d6b714df78f2c3c858b22cf8a SHA512 4a9be4d280cc5039d080bfaa318b47a80dfa930f3e60068ca10346aeac421abc8575d7eef3649061847e24ad3a6262fb58ab183f6f2704f429e9674f392c30a7
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
@ -283,6 +285,7 @@ DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d
 DIST xterm-query-0.1.0.crate 5662 BLAKE2B fe75d2e7d4e493a3dfc0105dd61e923910f890341ae473a8ce3c5b95dfd8efc9b0384f7857944baee129d9f0e8bbff16939fb523883acc36eeee34c737f76be0 SHA512 10809fb3d15364d3b2bda823a2d3bb102a5b859148090da8ecf019ad84e4663359160d6fb08f41dbad7b90752f5a71764fcb3809d73f0c07acc08c1d303c7515
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.10.0.ebuild 4724 BLAKE2B e13e4163a0ad1571f2c784d99387a6a5d36c99cab790be2bae88aa2e54eec90a3f13e0e15fee550399f4a6c128a6011ce96743b9e463a0ce13a76e4087211b91 SHA512 33977c27bcca26ef89dfd0132690200a6742bf1926b87f4c43009655b8432525f9a651adb4604706566faef4910234b4384fbf75ca3af51043603340cf46e99a
+EBUILD broot-1.11.1.ebuild 4726 BLAKE2B 02aaf695de78329cbc952f2454dbfc8f742c37a590a5bc2ba5fc41392787d132e03fd21ffd24ce6839af228ac417c483ebdc2ec010894e70f928e3cb38ebee36 SHA512 038175ee519bcf5d628fa3340809ad775ec692308e89849df54d6d36d1ab39e1cb798c7f88913f097f14dfa644f0008bc0ec2294bc14a2ccf8caecb143f1dd5e
 EBUILD broot-1.8.1.ebuild 4564 BLAKE2B 5e3958df321e20a68b6a3982eaa07d5eff329525189bd94b677c321fe394a90ba772d302b133e26b161678b4fc52ce9014d3e9737046fe43c8ea384383342171 SHA512 6cec0e09e46150e09047f7d5fbbc4ba269a542306cd3fd3821449d77129fea969534bd492fa9f69291d188cb5573418fea19a4cb00782cf87f642e5f9233f933
 EBUILD broot-1.9.2.ebuild 4593 BLAKE2B 13ad217d95abc40ecfd15aa09e436fa2f4311ebc1dd1a529d265bc32b8d4382c24fb74c0eb59b851466cf3a0512411d1b90fd2c3109eac2af17a0a1a24fcec03 SHA512 4e4196bd17309b2e318518c45f7461ef45748bca00b5b77c884274d62d1c177ba722a1247004a34d218b18b798a50d3a9cf0eec102766e483abdc663b8615253
 EBUILD broot-1.9.3.ebuild 4672 BLAKE2B 63c7668419110b6ec68937f87c6990bf58acbceaedb51bbda744254d5b65492798158aaee8c2780387a7513f2ee0330c5814abddb6172a265e01277b42ca9849 SHA512 e1f9b9ccfc645e822a400c540a504bbd7a456493dd0b5cfb1671add7898baf5a4fac7370ef8b33ed42ed21130112ef4c3084eb7b1a5b0058c56745636072ac8c
--- a/app-misc/broot/broot-1.11.1.ebuild
+++ b/app-misc/broot/broot-1.11.1.ebuild
@ -0,0 +1,272 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.6
+aho-corasick-0.7.18
+ansi_colours-1.1.1
+ansi_term-0.12.1
+anyhow-1.0.56
+argh-0.1.7
+argh_derive-0.1.7
+argh_shared-0.1.7
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.0
+bet-1.0.1
+bincode-1.3.3
+bitflags-1.3.2
+bstr-0.2.17
+bytemuck-1.8.0
+byteorder-1.4.3
+cc-1.0.73
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.19
+clap-2.34.0
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.4.1
+color_quant-1.1.0
+coolor-0.3.1
+crc32fast-1.3.2
+crokey-0.4.0
+crokey-proc_macros-0.4.0
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crossterm-0.19.0
+crossterm-0.22.1
+crossterm_winapi-0.7.0
+crossterm_winapi-0.9.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.6
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.2
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.6.1
+error-code-2.3.1
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.7.0
+file-size-1.0.3
+flate2-1.0.22
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.2.5
+gif-0.11.3
+git2-0.13.25
+glassbench-0.3.1
+glob-0.3.0
+hashbrown-0.9.1
+hashbrown-0.11.2
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.19
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.8.0
+instant-0.1.12
+is_executable-1.0.1
+itoa-0.4.8
+itoa-1.0.1
+jobserver-0.1.24
+jpeg-decoder-0.1.22
+lazy-regex-2.3.0
+lazy-regex-proc_macros-2.3.0
+lazy_static-1.4.0
+lfs-core-0.11.0
+libc-0.2.119
+libgit2-sys-0.12.26+1.3.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.5
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.6
+log-0.4.14
+matches-0.1.9
+memchr-2.4.1
+memmap-0.7.0
+memoffset-0.6.5
+minimad-0.7.1
+minimad-0.9.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.14
+miow-0.3.7
+nix-0.22.3
+ntapi-0.3.7
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.1
+num_threads-0.1.4
+once_cell-1.10.0
+onig-6.3.1
+onig_sys-69.7.1
+open-1.7.1
+opener-0.5.0
+parking_lot-0.11.2
+parking_lot_core-0.8.5
+pathdiff-0.2.1
+percent-encoding-2.1.0
+phf-0.9.0
+phf_generator-0.9.1
+phf_macros-0.9.0
+phf_shared-0.9.0
+pkg-config-0.3.24
+plist-1.3.1
+png-0.16.8
+ppv-lite86-0.2.16
+proc-macro-hack-0.5.19
+proc-macro2-1.0.36
+proc-status-0.1.1
+quick-xml-0.22.0
+quote-1.0.15
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.11
+redox_users-0.4.0
+regex-1.5.5
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rgb-0.8.32
+rusqlite-0.24.2
+ryu-1.0.9
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.136
+serde_derive-1.0.136
+serde_json-1.0.79
+signal-hook-0.1.17
+signal-hook-0.3.13
+signal-hook-mio-0.2.1
+signal-hook-registry-1.4.0
+siphasher-0.3.10
+smallvec-1.8.0
+snafu-0.7.0
+snafu-derive-0.7.0
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.86
+syntect-no-panic-4.6.1
+tempfile-3.3.0
+termimad-0.10.3
+termimad-0.20.0
+terminal-clipboard-0.3.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiff-0.6.1
+time-0.1.43
+time-0.3.7
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-1.0.1
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.3
+xcb-0.10.1
+xml-rs-0.8.4
+xterm-query-0.1.0
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.58"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@ -1,7 +1,3 @@
-DIST datovka-4.15.3.tar.xz 2827960 BLAKE2B 765b48f0608f3cbd947e5191778a0ae88e1fcb6679bc252160c8f5ed2b186f672fcfe2b55db67182d9a07676ebab01a272b70fced151e7f8ae027a632c6d9879 SHA512 e3791dae451ce7b42bd50cfdf0191430e3d1b5d8101a70e5c1466296b03d94e798dc080b663ff98bdf9dd80138f5d067ae5d493aeaf89285d66095b24ce15f1a
-DIST datovka-4.17.0.tar.xz 2942828 BLAKE2B 3ee1c9a02d8d5fe470cd59925f01ec8f420cceef36ddae951136c3b4191582da20c4ce35c64df2428034815ab2f6d498b2cf839e10ad33dcebaf86c919f2ecd1 SHA512 d5ab51c8eba611094bba113e51447d1964fe3833a9b842353168725afedb96aadef39d2f103ff344f0c28d989ec89f429415cb9f89bd5b6c2fbf5338374bbcb5
 DIST datovka-4.18.0.tar.xz 2966652 BLAKE2B 52210a7575ebff9744c8238c22f2270b22a207d210b09bb7cab4e90decab9bb2314e716abd667ed954c72010c38c939a2e3ae7b4f9b2d51079bda72035c47b1a SHA512 b27ae78734611824aaddd84b3a21c38649bbed8c11e5fb740b929df0bf2b5b28a7e9a98722424603127c98b845eec9882675e5326abf8214fccce676f1cca3bb
-EBUILD datovka-4.15.3.ebuild 1089 BLAKE2B 4c0bcf9c74adc67452e9f568a0ffd4b7a3f90db313fcb9fc33624a9b51a17b8303ddf6333d9854120c698342dfda60f3f5ec267381edcbb4e5325c3ba33d5bac SHA512 cccf1623c0127be3c5193693724bdbce09d8eafee481940c3dd40cca267ce45d8ab5a049bf314dba07752dc6ba1af23403f269df861147693aed10ef65789404
-EBUILD datovka-4.17.0.ebuild 1118 BLAKE2B df003f426a03119ca3ea4782e6b65f1d2a0a38530df7caeafb370e88622e26e5c5da32dc6ffecbd55744a235941a882defe843a7cda4391359f4a9698c29b383 SHA512 3ff562f3d2aa0cebdc1a6bb3e342f2ab12610a1f57d31a2c7c95db534d951f47fdb7c6a8fbed6cb0c80b8c05c4061cb63fdc22554cfe3c355b177af31466b582
-EBUILD datovka-4.18.0.ebuild 1118 BLAKE2B 8a2cc37ebe58d289708adc8443bd571a658d05446bcb8bfd5bbe7a53b0e7ddce930914d1e7834559de08d4fbaa6ee72d2069c94754ed508097eb973353b2dae2 SHA512 777a965441b562f18c52d11d3e12a17114226ca1391ce02d6ab3b0ab974da084d00eb342ff3329247138b19e8a8cb6b23f9446288384eed6ef0e1cb202b6c812
+EBUILD datovka-4.18.0-r1.ebuild 1151 BLAKE2B 3028ae1b2cb443eab0c29d05ee272feab43cfdb79c71dfe0859cd024c49b058c361d994aff9a477b47f563186eac27e96537336eb06031293c262a4f36efe5b2 SHA512 b488267ac93f3450a6170af6f95fd0a9600270ad525857253025db474d3efd5dd30516bec502385339f1fb7b99e78fa89ddd3afae97a2a26fbad593f667e9cb7
 MISC metadata.xml 446 BLAKE2B 44b5b1a612879e7159269411acbcbbe6993c0d80bf765d3eed6aeccccae8c1cbccf7223c4073f0a7d57a09605fff0e5c11ba0673f99ce5aa14aeecd4c2e66450 SHA512 012ad05c78078e2f6f055526971d080b370dcbf90d9ce1a3eec90336c8dbedd5140d8a96af67829c22d4fddd9c7e522701d12d99724e13fabb102573464e034e
--- a/app-misc/datovka/datovka-4.15.3.ebuild
+++ b/app-misc/datovka/datovka-4.15.3.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.14.0:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.11
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-"
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
--- a/app-misc/datovka/datovka-4.17.0.ebuild
+++ b/app-misc/datovka/datovka-4.17.0.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.14.0:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.11
-	>=app-misc/libdatovka-0.1.2
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-"
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
--- a/app-misc/datovka/datovka-4.18.0-r1.ebuild
+++ b/app-misc/datovka/datovka-4.18.0-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit qmake-utils xdg-utils

@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}[sqlite]
 	>=dev-qt/qtsvg-${QT_PV}
@ -29,15 +29,16 @@ RDEPEND="
 	>=net-libs/libisds-0.11
 	>=app-misc/libdatovka-0.2.0
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 "
+
 DOCS=( ChangeLog README )

 src_configure() {
-	lrelease datovka.pro || die
+	$(qt5_get_bindir)/lrelease datovka.pro || die
 	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
 }

--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@ -1,7 +1,8 @@
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
+AUX mc-4.8.28-tests.patch 1308 BLAKE2B 37f2d2a3264386d558212741d95c68c9362676d727d4d2b47a690dd6ad97c15ff943b3950cc28456ffceda78e88645bd6f73958a592f425594e727cc383721cf SHA512 41499d5ee4a7d0bf3e08c6fad56c2d46e3761f4f7359db1351c4ca1358a9ba33be7979df55d19263214acb3ea01271278efccff72d32ea3cf8a3cfb84a964f47
 DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
 DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
 EBUILD mc-4.8.27.ebuild 3277 BLAKE2B f0ad166643a2f22cac89583cb6793e47462a96a9d5acef7870fec3598403cd356e2bdedab092601371f3aa18a3e76596caaae3fa48a454051aa5af39c6bbe6c3 SHA512 282ac6d42a7de75cc3973ffa4259d33ce32eb0b7f1714f136f2dd349f09481fbe6aad7086d0f5bb4d6a0a24389bae4bd7b0962c5c573718bd5019750d676b605
-EBUILD mc-4.8.28.ebuild 3236 BLAKE2B 369d2786eb82bcbaf2151ef8c6ab3e4a8dfed8558f37b0ddc5839096d64c474a23f3b34495725b487830b6ea2355f171ea115687a0caee1e1ef3faf4e32d499d SHA512 66c24fddb327cc7c0e6ad317124f3ce169b9856706ce59e0172e3e4a50bcc35e1b4b15c88222c8839712f79b33f42d5977dab0f9a3b7e3a4f15904f3a48e4554
+EBUILD mc-4.8.28.ebuild 3276 BLAKE2B 465299020b14801c598da4fa1ec5ee33b07b4e0725ee17fd0a6f913072d8b638fe888fb45262fca3148261d0b0997f517ddcf58c750c0051ac22e7c5c42037af SHA512 013203b1821dc21d30a81c645d5f49cb3790f6644c55a16df68c765576ee482ac6d06a7a52dfe1f7bd59cd39fb0e2aaa9c03c68711eca7904194932e10dc18ad
 EBUILD mc-9999.ebuild 3561 BLAKE2B 4c7bd6ec644bfbccd2585244d683edfeb4c5bdf023c6eb866424ae11bd9138a99af2ce4dad7bd512853f6ebf18520319019c213b1036d9935563c29de24820c8 SHA512 93485a23e82d8584de49c2b8abbd8bf1ddbf3c2d722742d01b820b31befef9829c6f3de0eb69d3005109ea7f03d5ace7eee0eece5ad89862030faadb2bfbd908
 MISC metadata.xml 771 BLAKE2B 9680a9a9c9cdd9dd6c7972947f8d62eab08e14c8c1285009f4f55a90409bca51ea9bf72be913eb5812db7723230fa469acbc731a959b7caaa9473136b68115e4 SHA512 5c4dd207f8f3fc8c33bf571c78f50e51a4331ddddaa1b0cfdee93601b86d34a234482a1168ba021440fde04bcc4e034e223e89413a034ddf21faca08a112a9e9
--- a/app-misc/mc/files/mc-4.8.28-tests.patch
+++ b/app-misc/mc/files/mc-4.8.28-tests.patch
@ -0,0 +1,35 @@
+START_TEST uses the variable name _i, so GCC complains about redefining it with
+a different type here.
+
+--- mc-4.8.28/tests/lib/strutil/filevercmp.c	2022-03-20 10:02:47.000000000 +0000
+++ mc-4.8.28/tests/lib/strutil/filevercmp.c	2022-03-27 15:31:19.812120141 +0100
+@@ -353,20 +353,20 @@
+ START_TEST (filevercmp_test5)
+ /* *INDENT-ON* */
+ {
+-    size_t _i;
+    size_t ii;
+ 
+-    for (_i = 0; _i < filevercmp_test_ds5_len; _i++)
+-        for (; filevercmp_test_ds5[_i] != NULL; _i++)
+    for (ii = 0; ii < filevercmp_test_ds5_len; ii++)
+        for (; filevercmp_test_ds5[ii] != NULL; ii++)
+         {
+-            const char *i = filevercmp_test_ds5[_i];
+-            size_t _j;
+            const char *i = filevercmp_test_ds5[ii];
+            size_t jj;
+ 
+-            for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++)
+            for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++)
+             {
+-                const char *j = filevercmp_test_ds5[_j];
+                const char *j = filevercmp_test_ds5[jj];
+ 
+-                ck_assert_int_eq (test_filevercmp (i, j), 0);
+-                ck_assert_int_eq (test_filevercmp (j, i), 0);
+                ck_assert_int_eq (test_filevercmp (i, j), 0);
+                ck_assert_int_eq (test_filevercmp (j, i), 0);
+             }
+         }
+ }
--- a/app-misc/mc/mc-4.8.28.ebuild
+++ b/app-misc/mc/mc-4.8.28.ebuild
@ -48,6 +48,7 @@ S="${WORKDIR}/${MY_P}"

 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+	"${FILESDIR}"/${P}-tests.patch #836812
 )

 pkg_pretend() {
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@ -6,5 +6,5 @@ AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec0
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
-EBUILD glog-0.5.0.ebuild 1434 BLAKE2B 41a5f681a1b2d94c4122bcce5306fc999f40161a159e68ad78fab56b9bcb5d88caa6f309224f095cd540f00aa191b6fa1379b5e888ab62cb113160c578c5a23c SHA512 630a5b158fe228f22f4025594ca9b9741ca1abe11ddfcd65280111e60e46b19e8558d59e17bf63c7979af1b50c48259f679bf2d60782717ae5b42522c181e6ce
+EBUILD glog-0.5.0.ebuild 1441 BLAKE2B 36b65a05f64470f316bef75c6cb33717856f047eab30b9b2f47194660e1184c675edd25ed2bbaf383842b5e804cc5e589a84f54d4aaec411703c31806781434b SHA512 80ad142349249550929e1eaadd4215e535333dfcffe2488d801373296985c788562cc443340497256a930fae8a8c83913caffbd8ff56ef88a0a2a5fd52903b2a
 MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@ -21,7 +21,7 @@ fi

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"

--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@ -1,4 +1,5 @@
+AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
 DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
-EBUILD highway-0.16.0.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
+EBUILD highway-0.16.0-r1.ebuild 942 BLAKE2B 9fb7283832fd7064ecfd2737d2211788004763fb9ce97a70af64ca9867d50c42d2cd0f34e32608179cc3950aa59cd1a2e5f5d22a0eb5404a1b03355ceb5f41d0 SHA512 320e54fbba2da543642ea3d01c355bb2ece387aa5f96cfaffed33ef480285ab57fe89f1a96308d14dd4b73d1d35391f77e8700002b6733c6ac72f5589a5eb892
 EBUILD highway-9999.ebuild 834 BLAKE2B bb10c9e76cac9a5149824c3f7def1928cbb19db5f7612aa22b8d5aace561483cb7d391e95a21be12edb73c87b3ce5e2a0ae4bb652ea8cfc2f9976b9afecdad8c SHA512 68cf57994bbed31f0ecc10e876ab78edef1af6c1af5be91e2d6ee7758b962799104873795d7c6ce443a2b4cc68c2324823b4e0d8233ca95eeeeb61b042bb5487
 MISC metadata.xml 616 BLAKE2B d7aed88bf99a4e1370c0007e2eeb0d9e8a64c888cf1ef428f5096e40d75497a7255ceeeb73b68d7bb3afe44f65073811759dbb61f2270d4a8fdbc0721c7b27dd SHA512 855f548c51686530649f9eb1d5a8f4441f8dca8377622acc3cd32562b58556000dec77ba7c162e8f00443e85b75fde81d2cc900c1741ed76f815e3521d2602e4
--- a/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
+++ b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
@ -0,0 +1,17 @@
+https://github.com/google/highway/commit/daf441c78191b3433410498d27a5bfdfdf93a142
+
+diff --git a/hwy/targets.cc b/hwy/targets.cc
+index 2a0ab4ef..7e7e2d79 100644
+--- a/hwy/targets.cc
+++ b/hwy/targets.cc
+@@ -328,8 +328,8 @@ uint32_t SupportedTargets() {
+     if (!IsBitSet(xcr0, 2)) {
+       bits &= ~uint32_t(HWY_AVX2 | HWY_AVX3 | HWY_AVX3_DL);
+     }
+-    // ZMM + opmask
+-    if ((xcr0 & 0x70) != 0x70) {
+    // opmask, ZMM lo/hi
+    if (!IsBitSet(xcr0, 5) || !IsBitSet(xcr0, 6) || !IsBitSet(xcr0, 7)) {
+       bits &= ~uint32_t(HWY_AVX3 | HWY_AVX3_DL);
+     }
+   }
--- a/dev-cpp/highway/highway-0.16.0-r1.ebuild
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@ -25,6 +25,10 @@ DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"

 RESTRICT="!test? ( test )"

+PATCHES=(
+	"${FILESDIR}"/${P}-fix-AVX512-detection-on-IceLakeClient.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -27,12 +27,12 @@ EBUILD postgresql-10.19-r1.ebuild 13408 BLAKE2B 242cefd43604dfa557e83172783731f6
 EBUILD postgresql-10.20-r1.ebuild 13416 BLAKE2B d70e618b0bc07941ff8dd794a64c3cf94798f470c24b0222f505e5c36188ccf51477e1c9a35e71dd753250a7f5fe744297a017289006bcffe2b38ddd3c744179 SHA512 aa03b4ac07f61e75b71ea664546f0a6011d6afe93e6e487c36a634156441422465f6e2680587f8ff3bde2fba04f071c60ab35502099a8657e942a5b24f76754c
 EBUILD postgresql-11.14-r1.ebuild 13449 BLAKE2B f077ebe227322eb51ed8a1a24c2fd4e22662eb277acbec3d536b87f8d1baa09fd728d5a790106b1a1acc25ec0e2605d5d3d6111d4bb69c956d6c972caaafc71e SHA512 2f31ca8f2a23c9a98dc43d6af8314105f761293d78cb9efdb59579e02abc20403cac0e06bca1d25c3fb6e09811dbe1b3774ccd4a8bb2a6ebe505bc45e105d972
 EBUILD postgresql-11.15-r1.ebuild 13457 BLAKE2B dee96904f9cdcbd4ba3bdfde139235901e42d8152c9d3450706a8bfbb65d612da6df97e68a441c65e0a156f2ded4f59ed19d084941683fcb64b46a05310fc9d8 SHA512 35a5a7ce237ffddd3d3267f78c4f89307a8c959d2d4f541d9dc5776554c16fab540d32fee34b67215300f02cc0d3a02e06ad8f818a841e0ec0778c2d84bbef28
-EBUILD postgresql-12.10-r1.ebuild 13487 BLAKE2B f6df57c2651af60dc34f64cc44d15f6d2053a2782adda6771f8d26c933b3468e7f2e7056212e21fd95e85185885406d588a75067ef0c05e474fa81bac99588d3 SHA512 78821a3441e5b3c5047d06969da4a92fb0475eb51edb3ac810ddb1a884606cbfee34f4d005d3230975c32186cb660f04be6df7946a7953e91f1fa54ceb5c409b
-EBUILD postgresql-12.9-r1.ebuild 13479 BLAKE2B 741c241e9ad036ce21aec63766018245f434ecf7a14b208f2b233c0d5d3476081f60db261982b228acecee726bd9a7346358102fdb30a8e4f625642bc3740f52 SHA512 1cc4fb20e605b74d667f94ce3d7c0eb946fc86386f3f124860c57e867c6a941ce85ae9645a6437f833f629d4e0b26b7837ba0e1e2b6bb15074fe316089434f0f
-EBUILD postgresql-13.5-r1.ebuild 13917 BLAKE2B e1e534f765ace7b3e320d1ee156485099102011a8d275744b8f8a01d18ef4f9d28f43262a68599068ee497ae9839bb9750d43ae6d576087c59f01c94858872b0 SHA512 6edb5b6e39ad2085fad9c5429c71736660a72ac8a8c0f28681018020f8f12c913e209b0769c6edbc0f6811a5414d89f5536d360580a69ec6a390470d217c8cc8
-EBUILD postgresql-13.6-r2.ebuild 13925 BLAKE2B b3886de51fbfb35dfa79608ef4b470c306fe7ba580dfb84ca11da3b9e77545f8425a78496dbd03504b603566c7878cc8d71a4629f859c127c0703f8742730c4f SHA512 ba2272b63392a55a462287e0d228b969bf1aec60078a9798872866fc776e65779e7e2f985ecb933418d56bd3909465a2ce510fae4e7907b955517d46745fffe7
-EBUILD postgresql-14.1-r1.ebuild 13913 BLAKE2B 4001fc828fc38efa6096b5a6c6094380c82d9f3e2521909673f30999dce6f139968e1b9e8647022c766b511d3a74f45399ca5d8e438805c398aaa7b9e6337cea SHA512 58f425d31c26655b1060e453656e72e7f2dc6949f95d3dd5d34eef33199a838b8fb4b9a8c50d34440fb8c916796ee9cf229609188e663434fddaf021915de112
-EBUILD postgresql-14.2-r1.ebuild 13854 BLAKE2B aff48fafb0a5728a70dffbee12f80dc5f2dcf2ceda30af05b1cb409a434e491c66dfe970b26899c377ff362994903c58020c31444ef31ff7478c9a688991bb09 SHA512 63953e91dae73e3675dd65e2c0665ef3822f73a365e759de18e5241418b659e3802d201c5620f51e139171b8cc981454d95dfcfbf108f956e197335a33584d00
+EBUILD postgresql-12.10-r1.ebuild 13485 BLAKE2B 17be08192ba86e5046e54d5b76d57dee6bceae73f296e974640df028c641795cdb410d8f096dc51256756c76f4fc4aee843e83aa495eee4c5013568a51588da7 SHA512 cf0adab3e839c94ac3ac2f5d7367f70d15a23417ea60ea8122bce6355409abb82f8d29dc4ab2b39cef46cd9b38476981c3e882a89388affb69fcd46d7a2cdc1b
+EBUILD postgresql-12.9-r1.ebuild 13477 BLAKE2B 73da16f9f304441f554a0aff0b16fbcb0c283c45698862143c2e6d8432ffad15f912b10107d46f418da27d7bfa0462d96f91c124d5c33301188d5309db2c88da SHA512 741dde1ca4d9e8e2148c332cb657d3c86a3e7f8543a0f74cea4548e164cf53438246d487db2feffae302332bbcfe2273f96ab20d1bb1205224445cc27723f820
+EBUILD postgresql-13.5-r1.ebuild 13915 BLAKE2B 4e26527c9f181560e26c12dbad6c4ec4efa1541ef3e4c95aadecc634daac60aec4407ab050b4c1d8f2626d5ecf32f466f6e2c361a9502c21933d5a063b42c51d SHA512 c404c73cb8b61074329c6185e2a760b77b782f042e81a9b4e839f2554a3ee1b23f5a87519996777e8506cc461803f81ac585919eb0e5de8b6ab576f5c0f02a05
+EBUILD postgresql-13.6-r2.ebuild 13923 BLAKE2B 4affe91b5f0d9a50c5c4151614da2aa51f53c1c1a009e3bee1cdc9bf948ef1f393943192a7d7bc697b2e76ec7a34ff5cf3862f2d1f12a8a85a6e87ae9d01d6a3 SHA512 3b564b616a8a33a8f16c35d2d9360b35b6682169875de9cc79f00e44aea6d29a7324ea641c1df9613226db3f83e0bf860c131fae18b609ad3e817e21df97de19
+EBUILD postgresql-14.1-r1.ebuild 13911 BLAKE2B 579d9eb3d1b3ecbbaabfe44c2fefc590ebc7cc3a638e7affc9e4c5235c0da9cfccbd5b21b91cca5455924adbb5cca033b7d0fbfcc444119dce2ce570741f580c SHA512 4a9839e479f1c851f28b9d8738b65ec973346a650190c94b3968bbfa2dd45807a24efeba806a973dff83a7dc90f685616d659735528eff4113b9fbf658c64642
+EBUILD postgresql-14.2-r1.ebuild 13852 BLAKE2B d206b46531785c62f6e7912ec421b2873fb1bdea767f69304f2fed2ea0e3b3b2ea9796f87202b9bf24e4a668c6e6c4f7ef585bd9ef75398cb7d294531146fd8d SHA512 0f899a410b452683412e15588a887c424590a923d9d5cb0ee2e79ae6c03e59260347d340e9f06ecb06b37b7dae30bb1e38b655bcbf6d0520b5ac3581e2688f5a
 EBUILD postgresql-9.6.24-r1.ebuild 14328 BLAKE2B 9e2d97a2caee5f87d4fafebbc6903d6e48195e7a06f7e6ecbef7612e7113a29b431d04d087bf3543af7a468255926fd1d3f10df08bf8789cff07f9931185189e SHA512 9d361a663d1905314eaac7321b91dbb89b47c02610795ffeaea2ab056063d660e30531f90d14714357487e1561c9aced8d71082325e2398e7c87fd6e7c683d31
 EBUILD postgresql-9999.ebuild 14102 BLAKE2B 821a52a05174b6b4d9c539d01563a45a0edded846b1533b5cc87ccfd45fcfd56bf2e77c49ec8ee1f5cf79d7174f0aaade405591e70aa5d7d81c068fc33fee923 SHA512 e1d8c3ce0347b9db2ba4aeec48cf08d99e522eb5663ae0b84b510baf07be4a06c83a9b6c951952a949a7c3984e373048db0f518ce234117d54ce773fc735ccb2
 MISC metadata.xml 716 BLAKE2B c881b294d82137c80ddfde58ef50074a2e2b92e6883e6ebc5d8c71a366e8cbb0568756b2044fc411dd18e89da0e5625df80b876820e0abeaccc24d26880d5145 SHA512 dd045716ced95dbac8763aea347125d27bdb230eeb64bfc932f94110eda2ad42aa892e9cb19595c0d2f4a593d2629d9709a7aea792ac16661a2c210158368ba3
--- a/dev-db/postgresql/postgresql-12.10-r1.ebuild
+++ b/dev-db/postgresql/postgresql-12.10-r1.ebuild
@ -102,7 +102,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die

 	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"

 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
--- a/dev-db/postgresql/postgresql-12.9-r1.ebuild
+++ b/dev-db/postgresql/postgresql-12.9-r1.ebuild
@ -102,7 +102,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die

 	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"

 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
--- a/dev-db/postgresql/postgresql-13.5-r1.ebuild
+++ b/dev-db/postgresql/postgresql-13.5-r1.ebuild
@ -104,7 +104,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die

 	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"

 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
--- a/dev-db/postgresql/postgresql-13.6-r2.ebuild
+++ b/dev-db/postgresql/postgresql-13.6-r2.ebuild
@ -104,7 +104,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die

 	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"

 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
--- a/dev-db/postgresql/postgresql-14.1-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.1-r1.ebuild
@ -103,7 +103,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die

 	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"

 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
--- a/dev-db/postgresql/postgresql-14.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.2-r1.ebuild
@ -100,7 +100,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die

 	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
+	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"

 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@ -1,5 +1,5 @@
-DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
 DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
-EBUILD sqlcipher-3.4.2.ebuild 1365 BLAKE2B 933d675598bdb8012801b22ad767844968be7610513f4a5fc2aa32924c3ceb643b1ef4489ed93b8b279e4ba7016108ce85bc469b7fae5c6ab2db1ce4790d5720 SHA512 09ddf442ccb84e6be97d3a739fd96e9c41f2719339e73c2c61431e378ca841a0e460f18bb6a33a73141807b1cbd3118cab29024364d2886df84999062341b8de
+DIST sqlcipher-4.5.1.tar.gz 18132121 BLAKE2B 233ffbd9636eae78533553325f08fa3ceb1e01ce0d809be44ca8ed64d46478d6a70dd40f81c38a1f0524986932ebe8614e52fda9dfc1c2f20134692cac7d4b16 SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3
 EBUILD sqlcipher-4.0.1.ebuild 1581 BLAKE2B 032a1f9743e926ac051241b27c24e762b7e7360aab7eef8f9f137a838f9ff4142eacae709adec0ed37d8b0ddc37a0dbd1556cb88dfba4491938a4d1ddb1a2e8c SHA512 c1ea4418e572a28e240a41e7649ffd84418d50c5943f4c49a8097fe5e7e52cfd25f56827bcaa932695fa800efcc5fd3ee927720247747811296c2991fce14c78
+EBUILD sqlcipher-4.5.1.ebuild 1583 BLAKE2B 14f83d16acd21dfc42de299afe5c97e780947f23156d74e04a402b802f02785d11ffe82328b9e4467595c2c6f78444719f3fad4316af4bb304fa54585632c743 SHA512 2b73dc38db811c2bcffb0f43aea883574a75120c695c57727a881124912b4c9f7670fd755d93d23acfb452cd9be67ee812a97797b128f23f89a63bbee7acad48
 MISC metadata.xml 342 BLAKE2B 8b5efdecc7c683933b65a9f82c8744d618f1550aa990b3c1d17a63bac32101cb6beba5506d587bd9f96105bb01f4967ffbd1a64255ed183a54749d28892c7e1f SHA512 9d8dd1a27aeba6f0c12a4665887eee68bbe4a5c53a9f8bff8c207e81e06aa9d50bd31177c1eae0b5e89170ee6f10951626bc72b28372dfafbe6271acd393635c
--- a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-4.5.1.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
@ -11,10 +11,9 @@ SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"

-IUSE="libedit readline static-libs tcl test"
-RESTRICT="!test? ( test )"
+IUSE="debug libedit readline static-libs tcl test"

 # Tcl is always needed by buildsystem
 RDEPEND="
@ -35,8 +34,13 @@ REQUIRED_USE="

 DOCS=( README.md )

+# Testsuite fails, bug #692310
+RESTRICT="test"
+
 src_prepare() {
-	append-cflags -DSQLITE_HAS_CODEC
+	# Column metadata added due to bug #670346
+	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
+
 	default
 	eautoreconf
 }
@ -47,8 +51,13 @@ multilib_src_configure() {
 		--enable-fts3 \
 		--enable-fts4 \
 		--enable-fts5 \
+		--enable-geopoly \
 		--enable-json1 \
+		--enable-memsys5 \
+		--enable-rtree \
+		--enable-session \
 		--enable-tempstore \
+		$(use_enable debug) \
 		$(use_enable libedit editline) \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
@ -56,7 +65,6 @@ multilib_src_configure() {
 }

 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
+	find "${D}" -name '*.la' -type f -delete || die
 	einstalldocs
 }
--- a/dev-db/sqliteman/Manifest
+++ b/dev-db/sqliteman/Manifest
@ -3,6 +3,5 @@ AUX sqliteman-1.2.2-desktop.patch 224 BLAKE2B 8e4b75f21d3f2387a3933c3df00e3161e8
 AUX sqliteman-1.2.2-lpthread.patch 486 BLAKE2B 4918962f3369880750e366fdfd8ae2a4a7750bcda76dd86476c8cfbf7bcada4fd46fe9da7156724fbc198abe616bc7687dc7016f89c192ef2aa722567dcb7292 SHA512 e4598b7f74da7c046571a5b6744d172a9d5d8d35c28ff0bd11b0db68a3fa8ba291ab9634a3622ea5aa383fe6aff75318350665a0a75f68224b6ba97cbc8f3855
 AUX sqliteman-1.2.2-qt5.patch 11317 BLAKE2B 0fb2f1afca7d4c2cc443a29c7f5c4b1babdeea2025bb4811052d98bfb26f5ee241e58c99830fa820d07ed5a03d2cc264ebab532c872cbb622f4ed65e6e99174f SHA512 5169991a0b764fe02782dcc94befe1479bcae631f815c268c9e2a3f02c8efbaceb78ecb87d04eea240623fdfcc475b6b91149a4461974f648f4dea62ba07e309
 DIST sqliteman-1.2.2.tar.gz 1579855 BLAKE2B 9415ac36c56ddf3ea53ace0a6441ef45514b9bffc1a95a652f71c53c802f0f78f77701520c76abade149db55476155472a71cf19f845ee096d96888e111daebd SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4
-EBUILD sqliteman-1.2.2-r4.ebuild 894 BLAKE2B 0e8af0bf8b9a3e1fea44197371f181116905fe20428c86196fe00fc34bca752e9942fb6e568f08d9da3e524859706afcc3e32facaf9d1ad760c74dfdc8f6c67a SHA512 a13fc0d37d1bdc2598b3a2cc8cc9c00f71ad720c71c6406259904120e162f9ace760a4fbf4c15b0bb0eab73a0ce4a73620bf43e07315c4169893b6140a8fe539
 EBUILD sqliteman-1.2.2-r5.ebuild 768 BLAKE2B 4a3e7499c7821deb8790e6e828b0c327fc1d15096be2a07cb47c3f971d34d37eff449828e59e5695eb8fa29e4c73b2dd16d63210e89fcde19c82fce255f10000 SHA512 99c7d2ca8dddec52a44141796bae0f9caea9ed5eda068166095a224c375e333e0c40df8e53dfe32f068d4946e9d95710eddf6797cbaff8fe866b7c729a664c2d
 MISC metadata.xml 327 BLAKE2B a496818d78df9916ff4dfd166ee20e51e3e2c5ab88c63b96e4b0d966fe204aad099a977eb2d0f8a9c59f83ee7a45e8a71df2b90f23c1dd7c7bc4d73352a4d68a SHA512 e3a1e4a653332bbaff90ae0ff84638eb1e33948db96c055e74d2dd64936392b2a4fbacd40ad02e0613fe92f40ea83488412a6cd9c23086ed8ff5a22d8e82ddd5
--- a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-QT_VER=5.7.1
-inherit cmake-utils flag-o-matic xdg-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="https://sourceforge.net/projects/sqliteman/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtcore-${QT_VER}:5
-	>=dev-qt/qtgui-${QT_VER}:5
-	>=dev-qt/qtsql-${QT_VER}:5[sqlite]
-	>=dev-qt/qtwidgets-${QT_VER}:5
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-lpthread.patch"
-	"${FILESDIR}/${P}-qt5.patch"
-)
-
-src_prepare() {
-	# remove bundled lib
-	rm -rf "${S}"/${PN}/qscintilla2 || die
-
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@ -2,21 +2,18 @@ DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.zip 268257 BLAKE2B fd5ded7eb3aac03b098895d8efbd8bbba306b411dc58033bfb9355441e6f94268c4ea44ab6b52894929493ae19f4b605433d6a0aa2a1eed7c9ec15d1ef0d3de6 SHA512 bae490d3f532680ce28d3230fd76b3dd6100725056fdcda4588d88d6be212ac59ff449bc9a08a378f0743e45dd45ad5aa0d2cc18b762e3e715ea9e30f8be8dd5
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.1.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.1.zip 271753 BLAKE2B cccc7008adba51c52fac08e94dd38ecb44b47917af709808056219efba166ff1f7b1e5be29a132e800a67cc5b5f5238ec0a5d3e2cf5f6f516fcdd20da016b433 SHA512 bf46c66ed50afa151505f5bb0785439fc9b9ac90e056385a15aef9c62b0f95aaec26efb364f69533ff94c152b874ec47615d87e48d4660ff98f9b7d5ffba8362
+DIST go-tools-0.1.10-deps.tar.xz 16247548 BLAKE2B 7dc27e377eec3c7fa49d37614d2b7b826735228ae3b22b9481bcba4e344afd51145e98a885c33b5b732d9e6382a5f50a94efcd6f3a820088dd528e561bd5fae0 SHA512 a7bcb32b0393640dd603e07958dc70abba750d219b46f2de649d7e3644432364798c5227df5d764ab6e62d01b60f10d74668914ea09f469ce19134bc934d17ba
 DIST go-tools-0.1.10.tar.gz 3014465 BLAKE2B f3b6129ad00385539eab3426bc542a120bd41d3984174d5d8b91bee6435d7a179c0058f2a50de3235a07e5b67f6d9657288bd578591d61187447441bb6408e76 SHA512 9c817c98739a1788b7fb459728528b5c647226e64df495661c1b3027bfa571e884d6c28d8796558b65e2ba54774976897bddcd052568f33d4e30ce8ee5d883e1
 DIST go-tools-0.1.4.tar.gz 2822942 BLAKE2B c935233c9664dde773be4fe08580b5040a842548caa57bf43846bc5e9c96568fafda8399f3e118cc6e2bd613025b90f0cb35e1cc000b113febf5d09cfdaf91d7 SHA512 2bf15fcfc2543ef68b723a71363edff80d549eb6ff4cb2353b51dc4a83e8fdb6afbb88d93af1feb516f10e1b847388bf8867d3f294f6f8f31bca7a93f48f91c1
 DIST go-tools-0.1.9.tar.gz 2939407 BLAKE2B 3f610322c6f2d088039a66eaa2ae1ff01ff5bd24adb8ae8a028b11b10cd66ee7aea274d24b4e97128eeb24d9ee65db5491b21415c1c76f198532d0d54c7541f4 SHA512 dda788aa91db9c3e7ec2b09b8742055259ffaa74d1da971060458b3545f12336116fc65f30b3237209aa024d721c54a9a9d92007ae6d0254e9c14ecfc8749012
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.mod 214 BLAKE2B 06631482606d93f3622eb79087adb11f0fedc16eeee47c327d9542003c05828faca6ec89fb5a7b6479dbbb951126f85d3b11afff772bdddba37db3d99c0174ec SHA512 8ad3d2d81f0192ba3215650546e1cc1eb2d58f2c9898929e565233388d95bb2d1a334d038e9807a44733fe6a218ac0b32de24d16fe9d208addcd67cdc2ae8f79
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.zip 150900 BLAKE2B a376dc6f6413f699d69f6ee1c25f85e457fc602cc8cb23841aad223daac91598a98535ad9398bba2e8346c4450a5523129628546a6db69dbed84894c3bffdff2 SHA512 71dd98468c11a0b56877ec92ac220d0b34136e8c85075dc9aeb413cdab0fdb7937fa3000c370feff3e43b9466ee8541fc3aaadfa46d900616378b7fe7dc3fecf
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.6.0-dev.0.20220106191415-9b9b3d81d5e3.mod 214 BLAKE2B 16182f3f568cd09aaab4ea54290e9c0242ff47003d7160932ced3b2bddf2f333c331d600aae49aad6ec7901f2c7c71d08f8fc93e2c5e04e0d37c115b0c814800 SHA512 8ad9ed616127b7e63049d470e02d2ab91345b3feaea4848702a67d1d39069e2a50743d7684cf35341bc0acf5594409025f6dd67d1a61edfbaf68b5e51ff4e8db
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.6.0-dev.0.20220106191415-9b9b3d81d5e3.zip 169189 BLAKE2B cc2885cf1633e00ed387b67f7139d8f95d768b7d1b17a5fe90b88fb39d513766db08fbe75f0cf06e4b3bbbad4375716cfc67789a5634af51c75ebed3db60870c SHA512 3aca63d656dc70e1ad3e4a74917cc43f97ca42ca0491cd526632f70a3ca65a5aedd279d4efc6e276b6678070d4d31bc47df371fa256e7167fae484418a611c12
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip 1565731 BLAKE2B 25099f5d276bba9b2d3c5e75c603dac06f3364fd09d2a2c53aaf5030d4698fc3638758d23c0a82fc118a05661b40377b74ea55c2e8f5d9add2d03527104ae80b SHA512 23da0e9ed2c647eb043e4b57e384ae335119b3766411f84cb009496a1fae85c7cefed14a92154b3e8d7e93d92187dbfde9b9cc07236ea3a7ca4052b93c6dc0dd
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20211015210444-4f30a5c0130f.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
@ -31,7 +28,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip 1634371 BLAKE2B b13afd43d8734f143af16046780b9225a874157e0562068c8c3198dd23f7ff4b3e14f6654b578bc7520dd3c299411ca2d77999a8ab8459a765d05e74d03e81db SHA512 b7c4ff1752cb582263b837048e28b52fa219db5f7316739692d4c2d20bb2a9b8ad3645e92b3b1a72cba0817e4587ae04465dd351bb17a719bc92e193cb29cc76
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211019181941-9d821ace8654.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211019181941-9d821ace8654.zip 1667445 BLAKE2B a9a8930675519b134e8b1227b18fc8af991ebd531ea1e4cc66b51d5f9989e295e156c46b4662b37b44ce750987ca7b5385cb7db2e511bdaeebaaedd31e51e833 SHA512 654a5674688eb771be446b9e163796fd709b2b742cdc2179a981a03127bee29f2e47b50da73c73021c6e1ec0a00dcca4cde53312f7ce5a30ec7d8a3c7cb5a466
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@ -46,7 +42,7 @@ DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 B
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
-EBUILD go-tools-0.1.10.ebuild 5881 BLAKE2B dcda76d9173a7518be2cbf4e760cb28629f264b261d6ed88931714d208d909658e233b98bc6a92fea142d33388fd3bdc44fbd8e500fbf5e427f1c7cc7731ec5f SHA512 56ce3b6bbe15b4ee674c8b95de897e99b38ae3335fd8a884fdce4c7f030d8acb660691d392fe0e13af617df9e87bd8960c554253929f676d1e8ed556403ecf8b
+EBUILD go-tools-0.1.10.ebuild 3103 BLAKE2B 096345de8c552763953fc717fd891c5f12b477bbf322523cec1eab8eb0b7ad035745d25f33eed922a7a51190a5c807dad4ed2c0b7bbcd651577635ea3f3f8a80 SHA512 c00bcb7256c5add3b58e6ec93c77c606bdc8f93428107907d00155f0e50a16f3bbdbc35d64af511782900de4e7b70089fb0f693237d2ad007bffb9ef2834a277
 EBUILD go-tools-0.1.4.ebuild 5504 BLAKE2B 23c260b6168d29d53d1e757a829bc68840ac8d79c768dc3a8446cef2675024177ab7740c22e6bb3e6028906d4120f6a1c023d9a0426834b82d7186428f4b13f4 SHA512 b1d23996599b2df2b54cd65a61b7abd2ca4bec6f3bbb476df7aade6ed5ddf7bd6e85ae5c416277566993a09e15955e6dbea025b1edd389a57d0360b130371fb3
 EBUILD go-tools-0.1.9.ebuild 5737 BLAKE2B de4743b3b8d1fcff482d2e3014fa505af3658a0d84a712e9e06c3720e8bbe49e90f948f09ca16c4dac094d20b4360d036fee188bd1aeadd132b8863338e91fe7 SHA512 968f889c0a8a27b76f7d89e45bb1f5bacbe3858297c5c1c9e1a77044372f691d78e19d9b01146025cc25636d87d0aa187c254f0d4fa7f92a5cecf0f8a249524d
 MISC metadata.xml 304 BLAKE2B eb25bd6c86489f23152684d6eddeabebeb5bf9b2988b386d43d163286b9f38c8f0fe58a9103c45843280cd089d735e73a30e80e0368c3fe53e7bc2b4717603e4 SHA512 81050d8cfe2a1d8f1212613f4a043f0207c192026390bf7abfb68ea6262c12e0f0cd9f4f8c2ed23e62c47666bdb8498cf8fa58e57be5e10a7cd567dfc59e47ed
--- a/dev-go/go-tools/go-tools-0.1.10.ebuild
+++ b/dev-go/go-tools/go-tools-0.1.10.ebuild
@ -1,115 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8
 inherit go-module

-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
 DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
 HOMEPAGE="https://godoc.org/golang.org/x/tools"
-SLOT="0"
-LICENSE="BSD MIT"
+SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"

-EGO_SUM=(
-"github.com/yuin/goldmark v1.4.1"
-"github.com/yuin/goldmark v1.4.1/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod"
-"golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3"
-"golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-"golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f"
-"golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
-"golang.org/x/sys v0.0.0-20211019181941-9d821ace8654"
-"golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.6/go.mod"
-"golang.org/x/text v0.3.7"
-"golang.org/x/text v0.3.7/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-)
-
-go-module_set_globals
-SRC_URI="
-	${ARCHIVE_URI}
-	${EGO_SUM_SRC_URI}
-"
-
-GO_TOOLS_PROGS=(
-	authtest
-	benchcmp
-	bundle
-	callgraph
-	compilebench
-	cookieauth
-	cover
-	digraph
-	eg
-	fieldalignment
-	file2fuzz
-	findcall
-	findtypeparams
-	fiximports
-	fuzz-driver
-	fuzz-runner
-	getgo
-	gitauth
-	go-contrib-init
-	godex
-	godoc
-	goimports
-	gomvpkg
-	gopackages
-	gorename
-	gostacks
-	gotype
-	goyacc
-	guru
-	helper
-	html2article
-	ifaceassert
-	lostcancel
-	netrcauth
-	nilness
-	present
-	present2md
-	server
-	shadow
-	splitdwarf
-	ssadump
-	stress
-	stringer
-	stringintconv
-	toolstash
-	unmarshal
-)
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"

 S=${WORKDIR}/${P#go-}

-src_unpack() {
-	unpack "${P}.tar.gz"
-	go-module_setup_proxy
-}
-
 src_prepare() {
 	default
 	sed -e 's:TestDryRun(:_\0:' \
@ -172,20 +77,12 @@ src_prepare() {

 src_compile() {
 	local packages
-	readarray -t packages < <(go list ./...)
-	(( ${#packages[@]} > 0 )) || die "go list failed"
-	GOBIN="${S}/bin" go install -work "${packages[@]}"
-
-	local expected_progs=("${GO_TOOLS_PROGS[@]}")
-	local progs_diff=$(diff -u <(printf -- '%s\n' "${expected_progs[@]}"| LC_ALL=C sort) <(find bin -type f -printf '%f\n' | LC_ALL=C sort))
-	if [[ -n ${progs_diff} ]]; then
-		printf -- '%s\n' "${progs_diff}"
-		die "difference in expected vs build programs"
-	fi
+	readarray -t packages < <(ego list ./...)
+	GOBIN="${S}/bin" ego install -work "${packages[@]}"
 }

 src_test() {
-	go test -work "./..." || die
+	ego test -work ./...
 }

 src_install() {
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@ -1,3 +1,4 @@
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
+EBUILD ant-ivy-2.5.0-r1.ebuild 8558 BLAKE2B 76dc5420f88510014df56e19f113f5daa7cf438fab150ec84a5bb55c29c051ee0dec5e4b94992f001d456842672c92acbe2330f28934a4a25e1a5002b42dd7d3 SHA512 ebe13d31a2f096c9f2c88cfff1c048cb2a9ce35f60664fb2093faf1b2477d819f4775ef2a6ffed0e12c79c048fec9f3cc05f7102191a362db80a2746a42781dc
 EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.ivy:ivy:2.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple java-osgi
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/bcpg:0
+	dev-java/bcprov:0
+	dev-java/httpcomponents-client
+	dev-java/commons-vfs:2
+	dev-java/httpcore:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jsch:0
+	dev-java/jsch-agent-proxy:0
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-junit4:0
+		dev-java/ant-junitlauncher:0
+		dev-java/ant-testutil:0
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/xmlunit:1
+	)"
+
+# Restrict to jdk:1.8 since java.util.jar.Pack200 was removed.
+DEPEND="${CDEPEND}
+	virtual/jdk:1.8"
+RDEPEND="${CDEPEND}
+	virtual/jre:1.8"
+
+DOCS=( LICENSE NOTICE README.adoc )
+
+S="${WORKDIR}/apache-ivy-${PV}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_MAIN_CLASS="org.apache.ivy.Main"
+JAVA_SRC_DIR="src/java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_SRC_DIR="test-src/java"
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
+
+# according to 57,60 build-release.xml
+# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
+JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
+
+# Several tests require a certain treatment to "generate-bundles":
+# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
+# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
+#
+# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
+# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
+# So the failing tests will be excluded, saved for a later attempt.
+#
+# Not excluding any test classes results in  "Tests run: 1109,  Failures: 98"
+# Excluding those test classes listed below leads to "OK (812 tests)"
+JAVA_TEST_EXCLUDES=(
+	# https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
+	# test.class.pattern = *Test
+	"org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
+	"org.apache.ivy.core.TestPerformance" # not in scope
+	"org.apache.ivy.util.TestXmlHelper" # not in scope
+	"org.apache.ivy.TestFixture" # not in scope
+	"org.apache.ivy.TestHelper" # not in scope
+	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
+	# <exclude name="**/Abstract*Test.java"/>
+	"org.apache.ivy.util.url.AbstractURLHandlerTest"
+	"org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
+	"org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
+	# following excluded tests cause test failures
+	"org.apache.ivy.ant.BuildOBRTaskTest" #                                 Tests run: 3,  Failures: 2
+	"org.apache.ivy.core.deliver.DeliverTest" #                             Tests run: 1,  Failures: 1
+	"org.apache.ivy.core.module.descriptor.IvyMakePomTest" #                Tests run: 1,  Failures: 1
+	"org.apache.ivy.core.settings.XmlSettingsParserTest" #                  Tests run: 29,  Failures: 1
+	"org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" #                 Tests run: 3,  Failures: 1
+	"org.apache.ivy.osgi.obr.OBRResolverTest" #                             Tests run: 16,  Failures: 16
+	"org.apache.ivy.osgi.repo.BundleRepoTest" #                             Tests run: 4,  Failures: 3
+	"org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" #      Tests run: 46,  Failures: 1
+	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" #     Tests run: 44,  Failures: 7
+	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" #     Tests run: 10,  Failures: 1
+	"org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" #              Tests run: 14,  Failures: 3
+	"org.apache.ivy.plugins.resolver.JarResolverTest" #                     Tests run: 3,  Failures: 3
+	# following excluded tests can pass if run individually
+	"org.apache.ivy.ant.IvyConfigureTest" #                                 OK (14 tests)
+	"org.apache.ivy.IvyTest" #                                              OK (1 test)
+	"org.apache.ivy.MainTest" #                                             OK (12 tests)
+	"org.apache.ivy.plugins.report.XmlReportWriterTest" #                   OK (3 tests)
+	"org.apache.ivy.plugins.resolver.BintrayResolverTest" #                 OK (12 tests)
+	"org.apache.ivy.plugins.resolver.ChainResolverTest" #                   OK (15 tests)
+	"org.apache.ivy.plugins.resolver.FileSystemResolverTest" #              OK (27 tests)
+	"org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
+	"org.apache.ivy.plugins.resolver.IvyRepResolverTest" #                  OK (3 tests)
+	"org.apache.ivy.plugins.resolver.Maven2LocalTest" #                     OK (2 tests)
+	"org.apache.ivy.plugins.resolver.PackagerResolverTest" #                OK (3 tests)
+	"org.apache.ivy.plugins.resolver.URLResolverTest" #                     OK (5 tests)
+	"org.apache.ivy.plugins.trigger.LogTriggerTest" #                       OK (3 tests)
+	# Without PROPERTIES="test_network", the following test cause additional failures.
+	"org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
+#	"org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
+	"org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
+#	"org.apache.ivy.plugins.resolver.IBiblioResolverTest"
+#	"org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
+	"org.apache.ivy.util.url.ArtifactoryListingTest"
+#	"org.apache.ivy.util.url.BasicURLHandlerTest"
+#	"org.apache.ivy.util.url.HttpclientURLHandlerTest"
+)
+
+src_prepare() {
+	default
+
+	mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	pushd "${JAVA_RESOURCE_DIRS}"
+		cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
+		cp -r "${S}"/src/java/* . || die
+
+		# DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
+		# according to 210,221 build.xml and still in the upstream .jar file
+		cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
+		cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
+		cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
+		cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
+		cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
+		cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
+
+		find . -type f -name '*.java' -exec rm -rf {} + || die
+	popd || die
+}
+
+src_test() {
+	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
+	# name="build-custom-resolver-jar"
+	JAVA_SRC_DIR="test/custom-classpath"
+	JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
+	java-pkg-simple_src_compile
+
+	# Without "license.xml" the tests won't even start. "Tests run: 1109,  Failures: 318"
+	jar -cf test.jar \
+		-C test/java org/apache/ivy/plugins/parser/xml/license.xml \
+		-C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
+
+	# Reduce number of failures to "Tests run: 1109,  Failures: 98"
+	jar -uf "test.jar" -C test/java . || die
+
+	# Separate *.java files from test resources
+	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
+	mkdir test-src || die
+	cp -r test/java test-src/ || die
+	find test -type f -name '*.java' -exec rm -rf {} + || die
+
+	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
+	# name="prepare-test-jar-repositories"
+	mkdir test/jar-repos || die
+	jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
+#	jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+	java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
+	use doc && java-pkg_dojavadoc target/api
+	use source && java-pkg_dosrc src/*
+}
--- a/dev-java/apiguardian-api/Manifest
+++ b/dev-java/apiguardian-api/Manifest
@ -0,0 +1,3 @@
+DIST apiguardian-api-1.1.2.tar.gz 67267 BLAKE2B 27bbe157f23c0904863d093930968854771f4c6b1bc6b6a6e6b86604383abd291348fa8b009d760b3bc739bbfbdb74e9429942ce1acf4bfc52e29e79386f2059 SHA512 7c56ee15e0aba07e95b6f2fe7cedd98e449e774958eb63b2467066c381e1e82ad67c982c2885e18154c62e55fda80a1c2e0f689253afe449db9f7e7563122db6
+EBUILD apiguardian-api-1.1.2.ebuild 740 BLAKE2B 6c3ec891656ec13c25843e6fba68235eb8db87018b2516aac44bfb899c8087d5e81db4097cb793b812741bbd52f1ebff8af93308c7014be39bfb5ec45905cf13 SHA512 8b6f3b156fa24ec789ebea1d783a300c3796c83465e66f64fb6e395d95e3a2ac62d25a8c76d20221802dc797ba64dd3d9ca19cb23ba55de89f2e55c0d03ea492
+MISC metadata.xml 629 BLAKE2B b4b1e0ab2868f0953bbd02fc2ce392f9cc8303a6ba838ac5db93ac1942cbc07c184f1acdce977ba68cf7a842eb9a69d3cb67c9d8ae2631f4f22ba246e514e1ee SHA512 5c8ed27778be5acc2cd4396b72d464d30245667de22183d375c25e1e7fae3a69711557688d22d82fb4876d781c73a50fc0dc5114fd39127446249024c553cb5d
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apiguardian:apiguardian-api:1.1.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="@org.apiguardian.api.API Java annotation provider"
+HOMEPAGE="https://github.com/apiguardian-team/apiguardian"
+SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${PN%-api}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
--- a/dev-java/apiguardian-api/metadata.xml
+++ b/dev-java/apiguardian-api/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apiguardian-team/apiguardian</remote-id>
+	</upstream>
+	<longdescription>
+		Library that provides the @API annotation that is used to annotate public types, methods, constructors, and fields within a framework or application in order to publish their status and level of stability and to indicate how they are intended to be used by consumers of the API.
+	</longdescription>
+</pkgmetadata>
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@ -0,0 +1,3 @@
+DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
+EBUILD opentest4j-1.2.0.ebuild 746 BLAKE2B 7050e49a9b982258eb82304702bc78315e3d72d277effe3a586260ff67ddf3205441731fe37dc6d932a18006ea346a13724396aac9511885fddbe4dc33d6e6c6 SHA512 ee3394bfc5c99d87d19202e149eff2746613766ab6b17964e2b64550a8c849b1febe8e2106442ef235722ab2ce8d40510cdfd014aed29aa5f2b3f85596c82084
+MISC metadata.xml 302 BLAKE2B ea077bd25f3dc10129d182bad603f229905bea89332134c5a8792983bc5d338452087844adc12a7a0c1496ebd2df6c1fa0fb4c55198cf84885ab2f1ba99bfc72 SHA512 b88e1884b81818b405494ce7eff1790d3e726c66a6a04fa4caf510c8178893f5afd31d867893b118051db4a06954b73b783341b5eb2b7e8779e76ddc520d9636
--- a/dev-java/opentest4j/metadata.xml
+++ b/dev-java/opentest4j/metadata.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ota4j-team/opentest4j</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-java/opentest4j/opentest4j-1.2.0.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.opentest4j:opentest4j:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
--- a/dev-java/univocity-parsers/Manifest
+++ b/dev-java/univocity-parsers/Manifest
@ -0,0 +1,4 @@
+AUX univocity-parsers-2.9.1-explicitly-import-Record.patch 7598 BLAKE2B dabf3f190ecedc9f8897418ffb03351c9dc2b6db2d0cece5325997ba7b6b99da5a52466fbef920a5c09785874f99422c0eaba70031159a5186a26109a8fbc275 SHA512 80a84722a81a97b3f799dc2962c19b7bed077170a436e09a4440d536ec78ab6a994df7dfe1e4e3ea30c9fdecfb61f5f78147fa0045b63cfc3d274952b4dffb47
+DIST univocity-parsers-2.9.1.tar.gz 486417 BLAKE2B 4da3d31a1e57613731a0e112dfedcb084e57a2d0b6568e14f49986c447a080cb2cf8c530a6bb0ed30026a3afe5c5c648de2b4559eeca9432c5e13b5eb9b92b67 SHA512 f22062a277015c5f7fdc10b192ff07576baa6a8b67116bdc8e9aed37a70b6f3268a8faf0e422620be63deff13e3d74d4606f7c972cd9b4afda553f88feb75887
+EBUILD univocity-parsers-2.9.1.ebuild 981 BLAKE2B cde807edd70b02ad0e71da6ba057da4b94effb8684795ff0d481418a7f8bb6fa6ac2bbe43b81abd922754b9c8c914adb3b7e0dab4f073232dee3b9d6f1857b84 SHA512 4994d40cf0d7a542935d63ab8132a1ae9064002703e8a07e46f781ef7e72210bae85637fabfa4d2e9da43f9f1ae6852d47cdb729e22b5f912b9a0f1c4f686f95
+MISC metadata.xml 562 BLAKE2B a15a9a3770842da39b54d159216f2aaa51d45034c85e88001a2be7132ba7d9723f15c0a4ff9a3a90aa1fd4748b36ed74ac51a4ef5d9bfcbaeb48f51d5c5fe06a SHA512 3999b470a7b5318086021ba8df7b47f545658b096e1151ef6b56a73623c43f3bf2a6da7a35dd4911de764068524b8bb9ee7d511ed3d5d8d44dd0a9e06129df06
--- a/dev-java/univocity-parsers/files/univocity-parsers-2.9.1-explicitly-import-Record.patch
+++ b/dev-java/univocity-parsers/files/univocity-parsers-2.9.1-explicitly-import-Record.patch
@ -0,0 +1,159 @@
+From 6dffca791430639ca06dc6f2d9c309e085d8ba32 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Mon, 4 Apr 2022 09:36:20 -0700
+Subject: [PATCH] Fix "reference to Record is ambiguous" for JDK 16+
+
+Since Java 16, a new java.lang.Record class has been added to the Java
+SE API.  Classes under the java.lang package, including this Record
+class, are automatically imported in any Java source file.  Because this
+project also has a com.univocity.parsers.common.record.Record interface,
+when it is being compiled on JDK 16 and above, there would be an
+ambiguity as to which class/interface to use for the 'Record' type:
+
+src/main/java/com/univocity/parsers/common/Context.java:136: error: reference to Record is ambiguous
+        Record toRecord(String[] row);
+        ^
+  both interface com.univocity.parsers.common.record.Record in com.univocity.parsers.common.record and class java.lang.Record in java.lang match
+
+The resolution to this issue is simply to import the Record interface
+under this project explicitly in every source file using it.
+
+Bug: https://github.com/Leo3418/junit-5-ebuild-repo/issues/4
+Reported-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/main/java/com/univocity/parsers/common/AbstractParser.java   | 1 +
+ src/main/java/com/univocity/parsers/common/AbstractWriter.java   | 1 +
+ src/main/java/com/univocity/parsers/common/Context.java          | 1 +
+ src/main/java/com/univocity/parsers/common/ContextWrapper.java   | 1 +
+ src/main/java/com/univocity/parsers/common/DefaultContext.java   | 1 +
+ .../java/com/univocity/parsers/common/NoopParsingContext.java    | 1 +
+ .../java/com/univocity/parsers/common/ParsingContextWrapper.java | 1 +
+ .../com/univocity/parsers/common/iterators/RecordIterator.java   | 1 +
+ src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java  | 1 +
+ src/main/java/com/univocity/parsers/fixed/Lookup.java            | 1 +
+ 10 files changed, 10 insertions(+)
+
+diff --git a/src/main/java/com/univocity/parsers/common/AbstractParser.java b/src/main/java/com/univocity/parsers/common/AbstractParser.java
+index 42191ad..6dd4dac 100644
+--- a/src/main/java/com/univocity/parsers/common/AbstractParser.java
+++ b/src/main/java/com/univocity/parsers/common/AbstractParser.java
+@@ -20,6 +20,7 @@ import com.univocity.parsers.common.input.*;
+ import com.univocity.parsers.common.iterators.*;
+ import com.univocity.parsers.common.processor.*;
+ import com.univocity.parsers.common.processor.core.*;
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.io.*;
+diff --git a/src/main/java/com/univocity/parsers/common/AbstractWriter.java b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+index 6a19562..d7a5207 100644
+--- a/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+++ b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+@@ -18,6 +18,7 @@ package com.univocity.parsers.common;
+ import com.univocity.parsers.common.fields.*;
+ import com.univocity.parsers.common.input.*;
+ import com.univocity.parsers.common.processor.*;
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ import com.univocity.parsers.fixed.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/Context.java b/src/main/java/com/univocity/parsers/common/Context.java
+index d0adf5f..f3b28c9 100644
+--- a/src/main/java/com/univocity/parsers/common/Context.java
+++ b/src/main/java/com/univocity/parsers/common/Context.java
+@@ -15,6 +15,7 @@
+  ******************************************************************************/
+ package com.univocity.parsers.common;
+ 
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/common/ContextWrapper.java b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+index bee87e8..c338895 100644
+--- a/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+++ b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+@@ -15,6 +15,7 @@
+  ******************************************************************************/
+ package com.univocity.parsers.common;
+ 
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/common/DefaultContext.java b/src/main/java/com/univocity/parsers/common/DefaultContext.java
+index 11ea961..7346e64 100644
+--- a/src/main/java/com/univocity/parsers/common/DefaultContext.java
+++ b/src/main/java/com/univocity/parsers/common/DefaultContext.java
+@@ -15,6 +15,7 @@
+  */
+ package com.univocity.parsers.common;
+ 
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+index fe1f07d..79d8787 100644
+--- a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+++ b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+@@ -15,6 +15,7 @@
+  ******************************************************************************/
+ package com.univocity.parsers.common;
+ 
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.util.*;
+diff --git a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+index 20a59d8..e8b4f9d 100644
+--- a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+++ b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+@@ -15,6 +15,7 @@
+  */
+ package com.univocity.parsers.common;
+ 
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.util.*;
+diff --git a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+index 01b22cb..1620205 100644
+--- a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+++ b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+@@ -16,6 +16,7 @@
+ package com.univocity.parsers.common.iterators;
+ 
+ import com.univocity.parsers.common.*;
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.io.*;
+diff --git a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+index b38bc99..25285eb 100644
+--- a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+++ b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+@@ -17,6 +17,7 @@ package com.univocity.parsers.fixed;
+ 
+ import com.univocity.parsers.common.*;
+ import com.univocity.parsers.common.input.*;
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ /**
+diff --git a/src/main/java/com/univocity/parsers/fixed/Lookup.java b/src/main/java/com/univocity/parsers/fixed/Lookup.java
+index 1aeff0d..bcf0f98 100644
+--- a/src/main/java/com/univocity/parsers/fixed/Lookup.java
+++ b/src/main/java/com/univocity/parsers/fixed/Lookup.java
+@@ -16,6 +16,7 @@
+ package com.univocity.parsers.fixed;
+ 
+ import com.univocity.parsers.common.*;
+import com.univocity.parsers.common.record.Record;
+ import com.univocity.parsers.common.record.*;
+ 
+ import java.util.*;
+-- 
+2.35.1
+
--- a/dev-java/univocity-parsers/metadata.xml
+++ b/dev-java/univocity-parsers/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">uniVocity/univocity-parsers</remote-id>
+	</upstream>
+	<longdescription>
+		univocity-parsers is a collection of extremely fast and reliable parsers for Java. It provides a consistent interface for handling different file formats, and a solid framework for the development of new parsers.
+	</longdescription>
+</pkgmetadata>
--- a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
+++ b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Some test dependencies have not been packaged yet
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.univocity:univocity-parsers:2.9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of extremely fast and reliable parsers for Java"
+HOMEPAGE="https://www.univocity.com/"
+SRC_URI="https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# Restore value of S overridden by java-pkg-simple.eclass to default
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	# https://github.com/uniVocity/univocity-parsers/pull/502
+	eapply "${FILESDIR}/${P}-explicitly-import-Record.patch"
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -2,22 +2,16 @@ AUX 20php5-envd 208 BLAKE2B 7d876903c7f58ab148e1d6bb2b0d86cb9f5ecd241bc00e92138d
 AUX bug81656-gcc-11.patch 1953 BLAKE2B d682840f380693799fa1cf214d199b08862396bc795e88ac9a6ed0c0d12c6b04883301414ea5c3a2d28e204225787d546d3505322280df27105af3ce9d299139 SHA512 11e4c777538b00080cbdfb1a759064368582f894711fc1ff7828a0289d25770bc7a49c768a2a5fef2f89a04b3d9392a78ca0649dd05c67c30cb298320b115edb
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
-AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
-AUX php-icu-70.patch 1860 BLAKE2B 921a97c577ff280c00561c647546de7ae1c8e60eacdf022bc99d5013d45eb7ab20ec8ab9265cb772e7d2638bf0549253d42989012417f6d1bc6f9caef98fbafc SHA512 cc4c3d2a42e41d4ec6886ff28486dc52514b90583c3e4a50b157a0342c25b9d8126dd1100343a35b938a45b795173ec975370b5bdeaa3909fa9ab634c93390f7
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
-DIST php-7.3.32.tar.xz 12142436 BLAKE2B 375092f7fade8b93d2fbf409552cda42a685267248e3bce373913eeae5f133e7773554c2302b12bf09588d74a76898b138c47287f7d9a721f294635799ca46f6 SHA512 afed20a90aa7d207f9b409fb2066789a637b24d6c6874fc5733bbe6e9972616b387669ce40cba16b606893d88572f398e34aff7a36626308e3ede312f09fcc56
-DIST php-7.3.33.tar.xz 12143820 BLAKE2B 77b5ada50169b308b42dbf2c69b5aebd6e9ab9663be8de5bd26391e42015d856631f12b0268b98889f2c3058564a6c71ad298b725b8afff920e277aa3e787422 SHA512 b05edb3e87775c0b2d7bd5990e47751279076e6ef2356f59dc917f4a1447d95894f596cd8de711f03278650ff74ff9f2687ed96cec69d2d669a6af563a455e25
 DIST php-7.4.28.tar.xz 10418352 BLAKE2B 27673b5a891723a4c20a19fa22708f733b8ff12e16e5bbd727ed841845bcb8802ea98e8c2a4936b184704cde96f8725a2c338470ba573e8d3a0732a3f449e7e5 SHA512 e7fa281a3be9ec46b7fa69619fd417fc04200dc64fd153f9670184d84b0aa3d5f3698536cf18476a96d8a42ba40b856ff57ab18e8e8a485dd9b95467d1952fa8
 DIST php-8.0.16.tar.xz 10864076 BLAKE2B e5820ecd40632e458a0ada1d1886cd054520ab7f1492766fd8d5c3561977359abddd886b47f7d7255bcc80d00c96afeceb5cbd515eb779ed4ac15db9e01f1fe3 SHA512 68952638f2965752be26dc0a49f938eb4f251f2d5a7b309a2983c4f9bc064738c9da2e8015ec9b2ecc0dc06e014ace3c0348222166b898a4a38c31ab8b0fd139
 DIST php-8.0.17.tar.xz 10771016 BLAKE2B ed2b9fb4f8c2210e112d27e43acff2a71c57802c5fd72429ffc716f6b7666d00a24d35166e5e85d20d7f67e00d5cdae89eaf5d30238a0758b42964e27422507b SHA512 9e1e44860be8f5ddf0c264f791e2c8936ca3abd02c18c432ff340057e94f0fbc5f40f1ee8f4feee60416eb4ce712f43764d3757f2e667dc78150d2d86d3c02e3
 DIST php-8.1.3.tar.xz 11751576 BLAKE2B e55f5d3742d233f6b028c6ca97181ea4fb55331204bbea2f58f2e440a6f5c520343addb5bc05ed0c407d6cf9f1bda3754c2039195154b90bb903ddc7a13ca49a SHA512 230f70c4f23ac69b52063b91de5ea866e30a84b5ac8d0021e35baebf210fe432fb6c46264a9a2808bf0f0d2003f4c3db974c2c480718a5607c5e4d52379e9d9d
 DIST php-8.1.4.tar.xz 11700448 BLAKE2B 472f053bd9544403f6cffacb15b35af16e4165f984f4a651d0c2983e3e84ea8301123796f3fd2ba4c20d97cf6fa0fe02326c63d37d8eb1dabd756a2f858944de SHA512 63eb05c20ebeee9377f7b72aa5ae6ff4c5f04b8612b9f192f4a849a4f2db74691343e2279b9dfc7c79d0b42a7dc17ab4ed11ed66c018c96224cf1663eaab728b
-EBUILD php-7.3.32-r1.ebuild 22583 BLAKE2B bd03e0432d99074277e084cef440746183881cea39fc91171aaec394c2c824dd3fac2601a3dcdfb0ddf475dcc5021ec7da196a93a9bcc2535b65448085298b4a SHA512 29f1c52cc05b5fb4a13fd68c6247958c93856d8bd2db3dc5fe96207caff8ddbcc36622bf4cf1668cecb1cbb6c2d87a7f2d55fe6c36d8b9aa553e940c263bac7d
-EBUILD php-7.3.33-r1.ebuild 22590 BLAKE2B 8b96d9da3e9c059584d6f5ca67db70111e48c8184dda5b10aa2e7e2855f60258814cf1241b91152ba504675d371d2d9fc5087cad498b1bb76219504c96e01a1f SHA512 88cec91dd8bc1314ac3695304c72fe6335cef1f2d05d3f2bc69e219d7043b4a460828a31c2770d83d15570ad77ebfcef122eddda6cd5ed8a0c61e39585d2a10e
 EBUILD php-7.4.28-r1.ebuild 21304 BLAKE2B d19ad93fcb05f40c04e5cbbdef44fbacc6601bce98696745c73372278022743294284dc7b49ab974d1d4a5eb2f4b9747bd656a77439dc2788713f046ca25d99c SHA512 4ed582e8e247faf9202dcd54d3f337dde7f2195ffb8ec43b4965b297921134d599ab6cce86bb24a618471bd469acefe053cec4f6bd14350faa79a853e8d3e0bf
 EBUILD php-8.0.16-r1.ebuild 21819 BLAKE2B 5827016aca8a45915827e2abef2fcdecf86f2c22df97c2108a3e3bf2255398c7b6efbc344abfac7c90fd934ed88ba52607455515bb6f4996acfa003c446ba8cd SHA512 14307f4b87385968e4b44d1ea3ccf9297b1db695b5cdc419765750a2ffece449767f033bc8c25743ae7ce9b8e5d055046605ded6f31e86808338ccbbe648e451
 EBUILD php-8.0.17-r1.ebuild 21846 BLAKE2B 99f145d086645e33ebe0f604fec0835661c9be283046959e34921b6ae0223255361269c2100b1870612c0acac3e2e36c0b05e7bdfe4e4679f49d3431e177c4b9 SHA512 23125105bfa3a0726f0175835233d85fe44491fe09f390bce68ccfe49607d047170ea3b07eb242108b4dd11844e12a15cc239cfbf8b87c6baf338a0d83c90458
 EBUILD php-8.1.3-r1.ebuild 21839 BLAKE2B 22c63fab62fd30105aad614a5436f6008adf6c17ded1e6da63785a4f9d7ec84e738bf0be8d26153b6906494b5ecc9d2c37d7b49350399615bf5da0d6d4e7019a SHA512 377da8e5b02b1085805eb81d56592e7030553d18bc3031da529de64e08dfb0e44338800dbc621e178d6109422a80b3bf3123cdf3fa20d6bded46a405933fa903
 EBUILD php-8.1.4-r1.ebuild 21859 BLAKE2B bab7878ae8775a4593a12e5687766dbba585ac0bdb4f1c18bc3295d6b34a0f7c4653d630b5ff4a72dee445140fd82e762185979499360f3a8383fc760c6bb0eb SHA512 46f19e51b695a9a298ea7f1bc5cdf42c6276359cfe1cd349b763f71cfc78ee760241a671486e95fc3499a4210836e5594f5314c7eaeed50496cf047febb882bf
-MISC metadata.xml 3378 BLAKE2B 4ea64ce2404205f33be7d0be217ad8eeef2b82bc50700664dd89db5bd6c3aabfe2b0ab72497493bdb1214d3c30d9fdabe0e8790938aa68fd3cff8bb25249057b SHA512 21fc30b50fe9d5fdbd63c19e1bc7856bc2e7d96ff8fbd05aff4fc07bddae68cbe8dffecb1854de233031257dcd40da265463887259f95ed886dac8bc2b6cc535
+MISC metadata.xml 3150 BLAKE2B d9af858e1b9ee2b8d15a14761a86a5318a47496c892036aa8a198a008b0b627bf43772ad189c19bf73a4972ba2ff19687f85cb627bf097603dd3f531b71edcb9 SHA512 7ba0a8b9c425c1becb0931725a18f5831cc1ff4a03bcfa52cb78c3af1d1d5f5de7247840e1587d236528f14b9fb0b4aeb2b5dc3310189e667512d33a7fe022ae
--- a/dev-lang/php/files/php-freetype-2.9.1.patch
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch
@ -1,233 +0,0 @@
--- a/ext/gd/config.m4	2018-04-24 11:09:54.000000000 -0400
-+++ b/ext/gd/config.m4	2018-05-04 15:18:49.867283889 -0400
-@@ -186,21 +186,36 @@
- AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test "$PHP_FREETYPE_DIR" != "no"; then
- 
-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-      if test -f "$i/bin/freetype-config"; then
-        FREETYPE2_DIR=$i
-        FREETYPE2_CONFIG="$i/bin/freetype-config"
-        break
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    AC_MSG_CHECKING(for freetype2)
-+
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
-+
-+      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
-+      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
-+      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
-+      FREETYPE2_DIR="found"
-+
-+      AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
-+    else
-+
-+      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-+        if test -f "$i/bin/freetype-config"; then
-+          FREETYPE2_DIR=$i
-+          FREETYPE2_CONFIG="$i/bin/freetype-config"
-+          break
-+        fi
-+      done
-+
-+      if test -z "$FREETYPE2_DIR"; then
-+        AC_MSG_ERROR([freetype-config not found.])
-       fi
-    done
- 
-    if test -z "$FREETYPE2_DIR"; then
-      AC_MSG_ERROR([freetype-config not found.])
-+      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+      AC_MSG_RESULT(found via freetype-config)
-     fi
- 
-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
-     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
-     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
-     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
--- a/configure	2018-04-24 11:10:05.000000000 -0400
-+++ b/configure	2018-05-04 15:18:45.626367913 -0400
-@@ -34348,21 +34348,79 @@
- 
-   if test "$PHP_FREETYPE_DIR" != "no"; then
- 
-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-      if test -f "$i/bin/freetype-config"; then
-        FREETYPE2_DIR=$i
-        FREETYPE2_CONFIG="$i/bin/freetype-config"
-        break
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
-+$as_echo_n "checking for freetype2... " >&6; }
-+
-+
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
-+
-+      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
-+      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
-+      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
-+      FREETYPE2_DIR="found"
-+
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5
-+$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; }
-+    else
-+
-+      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-+        if test -f "$i/bin/freetype-config"; then
-+          FREETYPE2_DIR=$i
-+          FREETYPE2_CONFIG="$i/bin/freetype-config"
-+          break
-+        fi
-+      done
-+
-+      if test -z "$FREETYPE2_DIR"; then
-+        as_fn_error $? "freetype-config not found." "$LINENO" 5
-       fi
-    done
- 
-    if test -z "$FREETYPE2_DIR"; then
-      as_fn_error $? "freetype-config not found." "$LINENO" 5
-+      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
-+$as_echo "found via freetype-config" >&6; }
-     fi
- 
-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
- 
-   for ac_i in $FREETYPE2_CFLAGS; do
-     case $ac_i in
-@@ -36019,21 +36076,78 @@
- 
-   if test "$PHP_FREETYPE_DIR" != "no"; then
- 
-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-      if test -f "$i/bin/freetype-config"; then
-        FREETYPE2_DIR=$i
-        FREETYPE2_CONFIG="$i/bin/freetype-config"
-        break
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
-+$as_echo_n "checking for freetype2... " >&6; }
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
-+
-+      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
-+      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
-+      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
-+
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE_VERSON found" >&5
-+$as_echo "from pkgconfig: version $FREETYPE_VERSON found" >&6; }
-+    else
-+
-+      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-+        if test -f "$i/bin/freetype-config"; then
-+          FREETYPE2_DIR=$i
-+          FREETYPE2_CONFIG="$i/bin/freetype-config"
-+          break
-+        fi
-+      done
-+
-+      if test -z "$FREETYPE2_DIR"; then
-+        as_fn_error $? "freetype-config not found." "$LINENO" 5
-       fi
-    done
- 
-    if test -z "$FREETYPE2_DIR"; then
-      as_fn_error $? "freetype-config not found." "$LINENO" 5
-+      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
-+$as_echo "found via freetype-config" >&6; }
-     fi
- 
-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
- 
-   for ac_i in $FREETYPE2_CFLAGS; do
-     case $ac_i in
--- a/dev-lang/php/files/php-icu-70.patch
+++ b/dev-lang/php/files/php-icu-70.patch
@ -1,45 +0,0 @@
-diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
-index 1c4ba327bd83..1bdfb27b7e2e 100644
--- a/ext/intl/locale/locale_methods.c
-+++ b/ext/intl/locale/locale_methods.c
-@@ -1326,7 +1326,7 @@ PHP_FUNCTION(locale_filter_matches)
- 		if( token && (token==cur_lang_tag) ){
- 			/* check if the char. after match is SEPARATOR */
- 			chrcheck = token + (strlen(cur_loc_range));
-			if( isIDSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){
-+			if( isIDSeparator(*chrcheck) || isKeywordSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){
- 				efree( cur_lang_tag );
- 				efree( cur_loc_range );
- 				if( can_lang_tag){
-diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp
-index bf44678efc06..143c181590e9 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
-+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
-@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
- 	clearCurrentCharIter();
- }
- 
-+#if U_ICU_VERSION_MAJOR_NUM >= 70
-+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
-+#else
- UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
-+#endif
- {
- 	if (typeid(*this) != typeid(that)) {
- 		return FALSE;
-diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h
-index 7ecf12deb5ae..0baf607782d0 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.h
-+++ b/ext/intl/breakiterator/codepointiterator_internal.h
-@@ -39,7 +39,11 @@ namespace PHP {
- 
- 		virtual ~CodePointBreakIterator();
- 
-+#if U_ICU_VERSION_MAJOR_NUM >= 70
-+		virtual bool operator==(const BreakIterator& that) const;
-+#else
- 		virtual UBool operator==(const BreakIterator& that) const;
-+#endif
- 
- 		virtual CodePointBreakIterator* clone(void) const;
- 
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@ -27,7 +27,6 @@
    <flag name="flatfile">Add dbm support for flat files</flag>
    <flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
    <flag name="gd">Adds support for gd (bundled with PHP)</flag>
-    <flag name="hash">Enable the hash extension</flag>
    <flag name="inifile">Add dbm support for .ini files</flag>
    <flag name="jit">Enable PCRE JIT support</flag>
    <flag name="json">Enable JSON support</flag>
@ -64,8 +63,6 @@
    <flag name="xmlreader">Enable XMLReader support</flag>
    <flag name="xmlwriter">Enable XMLWriter support</flag>
    <flag name="xslt">Enable the XSL extension</flag>
-    <flag name="wddx">Add support for Web Distributed Data eXchange</flag>
    <flag name="webp">Enable webp support for GD in php-7.x</flag>
-    <flag name="zip-encryption">Enable ZIP file encryption from <pkg>dev-libs/libzip</pkg></flag>
  </use>
 </pkgmetadata>
--- a/dev-lang/php/php-7.3.32-r1.ebuild
+++ b/dev-lang/php/php-7.3.32-r1.ebuild
@ -1,754 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11:= )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode:0= )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	oci8-instant-client? ( !ldap )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-	"${FILESDIR}/php-icu-70.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
--- a/dev-lang/php/php-7.3.33-r1.ebuild
+++ b/dev-lang/php/php-7.3.33-r1.ebuild
@ -1,754 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11:= )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode:0= )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	oci8-instant-client? ( !ldap )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-	"${FILESDIR}/php-icu-70.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@ -14,6 +14,8 @@ DIST Python-3.10.4.tar.xz 19342692 BLAKE2B c430ad9bed71729fda29433af0614b6c0110a
 DIST Python-3.10.4.tar.xz.asc 833 BLAKE2B 289f2e96bfc2b60c4ae94b1591779d604f203890c4f5db2ee16e305bf03c6ddb9c8d6da4471a06b5943e12888f37ca572ea30876e9a80382a26814f66b41b7bf SHA512 699e37bf09067083af159e3734b38c952bdc75432c8abfb7a7b8cce7ca975038da37490abeb5c13befd2dacb84a5341ad30de5d0a63d35af5c512215744f4d6d
 DIST Python-3.11.0a6.tar.xz 18754036 BLAKE2B af19b9f548891fa9c89899f83ea05579a0fd30d030575dfbc33f28d26ec7c97081d978462760bbf3a160ff2ff4b04127983c7b6a62062587e630eca7bafe6981 SHA512 867f7aabe10977ccf31bcfd6968fd8bb880cf5c3671bb70364a9b37296dae7ab017624446c64c12f7753b59c1ebda9e494bed5f946c5586b54fd86b0289d04ea
 DIST Python-3.11.0a6.tar.xz.asc 833 BLAKE2B 30b26fcc60d77f189c8b6c7e87306f752de88366700a899f9a6a90e2a74c5a5259592a350eb812a338fd823994c066d0354285ba54a9e9421f400c9cf1c41b33 SHA512 c29bef3fa59ef304f420a18657fe3448211e4f742cc119937335aaad36b9898d965d84fc6ea8a2f9f27865e237cc929b9843663292c44dd7b3ae329aa3fab1e9
+DIST Python-3.11.0a7.tar.xz 19362368 BLAKE2B e11ba447731b5e7a15f9c11e44ebf2555e67cdebd9c52b0d232fdcbf1c061a4ed9e528bf493d68a868b438c65b54b30f426da41009408df286bc1583ab0124cd SHA512 f193ff9dedece16a428db129f4aac9ee2ad5f73a7f7eda2063ed58bfe230a4bfef067fe6c03e2b26d01be1d3205cee8778489ea6543b74a9d2a1f415739a63ba
+DIST Python-3.11.0a7.tar.xz.asc 833 BLAKE2B 33788f8855fd65fd27473a503c2e711fde6bbd52d0c812cdccd495daed2b3d3b1f93590d1b9aa87840326caf264a796875b626c06bd58060f070fe7c802dd10f SHA512 eae66913e3a5efe70a0c3639537e5b19cd66175a61f6e8b46b194411e27df2ea3f6a8154ed05c5905f511815f011e80c5b06b3a836ea8749cb9825f85223ecc2
 DIST Python-3.6.15.tar.xz 17223796 BLAKE2B c139c6f93ea70ad898d5626dfa964280a14de9676f0d9d55668ad91618b1ba330874cbba8d6526a87e53b585ff34e3bf242613ca3fb17ee60f362a9676306c7d SHA512 f1894d704c91669d94ec83b5631288bf1e0c73ddcf33cea0977575f262eb672caebc8ac00e34e9b99c321c19cc9a71d6081fa957bb8e23cf5bfba50f345145ef
 DIST Python-3.6.15.tar.xz.asc 833 BLAKE2B c910f2367ed947ff6b33380bf8fee318c65d6e5fb0c4a847fd8f2761bbae81dec07b729b31eca060916264b6a0ccf5c52ca72181b3db79751df7697a426a8939 SHA512 cdc93e5d8fb2b5b48a1560a55bba4680adea10e35c8c38b4c51cfd2f6ba54ab2a5d4e5f71b78b889f98cf8ad9d598e0f4e019d50cc16f7db57f9d292a860fcfd
 DIST Python-3.7.12.tar.xz 17401916 BLAKE2B f01b5cc54cd0ffe2e8756767c624dda8d2fbf24e90f22a16b5a406dad995ef218613db10f0b3fb2da0ece50ccb02c8a8e007ceb0842ce9e93ee9df7348ef1528 SHA512 e1a5942908c1d1469c0ab129fb4287d4ba6eb2a030e88fd71c043fe187a1bc86c00878dab29147199617a361a0c60d9e720fe3bc58bc7bc4cc8ec4bb50c7ea2a
@ -41,6 +43,7 @@ DIST python-gentoo-patches-3.10.2_p1.tar.xz 9860 BLAKE2B 6343b9fa1af2763501fc676
 DIST python-gentoo-patches-3.10.3.tar.xz 8584 BLAKE2B 4287b33e696a1c350fef2ef34843353a2f4ad20feed2e9d7e05d727ec4f18105f57c21e7ab73941e14cc2ace27e8ac7f5e96ce2893b626c8e75cac52760f0935 SHA512 515025b13063eaee71738b8e1f071cd9930cf516e90c1c652adc6f8bee356598d152cb3337a6633500cda4228a5ddc2819f1db0cdb2524a479a0bca69ca557cb
 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
 DIST python-gentoo-patches-3.11.0a6.tar.xz 3676 BLAKE2B 6fa21569fc8249f76d0eb8d4c3347e87aca70a77e2fc4887de7c51ac9866734bb29cc6b82a17f55ada74ccd03f9918ee89ef273b8a7fbbe86c5987eb8b1754fd SHA512 c61d6accef58722efe6c7f4266bda48a74417a68e27ba75b27fe7eb406aeec7a0e0f7c0f5a2bff9879f807a2ef11608aeaff796e62d907441596455c756d14a7
+DIST python-gentoo-patches-3.11.0a7.tar.xz 3332 BLAKE2B 3c658cd486d96fe103146cfa77deaaf828919ad1d8cb4b73bc48e7c9f856c58634aa99fffe16fcd4bc071f70651313ee0e46f60cef8b129c2f096c0db7873303 SHA512 1787f75997e34544f4756a647a69ba3d188574430a1a317bef25cf8e7aaab8a78f0d6c94fd9c603f45262bf55eb6c9d9557e167e53aef7ac6f9ed88a93d39434
 DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39
 DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d
 DIST python-gentoo-patches-3.7.12_p2.tar.xz 19604 BLAKE2B bd3b88d7ad5b73219d83fb1cd35190186a0c3e451a2d0764cfbfcffbb7323a1f01376d94e5fa01a48b9fae35bd5c9e3b61052020a8190816fcbb26bde0f4df94 SHA512 3c906ccabfcedf51c115706349389b7d5a3a0325713b27ceca638fb0f13558fad6cd1f9a3e2ad83c0d82586b30399124aefffc959ae66616a7cf8b30dba8b599
@ -63,6 +66,7 @@ EBUILD python-3.10.2_p1.ebuild 11477 BLAKE2B 46df80f0b47e9d1c2b84128ed840e40ab8b
 EBUILD python-3.10.3.ebuild 11774 BLAKE2B 90a09f2fa80e6c1461d99814754235c7cd0142d787d4e7e38bec8de2d764ba62dda0e2a8ad9d5a20d640b70ab7222cbb0c6e3620d9917b417982dbaca8884942 SHA512 e9e71e51ab64288bee80429f7e47ec8a06e9d7e866ce258fe1d9d2820ce8613d64f7764ae344df65ccf6e5873b0e0ac3390509b6299aaba280a6f0f28f09c745
 EBUILD python-3.10.4.ebuild 11781 BLAKE2B fe25aabe3ad72d727797e2ffc3e4ca0ab8c83ce10dd8ff1f9f37b0e164f0494a55ea34a8987bce87b46164d79db833e808f9c5d74a1ec608454fd81441200b4e SHA512 9d838cf787a037890569adb70a4e52e5b03453ac4d052cda24ae0b63daf52eeade876f101a35247c3086e7d0062f86176ffec3912d3634ea08f4dc38c7938b1c
 EBUILD python-3.11.0_alpha6.ebuild 11710 BLAKE2B 770d65ad0b6e6ea2a1dead8d70d3ef0c72ca0f06c713f29e68f618c2038916630ec2e6f5be6d0e3ccfbbfd97099bda01541effa2c851420d568c1cf85194bb1b SHA512 1a6c17321063bfba0d7b7cda8b665e38bfa6ed7e0287727ac8b4fcd21b0eb9da1918f61d69c1abef71686393700bc9fc29375e4967df8c08fe5e241580e9c9c0
+EBUILD python-3.11.0_alpha7.ebuild 11710 BLAKE2B 770d65ad0b6e6ea2a1dead8d70d3ef0c72ca0f06c713f29e68f618c2038916630ec2e6f5be6d0e3ccfbbfd97099bda01541effa2c851420d568c1cf85194bb1b SHA512 1a6c17321063bfba0d7b7cda8b665e38bfa6ed7e0287727ac8b4fcd21b0eb9da1918f61d69c1abef71686393700bc9fc29375e4967df8c08fe5e241580e9c9c0
 EBUILD python-3.6.15-r1.ebuild 9932 BLAKE2B 595a14f19b3f37f473f4d22b0533a4b565f7eda28e493596947957f979748a8b17417949e8b73e395dc78203930a9fdbf669e5ec840537e277e03066488b6373 SHA512 757dc6f2097654a35541ea0e1f434c43b34e3809651ca3a62745261845f3e4e2b940d75154a8e94b73eda482c5f85c3c3bb6b84fc2c1d35b9822545e7c006b23
 EBUILD python-3.6.15.ebuild 9714 BLAKE2B ca1cb4650ccf1e564686da9390ff985b92715a3cb3bd628d9fb53bc5a69985bf9d7dd506cef94fc7d4e36c8c9f8d98b8ceffec27c90b15c85bb886e1caf58078 SHA512 386be71366010a967f6ecc145ef3eb72672a5bace83a619a6e04e57f630816d12a151796a0e06ac397954af1e6ee99b546912b202070a9b032c53937a8e89bc6
 EBUILD python-3.7.12_p1-r1.ebuild 9827 BLAKE2B 1f156176b78cb8e6a35d94ff05de3e72c82688c1b7b6d298e34c91827f108e0a857f0bca164b69df946ab4f2b06b2da867f9a4d82f90ddca9999ed6f6239a2cf SHA512 e1cd10a819ac96edab70483a5b818a0f5cf94daed74aaffcc726d049338a228ae1dcc795becd2a6f25560e92d07bf1efc5b64428a625168fe19017effacebff1
--- a/dev-lang/python/python-3.11.0_alpha7.ebuild
+++ b/dev-lang/python/python-3.11.0_alpha7.ebuild
@ -0,0 +1,403 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_alpha/a}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	!!<sys-apps/sandbox-2.21"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+[[ ${PV} != *_alpha* ]] &&
+	RDEPEND+=" dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
+
+		# All of these seem to occasionally hang for PGO inconsistently
+		# They'll even hang here but be fine in src_test sometimes.
+		# bug #828535 (and related: bug #788022)
+		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			PROFILE_TASK+=" -x test_distutils"
+		fi
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=(
+		NIS
+	)
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}=disabled"
+	done >> Makefile || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	if use sparc ; then
+		# bug #788022
+		skipped_tests+=" multiprocessing_fork"
+		skipped_tests+=" multiprocessing_forkserver"
+	fi
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Expects to find skipped tests and fails
+	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"sqlite3 || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@ -1,4 +1,4 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
 DIST AppStream-0.14.6.tar.xz 2403088 BLAKE2B 1eb85601c1782fc47ff21983517f301dc9493fb60347cfe8072c277cc4415e80bf6c11a93db80b6d7fe1eeda7ff1fa414fd10ce7ef0d7379b415326407d805b8 SHA512 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0
-EBUILD appstream-0.14.6.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
+EBUILD appstream-0.14.6.ebuild 1793 BLAKE2B 89217e43939efb668bce81eca458000961027308fd9dd7d1af3ae22f38a8d8ac8e8faabc32be7b2612c20fcd519f8e04c44149288d6313dbf855e78a4b2c584b SHA512 6a42df221f26a033fc454e3e438795f86c42b9a19e278cf6bb7236ca81b483d632738f24b8ed1886205da8293cb34adb51a470cb693f94d012e1fb97c6413168
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
--- a/dev-libs/appstream/appstream-0.14.6.ebuild
+++ b/dev-libs/appstream/appstream-0.14.6.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
 	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi

 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
--- a/Show More
+++ b/Show More