Sync with portage [Tue Feb 22 09:30:40 MSK 2022].

2 years ago · 22e52d7e34
parent 8eec0b73b8
commit 22e52d7e34
5217 changed files with 15668 additions and 13864 deletions
--- 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,3 +7,4 @@ 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
--- 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 +1 @@
-DIST exo-1.49.2.tar.gz 5560650 BLAKE2B 1fe332c26f39c792aa1c49f324ebd898d8481edc846356968adfeba6ccf807e5d4d169be6ed68f990adbb8f9f833fc68dae8236a8b0ea2c75ca7750517ba5530 SHA512 57a4c0f6b077526ee165cf0b8a7d38a0dbede3a10d5b78ec938c8e3fdd60623fda5ba4d795def5ef81d7d917910ab21999c8c8d4c9ef49a07508375d50eb6d4f
+DIST exo-1.49.3.tar.gz 5565174 BLAKE2B bb21f29570016f9777d95f9dd92f6e1bd5eff237fb132a81f0f91b79f765461c9c123b62b983d6f2e7af64a475723c46be97a3ac646f7c5a89fc3aca4f972ef3 SHA512 be865bf423caeee8c479382bf579f18d7279b6ea16a97c800cca0ee56fa2bc584d4c4523ff4f70b6a097dbf9c9cce99764d2c95f662b14753f2cd131e043033b
--- 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 +1,2 @@
 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
--- 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 +1,2 @@
 DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
+DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
--- 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,3 +1,3 @@
-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
+DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
--- 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,2 +1,3 @@
 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
--- 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/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/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/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,2 +1,2 @@
 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
--- 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,2 +1,2 @@
 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
--- 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,4 +1,2 @@
-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
+DIST yq-2.14.0.tar.gz 28030 BLAKE2B 07e200524390e938705854c5d1ac4921fbc8f165cdbf8152e36124e52a1c51c70d6d711b67a3dac8c2bbf1f75040466e8d94505aa5f19e388a31bbcdc92e91bd SHA512 77d5d9cefc70fae9f2606434e11c3b14facb68113f6f99017f87acc860684a1b7a94ecf01514e8fa85a6d9cc860df926e13d1ac5bec160e7d057074d758d1d34
--- 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/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/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,3 +1,2 @@
-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
--- 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/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/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,2 +1 @@
-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
--- 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/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/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/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/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/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/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/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/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/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/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,5 +1,8 @@
+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
--- 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/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
@ -10,7 +10,8 @@ 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"
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.bz2"

 LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
@ -30,14 +31,13 @@ BDEPEND="${RDEPEND}
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"

-QA_FLAGS_IGNORED='/usr/lib.*/ocaml/raw_spacetime_lib.cmxs'
+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
-	"${FILESDIR}"/${P}-CVE-2018-9838.patch
+	"${WORKDIR}"/${P}-patches-1/
 )

 pkg_setup() {
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.bz2"
+
+LICENSE="LGPL-2.1"
+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 +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+	spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+QA_FLAGS_IGNORED='usr/lib.*/ocaml/bigarray.cmxs'
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patches-1/
+)
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+	# Broken until 4.12
+	# bug #818445
+	filter-flags '-flto*'
+	append-flags -fno-strict-aliasing
+
+	# 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
+
+	# Upstream build ignores LDFLAGS in several places.
+	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		Makefile.config.in || die "LDFLAGS fix failed"
+	# ${P} overrides upstream build's own P due to a wrong assignment operator.
+	sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed"
+}
+
+src_configure() {
+	local opt=(
+		--bindir="${EPREFIX}/usr/bin"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable flambda)
+		$(use_enable spacetime)
+	)
+
+	econf "${opt[@]}"
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake world.opt
+	else
+		emake world
+	fi
+}
+
+src_test() {
+	if use ocamlopt ; then
+		# OCaml tests only work when run sequentially
+		emake -j1 -C testsuite all
+	else
+		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
+	fi
+}
+
+src_install() {
+	default
+	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/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
@ -5,9 +5,10 @@ EAPI=7

 inherit flag-o-matic

-HOMEPAGE="https://ocaml.org/"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
@ -21,10 +22,10 @@ BDEPEND="${RDEPEND}
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"

-QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
+QA_FLAGS_IGNORED='usr/lib.*/ocaml/bigarray.cmxs'

 PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
+	"${WORKDIR}"/${P}-patches-1/
 )

 src_prepare() {
@ -63,7 +64,8 @@ src_configure() {
 		$(use_enable flambda)
 		$(use_enable spacetime)
 	)
-	econf ${opt[@]}
+
+	econf "${opt[@]}"
 }

 src_compile() {
--- a/dev-lang/perl/perl-5.34.0-r7.ebuild
+++ b/dev-lang/perl/perl-5.34.0-r7.ebuild
@ -52,8 +52,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"

 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-#KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@ -1,3 +1,3 @@
-DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-0.1.1.tar.gz 41993 BLAKE2B b9153a6330cecb781e2b5cd20554df3d0aad277dfc01174fd5d375211896b2912f26a76b0ba6ef7143c7101d844072e1a857caf5a8191893f22c0528c0a203d4 SHA512 48f7a0a52d03f36307271c8f387613dd53aebb19d0379e1758d557b043854c89068776ca4c22e64eb518429dd629c9a082476ecd2a548ac95e6aebef512a50ca
 DIST boxfort-0.1.2.tar.gz 42671 BLAKE2B 1053095fb6ffa16353fc9d34f99e556aa10fc05d1bd103e9cd6c0a4c332c09951e563ccb61ee8fcd983c247b3e9d2b7611f5f503d4d1bf5394103cc70aeccf60 SHA512 c381eb9a0947a9f8f2cbbb2db6bbaf76f1c328b5637bdd1d823590ead098bd741e015e415f49c55590b4f4fee3be19c5e23661df5fbbdc9a4a05c82d7c3293e5
+DIST boxfort-0.1.3.tar.gz 42968 BLAKE2B 973fac409567777a4b99597c2a158aada0f41c7e1544f858609c6bf4a6e93295019c9adfedd3e42559b23111d157944d08d62001a39bcea4695ea437924d05fa SHA512 07e26716204b9ee82332d34889b09b9560c28e00a831e15cec70b9105e95657f2e2b6255c718530d3a36e129c811c76462044fb76985feec2e71645b5e348bf2
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
@ -1,21 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI="8"

 PYTHON_COMPAT=( python3_{7..10} )

 inherit meson python-any-r1

-BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
-
 DESCRIPTION="Convenient & cross-platform sandboxing C library"
 HOMEPAGE="https://github.com/Snaipe/BoxFort"
-SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/BoxFort-${PV}

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 -riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 -riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

@ -24,8 +23,6 @@ DEPEND="test? (
 	)"
 BDEPEND="virtual/pkgconfig"

-S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
-
 python_check_deps() {
 	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
 }
@ -36,8 +33,8 @@ pkg_setup() {

 src_configure() {
 	local emesonargs=(
-		-Dsamples=$(usex test true false)
-		-Dtests=$(usex test true false)
+		$(meson_use test samples)
+		$(meson_use test tests)
 	)

 	meson_src_configure
--- a/dev-libs/cereal/cereal-1.3.1-r1.ebuild
+++ b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
@ -11,12 +11,16 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"

 BDEPEND="doc? ( app-doc/doxygen )"

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-fix-version.patch
+)
+
 src_prepare() {
 	if ! use doc ; then
 		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
@ -34,7 +38,6 @@ src_configure() {
 		# Avoid Boost dependency
 		-DSKIP_PERFORMANCE_COMPARISON=ON

-		-DSKIP_PORTABILITY_TEST=ON
 		-DWITH_WERROR=OFF
 	)

--- a/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
+++ b/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
@ -0,0 +1,14 @@
+https://github.com/USCiLab/cereal/issues/748
+https://github.com/symengine/symengine/issues/1886
+https://bugs.gentoo.org/833817
+--- a/include/cereal/version.hpp
+++ b/include/cereal/version.hpp
+@@ -42,7 +42,7 @@
+ //! The minor version
+ #define CEREAL_VERSION_MINOR 3
+ //! The patch version
+-#define CEREAL_VERSION_PATCH 0
+#define CEREAL_VERSION_PATCH 1
+ 
+ //! The full version as a single number
+ #define CEREAL_VERSION (CEREAL_VERSION_MAJOR * 10000 \
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@ -1,4 +1 @@
-DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
-DIST double-conversion-3.1.6.tar.gz 7030812 BLAKE2B 8572c4c127bca57c85075a1d308c81e22d133ddbc9c691538dc9a5564f82cf0b6e9009f0d223db0fcfd9c2c662059b8866cb26e8510187f47fe8b56101bfcc82 SHA512 2282e9838f916a0e59011e1b7530c32fb392e9bf07f370df419f1a8c59c88d66f7e16fa6ecdc3785af86591639d1201144feb0c60a5de54482da936f6c0c5534
-DIST double-conversion-3.1.7.tar.gz 7031619 BLAKE2B 2bea771abfad58af14cb4476208f2ca4562719213b942208d2c21ed1a3423688e3c0f5671dfbea9b939a1f005dc7870617f6c91fc543945a60bcab239a7b9319 SHA512 70baa0f8d5bbab433f6a3f3b6e172730f10cde5524639c7da8cb205bf95e6743a4b129b69ef09d8f121524e3d5a45d501a393e4f69f6848494e7ce87db765f37
 DIST double-conversion-3.2.0.tar.gz 7031760 BLAKE2B 971c06121e64c4d78a1f9bce9b206a079ea72fb82072f5db10f9b50516ecc178ade9d5ae2d6d024fdb78607d8a1c0d9d48380acabc529eb498e37ff38297aa00 SHA512 0670ee70ed2662c6795ec6cf144e0915d805940ea0f49633d17500c496fb241788a0de6f0a9f8eaed5cb74a376f64fe590fa0d883d0676dc2bd2dab288b85e00
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
--- a/dev-libs/double-conversion/double-conversion-3.1.6.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.6.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
--- a/dev-libs/double-conversion/double-conversion-3.1.7.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.7.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
--- a/dev-libs/expat/expat-2.4.6.ebuild
+++ b/dev-libs/expat/expat-2.4.6.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"

--- a/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch
+++ b/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch
@ -0,0 +1,29 @@
+From 778d03445f41c536f2ca9116ee6acb5f4f01b868 Mon Sep 17 00:00:00 2001
+From: Dimitar Petrovski <dimeptr@gmail.com>
+Date: Mon, 6 Jul 2020 18:36:31 +0200
+Subject: [PATCH] Emit the Initial Fetch Complete signal
+
+BUG: 423845
+The plugin does not emit the initialFetchComplete signal which seems
+needed by AllContactsMonitor and PersonsModel does not get initialized
+since it waitd for the signal from all plugins
+---
+ src/kpeoplevcard.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kpeoplevcard.cpp b/src/kpeoplevcard.cpp
+index bfaf71e..20531f6 100644
+--- a/src/kpeoplevcard.cpp
+++ b/src/kpeoplevcard.cpp
+@@ -153,6 +153,8 @@ KPeopleVCard::KPeopleVCard()
+ 
+     processDirectory(QFileInfo(*vcardsLocation));
+ 
+    emitInitialFetchComplete(true);
+
+     connect(m_fs, &KDirWatch::dirty, this, [this](const QString& path) {
+         const QFileInfo fi(path);
+         if (fi.isFile())
+-- 
+GitLab
+
--- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Library to expose vcards to KPeople"
+HOMEPAGE="https://invent.kde.org/pim/kpeoplevcard"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-emit-initial-fetch-complete-signal.patch" # KDE-bug 423845
+)
--- a/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
@ -0,0 +1,26 @@
+# 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 distutils-r1
+
+DESCRIPTION="Reading and writing of data on regular grids in Python"
+HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/mrcfile[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@ -1 +1,2 @@
 DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
+DIST GridDataFormats-0.7.0.tar.gz 2159247 BLAKE2B 7969f80960b5a29c44a645725a53dc6eb7c99d02e4fe1369700aaff85e4b98f3c7636768340c95b4ac44f6971558ab2efc5dc4e4968fb410e90e2228635e19ee SHA512 333c7f77c9c65f6be788c58efb0822eb05580893e96522c0bef04d84d3c5deae5498c1721353ece2ecd4ed8785acb6413b43123c0d895a855f0ee59e44b1d310
--- a/Show More
+++ b/Show More