Sync with portage [Tue Feb 22 09:31:17 MSK 2022].

2 years ago · 72a4fa08e3
parent 193285ead7
commit 72a4fa08e3
5261 changed files with 20827 additions and 18909 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29645 BLAKE2B 423a5148bbdab53d3f4a8394cd88ccd84f8971024373f5cbcbabd5ced775b3cf7464c964b575916cfa29a31081beb80476a1427cac5a4932bdef2d5a1cd48d0b SHA512 52ff70aa293a957c8f40ba7733a6730e57691385c405aced4d846bc9ad6bd3c0613d59c396822b19027ad369145a54ec1fbfb5893c34fd36795e3714f2a8ed46
-TIMESTAMP 2022-02-21T05:39:11Z
+MANIFEST Manifest.files.gz 29610 BLAKE2B 18a2e9be2d1811524a3f5af034c5d4dc574cb00c81557b91c42f72c3110073024b853075ce51e5c3285ff12bc777626c7ddc3a2f4f8e486bd61c780b92cf43e3 SHA512 f0c19057e321ceaf1cd964e05e13bf630c6db9f087edc997eb70520508fc2d1d37ba8276da5265e085950a3e2a1223d9bcf03fe2e60c502b6c84e49c17f682e2
+TIMESTAMP 2022-02-22T06:09:11Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmITJX9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIUfgdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkuA/9G6S0P6BPy7P47+3qBbP4VO3MbJILi6Ua1jgui/B+y0vxOCYA6SIC9AuQ
-XwmmenjIDrXB30e8JNaqVJiB8ISi/IAGj/dQceJ8XmSr7p0Pv74kcCs+Qesk5J4w
-FmgQQD4IU5YiWZrmF6zh0/biT3BbXh3qX5Xso0AUjp4mZ64mwNtoZq+b6lt7s4Q8
-GvT7HKwYE69Wb2djlJybm20Uu3B9BclXC58wippHOtPzB16aAkdvp3TrTpjx25ok
-wlRvUaIELXhLleSe6SCsPh6Du0eGsl+m6RfCai4OHWXz8Mp2olNlhHYulrOIoab7
-Rg9cjJitb4c49svFl+8KgEqBIzUA0rHDceNYWpxiTEPtMks6gXQ0TwMaI6WdvAdY
-iyI5SK06ANlZnvrMgsonwH1QQU7WzDLySPL3Lh6thlhLGkic9wVa8lOKhAxZXB7u
-F6g4sOMkB+aefaldCjWS5ChP08Yskd5R1UEFe4Yi4ImSHjFfE0KoHuYnjmDCvnkd
-t6/TqnYvu4vIQ3bLzgXW8iM/PQLPjgN3gbmuth+2ZrW9NrOjvKoTXjuhIxvHncGi
-k8rYGRyJqXcuUoXcp60glhXPJWfdAxEqG+WKLMdDM8ahkI7Qoi5dFcY2fcE2Uh9E
-ccUn+6LIRRQy7PAF+GLvGQIfu/lMpxA8iUaCZOSGR4WmnH8boa4=
-=so/e
+klCakA/9HXDdKCNoseTcbGORLPEB2rQRBh6W+igFTcY5j/FvCwgcbNHK1UxvVwj6
+a/h3YXjFfjNSMRz1PpBTz0QCAvYqi2BDkWKziueTCUP2wAPGU0zqYXpQE7o3g4KG
+lmIXdjh/2iQZ4VR04QTg+yfiRp/38A57Gh4OlXt95KpZ4mwRzvtxTPLyqa0X5M06
+jfq0sib6IZMfbFNpc02uSqsZeHpOFmY0TrEBXWjH+c4tn2cSl1YI6YI/0oxxv9Lb
+5qCXjF6FZ4I8Eiwx5FMcAF5G8Bem1jkpc/0/bOzjHgaDw5QG6ipmcxnz+JYX+dze
+JNRgp36g64L4It02VO7nEo6YhV6M42fohe905jf1QW7kZWl6b/XAHlW2/NAjUCGm
+nzK3gePaaTiEpr7hz07hJ1Ev2eWAXpWFzh5RfuVCF0dWlhRRqQsTktSihVjzYvua
+fodhfNsvbRNUgZFCJ4c9I+Dp6h2w/Lss6h8QcMkN6L1WR/bUZpeBNXBySjEh+nkH
+edLivyTn6OVSa2M7Az1J45JFduyn1GLahydxlRqy17fpLPmre9FRw+1tf3ivUu5+
+tC5sqeD/00s4Kd+GyBjLGqcEeNNpl6ysY16l1JdY599BHn+HCK2R32trOi7/BqRC
+WdrlE7+nqCFOCMhW/f83PDQtZ/lBUg4t33SCBjzYIELQib1/6gk=
+=7rV7
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -7,6 +7,7 @@ DIST awscli-1.22.55.tar.gz 2164540 BLAKE2B 7e69d2810ba3a829522e4ada836f70d229ac6
 DIST awscli-1.22.56.tar.gz 2164531 BLAKE2B 86ed7632aded1a5c3b18d2eabfbf5fd9954ef2d8f61ebf5c23e596452381a3915909d6fc93c92eaa5d58f02a27df994476fbc847b40984c141946e6f08933dd8 SHA512 fb4ad95f2990397fb1d83559e71dbebf1b4f2f52b46912da02bded1d486a61141c94dabc0f59ba2ffd724ef7e379f66113a71f2ea466e7a28cf6ac9582579004
 DIST awscli-1.22.57.tar.gz 2164852 BLAKE2B 4387cd8a93972f23149c722aa03ce26f9d9fe8daa908d3d9db6e6e845265089a663d8b20f6cb7bd858f69ca29cbbda94813f58349921659534250177eb21dea6 SHA512 ad7912aa9bd2318b043796ffce4df42915e4af60ce85f76236ff9e9c1b06ef87a7acc45e560abcfc48c06ab9f14a9d3ebad12b9d02a02f66c9bbaccbbcc66100
 DIST awscli-1.22.58.tar.gz 2165016 BLAKE2B d7eec5a51a64d3a78555abfd4a3dd70a02b4e2c4399b57a023bf81603946cbbce3c0a5e49b02d90adfc74ea9d060f72d0350a9673abe855164aede6e35530085 SHA512 62e9eff1c8d0ad035566fb97bf26d52554cf314c35bf2277062aadcaa7d96a8c1cb949c85f61a79ace17821f5355d93aeb9f5692b8ca417e852fa4e3aa1325c9
+DIST awscli-1.22.59.tar.gz 2165629 BLAKE2B f4223e9095a76121a94345219057b94b830c80c233ebec8864110945d71317e94fe2f08f02e059816f1bdd9e1e2f4800e1f9770559bec4df51d5d39286e11bd0 SHA512 0efa161c976e6dd6168a7d8808298a196c0c6e3d4b54c9130efcf88179d6e6f78ae0a231a6c31e1615c84165ba33fffebefccd322442289537c9502102b5ee11
 EBUILD awscli-1.22.31.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.37.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.46.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
@ -16,4 +17,5 @@ EBUILD awscli-1.22.55.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dba
 EBUILD awscli-1.22.56.ebuild 1702 BLAKE2B 57475e38d69402acbfa5c2a72c2e6fb03accda8177cc9729ef12cc15b0e69d567ff5d72d4a0ee70c5a8ecdb91467a9c8b69107d76a0b53e7cdae2f2381f1040a SHA512 da8fb0125aeb816df91880eadf2196fdcc8f23daebd9a9afd2c9c282e56236106397588d5e873ed7431bdbf79b6a06f803603043acf54af5857f7b2729847004
 EBUILD awscli-1.22.57.ebuild 1702 BLAKE2B 57475e38d69402acbfa5c2a72c2e6fb03accda8177cc9729ef12cc15b0e69d567ff5d72d4a0ee70c5a8ecdb91467a9c8b69107d76a0b53e7cdae2f2381f1040a SHA512 da8fb0125aeb816df91880eadf2196fdcc8f23daebd9a9afd2c9c282e56236106397588d5e873ed7431bdbf79b6a06f803603043acf54af5857f7b2729847004
 EBUILD awscli-1.22.58.ebuild 1702 BLAKE2B 57475e38d69402acbfa5c2a72c2e6fb03accda8177cc9729ef12cc15b0e69d567ff5d72d4a0ee70c5a8ecdb91467a9c8b69107d76a0b53e7cdae2f2381f1040a SHA512 da8fb0125aeb816df91880eadf2196fdcc8f23daebd9a9afd2c9c282e56236106397588d5e873ed7431bdbf79b6a06f803603043acf54af5857f7b2729847004
+EBUILD awscli-1.22.59.ebuild 1702 BLAKE2B 57475e38d69402acbfa5c2a72c2e6fb03accda8177cc9729ef12cc15b0e69d567ff5d72d4a0ee70c5a8ecdb91467a9c8b69107d76a0b53e7cdae2f2381f1040a SHA512 da8fb0125aeb816df91880eadf2196fdcc8f23daebd9a9afd2c9c282e56236106397588d5e873ed7431bdbf79b6a06f803603043acf54af5857f7b2729847004
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.22.59.ebuild
+++ b/app-admin/awscli/awscli-1.22.59.ebuild
@ -0,0 +1,59 @@
+# 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
+
+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}]
+"
+
+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}
+}
+
+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.49.2.tar.gz 5560650 BLAKE2B 1fe332c26f39c792aa1c49f324ebd898d8481edc846356968adfeba6ccf807e5d4d169be6ed68f990adbb8f9f833fc68dae8236a8b0ea2c75ca7750517ba5530 SHA512 57a4c0f6b077526ee165cf0b8a7d38a0dbede3a10d5b78ec938c8e3fdd60623fda5ba4d795def5ef81d7d917910ab21999c8c8d4c9ef49a07508375d50eb6d4f
-EBUILD exo-1.49.2.ebuild 703 BLAKE2B 578d53e37de9646d8e6b71ee642732e3b2fc1e0291fb19214fb41db184bc24dfbaa5e732e07720dc81375b7a3ece2398f306f9c3ebf9e896bf3dee716e5ee3ce SHA512 ab57c789deba1af547d40cb430e653e62c88e18868ba4d30ba79e365f7a5e0285b125b98a57e0efd48930331b8421e4c4f9f8c9b4142b997e86edd84e23d002f
+DIST exo-1.49.3.tar.gz 5565174 BLAKE2B bb21f29570016f9777d95f9dd92f6e1bd5eff237fb132a81f0f91b79f765461c9c123b62b983d6f2e7af64a475723c46be97a3ac646f7c5a89fc3aca4f972ef3 SHA512 be865bf423caeee8c479382bf579f18d7279b6ea16a97c800cca0ee56fa2bc584d4c4523ff4f70b6a097dbf9c9cce99764d2c95f662b14753f2cd131e043033b
+EBUILD exo-1.49.3.ebuild 703 BLAKE2B fbee615ad22bcdc4efdce1344136056d3366c31ff1240c3c86b1fff39787b18f99f896d455ebde5cc4c2bee05e28cbaf216d1ab973b5f100d4a9957c8989ee65 SHA512 21b1e8bb20a9db8f635374ff64e9724679188cd356f975818e2390d3f369f2ff8886710d9c202cb4e72df39ba900948a392c6da296f95dc18344492d86e56d98
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
--- a/app-admin/exo/exo-1.49.3.ebuild
+++ b/app-admin/exo/exo-1.49.3.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
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@ -1,3 +1,5 @@
 DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
+DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d4077a79a38ad54258d620654536890b67b688fc790c9a9a269b321f2e12d63ec21f24858866e39b41089195c528ddbdf1351bba5f SHA512 ed20a409def66bdea7de4cd5b397891eca220c841e1b5c8cab98e45f87389ae8ba881d9e24072dd07203141fc34c49c4b67cf099791857c007971e3b7d2e2fc2
 EBUILD system-config-printer-1.5.15.ebuild 1913 BLAKE2B 75fc9425362ee7f0f6b3eb8f8899be80fef98eeff68fe0841c8b1bb825f15f4a21ac0fc53e8eff2cb33ec1328b00bd09a5c44b5492d6a2500b6f6ec764d462fb SHA512 fe2c24101e3ca4dbbef37648011f2572e21c47b374b308609041a547c27c43cac3715ff6d004e4c1d87b844bf9c040fe3905f3ac6cf76c33f467a2462b0b49bd
+EBUILD system-config-printer-1.5.16.ebuild 1940 BLAKE2B 9cb4d47bcceadb26c7c4ca4a742a30e9b13cd5c10138a8a9242f0a5a10cef34a92664be7bf493d5f39f3a0c6235d6f383c8f1ee7e79ca2374c3c9696f7aca114 SHA512 4725dafaf1f1c99c375d00a0a7258fea78289eb86499059116e0f1817f8544e39ac369950623440ce8db1cde5b3347813ffcf3c703c3edcd6997622136ab1f7e
 MISC metadata.xml 464 BLAKE2B 6b9e1c83ddd541fa865336261d248c43e24354dbe1fdb585436bdaacd6cbbca9949b54961c0ad32220326b168650c377862640c50c2f40ad61106fbbb59fa3c4 SHA512 20f80adda8d894d92410585732a88565196b6cd10177bf5ed93966cf450d6dced89f46a840fd5c5ce26a9d7ac2fc42e59fbb8f789eb1f7f594e95da7a0cf60b8
--- a/app-admin/system-config-printer/system-config-printer-1.5.16.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.16.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+inherit python-single-r1 systemd xdg
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
+SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-perl/XML-Parser
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	>=sys-devel/gettext-0.20
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycups[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	')
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-xmlto
+		--enable-nls
+		--with-desktop-vendor=Gentoo
+		--with-udev-rules
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"
+	python_optimize
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@ -1,4 +1,6 @@
 AUX libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch 1316 BLAKE2B 0c0fb8c10d869ff98d0644067336e54f907904ed8c4899e58e5d65aa84406442a550a6d4d6939cc34d5f6a80ec5d1d96dc7dcc91e44e955a8eef9b272f2fef6f SHA512 e2e4474a2af3e6f8a5bde2eff58417991b3d85f3042fe77776815f86567094168ca01c25f101cbc82a5f66573b1bc4592e6dee6b1be082fb8ec612c1394a7ce9
 DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
+DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
 EBUILD libsecret-0.20.4-r1.ebuild 2345 BLAKE2B a13c06bda6cb753656b66276fcacddae29131cd3111e4ca0df4b94e8228216b48eaa16b3136b32236cdf16922c678320e35e8cac76250576a20fa4ad70becf66 SHA512 edd63da2e3b3d0d6c1b219896b2cc6e43f072814159725d4dfc6aa63beebd2c6af6b4b01141ecc75f24739f92effd38e283e771cdd57a28641515af3cbb8056c
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+EBUILD libsecret-0.20.5.ebuild 2201 BLAKE2B 5d71dd576d080459eaca248c575c305542ea33c11885997a7bf7b31b1244680a810b01b0919de15b17eca0dc50b879fe1090b87ea4073734e86ae7989080f63a SHA512 60c374fbfb47f3249e2fb6c14c939ca35fc6dd7623436cf8aeabee6037f1ccf9c3942f68f2e63bbf811f357c9c80fd058ed2705d0facffa3724b99403050206e
+MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
--- a/app-crypt/libsecret/libsecret-0.20.5.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND=vapigen
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test tpm +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx meson_src_test
+}
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="tpm">Enable Trusted Platform Module support via <pkg>app-crypt/tpm2-tss</pkg></flag>
+	</use>
 </pkgmetadata>
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@ -1,10 +1,10 @@
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
 AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1005626205d440fabda7f88444b0eef344df8f6ead5716807bcbaf490e7b24afc12580ae25c506fcc45dfb4bac0789d9b897dfcaae943c6ba9795b2f4f1d8 SHA512 adbff50c66a22659b563344c216d60bb80951016c3d7180c07c0498c285c9099a60e5573ed0ce29c7732de28d4c390b8eac16bf695c739d0c614dd344f1bfb46
-DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
 DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
 DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
-EBUILD tpm2-tss-2.4.5.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
+DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
 EBUILD tpm2-tss-2.4.6.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
 EBUILD tpm2-tss-3.1.0.ebuild 1730 BLAKE2B e240c1e2dbe8ec07ea76f3106b4193ed07c59c69b769259529579838500d2b8431119116fa03ee8b712778c59c8aaca680c4a20462a76deef81e7a19387b2f35 SHA512 1856795cde9db35aa62dbe81872c7b01c62f5383927b0f7f5dcad7f19cd4d92885eacebcec3a56e9e1389a57f5548a2dba7f52d11afc4080840ada1e3b924e01
+EBUILD tpm2-tss-3.2.0.ebuild 1897 BLAKE2B ba88dba5beae7e11486cb5ed5bec7c968ce83110ecd895e5e83069ef324447dc29f87a9df21c098b50fddfa06a16bfdd81ec1b315e701e8260365ace8c2d262d SHA512 0e81d95debdea0b2075fe5c0b1b0ea50b3a39dacf4b4674d2fc6b16ee14b5351554355af832b46ec008e98d127e891e1f6843b72dbbb0e34bd97252c472801e9
 MISC metadata.xml 827 BLAKE2B d771c64e37ccd09adbf4c40c412b744b1fdecc5497116e1fb5518f26921195a9141710f4e4d8daaabe6fb9076719bf87c088665fcd6d037d4875bfa761f9bcb6 SHA512 9b1fb93de976edafed96599a093aa4f8058d2542b6dd9be0fb2de5849f77394f2e17b6f4397c14b1dc13b679fb91c38c7852cfaed37908d4c0a2f216a56c659c
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0.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,30 +11,32 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +fapi +openssl mbedtls static-libs test"

 RESTRICT="!test? ( test )"

-REQUIRED_USE="^^ ( gcrypt openssl )
-		fapi? ( openssl !gcrypt )"
+REQUIRED_USE="^^ ( mbedtls openssl )
+		fapi? ( openssl !mbedtls )"

 RDEPEND="acct-group/tss
 	acct-user/tss
-	fapi? (
-		dev-libs/json-c
-		net-misc/curl
-	)
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
+	fapi? ( dev-libs/json-c:=
+		>=net-misc/curl-7.80.0 )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( dev-libs/openssl:= )"
+
 DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
+	test? ( app-crypt/swtpm
+		dev-libs/uthash
+		dev-util/cmocka
+		fapi? ( >=net-misc/curl-7.80.0 ) )"
+BDEPEND="sys-apps/acl
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"

 PATCHES=(
-	"${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
-	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
 )

 pkg_setup() {
@ -57,10 +59,12 @@ src_configure() {
 		$(use_enable fapi) \
 		$(use_enable static-libs static) \
 		$(use_enable test unit) \
-		--disable-tcti-mssim \
+		$(use_enable test integration) \
+		$(use_enable test self-generated-certificate) \
+		--disable-tcti-libtpms \
 		--disable-defaultflags \
 		--disable-weakcrypto \
-		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-crypto="$(usex mbedtls mbed ossl)" \
 		--with-runstatedir=/run \
 		--with-udevrulesdir="$(get_udevdir)/rules.d" \
 		--with-udevrulesprefix=60- \
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@ -1,5 +1,7 @@
 DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
 DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
+DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
 EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
 EBUILD yubikey-manager-4.0.7.ebuild 1006 BLAKE2B 364336b23b74f0db1e9423917a68a8b3941c6a2aa8d47aa1eee43b218243b3ffa6fb022e2db31d0f9f6b02072344e083b555b07b2611f0c75392cb1b0f010b74 SHA512 8fcb0743e3c150b37e3c8c7c27be0b228ba8c3392521041c173b486d2894effbd87aae1bf45d988082b9b76d8a252d21a4ac7dec6d44f02f08423a012fe1e2b6
+EBUILD yubikey-manager-4.0.8.ebuild 1182 BLAKE2B 5704983325266669d355a1f565840c6ee9b50d2a437681e6c9159e434cfed4d66d433b0b7fcd8133d4426f44e035ae547df42095dfe5da76c6b79855049d7037 SHA512 7e100ad39dc8a66dc072b68f998b3f5611a6f6c5bfc816961e31a212fb59f2fc3963d1e68033406463b3be341f84a6a787aca0e9ca5692a4e175f5209931fbe3
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ssl"
+
+# Waiting for keyword parity on dev-python/makefun (Bug #833854)
+RESTRICT="test"
+
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
+RDEPEND="
+	app-crypt/ccid
+	dev-python/click[${PYTHON_USEDEP}]
+	<dev-python/cryptography-39[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
+#BDEPEND="test? (
+#	dev-python/makefun[${PYTHON_USEDEP}]
+#)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/ykman.1
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@ -1,3 +1,5 @@
+AUX okteta-0.26.6-crashfix.patch 1473 BLAKE2B b91489a75302385ef04d2ed933aefc4b20acb237d9325d080a2edc3435c88993fc7b5f802acb67d759a47a85e6e711a8c22b61085b5bbde6cc6628694500f1c1 SHA512 6ab0cdcb81144a1ae8cbdac23bbd3b8b14d74c1b5a4028badf00921004667a9820166fd1ca620133abb40cb97eef8c271213d41f5c0237dc31638489a47829e9
 DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a
+EBUILD okteta-0.26.6-r1.ebuild 1809 BLAKE2B 12bf61800cd0a850df113ffb077c15a20839da969b038aa63e6088cd3fe489303479959493dbf87e8bb1440f193f1e35a322245cdc0a384ca1dc9ebbdc555336 SHA512 f6b5f761bf242249e7798ab761861a740d15001094d740ebb543a5b96a657d3972218471e9cdbbfba23253dca5faf9d30e190967c94a9aacd8c5437c589daf84
 EBUILD okteta-0.26.6.ebuild 1760 BLAKE2B d46526993dd9807d460a3976e77041d782e245d97fc95109c02247f63a2501e8ce80d92cd61db2c625335ff7424155c615576556f7a562a96267bd88adce3dc3 SHA512 5e47fb1cd03eade146322ec5888296d2e00303099f5196577f171a993c96662c347403fcbd1e81d8c83d674a79ba75c43712afe287cb9211ced5911be8f99977
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
--- a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
+++ b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
@ -0,0 +1,34 @@
+From 607390315750815b0009b95ecd65699e2a1d110a Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Thu, 11 Nov 2021 15:57:54 +0100
+Subject: [PATCH] String extraction tool: fix crash with marked strings in
+ closed view
+
+BUG: 444405
+
+FIXED-IN: 0.26.7
+---
+ .../controllers/view/stringsextract/stringsextracttool.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+index 0d629999a..bcb6b6734 100644
+--- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+@@ -58,7 +58,12 @@ QString StringsExtractTool::title() const { return i18nc("@title:window of the t
+ void StringsExtractTool::setTargetModel(AbstractModel* model)
+ {
+     if (mByteArrayView) {
+-        mByteArrayView->disconnect(this);
+        // disconnect explicitly from all connects but QObject::detroyed,
+        // for the case mSourceByteArrayView is mByteArrayView
+        disconnect(mByteArrayView,  &ByteArrayView::selectedDataChanged,
+                   this, &StringsExtractTool::onSelectionChanged);
+        disconnect(mByteArrayView, &ByteArrayView::offsetCodingChanged,
+                   this, &StringsExtractTool::offsetCodingChanged);
+     }
+ 
+     mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
+-- 
+GitLab
+
--- a/app-editors/okteta/okteta-0.26.6-r1.ebuild
+++ b/app-editors/okteta/okteta-0.26.6-r1.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -5,6 +5,7 @@ AUX libvirt-6.7.0-fix-paths-for-apparmor.patch 1974 BLAKE2B b5e9a151aa6bfbccf76e
 AUX libvirt-7.10.0-fix_soname.patch 488 BLAKE2B 83a69686fa431f0ac360b9658abec16fb08c8373b4b79c75aaaa0c38c3251f803d907396f4cc92762d7e72be18b78da83def39dbb235cf543585d0d1e98407f9 SHA512 a492dc55799165b4b23e773e198a7092115bf128a5a6e368e802f04e504f5fd68ab80560c76fc37e204fb92149fd64f252e82e4fff394318e5c212e0da826a9a
 AUX libvirt-7.9.0-fix_cgroupv2.patch 1273 BLAKE2B a51442511a9f3b1ce3702dec2c59cb1cdbc7a67710b5e7e48e16265ddd48d8e5bfca908ad2c6000497fea9332c1d62b9786a2fb96bbc3cace6dc002448a4d5a9 SHA512 f00dfb1ed1f4f3e2f26178b6c2b821af9deb3ee6c63f79c194612432f9a735567c4d81c8928a02e1c9dbe7d6ac0f16bb526e506b0c6d84b727b99ae8f654417d
 AUX libvirt-8.1.0-do-not-use-sysconfig.patch 8246 BLAKE2B bcac53a75a724e037a43512e1b6647ce525304ae2f1c6dd1615d412964897f3775df973b266b4352bbfdf8be1aeb669f660414f66845925d668a635195dd7e1a SHA512 2d75bec8c2ab6f2727c43711c256322f352c603a4dd5021bc3627a7c19b67dc3e3d8a7cc74466e8ab8160c938e486c13a163eea5c0e160d7395b23ba67efb378
+AUX libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch 2214 BLAKE2B f36e1e3fecb846834d09699a914e1e79afd8f283cdef1ce1085574d1ec5b573075af26854be2e3002db49aad87d005995606bc1cb501476209ed6eba5c514928 SHA512 24f49141cfe21eee27bc9cd4c3766bca4dec10afb8e2249198e083f5f3980d157c84aa59816f448993bf6ed30d4fe2795714adf16066e8fd185df87f363a18d8
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91
@ -18,8 +19,8 @@ DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 93c72117941b0a74484c7510c8437054e66fc3
 DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030 SHA512 d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
 DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 4669ae8f4de6379c3f94d3b6875ccc8eb435fbbf96aac26642fc593bc1921e9189decd9d366f5ca9e3e0fd8392ce840dce9e50ae048a5a2b72c465fd514eaf73 SHA512 e84cf2753d3c57cfe5aadbb6601fa76e0ba750471c1c24631720fe64376c3599ea252863ec671a50527e4fb380ffe0c2f02f07705b4b87d373ccf3e516ff4b1c
 DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc SHA512 ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b
-EBUILD libvirt-7.10.0-r3.ebuild 8766 BLAKE2B 1bb5ae8894f0ce1db9748d295f0fdb1ff1b5cb6f9fbb87045d3782f6bac3ecaf9263bfec3f97b031eb4363a796fcfa2051c2cd9d8a030b7ad3a9da6f26b31102 SHA512 f89106fb82c2c65f0cbd3d10d77d2dea74cabc5383f1648b401946e20b706c72490efc5f9a1454864a41ec03e2d97d30baaf918cb7dd9e3a008afac1c448446c
-EBUILD libvirt-7.7.0-r2.ebuild 8679 BLAKE2B 657965c786f30e2eb417cdc0c81b780c70122c528e5d27e55e6e3becf6bf35113b9874b7c0822ba2ef7edbb2583c464cb1001b221a1df69e4b21b98e315704a2 SHA512 658f88694897fe6e50aa66ec6a03e0420834f48cf214fc4d3a4b273c0422d5e8d042b8bed7be61c35e1411f90dd568ff8b3d133b58926aced7f41f23b3ae02ae
-EBUILD libvirt-8.0.0-r1.ebuild 8675 BLAKE2B 3cdd5152d4afda9e9b0a33bc4e928cf95101c837968b305fc61b13e845f0e8a1f94a61a0cde3bbd63a6e51362ed1cbf1f2de8e8cc00e0fbb789cfb490923c164 SHA512 06a41b7c9605a84bf3d4115e445818043796cdbb59a69f66dd77223610f2cb2c57e6434a4da66c63ce0d4b4995b380fb2a23c69408d2f705dbae5451270d0e38
+EBUILD libvirt-7.10.0-r3.ebuild 8838 BLAKE2B e75ceef6ee2e09265090fa1b4ac9c7b64326f4e75cb6f467222318ed7f27c9bfac8917a4865fdbd27f03833ce5f43273059b8909068c5a197fbad74d04694650 SHA512 f1d0478e7e90d91ef0a090797959da38379ec1c290e1f5c5cc35b1b77b86b5d4257a8b5d6e075038f2e2f9073560743196906e9b48fd5fa994e8b189663c08ec
+EBUILD libvirt-7.7.0-r2.ebuild 8751 BLAKE2B 4c9b1d35c8230f6cff100fa080214802afc2514dc336047ab682c6be0b8607950bac0f491bc3d3108a89e5fef25aa7b8ec9387e2871b13b899e7d107283a56ac SHA512 20d25b46b06820984f4ec3134b48c9d2d4450d73ac11c6eb9787f8bbae65ea798d477624babb4150c73b371f085c77b47ab1b6aa8883fe5f70425af4df7b5446
+EBUILD libvirt-8.0.0-r1.ebuild 8747 BLAKE2B 49617da96eba3e747e157972623312dc2f265a6f982b2099f5379e4936ece5bb4e323f643e7b7ba4337e08a097c7c1a51cebc654244663bacee028c65ad6dfbf SHA512 f35d44129a7ff62374c886c60fe7135de5d3c9692091e4cf070ae65a5cec46dcb542a64b58405ad87ab893ca0b8ad0b432b50a9e73ffb3cd06bd667093a1f0e9
 EBUILD libvirt-9999.ebuild 8675 BLAKE2B fc4d1ee48a1f22465bf5bf44a6eb88f2968f65996fb6f05e689e6cc9ae23f926b2a4cb2e481bd3aacaa63c693fa0b187e80b3eecfb4d429eceb72dff2c7156a7 SHA512 bac5876b8b903a50e9b28e96c986cfc8818e8198fa08a074dab98970f1d67f71f4b41d7417c389e63e0b874692c1f57004859bb94721f37bff3582d86504190f
 MISC metadata.xml 3328 BLAKE2B e7fa41cec946e6bb6888e335b463719b82a0ee9fe320eb48c03d400812d11c18ac94e9332f895c504563ad36dbb561e8ad165332433c02df6aef68957ea282f1 SHA512 1d68aaf6ea120da3407cf287f4cf6bc3eb091a155c78b4d6a731232e6f4d18238dfdbf1d7c4134a5641a3ee5f8ebaf3541b7a992ea61e5c1512dc7135a5bb02d
--- a/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
+++ b/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
@ -0,0 +1,62 @@
+From 54814c87f3706cc8eb894634ebef0f9cf7dabae6 Mon Sep 17 00:00:00 2001
+Message-Id: <54814c87f3706cc8eb894634ebef0f9cf7dabae6.1645458252.git.mprivozn@redhat.com>
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Mon, 21 Feb 2022 09:26:13 +0100
+Subject: [PATCH] docs: Fix template matching in page.xsl
+
+Our last default template had a match of "node()" which incidentally matched
+everything, including text nodes.  Since this has the same priority according to
+the XSLT spec, section 5.5:
+
+  https://www.w3.org/TR/1999/REC-xslt-19991116#conflict
+
+this is an error.  Also according to the same spec section, the XSLT processor
+may signal the error or pick the last rule.
+
+This was uncovered with libxslt 1.1.35 which contains the following commit:
+
+  https://gitlab.gnome.org/GNOME/libxslt/-/commit/b0074eeca3c6b21b4da14fdf712b853900c51635
+
+which makes the build fail with:
+
+  runtime error: file ../docs/page.xsl line 223 element element
+  xsl:element: The effective name '' is not a valid QName.
+
+because our last rule also matches text nodes and we are trying to extract the
+node name out of them.
+
+To fix this we change the match to "*" which only matches elements and not all
+the nodes, and to avoid any possible errors with different XSLT processors we
+also bump the priority of the match="text()" rule a little higher, just in case
+someone needs to use an XSLT processor that chooses signalling the error instead
+of the optional recovery.
+
+https://bugs.gentoo.org/833586
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/page.xsl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/page.xsl b/docs/page.xsl
+index fd67918d3b..72a6fa0842 100644
+--- a/docs/page.xsl
+++ b/docs/page.xsl
+@@ -215,11 +215,11 @@
+     </xsl:element>
+   </xsl:template>
+ 
+-  <xsl:template match="text()" mode="copy">
+  <xsl:template match="text()" mode="copy" priority="0">
+     <xsl:value-of select="."/>
+   </xsl:template>
+ 
+-  <xsl:template match="node()" mode="copy">
+  <xsl:template match="*" mode="copy">
+     <xsl:element name="{name()}">
+       <xsl:copy-of select="./@*"/>
+       <xsl:apply-templates mode="copy" />
+-- 
+2.34.1
+
--- a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild
@ -136,6 +136,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
 	"${FILESDIR}"/${PN}-7.9.0-fix_cgroupv2.patch
 	"${FILESDIR}"/${PN}-7.10.0-fix_soname.patch
+	"${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
 )

 pkg_setup() {
--- a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
 )

 pkg_setup() {
--- a/app-emulation/libvirt/libvirt-8.0.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-8.0.0-r1.ebuild
@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
 )

 pkg_setup() {
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,4 +1,3 @@
-AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf1b5a75f061e55b961d767972456803b8c9aa15120b2b2497651495e903925bf93b04c483e0713d9117a9 SHA512 7ec52fc65b5b8a22877c941f0ab6f249ba1d7b40ad7d50d8f0ac793069cc0eb85b1e5394ce81adf60fa23b01ecc8ce983e6c508b8e0d22189dc46e2c1ad8c1b4
 AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441
 AUX xen-4.16-efi.patch 696 BLAKE2B 2bc3db7286d7ea24c762e914012c71d3fe6dc4d8c47551c9c88282d67d896917c04456c607c155d8340d0b264a34830091309a1a28417dbfc585f26a9fc692ad SHA512 0c1f594ae6321af190cc205d2ebb8afbca53c2897302b630a6f0eee9ce43f591483c96cc4f8b8be5db78ee11451c724882e50bb4226359e784bbda520b090524
--- a/app-emulation/xen/files/xen-4.14-efi.patch
+++ b/app-emulation/xen/files/xen-4.14-efi.patch
@ -1,38 +0,0 @@
-diff --git a/xen/Makefile b/xen/Makefile
-index 0ade7f9..46c25d9 100644
--- a/xen/Makefile
-+++ b/xen/Makefile
-@@ -272,9 +272,17 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
- 	[ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
- 	$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
-	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
-	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
-+
-+	if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	else \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	fi;
-+
- 	[ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
- 	$(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
- 	$(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index 07eeefb..6b1c16b 100644
--- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -163,7 +163,7 @@ note.o: $(TARGET)-syms
- 		--rename-section=.data=.note.gnu.build-id -S $@.bin $@
- 	rm -f $@.bin
- 
-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@ -1,5 +1,6 @@
+AUX ddcui-0.2.1-build.patch 639 BLAKE2B 0485050d4e57aff2261b210e55b96baaeb3271060ccc05a0f88aed2c678c99c8b4e0485153e924b3dcc0f8a2faabf0991bac4b698f66f6547f925189ff85344a SHA512 cb4d61500c083ed18cb5264e02997fc88416baea7676a92f1aedaa400007aaa7931993ec32a8b1baa7fd9bb552553a4dbc77393c2501fbe1618e4150c9c0d87c
 DIST ddcui-0.1.2.tar.gz 126766 BLAKE2B 85317b68bbd7e3e5b780ad2ba45888049f9ca70695ccfeb5d0acc2f2c8db11ee97438aa53240671f908caffd45b12a488593cd82b41c8e1acbad38f97d560ab4 SHA512 008033f23cf1dccb69b503b2f8950518e771bd4892b2df912186712859e6e66f724019beb5941d49452ae9a6080ce2730a1e11ec201931a31b3ab4735c03c724
-DIST ddcui-0.2.0.tar.gz 598886 BLAKE2B d44e7b2226ca815c3d468a69f805b4be6359b447095e2688f98a5bde106d348dc2cbc80c31fc1de47f1bf0ebc7db4fae63e3e4f1501c10a6a7bb0c06718ad3cd SHA512 0509b2adae1b4a5c9cac3f3d598327085f183ada0fa8ef2ae85c1220704bdc50583fdc370f809b52d62eaeeae6a30146d63435ef2134a6467360eb6f90e64191
+DIST ddcui-0.2.1.tar.gz 601220 BLAKE2B 18af4ee4db741a612565260ed812f7274695472e9dc6e32c6670efcbdaeafcac9b0b45e44d02188d23e0f379f57b062270ecad58bdcfa8e8c2bf99c2775b1dfe SHA512 0df363dbf17750e3920e0afc5fc29b42271bbf06dcf52cddf46f3660155c0954ee39e8e356e9caebe1a6a679ab0b3a4ebb2e501a9bb9ac2cd47da3f522fb3169
 EBUILD ddcui-0.1.2-r1.ebuild 857 BLAKE2B 9e23bdf51975d181868ebe665b11945c095f9ac01897570c87cafd6d5f1ae27b2b17a0b1e52f53e9a9a55f7e43c68b00305faa8ff00d578cf15151c9b6b6393b SHA512 d950e915c882bab1f00d4137e96297c3f6f36dd5de6222348b28228b455bfa18d342f41c7ac107c5068960616a478b23ea8d3fcdd84f209eda14649af460e413
-EBUILD ddcui-0.2.0.ebuild 759 BLAKE2B 27a28bbcc19098f2d46dbb18cad5b915f1a2a2d68a646b6432168a80e791f8f39044f0795b5248851c4b4393b46f40951c045f976e8fd963610333c97ba4f541 SHA512 68b3a9b773adc8df9652b8be937190a4c42383d28a8b2f758a03387957f95370b8e7d74f468d5be88a76e1f4fd462d2781825ce86831e73d76f9ac4131603066
+EBUILD ddcui-0.2.1.ebuild 741 BLAKE2B 289ef69cd6ac16849a54775c251829d9b7382e2c501f4cfddad770f99f6126594730e625cc43222cb185e605ce9fafbeb2779bd4e8d4c752dd5c3b98a0d600ee SHA512 b46978ee3d36d2144e402e3aef62bcb35d8a851a6e4502230c9fca89bc9c331ab5346efb7d586c6a97f6fe6238c35d121578e958711e145c10ee22721d186205
 MISC metadata.xml 507 BLAKE2B 4f458118ad0f48137ac6b50871d7bc07f3b4416cbb82b264edd00726a6b9655d9ce986618da3c53a8e8855054a1e1e68045353589fdde1541c17e3f4b2e29828 SHA512 6a5c378319fc110e1338f4f6aeb5ce41c76ac521e95311c8b368b5357a2fd362038b21e46ff59dafc2cd8b0baeb55b7530b64c9f4f25513eb3eb66e528fd1e28
--- a/app-misc/ddcui/ddcui-0.2.1.ebuild
+++ b/app-misc/ddcui/ddcui-0.2.1.ebuild
@ -9,9 +9,7 @@ DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
 HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
 SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"

-# seg fault on launch
-# https://github.com/rockowitz/ddcui/issues/34
-KEYWORDS=""
+KEYWORDS="~amd64"
 LICENSE="GPL-2+"
 SLOT="0"

@ -26,6 +24,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"

+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_prepare() {
 	# move docs to correct dir
 	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
--- a/app-misc/ddcui/files/ddcui-0.2.1-build.patch
+++ b/app-misc/ddcui/files/ddcui-0.2.1-build.patch
@ -0,0 +1,13 @@
+diff --git a/src/feature_value_widgets/value_special_widget_x62.cpp b/src/feature_value_widgets/value_special_widget_x62.cpp
+index 1fb8118..e7169d2 100644
+--- a/src/feature_value_widgets/value_special_widget_x62.cpp
+++ b/src/feature_value_widgets/value_special_widget_x62.cpp
+@@ -185,7 +185,7 @@ void ValueSpecialWidgetX62::combobox_activated(int index) {
+    bool debug = false;
+    debug = debug || debugWidget;
+    TRACEMCF(debug, "feature 0x%02x, index=%d", _featureCode, index);
+-   assert(_cb->currentIndex == index);
+   assert(_cb->currentIndex() == index);
+ 
+    // QVariant qv = _cb->itemData(ndx);
+    // uint i = qv.toUInt();
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@ -1,5 +1,5 @@
 DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
-DIST ddcutil-1.2.1.tar.gz 801196 BLAKE2B f2db3c6a88b735ec96b03e401aea21a6dcc3ee7e6fb6c30854dacc8868adf9854f63b02153ad6627ce602d7deb51073142f910631b5c2ce86c15414a53644f7a SHA512 f80c45ed47a059c71ddf7dc56e8daf9b666120960d1911175d390f95ab9691a62cffb7ce4555ddc418e3e9cfe7a575a70778c35809cdea598d7610dac915ccbc
+DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B 65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe SHA512 0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
 EBUILD ddcutil-0.9.9-r3.ebuild 3281 BLAKE2B fa1f2dcf4f43dc5b746b3f3e3f0b3bac994f1d6be2bf5a2938f975a196c142b5c41723590566824d7887bc6067300c2e0a913e377c18002e579a73ff5bc3b889 SHA512 f0d0e919847bb907566fdc63e6639a265422b1332153b759ad456d9fb15e4360f5bbe72e67d53734372f4b6ef539bdaff9e38dd73b1fdf831be77ef45586878a
-EBUILD ddcutil-1.2.1.ebuild 2746 BLAKE2B 9f43f5583e77a0472b6210aa822c38d8285884234d0ae309c444a12ac4cc427fb44500cf1fe1190c1f8c3b8050843d918656f4444a3d8fc9430a35a076e2a0cf SHA512 ef8e04cedff182c67de5906eedea0eccb8f213d57903c82b385c10a218a261f4c2e1bbd5018ad6d4e72e9bd2101dfd6c5ab185c12d0f4ff78d7c126844a6732b
+EBUILD ddcutil-1.2.2.ebuild 2746 BLAKE2B 9f43f5583e77a0472b6210aa822c38d8285884234d0ae309c444a12ac4cc427fb44500cf1fe1190c1f8c3b8050843d918656f4444a3d8fc9430a35a076e2a0cf SHA512 ef8e04cedff182c67de5906eedea0eccb8f213d57903c82b385c10a218a261f4c2e1bbd5018ad6d4e72e9bd2101dfd6c5ab185c12d0f4ff78d7c126844a6732b
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
--- a/app-misc/ddcutil/ddcutil-1.2.2.ebuild
+++ b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
--- a/app-misc/spire/Manifest
+++ b/app-misc/spire/Manifest
--- a/app-misc/spire/spire-0.10.0.ebuild
+++ b/app-misc/spire/spire-0.10.0.ebuild
@ -1,523 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="the spiffe runtime environment"
-HOMEPAGE="https://github.com/spiffe/spire"
-
-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.37.4/go.mod"
-	"cloud.google.com/go v0.38.0"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod"
-	"github.com/Azure/azure-sdk-for-go v30.1.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.1.0"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.1.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DataDog/datadog-go v3.2.0+incompatible"
-	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190405210948-c70a36b8193f"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190405210948-c70a36b8193f/go.mod"
-	"github.com/InVisionApp/go-health v2.1.0+incompatible"
-	"github.com/InVisionApp/go-health v2.1.0+incompatible/go.mod"
-	"github.com/InVisionApp/go-logger v1.0.1"
-	"github.com/InVisionApp/go-logger v1.0.1/go.mod"
-	"github.com/Microsoft/go-winio v0.4.14"
-	"github.com/Microsoft/go-winio v0.4.14/go.mod"
-	"github.com/Shopify/sarama v1.19.0/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/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"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129"
-	"github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod"
-	"github.com/apache/thrift v0.12.0/go.mod"
-	"github.com/armon/go-metrics v0.3.2"
-	"github.com/armon/go-metrics v0.3.2/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/aws/aws-sdk-go v1.28.9"
-	"github.com/aws/aws-sdk-go v1.28.9/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0"
-	"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/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/blang/semver v3.5.1+incompatible"
-	"github.com/blang/semver v3.5.1+incompatible/go.mod"
-	"github.com/cenkalti/backoff/v3 v3.0.0"
-	"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.0/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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/containerd/containerd v1.3.2"
-	"github.com/containerd/containerd v1.3.2/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/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/docker/distribution v2.7.1+incompatible"
-	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-	"github.com/docker/docker v1.4.2-0.20191008235115-448db5a783a0"
-	"github.com/docker/docker v1.4.2-0.20191008235115-448db5a783a0/go.mod"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-connections v0.4.0/go.mod"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/go-units v0.4.0/go.mod"
-	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.0"
-	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5"
-	"github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v1.0.0/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-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.4"
-	"github.com/go-ole/go-ole v1.2.4/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.1"
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/gogo/protobuf v1.2.1"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/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"
-	"github.com/golang/mock v1.3.1/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"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"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"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gnostic v0.3.1"
-	"github.com/googleapis/gnostic v0.3.1/go.mod"
-	"github.com/gorilla/context v1.1.1"
-	"github.com/gorilla/context v1.1.1/go.mod"
-	"github.com/gorilla/mux v1.6.2"
-	"github.com/gorilla/mux v1.6.2/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79"
-	"github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.1-0.20190430135223-99e2f22d1c94"
-	"github.com/hashicorp/hcl v1.0.1-0.20190430135223-99e2f22d1c94/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.7"
-	"github.com/imdario/mergo v0.3.7/go.mod"
-	"github.com/imkira/go-observer v1.0.3"
-	"github.com/imkira/go-observer v1.0.3/go.mod"
-	"github.com/jinzhu/gorm v1.9.9"
-	"github.com/jinzhu/gorm v1.9.9/go.mod"
-	"github.com/jinzhu/inflection v1.0.0"
-	"github.com/jinzhu/inflection v1.0.0/go.mod"
-	"github.com/jinzhu/now v1.0.1"
-	"github.com/jinzhu/now v1.0.1/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/json-iterator/go v1.1.6"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.9"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/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/lib/pq v1.1.1"
-	"github.com/lib/pq v1.1.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-isatty v0.0.3"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-sqlite3 v1.10.0"
-	"github.com/mattn/go-sqlite3 v1.10.0/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"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"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/morikuni/aec v1.0.0"
-	"github.com/morikuni/aec v1.0.0/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/gomega v1.4.3"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1"
-	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-	"github.com/opencontainers/image-spec v1.0.1"
-	"github.com/opencontainers/image-spec v1.0.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_golang v1.0.0"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.4.0"
-	"github.com/prometheus/client_golang v1.4.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"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.2.0/go.mod"
-	"github.com/prometheus/common v0.4.1"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.9.1"
-	"github.com/prometheus/common v0.9.1/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/prometheus/procfs v0.0.2"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/shirou/gopsutil v2.18.12+incompatible"
-	"github.com/shirou/gopsutil v2.18.12+incompatible/go.mod"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.1/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spiffe/go-spiffe v0.0.0-20190717182101-d8657cb50cae"
-	"github.com/spiffe/go-spiffe v0.0.0-20190717182101-d8657cb50cae/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"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/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/uber-go/tally v3.3.12+incompatible"
-	"github.com/uber-go/tally v3.3.12+incompatible/go.mod"
-	"github.com/zeebo/errs v1.2.0"
-	"github.com/zeebo/errs v1.2.0/go.mod"
-	"go.opencensus.io v0.20.1/go.mod"
-	"go.opencensus.io v0.20.2/go.mod"
-	"go.opencensus.io v0.21.0"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.uber.org/atomic v1.4.0"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/goleak v0.10.0"
-	"go.uber.org/goleak v0.10.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-20190325154230-a5d413f7728c/go.mod"
-	"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/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/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-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/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"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/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/sys v0.0.0-20180823144017-11551d06cbcc/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-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/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-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190618155005-516e3c20635f"
-	"golang.org/x/sys v0.0.0-20190618155005-516e3c20635f/go.mod"
-	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82"
-	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/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"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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-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-20190618163018-fdf1049a943a"
-	"golang.org/x/tools v0.0.0-20190618163018-fdf1049a943a/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.3.1/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.6.0"
-	"google.golang.org/api v0.6.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"
-	"google.golang.org/appengine v1.5.0/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-20190404172233-64821d5d2107/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.17.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.19.1/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.22.0/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.24.0"
-	"google.golang.org/grpc v1.24.0/go.mod"
-	"gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0"
-	"gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/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"
-	"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/fsnotify.v1 v1.4.7"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637"
-	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"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"
-	"gopkg.in/yaml.v2 v2.2.5/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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"
-	"k8s.io/api v0.0.0-20190222213804-5cb15d344471"
-	"k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628"
-	"k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod"
-	"k8s.io/client-go v10.0.0+incompatible"
-	"k8s.io/client-go v10.0.0+incompatible/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/spiffe/spire/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/spire
-	acct-user/spire"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT+=" test"
-
-src_compile() {
-	go build -o spire-agent ./cmd/spire-agent || die
-	go build -o spire-server ./cmd/spire-server || die
-}
-
-src_test() {
-	go test ./... || die "tests failed"
-}
-
-src_install() {
-	exeinto /opt/spire
-	doexe spire-agent spire-server
-	keepdir /opt/spire/.data
-	insinto /etc/spire
-	doins -r conf/*
-	dosym ../../etc/spire /opt/spire/conf
-	dosym ../../opt/spire/spire-agent /usr/bin/spire-agent
-	dosym ../../opt/spire/spire-server /usr/bin/spire-server
-	newconfd "${FILESDIR}"/spire-agent.confd spire-agent
-	newinitd "${FILESDIR}"/spire-agent.initd spire-agent
-	newconfd "${FILESDIR}"/spire-server.confd spire-server
-	newinitd "${FILESDIR}"/spire-server.initd spire-server
-keepdir /var/log/spire
-	fowners spire:spire /opt/spire/.data
-fowners spire:spire /var/log/spire
-}
--- a/app-misc/spire/spire-0.11.1.ebuild
+++ b/app-misc/spire/spire-0.11.1.ebuild
@ -1,981 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="the spiffe runtime environment"
-HOMEPAGE="https://github.com/spiffe/spire"
-
-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.37.4/go.mod"
-	"cloud.google.com/go v0.38.0"
-	"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.56.0"
-	"cloud.google.com/go v0.56.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"
-	"cloud.google.com/go/bigquery v1.4.0/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/datastore v1.1.0"
-	"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"
-	"cloud.google.com/go/pubsub v1.2.0/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"
-	"cloud.google.com/go/storage v1.6.0/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.11.0"
-	"github.com/Azure/go-autorest/autorest v0.11.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.2.0"
-	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/DataDog/datadog-go v3.2.0+incompatible"
-	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190405210948-c70a36b8193f"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190405210948-c70a36b8193f/go.mod"
-	"github.com/InVisionApp/go-health v2.1.0+incompatible"
-	"github.com/InVisionApp/go-health v2.1.0+incompatible/go.mod"
-	"github.com/InVisionApp/go-logger v1.0.1"
-	"github.com/InVisionApp/go-logger v1.0.1/go.mod"
-	"github.com/Microsoft/go-winio v0.4.14"
-	"github.com/Microsoft/go-winio v0.4.14/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
-	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
-	"github.com/Shopify/sarama v1.19.0/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-	"github.com/agnivade/levenshtein v1.0.1/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"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129"
-	"github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod"
-	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
-	"github.com/apache/thrift v0.12.0/go.mod"
-	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-metrics v0.3.2"
-	"github.com/armon/go-metrics v0.3.2/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
-	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
-	"github.com/aws/aws-sdk-go v1.28.9"
-	"github.com/aws/aws-sdk-go v1.28.9/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0"
-	"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/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/blang/semver v3.5.0+incompatible/go.mod"
-	"github.com/blang/semver v3.5.1+incompatible"
-	"github.com/blang/semver v3.5.1+incompatible/go.mod"
-	"github.com/cenkalti/backoff/v3 v3.0.0"
-	"github.com/cenkalti/backoff/v3 v3.0.0/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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f"
-	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-	"github.com/containerd/containerd v1.3.2"
-	"github.com/containerd/containerd v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-semver v0.3.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-	"github.com/creack/pty v1.1.7/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/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/docker/distribution v2.7.1+incompatible"
-	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
-	"github.com/docker/docker v1.4.2-0.20191008235115-448db5a783a0"
-	"github.com/docker/docker v1.4.2-0.20191008235115-448db5a783a0/go.mod"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-connections v0.4.0/go.mod"
-	"github.com/docker/go-units v0.3.3/go.mod"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/go-units v0.4.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/emicklei/go-restful v2.9.5+incompatible/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"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.4"
-	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5"
-	"github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/evanphx/json-patch v4.5.0+incompatible"
-	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fatih/structs v1.1.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
-	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/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-ldap/ldap v3.0.2+incompatible/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-logr/logr v0.1.0"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-logr/zapr v0.1.0"
-	"github.com/go-logr/zapr v0.1.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.4"
-	"github.com/go-ole/go-ole v1.2.4/go.mod"
-	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
-	"github.com/go-openapi/analysis v0.17.0/go.mod"
-	"github.com/go-openapi/analysis v0.18.0/go.mod"
-	"github.com/go-openapi/analysis v0.19.2/go.mod"
-	"github.com/go-openapi/analysis v0.19.5/go.mod"
-	"github.com/go-openapi/errors v0.17.0/go.mod"
-	"github.com/go-openapi/errors v0.18.0/go.mod"
-	"github.com/go-openapi/errors v0.19.2/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
-	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
-	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
-	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
-	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
-	"github.com/go-openapi/loads v0.17.0/go.mod"
-	"github.com/go-openapi/loads v0.18.0/go.mod"
-	"github.com/go-openapi/loads v0.19.0/go.mod"
-	"github.com/go-openapi/loads v0.19.2/go.mod"
-	"github.com/go-openapi/loads v0.19.4/go.mod"
-	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
-	"github.com/go-openapi/runtime v0.19.0/go.mod"
-	"github.com/go-openapi/runtime v0.19.4/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/spec v0.17.0/go.mod"
-	"github.com/go-openapi/spec v0.18.0/go.mod"
-	"github.com/go-openapi/spec v0.19.2/go.mod"
-	"github.com/go-openapi/spec v0.19.3/go.mod"
-	"github.com/go-openapi/strfmt v0.17.0/go.mod"
-	"github.com/go-openapi/strfmt v0.18.0/go.mod"
-	"github.com/go-openapi/strfmt v0.19.0/go.mod"
-	"github.com/go-openapi/strfmt v0.19.3/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-openapi/swag v0.17.0/go.mod"
-	"github.com/go-openapi/swag v0.18.0/go.mod"
-	"github.com/go-openapi/swag v0.19.2/go.mod"
-	"github.com/go-openapi/swag v0.19.5/go.mod"
-	"github.com/go-openapi/validate v0.18.0/go.mod"
-	"github.com/go-openapi/validate v0.19.2/go.mod"
-	"github.com/go-openapi/validate v0.19.5/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.1"
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/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"
-	"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"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/mock v1.4.0/go.mod"
-	"github.com/golang/mock v1.4.3"
-	"github.com/golang/mock v1.4.3/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/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"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.3"
-	"github.com/golang/protobuf v1.3.3/go.mod"
-	"github.com/golang/protobuf v1.3.5"
-	"github.com/golang/protobuf v1.3.5/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
-	"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"
-	"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"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.1.0"
-	"github.com/google/gofuzz v1.1.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/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/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.1.0/go.mod"
-	"github.com/googleapis/gnostic v0.3.1"
-	"github.com/googleapis/gnostic v0.3.1/go.mod"
-	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-	"github.com/gorilla/context v1.1.1"
-	"github.com/gorilla/context v1.1.1/go.mod"
-	"github.com/gorilla/mux v1.6.2"
-	"github.com/gorilla/mux v1.6.2/go.mod"
-	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.13.1-0.20200518165504-8476a63db2c6"
-	"github.com/hashicorp/go-hclog v0.13.1-0.20200518165504-8476a63db2c6/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.4"
-	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
-	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.2"
-	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/hcl v1.0.1-0.20190430135223-99e2f22d1c94"
-	"github.com/hashicorp/hcl v1.0.1-0.20190430135223-99e2f22d1c94/go.mod"
-	"github.com/hashicorp/vault/api v1.0.4"
-	"github.com/hashicorp/vault/api v1.0.4/go.mod"
-	"github.com/hashicorp/vault/sdk v0.1.13"
-	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/imdario/mergo v0.3.7"
-	"github.com/imdario/mergo v0.3.7/go.mod"
-	"github.com/imkira/go-observer v1.0.3"
-	"github.com/imkira/go-observer v1.0.3/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jinzhu/gorm v1.9.9"
-	"github.com/jinzhu/gorm v1.9.9/go.mod"
-	"github.com/jinzhu/inflection v1.0.0"
-	"github.com/jinzhu/inflection v1.0.0/go.mod"
-	"github.com/jinzhu/now v1.0.1"
-	"github.com/jinzhu/now v1.0.1/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/json-iterator/go v1.1.6"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/json-iterator/go v1.1.8/go.mod"
-	"github.com/json-iterator/go v1.1.9"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.5/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lib/pq v1.1.1"
-	"github.com/lib/pq v1.1.1/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
-	"github.com/mailru/easyjson v0.7.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.3"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-runewidth v0.0.2/go.mod"
-	"github.com/mattn/go-sqlite3 v1.10.0"
-	"github.com/mattn/go-sqlite3 v1.10.0/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"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"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/morikuni/aec v1.0.0"
-	"github.com/morikuni/aec v1.0.0/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/ginkgo v1.11.0"
-	"github.com/onsi/ginkgo v1.11.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v1.4.3"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.7.0"
-	"github.com/onsi/gomega v1.7.0/go.mod"
-	"github.com/onsi/gomega v1.8.1"
-	"github.com/onsi/gomega v1.8.1/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1"
-	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-	"github.com/opencontainers/image-spec v1.0.1"
-	"github.com/opencontainers/image-spec v1.0.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/pborman/uuid v1.2.0/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_golang v1.0.0"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.4.0"
-	"github.com/prometheus/client_golang v1.4.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"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.2.0/go.mod"
-	"github.com/prometheus/common v0.4.1"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.9.1"
-	"github.com/prometheus/common v0.9.1/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/prometheus/procfs v0.0.2"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/russross/blackfriday v1.5.2/go.mod"
-	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-	"github.com/ryanuber/go-glob v1.0.0"
-	"github.com/ryanuber/go-glob v1.0.0/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shirou/gopsutil v2.18.12+incompatible"
-	"github.com/shirou/gopsutil v2.18.12+incompatible/go.mod"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.1/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/cobra v0.0.5/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.3.2/go.mod"
-	"github.com/spiffe/go-spiffe/v2 v2.0.0-alpha.5"
-	"github.com/spiffe/go-spiffe/v2 v2.0.0-alpha.5/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.2.0"
-	"github.com/stretchr/objx v0.2.0/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/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/tidwall/pretty v1.0.0/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/uber-go/tally v3.3.12+incompatible"
-	"github.com/uber-go/tally v3.3.12+incompatible/go.mod"
-	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/vektah/gqlparser v1.1.2/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-	"github.com/yuin/goldmark v1.1.25/go.mod"
-	"github.com/zeebo/errs v1.2.2"
-	"github.com/zeebo/errs v1.2.2/go.mod"
-	"go.etcd.io/bbolt v1.3.3/go.mod"
-	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
-	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
-	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
-	"go.opencensus.io v0.20.1/go.mod"
-	"go.opencensus.io v0.21.0"
-	"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.opencensus.io v0.22.3/go.mod"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/atomic v1.4.0"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/goleak v0.10.0"
-	"go.uber.org/goleak v0.10.0/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
-	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/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-20190611184440-5c40567a22f8/go.mod"
-	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/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"
-	"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"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/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-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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-20190320064053-1272bf9dcd53/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"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/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-20200324143707-d3edc9973b7e"
-	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/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"
-	"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"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/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"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
-	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/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-20190616124812-15dcb6c0061f/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-20191001151750-bb3f8db39f24/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/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-20200113162924-86b910548bc1/go.mod"
-	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82"
-	"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-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d"
-	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/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.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/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-20190614205625-5aca471b1d59/go.mod"
-	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/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-20190920225731-5eefd052ad72/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-20200331025713-a30bf2db82d4"
-	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/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"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"gomodules.xyz/jsonpatch/v2 v2.0.1"
-	"gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod"
-	"google.golang.org/api v0.3.1/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.20.0/go.mod"
-	"google.golang.org/api v0.29.0"
-	"google.golang.org/api v0.29.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"
-	"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"
-	"google.golang.org/appengine v1.6.5/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-20190404172233-64821d5d2107/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"
-	"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"
-	"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-20200331122359-1ee6d9798940"
-	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.17.0/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.22.0/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.23.1/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"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"google.golang.org/grpc v1.28.0/go.mod"
-	"google.golang.org/grpc v1.30.0"
-	"google.golang.org/grpc v1.30.0/go.mod"
-	"gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0"
-	"gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-	"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/cheggaaa/pb.v1 v1.0.25/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.4.1"
-	"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637"
-	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"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"
-	"gopkg.in/yaml.v2 v2.2.5/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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"
-	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-	"k8s.io/api v0.18.2"
-	"k8s.io/api v0.18.2/go.mod"
-	"k8s.io/apiextensions-apiserver v0.18.2"
-	"k8s.io/apiextensions-apiserver v0.18.2/go.mod"
-	"k8s.io/apimachinery v0.18.2"
-	"k8s.io/apimachinery v0.18.2/go.mod"
-	"k8s.io/apiserver v0.18.2/go.mod"
-	"k8s.io/client-go v0.18.2"
-	"k8s.io/client-go v0.18.2/go.mod"
-	"k8s.io/code-generator v0.18.2/go.mod"
-	"k8s.io/component-base v0.18.2/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
-	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/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"
-	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
-	"sigs.k8s.io/controller-runtime v0.6.0"
-	"sigs.k8s.io/controller-runtime v0.6.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.2.0"
-	"sigs.k8s.io/yaml v1.2.0/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/spiffe/spire/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/spire
-	acct-user/spire"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT+=" test"
-
-src_compile() {
-	go build -o spire-agent ./cmd/spire-agent || die
-	go build -o spire-server ./cmd/spire-server || die
-}
-
-src_test() {
-	go test ./... || die "tests failed"
-}
-
-src_install() {
-	exeinto /opt/spire
-	doexe spire-agent spire-server
-	keepdir /opt/spire/.data
-	insinto /etc/spire
-	doins -r conf/*
-	dosym ../../etc/spire /opt/spire/conf
-	dosym ../../opt/spire/spire-agent /usr/bin/spire-agent
-	dosym ../../opt/spire/spire-server /usr/bin/spire-server
-	newconfd "${FILESDIR}"/spire-agent.confd spire-agent
-	newinitd "${FILESDIR}"/spire-agent.initd spire-agent
-	newconfd "${FILESDIR}"/spire-server.confd spire-server
-	newinitd "${FILESDIR}"/spire-server.initd spire-server
-	keepdir /var/log/spire
-	fowners spire:spire /opt/spire/.data
-	fowners spire:spire /var/log/spire
-}
--- a/app-misc/spire/spire-0.8.1.ebuild
+++ b/app-misc/spire/spire-0.8.1.ebuild
@ -1,61 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
-
-DESCRIPTION="the spiffe runtime environment"
-HOMEPAGE="https://github.com/spiffe/spire"
-SRC_URI="https://github.com/spiffe/spire/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${VENDOR_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="acct-group/spire
-	acct-user/spire"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/go"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="strip"
-
-src_prepare() {
-	default
-	mv ../vendor . || die "Unable to move ../vendor directory"
-}
-
-do_cmd() {
-	if [[ -z "$@" ]]; then
-		die "No arguments passed to do_cmd"
-	fi
-	echo $@
-	$@ || die
-}
-
-src_compile() {
-do_cmd cd cmd/spire-agent
-	do_cmd go build -mod vendor -o ../../spire-agent
-do_cmd cd ../../cmd/spire-server
-	do_cmd go build -mod vendor -o ../../spire-server
-}
-
-src_install() {
-	exeinto /opt/spire
-	doexe spire-agent spire-server
-	keepdir /opt/spire/.data
-	fowners spire:spire /opt/spire/.data
-	insinto /etc/spire
-	doins -r conf/*
-	dosym ../../etc/spire /opt/spire/conf
-	dosym ../../opt/spire/spire-agent /usr/bin/spire-agent
-	dosym ../../opt/spire/spire-server /usr/bin/spire-server
-	newconfd "${FILESDIR}"/spire-agent.confd spire-agent
-	newinitd "${FILESDIR}"/spire-agent.initd spire-agent
-	newconfd "${FILESDIR}"/spire-server.confd spire-server
-	newinitd "${FILESDIR}"/spire-server.initd spire-server
-keepdir /var/log/spire
-fowners spire:spire /var/log/spire
-}
--- a/app-misc/spire/spire-1.2.0.ebuild
+++ b/app-misc/spire/spire-1.2.0.ebuild
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@ -1,11 +1,7 @@
 AUX yq-2.11.1-tests.patch 577 BLAKE2B e6a6f3fc58b9e260e095d1512cb807946c13f57b7a69f9dc8227287dad5965c94b1ace3f01383f12679455f4603c9b431a326e79e6dc7fb453d686c818bb1584 SHA512 4bb5887b1d5f826a205cfece0eaaddf50c8846cbc108dbaefc465c830d87d9ec3f313d4deeb60ee64fc7a09c1bb295747bb76d6a11c1e6bde3692ef580bbf323
 AUX yq-2.13.0-tests.patch 746 BLAKE2B 0d769a32a3e80cdc8a49e0f3575ab9da880bb0a916a564261874e6a8775b35c5570e99fad5a902bdf9bbdf5a6bb080a7bf57324aad461fb1ca7d9de4da787808 SHA512 e6bd60877d628e2fac51d5395b03f96a0cf7a5033c72a676dee8fe353425f6cc7ee585404567778d7765459ded0f7f71b6563e2343de9d520b8cde493012af01
-DIST yq-2.11.1.tar.gz 20660 BLAKE2B 4b51652958121c16462304d21ebe545cca835b6c189a6d7550c7ea0ffc8b7088a02eb61ee412295d85d502a339ec3ccbc67b8dc12cd45a07246cbafa7d7feaf7 SHA512 a59a0b12ac70724bb1b857618a66b8fa38ecd35f37adce0495e74ef194f4547be8adce345f29644d43c3b32c0e680512bfcb527310e17746965f9c1db2b612c1
-DIST yq-2.12.0.tar.gz 20796 BLAKE2B a314b54628e1865df68dadcbec8e59e16c1e57205e2b9f2b364bb6bee91563dc3da30c1e3a7ac9e2656899ee8ad004600291a845f59fbe13356f0cfb69de3e79 SHA512 3d6e26b674e5496e3a60678fb5b0389a6d83f4fdb519b40f5e6092f1df0023bbfb0e3b5e95dfac9b44e6001b8b35d7104aeeea6c347862313e57cc579110178d
 DIST yq-2.13.0.tar.gz 21695 BLAKE2B e6d75cde2c298c19616647aeb14f1e34b1a68bb4db1b7e6f4e2619166ef10142ebd405d3c21492e4f5880c46a8d42222ce22b08afec492e97102923e6b838e2d SHA512 fd2722450606175b7d6674407c992f1f542b8b2309fcb33d4eb7d6e3dbc6dbc9e04b3dae7c4c649d814fdffaa18cbd50472672f1d1357fc58c5306de082b353a
-DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c
-EBUILD yq-2.11.1.ebuild 1160 BLAKE2B 30d84041cc2929fabb76b6b7839c158d3cf97b498bf52b41b2cfe0a316fe8d3e12c0750631872c9f0d5a197caebbbdb2ba2f82878c320c2dc9f2b68e5911cde3 SHA512 00c0e8f5287b367945b0e1933892e7ba149cf4fe5b1426c4516589ee2145b54cb791065e5d692fcf87780cc5a6c010a85b0320373af820263e5d32a86b38ec7c
-EBUILD yq-2.12.0.ebuild 1159 BLAKE2B 62ffa38711ce983dc1fcf3781bc818421eadccf1092027bd4a751f487afc3a283daa9910cd89b8752699b6e06a95d413394b6332b3e3d023de7919886c24c872 SHA512 ebba91ba965089a9d4ca7bae013ae2ab3e225d5c507e57c650e722c3c80fe1768fcf65772eb1edc158d749a13a8d437e3312d7577dea220792ade89aab90af96
+DIST yq-2.14.0.tar.gz 28030 BLAKE2B 07e200524390e938705854c5d1ac4921fbc8f165cdbf8152e36124e52a1c51c70d6d711b67a3dac8c2bbf1f75040466e8d94505aa5f19e388a31bbcdc92e91bd SHA512 77d5d9cefc70fae9f2606434e11c3b14facb68113f6f99017f87acc860684a1b7a94ecf01514e8fa85a6d9cc860df926e13d1ac5bec160e7d057074d758d1d34
 EBUILD yq-2.13.0.ebuild 1130 BLAKE2B 0fb7c0e006fce21126bb1316691dd56b5421cdd43f0224ce6f1372d4e1b23b541b6a6d9efee718bb63ce5fd48dbf9a089a68320316b05ed8cf1136cde409e57f SHA512 a46165b9afb3934b7039fe60dcf2d0fbd1120c3874213c01fc0ad9cf79c0814bd64b22e8efd4ae654e9ad1e6ed623c0ba69084276c9c740bceb8318faa3ddcd0
-EBUILD yq-2.9.2-r1.ebuild 1093 BLAKE2B 02dbdece9adbbd784011f5cfde704ea8d1f290d9218c99991a84bc50e6b45aedab7c6044a0bd5dc6859f3da3a3e809c7d60955b81437ba81bec6ba67719b61d0 SHA512 ed79ecbdbbda5e575d855a7ba21dac4696e539e99415a2621da290be65f11f58be4a4c839ca692847917319ddf4965c3a8c9756244239948d3fc9304d723e15c
+EBUILD yq-2.14.0.ebuild 1130 BLAKE2B d67a0d8e1d1c2eab79cd6cad599268229d046a3618b8e85976dca3ecfc06c04259dbcd477352d23e32a48bb719ed79a2c9496169431b50d8a68bc3e7306300df SHA512 6777aef91d79de4c235517d6826bf938be679fe5c1c9a1a04e4c95763ec1928b8201c6048612f7389af35a7aa4b1bb00441fbe89eea57248ae4985a8e64cd22c
 MISC metadata.xml 444 BLAKE2B 43250e8368905e7c7613ef6d9555abe4ee58c5d88f1d94dc2fc6d26c99cc71e0253ed830e82356a7cae131c0d8d70397da5e5c6fac41a11a4ed5f18879a4aaba SHA512 f14ad6182b3a82311473ff28308f9f435c2a9ecbf2f1fae996f82366d7547421923c2cebfe255574c3bc57b3d3774ed19bd896b6dda5be1d919d372e1428a143
--- a/app-misc/yq/yq-2.11.1.ebuild
+++ b/app-misc/yq/yq-2.11.1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/jq
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/yq-2.11.1-tests.patch"
-)
-
-python_prepare_all() {
-	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
-		-i test/test.py || die
-
-	sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py </dev/null || die "tests failed under ${EPYTHON}"
-}
--- a/app-misc/yq/yq-2.14.0.ebuild
+++ b/app-misc/yq/yq-2.14.0.ebuild
@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} pypy3 )

 inherit distutils-r1

@ -19,18 +18,19 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-misc/jq
 	dev-python/argcomplete[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	dev-python/xmltodict[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "

 PATCHES=(
-	"${FILESDIR}/yq-2.11.1-tests.patch"
+	"${FILESDIR}/yq-2.13.0-tests.patch"
 )

 python_prepare_all() {
--- a/app-misc/yq/yq-2.9.2-r1.ebuild
+++ b/app-misc/yq/yq-2.9.2-r1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
-		-i test/test.py || die
-
-	sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py || die "tests failed under ${EPYTHON}"
-}
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@ -2,6 +2,8 @@ AUX kexi-3.2.0-fix-find-marble.patch 2537 BLAKE2B a78cbaa2edcdc8f424c366b9d8dcdf
 AUX kexi-3.2.0-glib-2.68.patch 1223 BLAKE2B 354fbb183b30bf678eb0b896fee5ae607bf873b915245a9765738b2ef07bf4fd1838c869287de365d544aec25bbce97f2a4320a620e1e49d36d4f9320f14c624 SHA512 e9a75f4f7aaf93fc1bc6d08705d1e3389b5e24611aa5f903c033ad55824ac912f1d6cb31674c2af8c097b91e4007c7b62de82305f061be447f119004ccce98bc
 AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1
 AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd
+AUX kexi-3.2.0-postgresql-9.14.patch 1114 BLAKE2B f4be17057626a66baf65ca0f2aaa5760ffa95f9110bb9541d90c89d2f1c227465d6832aeb47fb743f08e619a42b7d7d3f327d8a7a45aa9a86d687aeacb1e6059 SHA512 0ad16ed8737ee0d559517d16c7188f9156e01c45cfd4511be65113018d3b42df68ead147e9e43f022e2fcf71063871984baba103774a75f8ff27f5dfb3b00829
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
 EBUILD kexi-3.2.0-r2.ebuild 2563 BLAKE2B 7e59fb8d1e99e0330db54cdcfba82c0e32836fc7fbc70792373ede56522d9365b4d51e7f9a002b0c3ea948876cc22cc356547ba94f7694f888bbe30ac9f36772 SHA512 0a800fde2d0f76566ae6e33d03d777518dc12f6a56fcb28cababd6781ee44dbcc798211b36133b84eb80a9ac2a208c612d6fe7cfe850beb230dd5ad8dfbfc0f3
+EBUILD kexi-3.2.0-r3.ebuild 2547 BLAKE2B ef11bf39f5b22ed53acef9f71c91e84f5c51b3388b2546a0c5d457b92bc8e397fe1e223ae9ae80fe25aaaee28c4c7579f223e40e8d2b92b6d257b8424a44d901 SHA512 4079ac0081ddb2805701656c1331eba47fcc3a0a85f1afdc1ab09f04b2dc16a45696c67152f324d753b49998e6035d2b244fee8df7858676c43757b8b3714835
 MISC metadata.xml 575 BLAKE2B 1dca47de7a2eb1ddd144ce3973ae4a9ed10cdf26ee7e5fae40db8758f644337c47a8af5025a1e93ef709aa379f50af59a442c8d9946853686089968a0865f29f SHA512 e4043a2476ebed2ce2af0ea7b1dc16f9ddd8370319882a3390384f27c8277358bb98800dc456f75b57d254cc991adbfd1c822639eb5c5022327bb68e4b724f79
--- a/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
+++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
@ -0,0 +1,25 @@
+From 49c3b55019ebb563852c8ee1172def3288cd0fda Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Fri, 21 May 2021 13:33:49 +0200
+Subject: [PATCH] cmake: find PostgreSQL 14
+
+---
+ cmake/modules/FindPostgreSQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index 16e3cc32a..12b1469b4 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
+++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
+ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+    "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
+-- 
+GitLab
+
--- a/app-office/kexi/kexi-3.2.0-r3.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r3.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ECM_HANDBOOK="true"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Visual database applications creator"
+HOMEPAGE="https://apps.kde.org/kexi-3.3/ http://kexi-project.org/
+https://userbase.kde.org/Kexi"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE="debug experimental marble mdb mysql postgres sqlite"
+
+DEPEND="
+	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
+	>=dev-libs/kproperty-3.1.0:5=
+	>=dev-libs/kreport-3.1.0:5=[scripting]
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/breeze-icons-rcc-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	marble? ( kde-apps/marble:5= )
+	mdb? (
+		dev-libs/glib:2
+		virtual/libiconv
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-header.patch
+	"${FILESDIR}"/${P}-postgresql-9.14.patch
+	"${FILESDIR}"/${P}-glib-2.68.patch # bug 784974
+	"${FILESDIR}"/${P}-fix-find-marble.patch # bug 812392
+)
+
+src_prepare() {
+	ecm_punt_qt_module WebKit
+	ecm_punt_qt_module WebKitWidgets
+
+	ecm_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
+		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
+		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
+		$(cmake_use_find_package marble Marble)
+		$(cmake_use_find_package mdb GLIB2)
+		$(cmake_use_find_package mysql MySQL)
+		$(cmake_use_find_package postgres PostgreSQL)
+	)
+	use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
+
+	ecm_src_configure
+}
--- a/app-office/ktimetracker/Manifest
+++ b/app-office/ktimetracker/Manifest
@ -1,3 +1,7 @@
+AUX ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch 1084 BLAKE2B d87540eb20e04e97cd5e87fef2c6835e8acdd764750671812cbd51ec5460f8c7f2ed95e480733e9e3a348b35e5ff8223bfa7348342f5f2d01f4a91036fbbac65 SHA512 3b29e0c213a7469a0d083d9f947941ed72bd6e83be63328d9232a7c43ddc9a027fcd31db18ae6302c72448c85eed6550dfe325f24d237154fb6902d4988cc607
+AUX ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch 1278 BLAKE2B fde6c32461f978ba64f9b79136a40972ca502798c78a6e3d5e9b244af5f0791d8a75df771d59329b7993344f5fb49c100e47347f95ba0afb18eb79707feaabf6 SHA512 9cc60f8f01cc05ab575b6de4994d2f9ebce75153353f237cb05040dbc6826d6d044ae18abbe54bb13d486cba4e32ca94c86a035377700b79122609023cdd7575
+AUX ktimetracker-5.0.1-fix-sorting-of-time-columns.patch 1675 BLAKE2B 2b590c5db0e96c9fd7eff814c685d3047d0fe47deaceb68e26ff2d191745c5cd25cb97528a56163057036f0bf5669d775a8298a56fecfec75cc93de88e40cdbd SHA512 dd61a545da182f2b26be82ebadc11ab53ee40e37c1b4bfd07b2732d11ec72b187124d952f492d99690b64809c22f17ff932734041a9bd5464cbf879fc9fae0d2
+AUX ktimetracker-5.0.1-fix-table-column-visibility.patch 1084 BLAKE2B ea36953044d6efb9288b224ae93c2e5884f910f504bbbc8cc4ec6a45defce4a84e11789c17b33b34f7898bdf61077c07be56129580882544082d15b16e4d9017 SHA512 0a56fff5b94d3fa8a9d2be736ea3c23d6ae8f3efa6165c1e4cd4b9119316139cca58c0e4e861d1606bd73bea6f1993d9b22c11e7494c74aeb2148a28c63d7541
 DIST ktimetracker-5.0.1.tar.xz 422820 BLAKE2B 4aa4aba97f612b4ea426ed13cb0f830f646311254e75ab8ddef5f6edc62bbf2acb85d85d8031bae969f3dde411e649f645bb1fbd2a52b95eb831a530fa4e80ba SHA512 78de8651efd72fa9fd5c7f06992ab8970e1d763c6f30f5eba52ec93bb6a2bb19ae777bc90809ef5198bc3b6a5f9f5ee78e240eadcacd8ce8489bdb28cd62431e
-EBUILD ktimetracker-5.0.1.ebuild 1217 BLAKE2B 7b2061dfb6604b181c7b402aed93a515e687706a8ba8d726760a0aed088a458074d39499206acd0dee099633b9ab2ec7112bb371041d8eb56d1905028ea58a7c SHA512 95f380258f2bb9cda997acb592727b2e3d79642c305c1ce644eb0fd0994d64d303f5be7db2b9ec1218c980840fb7e5054127b5b58ec3dfb319a79ce730200f6f
+EBUILD ktimetracker-5.0.1-r1.ebuild 1487 BLAKE2B 80319f791983ffab21a1cd79cdb144263c2b9f648d1029d15a27cd476dbff7a06496d6bf8f3ce710662fbce545d29a0a55ba61c7a19ba8e1e4694b7c20cb1f82 SHA512 80fa4b94e6d24647d0a987959966e7be144cc057bf9cd34253757fb00facb45736ef5db4755f17c214e06a1e70bacd0e3c9f45645843a77f969238f64c54f949
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
--- a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch
@ -0,0 +1,31 @@
+From 065d7c154641f83c46e490cbb5d15b6cff92121b Mon Sep 17 00:00:00 2001
+From: Marc Orcau <budalokko@gmail.com>
+Date: Tue, 27 Apr 2021 17:17:18 +0200
+Subject: [PATCH] Fix edit history dialog crash when event has non existent
+ related entity
+
+Replaced qFatal() by qCWarning(). Faulty event does not appear on the list then.
+
+BUG: 424993
+---
+ src/dialogs/historydialog.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/dialogs/historydialog.cpp b/src/dialogs/historydialog.cpp
+index ca2f10a..458c147 100644
+--- a/src/dialogs/historydialog.cpp
+++ b/src/dialogs/historydialog.cpp
+@@ -131,7 +131,9 @@ QString HistoryDialog::listAllEvents()
+ 
+         const Task *parent = dynamic_cast<Task*>(m_projectModel->tasksModel()->taskByUID(event->relatedTo()));
+         if (!parent) {
+-            qFatal("orphan event");
+            qCWarning(KTT_LOG) << "Unable to load 'relatedTo' entry for " << event->summary();
+            err = "NoRelatedToForEvent";
+            continue;
+         }
+ 
+         auto *item = new QTableWidgetItem(parent->name());
+-- 
+GitLab
+
--- a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch
@ -0,0 +1,33 @@
+From 310c0fee25f142c6f6a0e7a0b4445af2e8785c79 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 21 Oct 2020 10:49:20 +0200
+Subject: [PATCH] Fix formatTime() in non-decimal mode on 32bit archs
+
+int64_t is not long int on 32bit architectures but long long int, thus
+the "%ld" printf modifer gets truncated/wrong values.
+
+As solution, do not use int64_t but long long int, so the "%lld" can be
+always used.
+---
+ src/ktimetrackerutility.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ktimetrackerutility.cpp b/src/ktimetrackerutility.cpp
+index aca00e8..fe449ba 100644
+--- a/src/ktimetrackerutility.cpp
+++ b/src/ktimetrackerutility.cpp
+@@ -33,9 +33,9 @@ QString formatTime(double minutes, bool decimal)
+         time.sprintf("%.2f", minutes / 60.0);
+         time.replace('.', QLocale().decimalPoint());
+     } else {
+-        const auto absMinutes = static_cast<int64_t>(std::round(std::fabs(minutes)));
+        const auto absMinutes = static_cast<long long int>(std::round(std::fabs(minutes)));
+         time.sprintf(
+-            "%s%ld:%02ld",
+            "%s%lld:%02lld",
+             minutes < 0 ? QString(QLocale().negativeSign()).toUtf8().data() : "",
+             absMinutes / 60, absMinutes % 60);
+     }
+-- 
+GitLab
+
--- a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch
@ -0,0 +1,38 @@
+From 7b17dccec643ffbf9e51a011d2aa1547169e9686 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@centrum.cz>
+Date: Sat, 8 May 2021 13:05:34 +0200
+Subject: [PATCH] fix sorting of time columns
+
+Commit 910b2939a07ee241 changed QVariant types for sorting from qlonglong
+to int64_t, but QSortFilterProxyModel::lessThan() docs explicitly list
+types that are compared numerically, int64_t is not one of them, so it
+gets sorted as a string. This meant that '0:02' was sorted before '0:17'.
+---
+ src/model/task.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/model/task.cpp b/src/model/task.cpp
+index 106e719..ff68b24 100644
+--- a/src/model/task.cpp
+++ b/src/model/task.cpp
+@@ -509,13 +509,13 @@ QVariant Task::data(int column, int role) const
+                 case 0:
+                     return m_name;
+                 case 1:
+-                    return QVariant::fromValue<int64_t>(m_sessionTime);
+                    return QVariant::fromValue<qlonglong>(m_sessionTime);
+                 case 2:
+-                    return QVariant::fromValue<int64_t>(m_time);
+                    return QVariant::fromValue<qlonglong>(m_time);
+                 case 3:
+-                    return QVariant::fromValue<int64_t>(m_totalSessionTime);
+                    return QVariant::fromValue<qlonglong>(m_totalSessionTime);
+                 case 4:
+-                    return QVariant::fromValue<int64_t>(m_totalTime);
+                    return QVariant::fromValue<qlonglong>(m_totalTime);
+                 case 5:
+                     return QVariant::fromValue<int>(m_priority);
+                 case 6:
+-- 
+GitLab
+
--- a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch
@ -0,0 +1,34 @@
+From ddc87a47089b900ee1c62be10b23d0d4bb2361f1 Mon Sep 17 00:00:00 2001
+From: Alexander Potashev <aspotashev@gmail.com>
+Date: Mon, 24 Feb 2020 23:01:23 +0100
+Subject: [PATCH] TaskView: Change visibility of table columns after the view
+ is connected to model
+
+Otherwise setColumnHidden() has no effect.
+
+BUG: 417988
+---
+ src/taskview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/taskview.cpp b/src/taskview.cpp
+index 3b9578f..c1b7580 100644
+--- a/src/taskview.cpp
+++ b/src/taskview.cpp
+@@ -164,12 +164,12 @@ void TaskView::load(const QUrl &url)
+     m_tasksWidget->setRootIsDecorated(true);
+ 
+     reconfigureModel();
+-    m_tasksWidget->reconfigure();
+ 
+     // Connect to the new model created by TimeTrackerStorage::load()
+     auto *tasksModel = m_storage->tasksModel();
+     m_filterProxyModel->setSourceModel(tasksModel);
+     m_tasksWidget->setSourceModel(tasksModel);
+    m_tasksWidget->reconfigure();
+     for (int i = 0; i <= tasksModel->columnCount(QModelIndex()); ++i) {
+         m_tasksWidget->resizeColumnToContents(i);
+     }
+-- 
+GitLab
+
--- a/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
+++ b/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
@ -1,12 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.64.0
-QTMIN=5.12.3
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org

 DESCRIPTION="Todo management and time tracker"
@ -41,6 +42,11 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}
-	!kde-apps/ktimetracker
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-table-column-visibility.patch" # KDE-bug 417988
+	"${FILESDIR}/${P}-fix-formatTime-in-non-decimal-mode.patch"
+	"${FILESDIR}/${P}-fix-edit-history-dialog-crash.patch" # KDE-bug 424993
+	"${FILESDIR}/${P}-fix-sorting-of-time-columns.patch"
+)
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@ -1,7 +1,5 @@
-DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
 DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
 DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-EBUILD foliate-2.6.2.ebuild 1217 BLAKE2B bad2c61ebe50ad2780fcf432273ce882f04eefb16119d6627b185db713717ef68d408e08cd18b5af63db2d94971291744b734fbad43ae2e20ba66e3ae78aec9a SHA512 253edf5d06def6414bc22ae06a834260609b065a292dadc5a038fd8e0a44116f7ed68372be55b731a97f1bc4c12a002a247a6886d1bbc0723f923cc3748cff7a
 EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
-EBUILD foliate-2.6.4.ebuild 1202 BLAKE2B 5393135b4883f5cd16ca754cfd1ad41f53606118c44469d5fb03788ed1069d7dab0890628cc80aad692be1f4a345558eaad8bf1f95c4993290bb6f572a9b88b5 SHA512 e5b91817a3abac0ad25b54b0adaa0450937383a7f5bfba879c62c072658e38632218fc1fc9ee9345228d8266418de8e4fca43de4f3771e5af20dfd3be8b5e760
+EBUILD foliate-2.6.4-r1.ebuild 1210 BLAKE2B 8fa95a0d012751c378194e284391d30f0f4dec8e13ab8bc299cd3bbc4633a9385528dc0cb5576172a9e91abeec157ccc564492c1402b0009cc50ecac5a692ea0 SHA512 01d4b52af39728a8cfe02810c8c154c99451aafb90eae8791be2bd70f4cb7fdc9111b0bcaf51109b9e5b38bc83abf9b383f5a8c61354116c94f169e39e61ada7
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
--- a/app-text/foliate/foliate-2.6.2.ebuild
+++ b/app-text/foliate/foliate-2.6.2.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
-	default
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
--- a/app-text/foliate/foliate-2.6.4-r1.ebuild
+++ b/app-text/foliate/foliate-2.6.4-r1.ebuild
@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8
 PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 plocale xdg gnome2-utils
 SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="gtk ebook reader built with gjs"
 HOMEPAGE="https://github.com/johnfactotum/foliate/"
@ -14,17 +15,21 @@ KEYWORDS="~amd64"
 IUSE="handy spell"

 BDEPEND="${MESON_DEPEND}
+	${PYTHON_DEPS}
 	sys-devel/gettext"
 RDEPEND="dev-libs/gjs
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
 	net-libs/webkit-gtk:4[introspection]
+	sys-devel/gettext
 	handy? ( gui-libs/libhandy:=[introspection] )
 	spell? ( app-text/gspell[introspection] )"

 src_prepare() {
 	default
+	python_fix_shebang build-aux/meson
+	xdg_environment_reset

 	plocale_find_changes "${S}"/po '' '.po'

@ -37,15 +42,11 @@ src_prepare() {
 }

 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 	gnome2_schemas_update
 }

 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 	gnome2_schemas_update
 }
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -33,5 +33,5 @@ EBUILD postgresql-13.6.ebuild 13806 BLAKE2B ca2671a77d6b1fcade98d12fe277101d8573
 EBUILD postgresql-14.1.ebuild 13794 BLAKE2B 3a99312b8f728e49f10bfe8d174fd6e8a8e7bee887fa51b7a9235253503ed331f8599046af1d479f2c8a497fc54ef71c74e0dfddffebe79b1980fea0d8f09626 SHA512 8811c1715f245ca8eec52e2e837a49cb40dafb760e5203d9008db8bd50e2f23bacdcaa3c901e58d4a7998eeccd9145b91d4f41285952abb14c24c3eee0d53823
 EBUILD postgresql-14.2.ebuild 13794 BLAKE2B 3a99312b8f728e49f10bfe8d174fd6e8a8e7bee887fa51b7a9235253503ed331f8599046af1d479f2c8a497fc54ef71c74e0dfddffebe79b1980fea0d8f09626 SHA512 8811c1715f245ca8eec52e2e837a49cb40dafb760e5203d9008db8bd50e2f23bacdcaa3c901e58d4a7998eeccd9145b91d4f41285952abb14c24c3eee0d53823
 EBUILD postgresql-9.6.24.ebuild 14326 BLAKE2B 946d0c681c44ec7b13a2d7dc63cf7e8f29bf41e4419863d2f85a86c7f6e747177550abfede7618c49a7d25b40a298f8901429e303c7eea9f774aec964ec012ea SHA512 a52d6bda4f8670d9024afb6c78daf9413f28b90cd4d9fbf81018ca7807f211b372da29465a72051cdc15a1e44e0946d2ee93c2fa347a04a26667a5015eb31de1
-EBUILD postgresql-9999.ebuild 14048 BLAKE2B 0c7adea21bfd10a5c96871b507bd047a931869972e1ca0fdd7c7855ec933577234bf6c0e3293324fd09cd8780c5ea2533752737689f1ae1043b1d64ade1f69af SHA512 0d4f03aa830d1563322aa97c70832b48794585d443c906c28787848cc46f8122e4ff2b3d58f23d14791220939da1bd0c93db61b67ebad9536f58a51665882369
+EBUILD postgresql-9999.ebuild 14100 BLAKE2B b6ad36c1fa6e89db3876719b0950f77ffbd63cb36a3289285cac7661dfc6126ee49f83699aebc0b087262abf3d1f37eb84ab79c5e72a4dee18c4c4e09218a7e2 SHA512 4cb7274fc8cec788146ca4b164dd3c32647fd069c6ce85100c3279ec34ddf37229a6254b92804cb57d7c766d7b15a4c35b5a390260a57808a2f395184d858228
 MISC metadata.xml 716 BLAKE2B c881b294d82137c80ddfde58ef50074a2e2b92e6883e6ebc5d8c71a366e8cbb0568756b2044fc411dd18e89da0e5625df80b876820e0abeaccc24d26880d5145 SHA512 dd045716ced95dbac8763aea347125d27bdb230eeb64bfc932f94110eda2ad42aa892e9cb19595c0d2f4a593d2629d9709a7aea792ac16661a2c210158368ba3
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@ -18,9 +18,9 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"

-IUSE="debug icu kerberos ldap llvm lz4
+IUSE="debug icu kerberos ldap llvm +lz4
 	nls pam perl python +readline selinux server systemd
-	ssl static-libs tcl threads uuid xml zlib"
+	ssl static-libs tcl threads uuid xml zlib zstd"

 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

@ -48,6 +48,7 @@ tcl? ( >=dev-lang/tcl-8:0= )
 uuid? ( dev-libs/ossp-uuid )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
+zstd? ( app-arch/zstd )
 "

 # uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
@ -173,6 +174,7 @@ src_configure() {
 		$(use_with xml libxml) \
 		$(use_with xml libxslt) \
 		$(use_with zlib) \
+		$(use_with zstd ) \
 		$(use_with systemd) \
 		${uuid_config}"
 	if use alpha; then
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@ -1,3 +1,3 @@
 DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238
-EBUILD checker-framework-qual-3.14.0.ebuild 733 BLAKE2B 6031ddd4fbd2351b58c843670ae105a48a90a1d9d342ae9fa3017066726bf98f64a2a50b2808dc6b934f08f7107b12d02796f636477bfd3a568a7e7f72ddf41c SHA512 ee3d79c7c7b1333a4fb7491ee7991557419f6577ff2a462cc0bd220c99bbc68ae597e676e2490a8789e09bb5d42f962e88f0ef91d7fbf4818bfe48acbe5f9459
+EBUILD checker-framework-qual-3.14.0.ebuild 732 BLAKE2B a745c2310646a8091e12ca0c78a3a1e6abf9be4731bde468b3b95d8a7f081a44906969f1b7770f43375652f40d7f3e08a0c045ae8107310d62af51bbdbb4cc4f SHA512 440da2ab6ea9da0b068fa0da071ccff2b7b7efa331dcddbfc6d22fe3c4276a90c2181d141651f774af1706cc53582e1497de9cf2a0229e36e3898bc94f9fcb58
 MISC metadata.xml 559 BLAKE2B cfdff3f58c4318542e3dd6ac9c98c826607441b11506ab0c2b0357701908c02a5b9e4496550fd81ffeed8b853598885230bf36118b4d36a49f191dfd83bece6d SHA512 fc19ef762da9b61820497c0febb3c5213c661aed64630f8235d06c895588743fa22dbe27930afe2790ee88c32e4744b4f4c44993ca0e251f98add7f5e66ee042
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://checkerframework.org/"
 SRC_URI="https://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"

 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@ -1,5 +1,3 @@
-DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
 DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
-EBUILD error-prone-annotations-2.0.14.ebuild 606 BLAKE2B 2358c936d84ca4a9d05a1472fdef821f7f5d76f029fe630c320f865513281b2e6d984026e6ed54ebe470a40c6cf77a87e2e1e5b5c14fb4db5db1a9111c4db2ee SHA512 2b3fa928f1931785c0516cc4c54331800e0319c9efc15f31e5be4908d28fbbbfa4f1eeecab93663f5e6979759d0e85adf2019e5fb569184fe9ae88afb3bf5aab
 EBUILD error-prone-annotations-2.7.1.ebuild 928 BLAKE2B f49580ddc370cb985d8be8d33dd141324776ac6cd60ba6883711c9908703927f3a0f4afab60207c5f93490373c1f84959ea46c6a93fc7bee8eee131a0edec566 SHA512 54a0b82ed79a85dff80670fc45b54eafacdb480e774f1ee4652b0c03da22df7c07cc61a6bdbbc8413ce0d1bc6e1235a4038160e54cce496649aae9edc712c2da
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN%-annotations}"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotations for the Error Prone static analysis tool"
-HOMEPAGE="http://errorprone.info"
-SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}/annotations"
-JAVA_SRC_DIR="src/main/java"
--- a/dev-java/failureaccess/Manifest
+++ b/dev-java/failureaccess/Manifest
@ -1,3 +1,3 @@
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
-EBUILD failureaccess-30.1.1.ebuild 925 BLAKE2B 5965010da9dba78b0301977d160ebe9e85ab026c37667017d8b1c624f7c3597ffa5cc54e6c43e6b8c43e3dabfde32861eaaeb08b6d340dc2fbab0d29aa32e831 SHA512 364bf5b9c9eeceb7ca59aacde6e2db1d0a04f59ede4baeab9c20658df3ac29d3d244513bdd65aff6891f314aa0b6bd18342f2fa8172f05ec6860324306606286
+EBUILD failureaccess-30.1.1.ebuild 924 BLAKE2B f4f64f370c0200a73340ddc82adcd3200ab0e37982ffe7e93b0d7d6b28d19f7fa66ae86c20f32390db8ac259c4b30fb67c71370d771b7caf1a1d4269f638e381 SHA512 f19b0a2db33e9431eb3c2f88ca44711da69b8e3b22889a958e203b536104826cf77dcc9ef4c70724af756d804d4aa910f068ef2002b675724c253b2b5811b890
 MISC metadata.xml 755 BLAKE2B af0cc772ea1dab11a52db3dad6ea865af7cfcda4189778c444810dc03162db63baa1a48379bc16b603669bbb7fbc7ed29db47fbefca65887cb8e05d9f1d87e03 SHA512 caeefc4d01c0e0864858fc7a2c50526df15c27a3ff39f3dd577e508d79893eba8c4849aa685ffcd35382b685b298e0626d44bddc62e960274c43e129abd70ece
--- a/dev-java/failureaccess/failureaccess-30.1.1.ebuild
+++ b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/google/guava/failureaccess"
 SRC_URI="https://codeload.github.com/google/guava/tar.gz/refs/tags/v${PV} -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"

 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@ -2,5 +2,5 @@ DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
 EBUILD guava-20.0-r1.ebuild 848 BLAKE2B 9eabed972891b3e2284c3133181fab6188ddfd0ab3988cf6ee5391d028bb8e762d5e6faf947f734e5f732f1a9f424daba4d0f2cf72344e936d93eccdea5df95e SHA512 c4be9028b341fbf960f160e94839af2b2d2672bbfd191336d7d8aa8fb4462086eba3e4f4fc6415451b590200853bd1d31f09d44b02635dacd4e73c5886ec6d75
 EBUILD guava-20.0.ebuild 845 BLAKE2B 0df28f19f6916d03bb9624755c88bb8c5d3a6706e8aedab3dfb49c2a7d0d449040875aa5a554388ca716f6d221f78eb4d5d329b89c4bedfa1fa05d81d7eb6744 SHA512 31cc84e2b174b988b2b5449cdeb629360e7e17d6cdfae350f7929c9756dcc7cb3fd387cbd9ad069971f09afc833608b001bca9421986efa526715e9bc4537156
-EBUILD guava-30.1.1.ebuild 1822 BLAKE2B 26d96024e00c7a7294e2b783d3f0f77578455307f49a5f6f962a8326fc3046fd57df0e76b391cd6439fa4e9a85e5c46c489e4b4150225e3398b0cd9cb05a0a0e SHA512 23103acd2948dbd8b172b657eba31f2f9fd0d25db57a63d0e546a529a09808c3ff653e63fd5948d5a6b9eb0f014669507ac09806dbd6a857a660aebbd2d9a914
+EBUILD guava-30.1.1.ebuild 1821 BLAKE2B 47b0e218c925ec42dafb87483a061e1d8b0bda337c123f134ea64965f2c2a49032266925e77d0055b54c1ad0ca28a96c74e7748a4066152cd74fc8b71929db18 SHA512 3c3dea402893fe3c93d6681c03480cde763bfe761e11a11cd75604b6261e050adf7a396f4746312909e00ac4d6473cbb346bc39ec6b19ce30e4910f7fff4d363
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
--- a/dev-java/guava/guava-30.1.1.ebuild
+++ b/dev-java/guava/guava-30.1.1.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/google/guava"
 SRC_URI="https://codeload.github.com/google/guava/tar.gz/v${PV} -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"

 # Common dependencies
 # POM: pom.xml
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@ -1,5 +1,5 @@
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
 DIST jcifs-1.3.19.tgz 883534 BLAKE2B ede24f43018a4bf304019aeddb6cf789e3a01622d840dc3f6bfa45104b97a39d256807f766f14b3e215e53519f3838aabeb73bdf7897323fb41ca5ef2b7c9372 SHA512 24ea656469ac7a5666d28dcdf122c80d254af5317a704718d8848858a21b38c6efe9b977854a33130cdb57d2fc8324ac3ee01fb5443360899f9572ec41788eef
 EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
-EBUILD jcifs-1.3.19-r1.ebuild 799 BLAKE2B 5602206e47b356a402b35a6243b23b1a3161c9836a9bbe03fa869b41fa24896f5608afbb4c78214985b3ad79702d26651efcfbd243645f5538a8c89b62e0eece SHA512 6c6f86e6c77fb5dec022b7bef80c5c89c3d8893b1afbf14d39d4b33ea54368585a1aef26c6acdc045873177f60e9ca85d500578adaaa0503f46fe7c3f9410c98
+EBUILD jcifs-1.3.19-r1.ebuild 797 BLAKE2B 0758ccf0d05abda4521fe67bfca909ef3041c57c32860ec5e8420ccf13ac0aece0f343f738d7838d894673f2084f6326032c1c5efa56d20cb266f6bb46796ef8 SHA512 805be2d2f5d2d4d522a2c90521846d12448ab1c4a35452c9249091a3b4627cee979edea646b0100f968e698fba43b8e96e121d57dd69cf6382a952e86b0f736c
 MISC metadata.xml 548 BLAKE2B bc7c331f8d53556d450986b25180a144923c7a84dd0aeaff351c4603899d2664fd919f82ff6d9545331855889aa350b7b9d68e8963c2454a79dab7cf26904003 SHA512 339f5cabfc56e1c50cb6d2e1a55992bc593c31ed9b818cd1c071f4c5e07e46cf2c5699287ecf8e27e69ba3f48946856c31723fe9e26e37ef8a1a795f32b70a3d
--- a/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"

-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"

 CDEPEND="java-virtuals/servlet-api:3.0"

--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@ -1,4 +1,5 @@
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
+EBUILD metainf-services-1.7-r1.ebuild 581 BLAKE2B 35c28ce97bd4c808a3c4b9a3e95f983b006a95a4e91f462526c42bd560cb3de11534799fb899ed2669770ba2f2d7ef4930ad3a642bcf342d100507ea74af25c4 SHA512 c196202feb08d82949b14a24e74425d02a35d0830e5080a356193ac2c52b0d2906a2a07a6485738ce5be217f36beba9b889903c0bb088eada0d4851be9f8ddb7
 EBUILD metainf-services-1.7.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
 MISC metadata.xml 336 BLAKE2B b113ab8fbfc9b92ca28ffd74d92fbea63d51e156566c0cb5292186efe18e8cc6b1e4c8d53efa1bade7d7ffacfed5780e699838805ac7ec6e2dd6684067fa9297 SHA512 1e1092dca56408b2ea5d09537f33d685c6ee97d59e62b1894f2fa24255d699b82c6aeb6fe7af90045bf4498035a6f45be93b843784ee1e89fdcf7ce165aeccc9
--- a/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Generates META-INF/services files automatically"
+HOMEPAGE="http://metainf-services.kohsuke.org/"
+SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+}
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@ -2,7 +2,11 @@ AUX lockfiled.xinetd 202 BLAKE2B 38ecf8d5faadf521d5253e60183d13c3040a88035d5e039
 AUX rxtx-2.1-7r2-lfd.diff 497 BLAKE2B 1e74708071d4645e0444d4ac2bffb8b952f17723d1ce98a784a75c5e1f1d22f2472ebbe0aa16c40b830be0255bd04b8d3a13ffe8d54b4d787e3a03e4d07f4be9 SHA512 fd06c021ad496036556f979e783864d6d88d1a0c039396eefacc569d66e6942b08b246970be640c73c0c2d209aa0c3247db61bdc19a99066789d4f4d0e4d390e
 AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da06972d4511905c73e1676fab4ad772a9d22aa3d639095798def629cba794f93add6e67878fff8441f628063ce421 SHA512 c7c6c11785089d321ee9680f4b67c590fe0c3cc0f031196eb71831ef7f319867fb156912c0c934a751d5d9e97774d6c26cab5c710055e919e97bcf39a789787d
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
+AUX rxtx-2.2_pre2-fix-for-java-10+.patch 1825 BLAKE2B 5ae56268cf4e98ec78f91c4e65d17c0bccefcc297b7f34354d4de972038f894f4aa14493c8f40f4ba0ef89c93865e4384494195e93b2c2083d4612b13f54ac65 SHA512 61a1d5ced0f25cd5cd7eea7e4da57eeb933f59919c3b1137a27cf69195d08c9ad0f2d7d0a52748df2daf280c9abd5bdd4f610783b8ccaccd480b02ef1d0a8555
+AUX rxtx-2.2_pre2-fix-invalid-javadoc.patch 8268 BLAKE2B f5b40ce1dbdfa2a1ec98ad6c886a932ddfea7157ff5a2e21f7c56c32e50dfe9b220e033ced0e41f94b0432669d042eebb37dc23e0b1084127f5376fb8f1faaa1 SHA512 a86dbc331e6c3a697f09a517abdebbf450ecffdd0a90dd0b539a4ea7ccda366655e1efd626d8fd503d58a9e221be9a01ad44ac37327316149d8d0e2fb6923802
+AUX rxtx-2.2_pre2-format-security.patch 2480 BLAKE2B 5e19b8ae5d49c094a8faa84c2cd5eca513bb309836fc8f1544e142ccab5b9a53f05771f2412b2953cae3f13e1c96d8d84e1f4a1f4dfdcc3719947d5ec182cec8 SHA512 c0ed0d34c04cfe87b134c55c819af65017c30e38cce00eedd146d70bb7e3a304b92b8fa8c11f3ab9076701f71f7370b28a902c7e3fee18f46f5a6a2aea3ed66a
 AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
 DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
 EBUILD rxtx-2.2_pre2-r1.ebuild 2222 BLAKE2B f94fffc150c4ec4fec5788ac72156208bfedad321ebf40b220b1abc98e31be3df6ad22705b6491df61028e0fd79e9cca453f5a989322006ebf153b53b6da34b9 SHA512 92a9461b5789013746a149a11d3d52e2476933200b127975c64c6969751193919fe70ff7b871ae0e1b6c59f7ac4d3292d66ad9fdf3a189766e428254db7ede12
+EBUILD rxtx-2.2_pre2-r2.ebuild 2652 BLAKE2B 5c40a32c1f50f373f532c215c79503bc13da73dff8902da87ad11f3a619f2fbd18188c46f210b57bbf9a9785c1d40952344d95ffcff5943e6c10c0efc735e8cb SHA512 33d119de59d124148c9c270dd302248a31eef1d60cda89d119e93867d8138a4ce60dac162526d5e1d858a50bb9301c9fb1598ffa4fcd6d44a8f487d0d5eae6af
 MISC metadata.xml 334 BLAKE2B b86a021232d18fba74442a66f689351c6440a1cca9be38d526ec2c9e65fa634f1cb265177d974bdf6b6f764c1df9531f75346f69ac071de6ed3f880eb09a3f44 SHA512 cb51df875f3ab1e39a5141ffe2cf79fed88339a9bf2bcb747be78b5986035dd5925fccd120cdb54ab8ab4e0371eda1cb9412f141bcc7583cb55f7bcf85a3683a
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
@ -0,0 +1,50 @@
+Debian patch for fixing build issues on JDK 10 and above.
+In particular, 'javah' needs to replaced by 'javac -h' since 'javah'
+has been removed due to JEP 313 (https://openjdk.java.net/jeps/313).
+
+To support Javadoc generation with JDK 17 and above, the '-source 1.8'
+option must be included in the arguments to 'javadoc'.  Otherwise, the
+following error would be raised:
+
+	src/gnu/io/LPRPort.java:373: error: invalid use of a restricted identifier 'yield'
+				yield();
+				^
+	  (to invoke a method called yield, qualify the yield with a receiver or type name)
+
+The original patch can be found at:
+https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/java10-compatibility.patch
+
+Bug: https://bugs.gentoo.org/831394
+
+---
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -111,11 +111,6 @@
+ $(CLASSES): $(javafiles) $(TOP)/Makefile
+ 	$(JAVAH_FIX)
+ 	$(JAVAC) $(javafiles)
+-	$(JAVAH) `(for i in $(javahfiles);do \
+-		if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
+-			echo $(CLASSDIR).$$i; \
+-		fi; \
+-	done)`
+ 	$(JAR) cf $(JARTARGET) $(CLASSTOP)/*
+ 
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
+--- a/configure.in
+++ b/configure.in
+@@ -485,9 +485,9 @@
+ 	*)
+ 		find_java_native_include jni_md.h
+ 		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+-		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8"
+		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8 -h \$(DEST)"
+ 		JAR="\$(JPATH)/bin/jar"
+-		JAVADOC="\$(JPATH)/bin/javadoc"
+		JAVADOC="\$(JPATH)/bin/javadoc -source 1.8"
+ 		CFLAGS=$CFLAGS" -D_BSD_SOURCE"
+ 		;;
+ 	esac
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
@ -0,0 +1,229 @@
+From 4c47d6d133f727a9615987d582fa143e4a17cd01 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 20 Feb 2022 08:17:59 -0800
+Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors
+
+Bug: https://bugs.gentoo.org/642030
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/gnu/io/RXTXPort.java | 50 ++++++++++++++++++++++------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java
+index 622a6a8..77a23ea 100644
+--- a/src/gnu/io/RXTXPort.java
+++ b/src/gnu/io/RXTXPort.java
+@@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return BaudRate on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*  This will not behave as expected with custom speeds
+ 	*
+ 	*/
+@@ -1751,7 +1751,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return DataBits on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 	public static int staticGetDataBits( String port )
+@@ -1770,7 +1770,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return Parity on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 	public static int staticGetParity( String port )
+@@ -1789,7 +1789,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param  port the name of the port thats been preopened
+ 	*  @return StopBits on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 	public static int staticGetStopBits( String port )
+@@ -1839,7 +1839,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  the port a second time later on.
+ 	*
+ 	*  @return true on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1862,7 +1862,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  the port a second time later on.
+ 	*
+ 	*  @return true on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1885,7 +1885,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  the port a second time later on.
+ 	*
+ 	*  @return none
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1907,7 +1907,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1927,7 +1927,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1947,7 +1947,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1967,7 +1967,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -1987,7 +1987,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -2007,7 +2007,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*
+ 	*  @param port
+ 	*  @return true if asserted
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*/
+ 
+@@ -2025,7 +2025,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  This is an extension to CommAPI.  It may not be supported on
+ 	*  all operating systems.
+ 	*  @return int the Parity Error Character
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*  Anyone know how to do this in Unix?
+ 	*/
+@@ -2049,7 +2049,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  all operating systems.
+ 	*  @param b Parity Error Character
+ 	*  @return boolean true on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*  Anyone know how to do this in Unix?
+ 	*/
+@@ -2067,7 +2067,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  This is an extension to CommAPI.  It may not be supported on
+ 	*  all operating systems.
+ 	*  @return int the End of Input Character
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*
+ 	*  Anyone know how to do this in Unix?
+ 	*/
+@@ -2091,7 +2091,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  all operating systems.
+ 	*  @param b End Of Input Character
+ 	*  @return boolean true on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*/
+ 
+ 	public boolean setEndOfInputChar( byte b )
+@@ -2111,7 +2111,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  or "16750".
+ 	*  @param test boolean flag to determin if the UART should be tested.
+ 	*  @return boolean true on success
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*/
+ 	public boolean setUARTType(String type, boolean test)
+ 		throws UnsupportedCommOperationException
+@@ -2127,7 +2127,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  @return type String representation of the UART type which mayb
+ 	*  be "none", "8250", "16450", "16550", "16550A", "16650", "16550V2"
+ 	*  or "16750".
+-	*  @throws UnsupportedCommOperationException;
+	*  @throws UnsupportedCommOperationException
+ 	*/
+ 	public String getUARTType() throws UnsupportedCommOperationException
+ 	{
+@@ -2140,7 +2140,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  @param BaudBase The clock frequency divided by 16.  Default
+ 	*  BaudBase is 115200.
+ 	*  @return true on success
+-	*  @throws UnsupportedCommOperationException, IOException
+	*  @throws UnsupportedCommOperationException
+	*  @throws IOException
+ 	*/
+ 
+ 	public boolean setBaudBase(int BaudBase)
+@@ -2155,7 +2156,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	/**
+ 	*  Extension to CommAPI
+ 	*  @return BaudBase
+-	*  @throws UnsupportedCommOperationException, IOException
+	*  @throws UnsupportedCommOperationException
+	*  @throws IOException
+ 	*/
+ 
+ 	public int getBaudBase() throws UnsupportedCommOperationException,
+@@ -2170,7 +2172,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	*  Extension to CommAPI.  Set Baud Base to 38600 on Linux and W32
+ 	*  before using.
+ 	*  @param Divisor
+-	*  @throws UnsupportedCommOperationException, IOException
+	*  @throws UnsupportedCommOperationException
+	*  @throws IOException
+ 	*/
+ 
+ 	public boolean setDivisor(int Divisor)
+@@ -2184,7 +2187,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
+ 	/**
+ 	*  Extension to CommAPI
+ 	*  @return Divisor;
+-	*  @throws UnsupportedCommOperationException, IOException
+	*  @throws UnsupportedCommOperationException
+	*  @throws IOException
+ 	*/
+ 
+ 	public int getDivisor() throws UnsupportedCommOperationException,
+-- 
+2.34.1
+
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
@ -0,0 +1,118 @@
+Debian patch for fixing errors emitted due to -Werror=format-security.
+The patch can be found at:
+https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/format_security.patch
+
+Bug: https://bugs.gentoo.org/550534
+
+---
+From: tony mancill <tmancill@debian.org>
+Forwarded: no
+Description: use format specifiers in fprintf statements for hardening flags
+
+--- a/src/SerialImp.c
+++ b/src/SerialImp.c
+@@ -5108,7 +5108,7 @@
+ void report_warning(const char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -5129,7 +5129,7 @@
+ #ifdef DEBUG_MW
+ 	mexErrMsgTxt( msg );
+ #else
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #endif /* DEBUG_MW */
+ #endif /* DEBUG_VERBOSE */
+ }
+@@ -5145,7 +5145,7 @@
+ void report_error(const char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -5164,7 +5164,7 @@
+ {
+ #ifdef DEBUG
+ #	ifndef DEBUG_MW
+-		fprintf(stderr, msg);
+		fprintf(stderr, "%s", msg);
+ #	else
+ 		mexPrintf( msg );
+ #	endif /* DEBUG_MW */
+--- a/src/ParallelImp.c
+++ b/src/ParallelImp.c
+@@ -920,7 +920,7 @@
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -938,7 +938,7 @@
+ void report(char *msg)
+ {
+ #ifdef DEBUG
+-        fprintf(stderr, msg);
+        fprintf(stderr, "%s", msg);
+ #endif /* DEBUG */
+ }
+ 
+--- a/src/SerialImp.cpp
+++ b/src/SerialImp.cpp
+@@ -1844,7 +1844,7 @@
+ 
+ 
+ #ifdef DEBUG
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #endif
+ }
+ 
+--- a/CNI/SerialImp.c
+++ b/CNI/SerialImp.c
+@@ -4549,7 +4549,7 @@
+ void report_warning(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -4570,7 +4570,7 @@
+ #ifdef DEBUG_MW
+ 	mexErrMsgTxt( msg );
+ #else
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #endif /* DEBUG_MW */
+ #endif /* DEBUG_VERBOSE */
+ }
+@@ -4586,7 +4586,7 @@
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
+	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -4605,7 +4605,7 @@
+ {
+ #ifdef DEBUG
+ #	ifndef DEBUG_MW
+-		fprintf(stderr, msg);
+		fprintf(stderr, "%s", msg);
+ #	else
+ 		mexPrintf( msg );
+ #	endif /* DEBUG_MW */
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit toolchain-funcs autotools java-pkg-2
+
+MY_PV="$(ver_rs 2 '')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Native library providing serial and parallel communication for Java"
+# SSL protocol versions supported by the HTTPS website are too old for
+# the latest web browsers, so please keep the HTTP URL for HOMEPAGE
+HOMEPAGE="http://rxtx.qbang.org/"
+SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="lfd"
+
+RDEPEND=">=virtual/jre-1.8:*
+	lfd? ( sys-apps/xinetd )"
+
+DEPEND=">=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
+	sed -i \
+		-e "s:UTS_RELEASE::g" \
+		-e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
+		-e "s:-source ... -target ...:$(java-pkg_javac-args):g" \
+		configure.in || die
+
+	eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
+	eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
+	eapply -p0 "${FILESDIR}/${P}-limits.patch"
+	eapply "${FILESDIR}/${P}-add-ttyACM.patch"
+	eapply "${FILESDIR}/${P}-format-security.patch"
+	eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch"
+	eapply "${FILESDIR}/${P}-fix-for-java-10+.patch"
+	eapply_user
+
+	rm acinclude.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lfd lockfile_server)
+}
+
+src_compile() {
+	# Parallel build on this package may cause random
+	# build-time errors sometimes due to race conditions
+	emake -j1
+
+	if use lfd ; then
+		# see INSTALL in src/ldf
+		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die
+	fi
+
+	if use doc ; then
+		emake -j1 docs
+	fi
+
+	# Fix for src zip creation
+	if use source ; then
+		mkdir -p src_with_pkg/gnu || die
+		ln -s ../../src src_with_pkg/gnu/io || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar RXTXcomm.jar
+	java-pkg_doso ${CHOST}/.libs/*.so
+
+	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
+	docinto html
+	dodoc RMISecurityManager.html
+
+	if use lfd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/lockfiled.xinetd" lfd
+		dosbin src/lfd/in.lfd
+		dodoc src/lfd/LockFileServer.rfc
+	fi
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src_with_pkg/gnu
+}
+
+pkg_postinst() {
+	if use lfd ; then
+		elog "Don't forget to enable the LockFileServer"
+		elog "daemon (lfd) in /etc/xinetd.d/lfd"
+	else
+		elog "RXTX uses UUCP style device-locks. You should"
+		elog "add every user who needs to access serial ports"
+		elog "to the 'uucp' group:"
+		elog
+		elog "    usermod -aG uucp <user>"
+	fi
+}
--- a/dev-java/swing-layout/Manifest
+++ b/dev-java/swing-layout/Manifest
@ -1,3 +1,4 @@
 DIST swing-layout-1.0.4-src.zip 69859 BLAKE2B ccf30c659e6dacecbd0bbe4f3cedbbb7088c108f7af615f7ba465a36f70181da4744c364529ded933ba5c402dddf6f640d8ea1ebd739bb425861605a71315f27 SHA512 83fe876b7d35ba204158ea9ee7a313b330c4f0e8b0ea81b3b487e75aa5e14a00c744aa30af049d9feaafc888875ab194fe73a5838b8073852596704e36517dae
 EBUILD swing-layout-1.0.4-r1.ebuild 506 BLAKE2B 19386f4f5d579fd2782b5f88867d60ef1c290bfc04d01b9ecd5f5faf99812aa030859aec8f17a47d59b01532fc1037d3beb40fb495e189b39077e6f882ee7773 SHA512 17c1ec85b611fad3b8c734d1ec9298d65c95cfc3afcfc8e6db3f5e2450654a076921a4f9ba8dbe6a0c63d060e0bd04c4dfc7ba812dfda3580b7cb6859d663188
+EBUILD swing-layout-1.0.4-r2.ebuild 509 BLAKE2B 21e936326c2e4b874112a3f0140251f279077f3be0d962a75f9dfcd5d7261ddc2c4a996a154c654c7e5515d9435dc5dff6da853ab98f0c5a6e87be9738ab2208 SHA512 7a49aadd883e2729eedeee86c2380687617c779000a3b1ee11475bc7d67b42c64f77d7732d73952aefcfe8e106bd1c03b15d26b8af64504a06a075ebd8dfdd5d
 MISC metadata.xml 452 BLAKE2B e89e076ddc599049c2575ba125244ea4f69edd3fc28b4e91a89f82a60100a6cdb8bdfc4b7c17f46c9d9a1160ced3cb9361e6c973ac4cd281040520161ca523e0 SHA512 e60ee7f2a6911d2fee83d2843b0fbec05666ec5e99001403796d6d93f56288bd80683847431b345cc3f85c96f694f046007fb6f79e4ebad320b5e450c9cc8367
--- a/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
+++ b/dev-java/swing-layout/swing-layout-1.0.4-r2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Professional cross platform layouts with Swing"
+HOMEPAGE="https://swing-layout.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
--- a/dev-java/swingx-beaninfo/Manifest
+++ b/dev-java/swingx-beaninfo/Manifest
@ -1,3 +1,4 @@
 DIST swingx-beaninfo-1.6.4-sources.jar 185813 BLAKE2B 6475c08c495b246ab34b605f63131616645c4533c1603c2d53303b809f77509756ef09106bdf3ae9f963ed1ca3b83f7dc5be31740a6f1568564ec5308081a61e SHA512 9461a00404c8cd1aa7c473e060c855667fedd357688ca1be5e78d6d7f56e15ff5345cf593bc03c173172a42c190c5f76682c01d226f51472f9b1757fcca52ac9
+EBUILD swingx-beaninfo-1.6.4-r1.ebuild 630 BLAKE2B 57a38e9485689fb526bb2027a60f08c4c648a5777f7f21e82b4548e6d75402119c6a1257e327e2ffb77f9fb254e5ac7bcaf72ea7a81026aecc0d1c1e5eece862 SHA512 58864630350921b98200c2626d1ee0e3f3a0d20d678e08025ad7b9c7925d2f142715965506f114e9128817787a354c6f3bc23249435dc492affdc55102a35ce8
 EBUILD swingx-beaninfo-1.6.4.ebuild 619 BLAKE2B c56ee050a5385b1ec4ffc540b3bde3d2b716025bbc5a6a3a78388efe40e9e37bab6cd0609e2b9f80c10f8a684d0a4543f016cc0bb42e7809eface5a3724276d2 SHA512 d3a6a148173d59b2a156ede023be68b8cef07b1270901eb8f79c45e765186599cdcd37102b63809e2dce065c6135aa5d0a31e9c84ace7168fe8554639eec119e
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
--- a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
+++ b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4-r1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SwingX Beaninfo"
+HOMEPAGE="https://java.net/projects/swingx/"
+SRC_URI="https://java.net/downloads/swingx/releases/${P}-sources.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/swingx:1.6"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+BDEPEND="
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="swingx-1.6"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar .
+}
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@ -1,3 +1,5 @@
+AUX swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch 1446 BLAKE2B 4abe6f6f22d46cc2f39720f43645098aad3b9e13ffeba1017dfb06e12f2acd1e3c7fa8e328ab421f24cc907dab223c6098fd65fbeeb500d178af75bab6429913 SHA512 5fe1b2af4834bd90183d9cbe0d697e5fbf22b6c401d7c2240fc1cdece71a24ed80ba8e4fbb3beeb4345761a51c1ee214f02206dac0efa1bf97a60523a39745d0
 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
 EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a
+EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1873 BLAKE2B 194f550d73efec79aa9e06280cc1843e991251282dcf02918354a1887c0aa9633f0a4c9ec22f824079930580d63f92e76e8ff2a6ca130ca22f1c0b1cf1c88dd3 SHA512 083ecf5d235caa3a7bff4ba48184542192c4e25c1afc314ac964d7fe67e0c1230442c86f33fd9a79f4bb02ad68de7df277fee116bcc68323d8bc9775d60c1b78
 MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121
--- a/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch
+++ b/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch
@ -0,0 +1,40 @@
+From 803016b9b4bd6cc96efb6cba8c37befaf410be61 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 20 Feb 2022 11:07:41 -0800
+Subject: [PATCH] Replace use of sun.misc.BASE64{En,De}coder for Java 9+
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ java/org/jdesktop/http/Request.java | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/java/org/jdesktop/http/Request.java b/java/org/jdesktop/http/Request.java
+index ff72322..57c4bf8 100644
+--- a/java/org/jdesktop/http/Request.java
+++ b/java/org/jdesktop/http/Request.java
+@@ -30,8 +30,7 @@ import org.jdesktop.beans.AbstractBean;
+ import org.jdesktop.http.Header.Element;
+ import org.jdesktop.xpath.XPathUtils;
+ import org.w3c.dom.Document;
+-import sun.misc.BASE64Decoder;
+-import sun.misc.BASE64Encoder;
+import java.util.Base64;
+ 
+ /**
+  * <p>Represents an http request. A <code>Request</code> is constructed and then
+@@ -613,10 +612,10 @@ public class Request extends AbstractBean {
+     }
+ 
+     private static String base64Encode(String s) throws Exception {
+-        return new String(new BASE64Encoder().encode(s.getBytes()));
+        return Base64.getEncoder().encodeToString(s.getBytes());
+     }
+     
+     private static String base64Decode(String s) throws Exception {
+-        return new String(new BASE64Decoder().decodeBuffer(s));
+        return new String(Base64.getDecoder().decode(s));
+     }
+ }
+-- 
+2.34.1
+
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-2011_05_15-src"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications"
+HOMEPAGE="https://java.net/projects/swingx-ws/"
+SRC_URI="mirror://sourceforge/bt747/Development/${MY_P}.zip"
+LICENSE="LGPL-2.1"
+SLOT="bt747"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/jakarta-xml-soap-api:1
+	dev-java/jdom:0
+	dev-java/json:0
+	dev-java/rome:0
+	dev-java/jtidy:0
+	dev-java/xerces:2
+	dev-java/swingx:1.6
+	dev-java/swing-layout:1
+	dev-java/swingx-beaninfo:0
+	dev-java/commons-httpclient:3
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}/src"
+JAVA_SRC_DIR=( "beaninfo" "java" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-replace-sun.misc-classes-for-java-9+.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean "${WORKDIR}"
+
+	# SwingWorker has been built-in since Java 6.
+	find java -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingworker\.:javax.swing.:g" {} + || die
+
+	# Fixes for newer swingx-beaninfo.
+	sed -i "s:BeanInfoSupport:org.jdesktop.beans.\0:g" beaninfo/org/jdesktop/swingx/*.java || die
+	find beaninfo -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingx\.(editors|BeanInfoSupport|EnumerationValue):org.jdesktop.beans.\1:g" {} + || die
+
+	# GraphicsUtilities moved in later SwingX versions.
+	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
+		java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	local DIR
+	for DIR in "${JAVA_SRC_DIR[@]}"; do
+		java-pkg_addres ${PN}.jar ${DIR}
+	done
+}
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@ -12,13 +12,13 @@ DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71c
 DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
 DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
 EBUILD tomcat-servlet-api-10.0.14.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
-EBUILD tomcat-servlet-api-10.0.16.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-10.0.16.ebuild 3016 BLAKE2B d95a171fd0f5d3ed467b02c7fef82df0cc15777ed8d62998eb7515fc7eba84a3c23934765216778dcace0abc47ded6ff71cca335bb4169669bc59d6d030da5d6 SHA512 08416d888f565b2fceb1b1f9a67fa755c1af92d0173a28e7330feb3df6fb7b041750e2ebf340168dac2560799eff7161655f2891fd46151d5e98e43e63e6109c
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.73.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.75.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-8.5.75.ebuild 3004 BLAKE2B 6dfb6ed890fe7c8461da4f71cb0d4ade2dfa2022647e91e1072d96bd20539d69dfb7cca636d65eed4a415c9047e75f7a24240af35b343737194f1ad6cc4ea04b SHA512 aa07371f8f1d8c8da1c59e8ba9216c4f524518b1a3d99418dcb18c6f08adde472411d9d644588ed529c3fd3dc3201d53d9bb79d79b402ab853db248dbb73bcb1
 EBUILD tomcat-servlet-api-9.0.56.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.58.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.58.ebuild 3011 BLAKE2B 2dbffa8fb7484e65d835e876744721aa4a4f67a2f01a8f83a38eefe550069260811e008fde80b228b14f1d6be90cf9ea06498d190ddf4963339872f3a2e4c81e SHA512 3227e875e3e5836ca8d2e75a9dd7da999d33ebce0af9579e39f5ea9fd8ea0e58578934953e2a29bf4f70c0f8140242a7e4e62daeca4fc028b48042f060b7e16d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=virtual/jdk-1.8:*"
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=virtual/jdk-1.8:*"
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND=">=virtual/jdk-1.8:*"
--- a/dev-java/xerial-core/Manifest
+++ b/dev-java/xerial-core/Manifest
@ -1,5 +1,3 @@
-AUX 2.0.1-build.xml 5674 BLAKE2B dc70ae55f105e36306cc30e71b64fb1008003b2a330dd12b7531a81191e82a6ea376eedd58495b788fa2a526badb5b33b0e72a4627c5cbe0db3ebefbd9eee924 SHA512 fe6cae55b06099f1718fe2d2b70f680b3549c20047884f879d4fcdc7f8765d4b18a5f8b80478b09913013958834f2602ded4e0b9580db96467d89b1bd5c23650
 DIST xerial-core-2.0.1.tar.bz2 519709 BLAKE2B 3d81bda265e3b3b37a50a62061298f23de7c2947a9d50ba6eac336c3ec09fcaaeea84d456e344b0d2ae16710870025a869c2359a17f0956c8dda557804e9d5ff SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb
 EBUILD xerial-core-2.0.1-r1.ebuild 1452 BLAKE2B 1488e6c026ddbc8187ed0dcc3a90fa860996cc94a2204b3c8e90fa649aa692e985446da50f377ef500458038de179477975cc38ecbc2332849965984993c1f54 SHA512 b5535339e5b35b4021ae1cb0113f4f9ee67f6cc66a0ba132ed5c4f508d62d1b1629029a551b39311a8dbfcf9e19ba663531fa8e046c066c0f643d9e60f5f7bf3
-EBUILD xerial-core-2.0.1.ebuild 924 BLAKE2B eeea14596a52313896ec32d3fad773bebb08a8ee73fbb43f7ee16e818896920e3bbc2a230b1de586ec33900701c908b7826c37e44d77ced69806fa5cfb901651 SHA512 1d0e2abac6e6733e1992ea76d87788e489654af275849e4e78a5bfd5bf29fa9ea5f845b82684a39421b4ab4d9332f49140093fc5e7da89570bc42f94b7cf997f
 MISC metadata.xml 320 BLAKE2B e2b3c6290aa495c539b2b3f7afe9fbbad2011245a00e41dd928649a35256f1882ea2bc0eb95c9b468e041734464f4299c39da87c7727b9f43ad8346a0d68affa SHA512 86ce5a0bed000e534fce286494c981aa6e3d8e7619c549ad666655d51928a62699cfd1638d99dcb66f3a83c5717aacb50211f3e2e3314408c188594e986f7171
--- a/dev-java/xerial-core/files/2.0.1-build.xml
+++ b/dev-java/xerial-core/files/2.0.1-build.xml
@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="xerial-core-from-maven" default="package" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="xerial-core-2.0.1" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.1" value="src/main/resources" />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.1" value="src/test/resources" />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath" />
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-		<copy todir="${maven.build.testOutputDir}">
-			<fileset dir="${maven.build.testResourceDir.0}">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-		<copy todir="${maven.build.testOutputDir}">
-			<fileset dir="${maven.build.testResourceDir.1}" />
-		</copy>
-	</target>
-
-	<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/Test*.java" />
-					<include name="**/*Test.java" />
-					<include name="**/*TestCase.java" />
-					<exclude name="**/*Abstract*Test.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/*Abstract*Test.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="test-junit-present">
-		<available classname="junit.framework.Test" property="junit.present" />
-	</target>
-
-	<target name="test-junit-status" depends="test-junit-present">
-		<condition property="junit.missing">
-			<and>
-				<isfalse value="${junit.present}" />
-				<isfalse value="${maven.test.skip}" />
-			</and>
-		</condition>
-		<condition property="junit.skipped">
-			<or>
-				<isfalse value="${junit.present}" />
-				<istrue value="${maven.test.skip}" />
-			</or>
-		</condition>
-	</target>
-
-	<target name="junit-missing" depends="test-junit-status" if="junit.missing">
-		<echo>=================================== WARNING ===================================</echo>
-		<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-		<echo>===============================================================================</echo>
-	</target>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" charset="ISO-8859-1" linksource="false" breakiterator="false">
-			<doctitle>&lt;![CDATA[xerial-core-2.0.1 API]]&gt;</doctitle>
-		</javadoc>
-	</target>
-
-	<target name="package" depends="compile,test" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
-	</target>
-
-	<target name="jar" depends="package" description="Builds the jar for the application" />
-
-	<target name="test-offline">
-		<condition property="maven.mode.offline">
-			<equals arg1="${maven.settings.offline}" arg2="true" />
-		</condition>
-	</target>
-
-</project>
--- a/dev-java/xerial-core/xerial-core-2.0.1.ebuild
+++ b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source DBMS for XML/JSON/Relational data"
-HOMEPAGE="https://code.google.com/p/xerial/"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar "${S}/target/${P}.jar" "${PN}.jar"
-
-	use source && java-pkg_dosrc "${S}"/src/main/java/*
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@ -1,24 +1,24 @@
 AUX ocaml-4.04.2-tinfo.patch 506 BLAKE2B 889c964385442247a70b7205abc497a8d83ac9e3fcedebdb184c9ded8ae81d171656fbe0ade7e431990545c01287f3618e45c3d25e0f77a4e7682e9a21c3f76a SHA512 5bf7e13de2e4a513b5411c3dcaa204aeaff6975b978d68455e059177049c2a1d862b4d1a96f0a986112ea0d347306190c81da6ec4b1150f56a3addc8f3d9b777
-AUX ocaml-4.05.0-CVE-2018-9838.patch 2888 BLAKE2B 75fe491c1b12d9882c7b558efb3384a133c56bea0c85e97a6b46ec5b5f4050da4752228c795d937875645260b98ac9d203b9cdbf583ed36934a29faf4d47ecc3 SHA512 3da218dcea2c08ed97da805a2c1a1bc134a48b4425b4912283e353dde606ae99c95b86b59c6575b42961c9eb6903e09d60968c5a8db72a58510c4e3dcd13a5ef
-AUX ocaml-4.05.0-gcc10.patch 1976 BLAKE2B cf1240a815d731e99862740ddf90f6a0ea1d078c9e4e1cef126eff4a7d80afbde73f45d360a26eaa14863cc35d2086d98d130251490959df4c361a51ced0557e SHA512 e55cb651431798294b21ee0ea8818d6c42f88c329b7a1985af9d460f2a5b3057f2ee229e72699f9660168202a0c78dcf89b8bfce2154ca3e141fe8fb5f861773
-AUX ocaml-4.09.0-cflags.patch 2644 BLAKE2B df053880534f47ad922a16bce7ad49017152afe514af037c069ef27f54a154332c860a7d1a264b882d82abf474dfdabf803e24dd3632bd67aa0e149e7f52b292 SHA512 622f6f8be1dfe6c10cb6eea2357beff7470f9ff9a0bedd45211099d3ba5a465a01422db61849b0625671ac8e1c2d198f8dd848258d40317062d217f2859c278b
+AUX ocaml-4.09.0-cflags.patch 2212 BLAKE2B 1aca56e090ab3900a49697f73954cab56c72245cc27503793cf45281e9704915e612571e4f88030e04587c49f3f9b9b1f74efff2b7d3e7c81d444cc7e9c57ec3 SHA512 df9524960ae701b14a4c06290fe41fd90b7d4861cdc2ac59c13aac1a9fbc616c8c6d90f623925ca5cd2c04038cf4d847fc7c19fd1949a2815cca0f85f360fb55
 AUX ocaml-4.09.0-gcc-10.patch 571 BLAKE2B 990107a1d199d350a821596e7655566bb8eb71ee828eb0247bd25111760dd4dd6952a0bea6c29f69f6fa4ef8d02bd47166b5f2c4ced30ed830078b1555ca86eb SHA512 430774f62cea3f4ed06c9a1cbc73c68e3eab0d6fbebb5e62ea12a012cc2b25bb1a776ff08a7d532140bc2e12eae3e1a43605bf5708e1333b23a135b9801de084
-AUX ocaml-4.10.2-cflags.patch 1704 BLAKE2B aa106b9a90e2daa49df1cae0d9a0f57c7a7c3bd38b0f083aa0f52a247190a5a64c165266e86fdd5a0ad7bf1d0a250ae9823b8d2050d3f00d3cc0ac4145a0c9c5 SHA512 a4d402d769c8d8a0135fcdb1b75a3edcae4fe2e62614e6c4513429f7a0e21be108f4d67eed31470a869737e13dfb7a4493173164902937dcc0fbc8e5d8150e83
 AUX ocaml-4.11.2-glibc-2.34.patch 3318 BLAKE2B 96fe61e553e7c67f76df32f2e5532f7a6eae57fb60752c7c49d71baf416ac74a4c7b925ecfd0bd5874a1728b51ca36b82d636bfa6ab30ec5f3df37fbac2a73b9 SHA512 eb54d912338a42a21f736dcd1591f77403b0dff8772059bd7f39a6e83b8a5e89bd5a7a9d4200bacbcaa8ec0450a5a78ecf6645bb5405d45fd1c077cbe1c36f7f
 AUX ocaml-4.12.0-glibc-2.34.patch 3411 BLAKE2B d5138feaf6ca1e4a25ee85100013e343f8867bfe22d1c8c26df56fe1a6266b9cf37738f0b5fa6ee6daaaed9c90880529a50ffa1e789766039727dd407d15da51 SHA512 978a300d28bcb4c4d312e5b9f830140b08a282ba850d7c7a3866ca54413a321695d21315fff423d646085d8eed148a3f84567c08a4e09957b4b87010d65ee694
 AUX ocaml-rebuild.sh 1120 BLAKE2B 6f88a9f2b99fae7f89b884bb08d2c6ad6a0e14d4a8fd06d498037f78c5f6ef040428f9de224b5fe5df4ef64eaed419cda6d8715ea0c0a4c4dad60c5cf75a4147 SHA512 05a3e81e95533135d9895091c21621c73ae82851abd4889d64f035979eb25f8d90b60f469d7ef5e789fd1a4adffd6bbe255e6708c14c24a04f8a423507d19a40
 AUX ocaml.conf 177 BLAKE2B da070848d9e3a30ad303c296f55de87c30fd15feee3304ccc1d1f844d83c5a646664cd4d9958375ead2324e25bb88280fdb78f9e4230eeb8cd5825eed6f2f91d SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4
+DIST ocaml-4.05.0-patches-1.tar.bz2 4009 BLAKE2B 052c3a6859a942f2993d0b06ab57ca8f7469650c096f20bff7ff7cf5c2842e8d5019d595a4eca0dc1a4e5feda2db8a831a6917b3b6d9f39166c8ae7af1e894e7 SHA512 b349e6613201d9400f736c5b2d0ede01e7e113524cbc6989999a71fb97cb1eb67f90af8c2fbd3fd8abeccf3193e317cdd8258aee328c3e078634385c21558619
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
+DIST ocaml-4.09.0-patches-1.tar.bz2 3300 BLAKE2B ef710ea5ed5a243ae684f68b7f203ba454192c9f8f19c32697d336bf18cf2a0e8ea08df232b0fd8e2475a000758a5ba95b3794096ec7d0d1b292a715ab3de86f SHA512 94096b99fd58b32232e418c5736203f08ab3c1558154ed00d4290730bd4db849bc60dfae6160f344acce63bbb8eaceecee25cf836bb73fa419d7bbf4eac433f1
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
+DIST ocaml-4.10.2-patches-1.tar.bz2 3180 BLAKE2B 474471e10c4525e4da730fcf8602fddf5209f7d8eb15bd76894ed2bc22213a6e61aa7f52b1b67dff6c8bf04eac7d759ada28f1783c83a075cc65e7e5caadc715 SHA512 1456f90c0c833461eb9d1c140ba1a7358aa9351f6303e83b0e19bb8688dcb17bdad211f4cec1281a47180bbdddcfdbf44367b47a6b301d2ea41fa9d926bd03a5
 DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
 DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
 DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f SHA512 e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
 DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae SHA512 da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
-EBUILD ocaml-4.05.0-r7.ebuild 4293 BLAKE2B bd07fb0811d4345e135b92c782a45322b0be6f70b1ac7b5734278ce89503c6eeb5dc86521f3f142fcedb4717f9a568c8fc1e8a1cf8681d30b5c170e3c65a83fe SHA512 c5d527caa2bf54ab1d518ab85a4b9a331e5575af93cfc2f1ac792476edab1d035be56e603260ef44ba0c85097040e46721af31ad02b115f55da26f73c97a2d3a
-EBUILD ocaml-4.05.0-r8.ebuild 4333 BLAKE2B 45432804c19f71b9b671adac43627bdfd81dec327d3664f8b692de544c44a8224246e4bfd2038740d3d91e1e6fe400da555343796ed94381289c129e860f268f SHA512 96398dffb8f7f28946f27ea157a0c80aaf69e1507f3de506566b99956b8418a61a15bc0d2da5ad9985bad027e2ec50e224b47d6f47fc06f927766d552a4031fb
+EBUILD ocaml-4.05.0-r9.ebuild 4370 BLAKE2B 22f915f38da08b3f98923f337dbe1a2ae25f2edaf73887f602c0d13047808bff8f5bcde68d7ac214f07da7d68d6c05a2f9520318d1cda041d54e37966b27c605 SHA512 111a2e4d4a18034a2d4580d19e4074fd4d6b60330e0af861062c4196c19027667d18e0361e1e73cdf9d46c31d06d66ce9a7ada36058fca168f634a891cdae861
 EBUILD ocaml-4.09.0-r2.ebuild 2755 BLAKE2B a5baaf014e722eacb2b1ed1c7e1bfee9dca9b2c19f40fb14256d77607a2c554a4084e4851de604f902691067894438dd229fe26d47efbb55b25b6aba1df183f1 SHA512 85d4ac2b1f7d48dd9867e786f9ed8f687bfe2078a3694c2a9aa86c5684917eba4f51cd5228f3b5c811b6dbf431770d5fb66b6fed1167828a6c32881f604671a0
-EBUILD ocaml-4.10.2-r2.ebuild 2722 BLAKE2B f9e52093866c8f0d76cb3ed889dea2c2c6435aa8e0e504d8b8afa0bb2ab681208a2dbb0ab598e6eb42015ebf9046cb2ae2f7dd421c3375db8651174f8e929019 SHA512 58645c5008d88fea796e3cc77cf1bc3a194cdc7da480747ab6ada82b998d08e954d29fc7ad7b72dfcba667103059a7c5e7d7683acb7d3730fcf4c1182de9c48b
+EBUILD ocaml-4.09.0-r3.ebuild 2799 BLAKE2B 48898860d3a30ad8099c5fb6c2e32440337273d006d889ca012c651e83b200f9db19809ba8e3eacd3550fab5ace92d6a5982dfaf3a95e9f0e7726a33e40bb413 SHA512 6cdf1ff0a304d146a2fe4dd2ac82a63df7f6d0edc8812b80cc5f4cdf651da6f551d224bae02d8e1fcc3baac05b6dace1602b0688619329936d86c02f1464daa5
+EBUILD ocaml-4.10.2-r3.ebuild 2801 BLAKE2B 089f0d19153db72faa63db09fc7ef60b69ea087573f79f137e0f458ea1d6dc0e353ab2455359418dce6f26c5f6df912198360369873decaa340b72dce3abba5b SHA512 a3d8ec3bd0639af28ceb824d84c4b591a1f4ed40f61377477265c42eea2f18cbe9729c9493a0577e4c3540521a0be1b9cc5dba8d5dea245eba43ce57ac03d987
 EBUILD ocaml-4.11.2-r2.ebuild 2641 BLAKE2B 8fb877a5a10778e4d96830b7d9f6b62217fc76d3208c7aeda9973479f5aede645251cd0c4a0680115898cf435a141fd09b8900d2efbbe91c2d8e324fa54e2bbc SHA512 b52ce16cafece2d229cbaf04e815c5791b3b211b1e512337f5c02d7af41328dfa5fa573853d6fd9a858d5733fbb321244a811902b8116b57a564961e7ffa6bd5
 EBUILD ocaml-4.12.1.ebuild 2515 BLAKE2B 6d91d1e528169b037dafd58701b57dafe536f1abdf1a207ffa8ad75b20577410bf55305b031510432ca9c28391e2fce5b7bd6e4066a6cf09470e3eb689da6f2f SHA512 5497b9ca6081b947c6489fe7c6cbcfc7f4b18dbc8bda8682615c255326454941e7e6ff277168cf8234250e89539022364d2b7a4c79a3d1a886e3d8c7bfc2f846
 EBUILD ocaml-4.13.1.ebuild 2457 BLAKE2B cca2eae8a16069050ee1248270a720c4726da6e67ed0bd7ef15e401db8cdfaaec74e7c9462a8d5faf5acadfaaa9e269de6e3a8d8944b86a5c36dbb8409777012 SHA512 601cb38b4174a46c441da4051ce5b789d16d0e2f69c9fb85aa3dd4027903cbe7a3ad4b5738fbd63893225ec72874f43d4a6d11558760335d961071e54e21bb2a
--- a/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
@ -1,70 +0,0 @@
-https://bugs.gentoo.org/755257
-
-Needed for both fixing the CVE + compatibility with Debian for e.g.
-Unison.
-
-From c6ca3afc78b75d7748e4e09e56c6b020418be06e Mon Sep 17 00:00:00 2001
-From: Stephane Glondu <steph@glondu.net>
-Date: Fri, 25 Jan 2019 14:34:23 +0100
-Subject: [PATCH] Fix integer overflows when unmarshaling a bigarray
-
-Malicious or corrupted marshaled data can result in a bigarray
-with impossibly large dimensions that cause overflow when computing
-the in-memory size of the bigarray.  Disaster ensues when the data
-is read in a too small memory area.  This commit checks for overflows
-when computing the in-memory size of the bigarray.
-
-This patch is based on one by Xavier Leroy and has been modified to
-use caml_ba_multov instead of caml_umul_overflow which is unavailable
-in OCaml 4.05.0.
-
-The original commit hash is 85162eee9d4072fa9c2f498f03cd94e357033eec.
-
-Origin: https://github.com/ocaml/ocaml/pull/1718
-Bug: https://github.com/ocaml/ocaml/issues/7765
-Bug-Debian: https://bugs.debian.org/895472
-Bug-CVE: CVE-2018-9838
--- a/otherlibs/bigarray/bigarray_stubs.c
-+++ b/otherlibs/bigarray/bigarray_stubs.c
-@@ -966,22 +966,34 @@ static void caml_ba_deserialize_longarray(void * dest, intnat num_elts)
- uintnat caml_ba_deserialize(void * dst)
- {
-   struct caml_ba_array * b = dst;
-  int i, elt_size;
-  uintnat num_elts;
-+  int i;
-+  uintnat num_elts, size;
-+  int overflow;
- 
-   /* Read back header information */
-   b->num_dims = caml_deserialize_uint_4();
-+  if (b->num_dims < 0 || b->num_dims > CAML_BA_MAX_NUM_DIMS)
-+    caml_deserialize_error("input_value: wrong number of bigarray dimensions");
-   b->flags = caml_deserialize_uint_4() | CAML_BA_MANAGED;
-   b->proxy = NULL;
-   for (i = 0; i < b->num_dims; i++) b->dim[i] = caml_deserialize_uint_4();
-  /* Compute total number of elements */
-  num_elts = caml_ba_num_elts(b);
-  /* Determine element size in bytes */
-+  /* Compute total number of elements.  Watch out for overflows (MPR#7765). */
-+  num_elts = 1;
-+  for (i = 0; i < b->num_dims; i++) {
-+    overflow = 0;
-+    num_elts = caml_ba_multov(num_elts, b->dim[i], &overflow);
-+    if (overflow)
-+      caml_deserialize_error("input_value: size overflow for bigarray");
-+  }
-+  /* Determine array size in bytes.  Watch out for overflows (MPR#7765). */
-   if ((b->flags & CAML_BA_KIND_MASK) > CAML_BA_CHAR)
-     caml_deserialize_error("input_value: bad bigarray kind");
-  elt_size = caml_ba_element_size[b->flags & CAML_BA_KIND_MASK];
-+  overflow = 0;
-+  size = caml_ba_multov(num_elts, caml_ba_element_size[b->flags & CAML_BA_KIND_MASK], &overflow);
-+  if (overflow)
-+    caml_deserialize_error("input_value: size overflow for bigarray");
-   /* Allocate room for data */
-  b->data = malloc(elt_size * num_elts);
-+  b->data = malloc(size);
-   if (b->data == NULL)
-     caml_deserialize_error("input_value: out of memory for bigarray");
-   /* Read data */
--- a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
@ -1,59 +0,0 @@
--- a/byterun/caml/intext.h	2021-01-28 22:46:20.400224678 +0100
-+++ b/byterun/caml/intext.h	2021-01-28 22:46:49.312751054 +0100
-@@ -196,7 +196,7 @@
- 
- CAMLextern struct code_fragment * caml_extern_find_code(char *addr);
- 
-struct ext_table caml_code_fragments_table;
-+extern struct ext_table caml_code_fragments_table;
- 
- #endif /* CAML_INTERNALS */
- 
--- a/byterun/caml/major_gc.h	2021-01-28 22:44:12.193323457 +0100
-+++ b/byterun/caml/major_gc.h	2021-01-28 22:45:20.918198701 +0100
-@@ -64,9 +64,9 @@
- extern char *caml_gc_sweep_hp;
- 
- extern int caml_major_window;
-double caml_major_ring[Max_major_window];
-int caml_major_ring_index;
-double caml_major_work_credit;
-+extern double caml_major_ring[Max_major_window];
-+extern int caml_major_ring_index;
-+extern double caml_major_work_credit;
- extern double caml_gc_clock;
- 
- /* [caml_major_gc_hook] is called just between the end of the mark
--- a/byterun/meta.c	2021-01-28 22:47:34.148016359 +0100
-+++ b/byterun/meta.c	2021-01-28 22:47:56.048657393 +0100
-@@ -32,6 +32,8 @@
- #include "caml/prims.h"
- #include "caml/stacks.h"
- 
-+struct ext_table caml_code_fragments_table;
-+
- #ifndef NATIVE_CODE
- 
- CAMLprim value caml_get_global_data(value unit)
--- a/byterun/backtrace.c	2021-01-28 22:50:25.275226598 +0100
-+++ b/byterun/backtrace.c	2021-01-28 22:50:37.541027290 +0100
-@@ -28,7 +28,7 @@
- #include "caml/fail.h"
- 
- /* The table of debug information fragments */
-struct ext_table caml_debug_info;
-+extern struct ext_table caml_debug_info;
- 
- CAMLexport int32_t caml_backtrace_active = 0;
- CAMLexport int32_t caml_backtrace_pos = 0;
--- a/asmrun/startup.c	2021-01-28 23:02:50.526072662 +0100
-+++ b/asmrun/startup.c	2021-01-28 23:03:09.977754311 +0100
-@@ -44,7 +44,7 @@
- #endif
- 
- extern int caml_parser_trace;
-CAMLexport header_t caml_atom_table[256];
-+CAMLextern header_t caml_atom_table[256];
- char * caml_code_area_start, * caml_code_area_end;
- 
- /* Initialize the atom table and the static data and code area limits. */
--- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
@ -1,5 +1,5 @@
--- a/runtime/Makefile	2022-01-22 19:49:32.914213696 +0100
-+++ b/runtime/Makefile	2022-01-22 19:50:03.765640701 +0100
+--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -335,7 +335,7 @@
 # (without the extension, which is added by the macro)
 define COMPILE_C_FILE
@ -9,24 +9,24 @@
 endef
 
 object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
--- a/yacc/Makefile	2022-01-22 20:02:56.510340885 +0100
-+++ b/yacc/Makefile	2022-01-22 20:03:14.998000508 +0100
+--- a/yacc/Makefile
+++ b/yacc/Makefile
@@ -63,4 +63,4 @@
 # also works for .obj files.
 
 %.$(O): %.c
 -	$(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
 +	$(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
--- a/otherlibs/Makefile.otherlibs.common	2022-01-22 20:24:15.316779625 +0100
-+++ b/otherlibs/Makefile.otherlibs.common	2022-01-22 20:24:50.730126701 +0100
+--- a/otherlibs/Makefile.otherlibs.common
+++ b/otherlibs/Makefile.otherlibs.common
@@ -138,4 +138,4 @@
 	$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
 
 .c.$(O):
 -	$(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
 +	$(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
--- a/ocamltest/Makefile	2022-01-22 20:30:22.454009704 +0100
-+++ b/ocamltest/Makefile	2022-01-22 20:30:33.845799603 +0100
+--- a/ocamltest/Makefile
+++ b/ocamltest/Makefile
@@ -221,7 +221,7 @@
 	$(ocamllex) -q $<
 
@ -36,8 +36,8 @@
 
 ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config
 	sed \
--- a/otherlibs/systhreads/Makefile	2022-01-22 20:42:17.647349876 +0100
-+++ b/otherlibs/systhreads/Makefile	2022-01-22 20:43:29.766086103 +0100
+--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -93,11 +93,11 @@
 # twice, each time with different options).
 
@ -52,8 +52,8 @@
 	  -I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \
 	  -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \
 	  $(OUTPUTOBJ)$@ -c $<
--- a/tools/Makefile	2022-01-23 09:57:00.788877931 +0100
-+++ b/tools/Makefile	2022-01-23 09:57:21.735516656 +0100
+--- a/tools/Makefile
+++ b/tools/Makefile
@@ -322,7 +322,7 @@
 endif
 
--- a/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch
+++ b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch
@ -1,42 +0,0 @@
--- a/runtime/Makefile	2022-01-22 19:49:32.914213696 +0100
-+++ b/runtime/Makefile	2022-01-22 19:50:03.765640701 +0100
-@@ -335,7 +335,7 @@
- # (without the extension, which is added by the macro)
- define COMPILE_C_FILE
- $(1).$(O): %.c
-	$$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
-+	$$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
- endef
- 
- object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
--- a/otherlibs/Makefile.otherlibs.common	2022-01-22 20:24:15.316779625 +0100
-+++ b/otherlibs/Makefile.otherlibs.common	2022-01-22 20:24:50.730126701 +0100
-@@ -138,4 +138,4 @@
- 	$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
- 
- .c.$(O):
-	$(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
-+	$(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
--- a/otherlibs/systhreads/Makefile	2022-01-22 20:42:17.647349876 +0100
-+++ b/otherlibs/systhreads/Makefile	2022-01-22 20:43:29.766086103 +0100
-@@ -102,10 +102,10 @@
- st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS)
- 
- st_stubs_b.$(O): st_stubs.c $(HEADER)
-	$(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
-+	$(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
- 
- st_stubs_n.$(O): st_stubs.c $(HEADER)
-	$(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
-+	$(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
- 
- partialclean:
- 	rm -f *.cm*
--- a/Makefile.common.in	2022-01-23 18:05:04.192323554 +0100
-+++ b/Makefile.common.in	2022-01-23 18:05:17.211122643 +0100
-@@ -79,4 +79,4 @@
- # general (it supports both .o and .obj)
- 
- %.$(O): %.c
-	$(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
-+	$(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
--- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-PATCHLEVEL="9"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the ML family"
-HOMEPAGE="https://ocaml.org"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
-# so here we go with the subslot.
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	ncurses? ( sys-libs/ncurses:0= )
-	spacetime? ( sys-libs/libunwind:= )
-	X? ( x11-libs/libX11 )
-	!dev-ml/num"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-QA_FLAGS_IGNORED='/usr/lib.*/ocaml/raw_spacetime_lib.cmxs'
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512
-	"${FILESDIR}"/${P}-gcc10.patch
-)
-
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
-
-	cp "${FILESDIR}"/ocaml.conf "${T}" || die
-
-	default
-}
-
-src_configure() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# Broken until 4.12
-	# bug #818445
-	filter-flags '-flto*'
-	append-flags -fno-strict-aliasing
-
-	# -ggdb3 & co makes it behave weirdly, breaks sexplib
-	replace-flags -ggdb* -ggdb
-
-	# OCaml generates textrels on 32-bit arches
-	# We can't do anything about it, but disabling it means that tests
-	# for OCaml-based packages won't fail on unexpected output
-	# bug #773226
-	if use arm || use ppc || use x86 ; then
-		append-ldflags "-Wl,-z,notext"
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-	use flambda && myconf="${myconf} -flambda"
-	use spacetime && myconf="${myconf} -spacetime"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
-		--prefix "${EPREFIX}"/usr \
-		--bindir "${EPREFIX}"/usr/bin \
-		--target-bindir "${EPREFIX}"/usr/bin \
-		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-		--mandir "${EPREFIX}"/usr/share/man \
-		-target "${CHOST}" \
-		-host "${CBUILD}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	# http://caml.inria.fr/mantis/view.php?id=4698
-	export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake world
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake opt
-		emake -j1 opt.opt
-	fi
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake -j1 tests
-	else
-		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
-	fi
-}
-
-src_install() {
-	emake BINDIR="${ED}"/usr/bin \
-		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${ED}"/usr/share/man \
-		install
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	# Create symlink for header files
-	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
-	dodoc Changes README.adoc
-	# Create envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
-		doenvd "${T}/99ocamldoc"
-	fi
-
-	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${T}"/ocaml.conf
-}
--- a/Show More
+++ b/Show More