Sync with portage [Wed Nov 10 20:19:40 MSK 2021].

2021-11-10 20:19:40 +03:00 · 2021-11-10 20:19:40 +03:00 · 4485ffab20
commit 4485ffab20
parent df9cde0b01
938 changed files with 5106 additions and 9386 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29278 BLAKE2B 9d44c62187805ce4cb2d204dd5b19bc019c4395d870f5414b5ebe89deb93bd4a49da10ee23da0263114bc977fbfb37707cdf622b8fa11155c57c8e972ac95491 SHA512 0ec09ded19e3419f9301ff3ca898b092a9dfd2b3da4686e0127e41826596fb6b51565b7b10749e64a146901dd2c96fb03e640c192fa6dd5befe67e80716dd023
-TIMESTAMP 2021-11-09T17:09:09Z
+MANIFEST Manifest.files.gz 29331 BLAKE2B 8519e725e87fea52d66aacf28300b771ce2d86dda96ac2975daf95759502fde4def34fa751ffdbd39e554c2f4fc5c487f2652630260ea414b1d734d2970f45f7 SHA512 4deae5985a7cba45eda3a259fc26dee232155aad325bf65883263410c0fed25ae5168e987bc899da1f12f9e080e01c8fadf5910b4881957735d2511555dbbd2b
+TIMESTAMP 2021-11-10T16:39:12Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGKqzVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGL9bBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC23A//W+LX01f526Nu26nxlvBmdaDnwf1R+77krRMcKoJiOPZvcJMGHWxSRh8v
-/nY2tfW1obtYm/nJnY34/EgPoP1/BHhzT5u1eNmmVP6DeGD/kWk0n1As+4AcI3y/
-5UJaFfx2ukB4Mm//doh/uGeFcWfaMV5tpsGzIXdIzewkosYmWc/PSI7a/YqXndhT
-vAvhV/dxqOk1ueqwB4Y0ieEAQPlBXSVoJDVlhc7S+NJp45w+sSxX3eT7yjN6/yDu
-a2SnfrXDxyKAT2sh8h457rSpq2yNB0d2thNyZy6K+5F+83buHYbOKj2QYlIwQS6W
-hsFf+6C58Oq4ucE30Q8m9x0xW3FlNXxG+D2170pREr4K8RJm5DfO0FXGib9o0C/i
-4itWxdCwJ2n2OULxTQ/XvrJFTI8EDgzen6TvB9HwcLFH5IyOQ5GmhlRLRYt3ZGSS
-c7x+p1AxmR08i5KrMpWjl7St0VuMUO1yeynac0iVg39MbWbY76DFltr0NYXB4KOt
-MOmxBdt7K0U/NVzDbzsBDBm3FvH1dga8ReeQ+lsgNxpenOQ4fqrWzkc+QD9umyaU
-OZBX1cB+Nb4CIwOHoczUQQ6Mgd2OgJy5QhXBcUdnPgj0Qju91b0+e/knPWHaqA/B
-GIj8zxzDVr8hMorMhAoBolpHW67/hKMe6JFe0Vmue+S+K7Bgu0s=
-=7zr1
+klA+Cw//bbZeVSSo0bl4s1G+yOe5VRhRMerrRbY8Fl7fyn42XxYla4vzwJSK4Geb
+mX6gsoqZ23hXh7HQqj7uyv7wLh2n6uhH92AqyDDy+2OIqYWM09HUIWifcS4604wn
+Tzls8Zpks9Ao5/tvctG1iVBFHiUpkQR2ZZWB88vBPeshrb6umrY6Gz3wr6DCkgYn
+htsGPLemYGpdD/C9lmiZgjrvFknBeok4Pry0hber7+Cm1iLM5bcPwuGzZAwUd6bW
+XH+DOd7h8/e/TvgX7C5ePG3UOkV0Z8JY3KMXSqWhQRQbrfDdqb20FcOhELVU5LYr
+4ebrehEacZ/nkSHPr/6zrgYZp0A9N7fCQpgQi+TXt8owj0lkEhvVEidd2A6chyr/
+kLkopdAxHcGRZB7aBlE5W/GNaZWb+VD+3XHBIQmJZ912raT+XD9+QjsGLagG7t6Z
+SP9Ca26mBS12QMlkAN0p5zIFXEY+VvxtogW+VvQtXw3XRIEJOb4AGByIeoQP9ELa
+gulTxN+BkK2D3VqVcjFIlNmIrDKz4Nk7nE12HXNtcTbJ6tTQ9x5cpW7K7V6jNipk
+XwczNrBgeYTRmS8+7Xh6Kb1XpyNi7XImBo58ta7qXyqtw3Z2tVQAbxlGNlAN0jyX
+MRQGhdcacA+iAtc2s+gvDgVMAONQsCeCX7rGNXV0/1By+hjPs4Q=
+=5z3q
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@ -1,5 +1,5 @@
 AUX edbrowse-3.7.5.1-fno-common.patch 508 BLAKE2B b7908cf4019500da7df9f37c59e76b204227fefc16e068a1f5f3454ba6c33f30f7740cf89f6d6a9d193e79fd4b35d8f9584bc43b89c888b339742f5708bb8d27 SHA512 8adaa0621546b24b471f1afe5c93991876320170619dae5babe48099a3ef14286914136efb6643924be84ab5b6d7f709f4f5728d117d45f502db3befe3e4195d
 AUX edbrowse-3.7.5.1-manpage.patch 946 BLAKE2B 34ee1e54da6d1f980f8876bf43dff170136ce18fa216df14e9bb62b62bafb7d33b622a01df6fdc8db9af95e27d2149b0916e0e7834960e647919e1a237257cdb SHA512 5aa93520e1765db0cf38c9d85debed9e97f08f3941c104611850a5bb496d13882ab12d850eec509378ed8c878049c659af460a334eaa5dcce7ed48fa85d8b906
 DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
-EBUILD edbrowse-3.7.5.1-r2.ebuild 919 BLAKE2B e7a033c6d8017b59eadd3c202bda780d0757bf2b076b6793d6012e79dac85d763976e415ffe6321472df27dd50d6e2622ee643353bde2e34bbe4a07cb04ac820 SHA512 642a54a4b36945b3053beadb8057fdb33d16e84e39e8f48dcae0ebdb5ec7441590f5a7017ec6bb0b515dc914f805b8a0c97c05abd2143ab792df2e3962b589fd
+EBUILD edbrowse-3.7.5.1-r2.ebuild 892 BLAKE2B 45ca70a09d1b74e9c8cbb652afe1e2aec5345b4d010acc32b0507a5206e7888c83b94f40e2e52ac6d166ad26b8981d4bb18212a1ebdf4c44155436c730fa16b0 SHA512 b27bd8546109870a37f42fbc481173c97341af833503a9abc91d0ff203437f0cae4690efcc8cec8295e5908c09b532c63ab2643c3dc08487596c00accef8cf12
 MISC metadata.xml 266 BLAKE2B 96d4f95fc465d2fcfcb2e2fb34567c06ae71945e0fd547fff07098ecbd9d1d5ca6cee4818744d2b70b1950e42eb1741839d4fae6eb9fad3940068bb1a7dd570f SHA512 84581279844cb3705e8d58b0fb7da8134ad20b803939d955900bd1a8acf287b17ea204911cf1c0c570ffd4b18722a0c0c910c5b9602b079f151a0c09a42a98d5
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="odbc"

 RDEPEND="
-	|| ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )
+	>=app-text/htmltidy-5.0.0
 	dev-lang/duktape:=
 	dev-libs/libpcre
 	net-misc/curl
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -4,10 +4,12 @@ DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e
 DIST awscli-1.21.12.tar.gz 2097963 BLAKE2B e752cb1369be9ee26b517ba1226d3e16fad0a075c7f82eb1fcce3a3076aa67c5dcf4bdefcc6c29166ac7a96a2aa59da24636ddf1d3eb9bd21f3f05e665581de3 SHA512 90f39476b86ce97c0b47910b2d5cf5c512f142c1bf1620d0fa2384bfb40e54f812269e7f1ff72951ee13f37e6c918061c2d592b4e96e46116032810e1eb6bcb1
 DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
 DIST awscli-1.22.1.tar.gz 2109309 BLAKE2B 24be9fca3f767745eb2bd8dd77389410a95e583c8b9fb701122c666cd190393aa32299ec2c62f19a917a235853cc6dbde5324ad665c11ec3d54f596584d19470 SHA512 b653a63f1db2f4cfeba0ef463596bd9b7d40a76b06bbeb9671eba9e14cd27f3283ba222ad97172d8399f2c9a8f8fa39f59a25a1e5f8832cba6694f26262797bc
+DIST awscli-1.22.2.tar.gz 2109538 BLAKE2B 09ba6020093a80f1505bf945f0e0946cc37368a9ef1425e1ff20cfe3b19d9cb346f52f22513c58e8820a1454dd296474efaeef6349060819bb29dce972216549 SHA512 64a32f6ae4961f20c52801bcc654fbeb2a84e2bcf582e701ab266ffd61a67b1122a2dcb469ae43c363b87b8b79b59c78738adef7c4677d19c5a7bb4dcb11764b
 EBUILD awscli-1.20.53.ebuild 1306 BLAKE2B 1b1be64ca6072a28230aa36c66bea67684784f2d44e040ecdb6694ce5f023168e170a36d3a3e133a9a8559d15dd0aced5e7a78af349f3691a883bc19f7f60318 SHA512 6b9579b86a827d2a4d46568d17899f3a45b047621abec213da57f70603021ab2ac57dbe1e127ee12aa41edc93aafd503db911e13ab744fcaf5ea6d8b5d60ad6c
 EBUILD awscli-1.20.60.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.20.65.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.12.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.5.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.22.1.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
+EBUILD awscli-1.22.2.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.22.2.ebuild
+++ b/app-admin/awscli/awscli-1.22.2.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+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 --install 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
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1,3 +1,3 @@
-DIST exo-1.46.0.tar.gz 5559295 BLAKE2B 145731040a5479f30ce30043d87e28d0974d8a2a61ef347f223b90527fca35e9e55b1eac7a9316ee4a2b14e78d4ad8f0d1074bf810fe1667d0090fb12d62c76c SHA512 a0376c78e46b565e4ebc39a5a543042e4ddea3b0b4b7205b7be884ec3543f2e7d9aa4e9902e207a61adad70e11a2c153e358ad698b67d6be16adabe0a41c677d
-EBUILD exo-1.46.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.47.0.tar.gz 5552584 BLAKE2B 3b6a776fdc3d227babab4a0d0679fc2a9eaef3f506d86becbe3af69d4652a0a09bf9e75730a3b9e26db38c94340e0aece5a3fd387a4952a1b429e3dde0e0e95c SHA512 55487ac2a269da3672b7d5fb3b5f885ffe88b1eb79cb105565d669e16a45b3877780099cdce3033f16ee7ba6fadf4ad72a6b087d2522523b67aecbff4a7bf8cd
+EBUILD exo-1.47.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
--- a/app-admin/exo/exo-1.47.0.ebuild
+++ b/app-admin/exo/exo-1.47.0.ebuild
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@ -4,5 +4,5 @@ AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92
 DIST dpkg_1.20.7.1.tar.xz 4952736 BLAKE2B 0439cd9440c34597ff5c5e04bd8e1b79d34cd7675a216cbe1e7dc4d68460847143a8a7dff14b1845374d8e504d6fba63842b1d1ac37aa01f7b2a96b78ef0278d SHA512 beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
 EBUILD dpkg-1.20.7.1.ebuild 2001 BLAKE2B e236a5cd683fed0131efe0ba775f33372ab0ad2ea7b12eed1107dcdcbf164b9d4ba7f8be97f183f18fed82861e50552fbfc3cdacca98fbf84285c400239702c3 SHA512 2567e608fcecbcfc2c066f7861cf9f038d3f51d3c49efb1f2255cad6f44233e5eafb3bd6cb81ef65bb9215b678217b3d4ae6208b53f4477a8d406075d0088630
-EBUILD dpkg-1.20.9.ebuild 2013 BLAKE2B 4dddd7c3f01243af9c6fa283513d20b4a86914ab34f58750a8bb5b8aead0b614e8f6607be273b2678f328eb19c7dd6e67377583bffbea1fa96e25f49c619580e SHA512 e1fb5e65db69a9eb036e80683f06b9d50573f055dfaccbc0b974eb4d978e78f4668764e2861023a4ec3978e2c489d50aaf4c1579bf0056e1fa8d36d4d515c391
+EBUILD dpkg-1.20.9.ebuild 2009 BLAKE2B c68cf0ae4de2d86c675da894ceea766a38e863672f94e957fd51b29bb65f1376595cf6e512bfc61bf6d942fe2666361b3e5e9eaca825b1ab899ba6e888efd9c4 SHA512 328e70263886657d5dff406a41b8f953e072462b16467e648239bd808ef6530e70e0aebd7d79f505d56c9c14849b2cb60730912eb0453979dc6dca8eb661cf26
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
--- a/app-arch/dpkg/dpkg-1.20.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.9.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"

--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@ -1,8 +1,3 @@
-AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0effde2d31d7571ad71041a49a66da003c49a383fc119013a3aeac5c39c1ebfce0e9c0642d5c394d823cf9837b31c1d4172818ff403111 SHA512 c5e683398572889e4c09d3dfccf8847566421be5e3a56d086217ebbb70c17c4ca23c124cfe5d146e7e5b71e0ecce914575c1c50bdbc8438d3f00a6282790edca
-DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
-DIST unp_2.0~pre8.tar.xz 16336 BLAKE2B 6c6ffd75acda980e6c572c48944b238788a64d2bf1f854b45a3bc468da19fc6e593a8b604d99dac51b5b645ec88b27300be6af4d988a56470812a7ae92f19336 SHA512 58d2a6a9f7fe868773273532b46249109e1e757517dd46e485f2b3a77fea404aeea34edf4460e76376806ae0d28baefa55f1063919bdf1493617f1b361fe6039
 DIST unp_2.0~pre9.tar.xz 16424 BLAKE2B 9042f48be0f80d5e40a08161a35c282ba458dc98cf13992835bdeecebd5fbadd33b3af9165738332cb9f508550a234a48d314332f00ecdacc808a8051eb0740b SHA512 74c9a6e143c9023bdd456dacff5c3a6e30722e259f324c066fe3eed9e4a09c38b399b381719c8677c2fa84434c1e7720384d782d97c098fa6fbcbdbf4030986e
-EBUILD unp-2.0_pre7_p1-r1.ebuild 1172 BLAKE2B cddeb95735206ca57233eaa8ffffc1515dddad87f69e793fc574ea0d27aa87074e54c6b6eb697017af8f00825345d396656fe722aecbfa16d9b5110d03075986 SHA512 683c391301bf4a30fb0889b17ff1b88c099c8755af8af1b198df162d7f22dda35479954f567f21dba797e4257982913b0b53d8600d0a5d42c3404c294e0bd411
-EBUILD unp-2.0_pre8.ebuild 1094 BLAKE2B b4edad448e7103c8aac65b3e0beb0ce5cfb3c5917fa9deff14e659023c781bdc4e9f0650ce796dd4a4b1e4a5c12de6df7bbfe930b109d7ae4de3ab7e428edffb SHA512 6c96e28e3a90eca55e8212b9f22528eded36d62362d3ff1280e3f161513cda44b42421b99c2697212850785450b9ee3dfcade15fadedb6d5cd9dfdcce02937c8
 EBUILD unp-2.0_pre9.ebuild 1092 BLAKE2B b34b85080761aa4bbb57c457578d3f230a97dfdcf3985b26515e913a99356537e77726f3f4f7e69305d5632ca214474f428c285b90301f741d73a584249ce4aa SHA512 61368e6fd722af9f2ab09f33eb7381f177afbc78948d8c45ec0f0424230ca3f5776bd7fd6bd5b4b590641ec33451720a674b016ce7420d02701caa09a161470a
 MISC metadata.xml 211 BLAKE2B 8a357a845c5cd7c1afeda19eefd020f5cab0b573e5a6914aa4a06c2b48261c7b86a5d72b96731cd78140f992d895cbb1d54ba70a1bb1485ae5a75bd7062e13c4 SHA512 9a2eeafd67a65fd9a667e31692033480c29f9250bfe5b54166130e805e3621c22d9eb9d0515b2622c220dc78255cb42c2ae6b6379070591164b1295441a4c12d
--- a/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff
+++ b/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff
@ -1,10 +0,0 @@
-diff -Naur unp-2.0~pre7+nmu1/bash_completion.d/unp unp-2.0~pre7+nmu1-1/bash_completion.d/unp
--- unp-2.0~pre7+nmu1/bash_completion.d/unp	2012-05-16 22:05:13.000000000 +0200
-+++ unp-2.0~pre7+nmu1-1/bash_completion.d/unp	2014-10-22 10:34:20.343233166 +0200
-@@ -1,6 +1,5 @@
- # bash completion for unp
- 
-have unp &&
- _unp()
- {
-     local cur
--- a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
+++ b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
-TEMP_PV="${PV/_pre/$'\x7e'pre}"
-MY_PV="${TEMP_PV/_p/+nmu}"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=( "${FILESDIR}/${P}-remove-deprecated-have.diff" )
-
-src_compile() {
-	if use nls; then
-		strip-linguas -i .
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.po }.po"
-		else
-			emake -C po
-		fi
-	fi
-}
-
-src_install() {
-	dobin unp
-	dosym unp /usr/bin/ucat
-	doman debian/unp.1
-	dodoc debian/changelog debian/README.Debian
-	dobashcomp bash_completion.d/unp
-
-	if use nls; then
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install
-		else
-			emake -C po DESTDIR="${D}" install
-		fi
-	fi
-}
--- a/app-arch/unp/unp-2.0_pre8.ebuild
+++ b/app-arch/unp/unp-2.0_pre8.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
-MY_PV="${PV/_pre/$'\x7e'pre}"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	if use nls; then
-		strip-linguas -i .
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.po }.po"
-		else
-			emake -C po
-		fi
-	fi
-}
-
-src_install() {
-	dobin unp
-	dosym unp /usr/bin/ucat
-	doman debian/unp.1
-	dodoc debian/changelog debian/README.Debian
-	newbashcomp debian/unp.bash-completion unp
-
-	if use nls; then
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install
-		else
-			emake -C po DESTDIR="${D}" install
-		fi
-	fi
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@ -2,5 +2,7 @@ AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aa
 AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
 DIST swtpm-0.6.1.tar.gz 326488 BLAKE2B 46c53cbd4195cfc1d45ef5e56b1f78c59dcb9f859349e161f07d9933ce720ec3511343cf29236119d08162410355fc50cb5d15745c84db78d860b006812c169f SHA512 a44e36820ad61e84d62b330f3adf0c463c98438056d74c5ba30916d956e722633e0198ae87be8352a0ab909ae5a4bbc3826410d2166186c43bba067f533fec85
+DIST swtpm-0.7.0.tar.gz 353641 BLAKE2B a9169affdfd09cec887667e21d4db72b7d4b489bf3ecf5e43da9ae2d59ef3f15b94627ce22ed1f6fca69f46da40293ba1ef3d129fab7de3ca32c4b12ffc51544 SHA512 32096309bf710e51d7565f013db32627423682fb2bfa9358976126102a0bf07401146bae9346af389c932c038f3d03217739375cef01a2ff10b01c7bd004b55e
 EBUILD swtpm-0.6.1.ebuild 1433 BLAKE2B a5f67396fc4132fc08dbc507f7a7beff6d3d35115b93607d668a2cb5301a3f0ded9985cc61dce1375fed3da62f435b7217017ced0af9da99d473a828ddca3259 SHA512 0bfc6b861f7bd45c41aea45e0b86384d66deee9ae0a7e3ed464ae6bef9233a92dff896d7ddbcd9deb05133438b67d716735a917b53b711dc9fdda173a3cc841f
+EBUILD swtpm-0.7.0.ebuild 1434 BLAKE2B bd889e4de7b54aa1db707aae32bb715a6d1e73810e6d14ddeb399370c3c039a38290e932a1421c0b257783506673d4956e4c0aa3b671b4afc8c9aabc9325c3f0 SHA512 ed8c58e32847c3706b2c3efa161dd2519b6ec4ba704d00bb9395024f80642c003bf3fb09305b47fca1ee82b6c51358a5b28ee1fa0f58e470f9ec036635545a2c
 MISC metadata.xml 623 BLAKE2B 10e2a56c1ad2da7890bb641cdb368f0f512185cefd18356ef96c8e7b34a873c439e9f7d5d98e0e2f339a0a9f090cb372a1ef8d1cd7251efc115fc021ab05825c SHA512 edd9f7ccc6147cb92f32415ba3ed6ad9351a49fbff8655866c99e80f1782801df90a63f3ca40153bfb01d689ab642823cea5d6e144b0aede0ce6d7da8b48f5f1
--- a/app-crypt/swtpm/swtpm-0.7.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.0.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="fuse +gnutls seccomp test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	)
+	gnutls? (
+		dev-libs/libtasn1:=
+		>=net-libs/gnutls-3.1.0:=[tools,pkcs11]
+	)
+	seccomp? ( sys-libs/libseccomp )
+	acct-group/tss
+	acct-user/tss
+	dev-libs/openssl:0=
+	dev-libs/json-glib
+	dev-libs/libtpms
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	test? (
+		net-misc/socat
+		dev-tcltk/expect
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+)
+
+src_prepare() {
+	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openssl \
+		--without-selinux \
+		$(use_with fuse cuse) \
+		$(use_with gnutls) \
+		$(use_with seccomp)
+}
+
+src_install() {
+	default
+	fowners -R tss:root /var/lib/swtpm-localca
+	fperms 750 /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+	find "${D}" -name '*.la' -delete || die
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@ -2,6 +2,9 @@ DIST firecracker-v0.24.5-aarch64.tgz 1426237 BLAKE2B 11e260d4afcd5f5ebabeb5c7730
 DIST firecracker-v0.24.5-x86_64.tgz 1432963 BLAKE2B 70e16dc651ae1071b9f223f0a21eaba6a8ad515d75847698cbf67ac73053cb8c52d67cd46a315e5681dadbab92ecc4d0d43ecbba9928dc2f52a5168c0a889a97 SHA512 746f1af7a37b2ecdd86faee75ee0cacf01aa80aa6f060cc75761f930df0da9a6f6597fea4235035ba10f6198909b5b2f7a834571c52d73e647611f9be8fa0967
 DIST firecracker-v0.25.0-aarch64.tgz 1747986 BLAKE2B cbfbe04326f78491fccbde69ae28552db255ef88b1da4a6d3ba62fd8aac34e935677e7fc8d71d8efa56f87f764dfd17b3da6ff688fd0602f0b414060a402c0d2 SHA512 2cc1882782e26492979c06fef06f162d4f1d20a8e1cacc2680b3ea54d6f028b951c6a14f1a3d4169079cd407f9e6e77c49e64b8dbebd4e329b683a1f38f90298
 DIST firecracker-v0.25.0-x86_64.tgz 1773525 BLAKE2B e870c7d021f6c5b960c52883ab659fc33fec3b39314ec1ca5448f02b9596e88192831639c6817048b97954d28866eaa7b94b50821a6c991def345bce3b47b9bb SHA512 ffd3e9dfe7e2b29ce6c9ef61504056844d7081850dfe484ddb207d7339242819adf6d7a43e9c812c032fcf606daca8d10c125071d11dd5cfe431de41eb557c0f
-EBUILD firecracker-bin-0.24.5.ebuild 2472 BLAKE2B 21f2b037baf114eaa0e8593efd48669db00742919a5bc8f102f9de0d5d67fde010ff8eb9b78751d963ce92754f87d87bc253ac1b7b903bd55ddf6e130cc49283 SHA512 5127b2ba73fae49b8f8a4e3fc4163ef1253a4b41323df9c149b0be8dccb8bba30b13470c0894a254fec20820bc31382a23a5cd2d22adee44486822781e8b8b1c
-EBUILD firecracker-bin-0.25.0.ebuild 2472 BLAKE2B 21f2b037baf114eaa0e8593efd48669db00742919a5bc8f102f9de0d5d67fde010ff8eb9b78751d963ce92754f87d87bc253ac1b7b903bd55ddf6e130cc49283 SHA512 5127b2ba73fae49b8f8a4e3fc4163ef1253a4b41323df9c149b0be8dccb8bba30b13470c0894a254fec20820bc31382a23a5cd2d22adee44486822781e8b8b1c
+DIST firecracker-v0.25.1-aarch64.tgz 1746829 BLAKE2B 613e575d06cd9e482cec705a1775099b4587311a579e3146f7b35bf2d26293384d5092106c7e666e1858c7d898cccb3a5173afcba57f8cce1b8a81547505c0e5 SHA512 1e3217a94f1a43b2ef84a5a07d2f1f2690ae1129787cb286ac4f1b8c82dbd15d7489149222f22cb58a9628e8cd1704cf387c17e71053367218425881f73610e5
+DIST firecracker-v0.25.1-x86_64.tgz 1773703 BLAKE2B d577dfad765b8135471a673e9699c75bb7905e73496b7e9940a7634182267a1b3bfd8111088db4e1103da47e64159c585d46f8a9fb913ba3dcb1d4d1fe5f9920 SHA512 8108b7576655ae31c97f6349f5dd530aca2828acbb0d4589d6d0c113d44c4e14b28c4d76f73fe16c5538ce4940bd86e913e97ad35d7f915f8199bceaf4f74fe3
+EBUILD firecracker-bin-0.24.5.ebuild 2250 BLAKE2B b41fd6a717d476261973d9da6d096b0faae767ad7b37eee4122744b2e5affef47b172b80aa798d7e53d588f630bc061708b5189756ceb30b59bebadb97256224 SHA512 0eacee8d8a3ff5b13526cb7d21183a0ace74ed2de1c1c096861f0da614c9845f7b73943a624a3933beb59546578494d16b259e3dc45514e3790101b478b95586
+EBUILD firecracker-bin-0.25.0.ebuild 2250 BLAKE2B b41fd6a717d476261973d9da6d096b0faae767ad7b37eee4122744b2e5affef47b172b80aa798d7e53d588f630bc061708b5189756ceb30b59bebadb97256224 SHA512 0eacee8d8a3ff5b13526cb7d21183a0ace74ed2de1c1c096861f0da614c9845f7b73943a624a3933beb59546578494d16b259e3dc45514e3790101b478b95586
+EBUILD firecracker-bin-0.25.1.ebuild 2519 BLAKE2B 059f73103611a59403d32518ee826e135970ff7ea17a6f6b8431f87054d3a6f6d99e6153b0d9b587532b3f70862a646c83a59d376887551f388eb97c9f532460 SHA512 04b0222724aaec3079331bfb377a13e9ad90e5962da6a508f05bf0516914b95fed67a103d48ee1d33fbda8fb1eebe32568837c17c190acaca68ab85eae9921aa
 MISC metadata.xml 416 BLAKE2B 6c2f61f240e5ab54c1f41aa2601e5ba1900759eeeb8fa7d8d06e9f69b9217577ff53bf85215396afa0e08df8cccc324472de25c5094e74c501f972eda9d6268a SHA512 cda9858fec112e6f8a13fdd29a82563ffdee55fbd3adf0d2fbdecb1fca607f9ba0bd0c7c48746a15c672a4dd36bbc487ae659804cd71f60f46c4d7630a2182b4
--- a/app-emulation/firecracker-bin/firecracker-bin-0.24.5.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.5.ebuild
@ -36,7 +36,7 @@ pkg_pretend() {
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
 		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE ~VHOST_VSOCK"
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
 			ERROR_KVM="You must enable KVM in your kernel to continue"
 			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
 			ERROR_KVM_AMD+=" your kernel configuration."
@ -47,9 +47,6 @@ pkg_pretend() {
 			ERROR_TUN+=" virtual network devices."
 			ERROR_BRIDGE="You will also need support for 802.1d"
 			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
-			ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
-			ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."

 			if use amd64 || use amd64-linux; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
--- a/app-emulation/firecracker-bin/firecracker-bin-0.25.0.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.25.0.ebuild
@ -36,7 +36,7 @@ pkg_pretend() {
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
 		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE ~VHOST_VSOCK"
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
 			ERROR_KVM="You must enable KVM in your kernel to continue"
 			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
 			ERROR_KVM_AMD+=" your kernel configuration."
@ -47,9 +47,6 @@ pkg_pretend() {
 			ERROR_TUN+=" virtual network devices."
 			ERROR_BRIDGE="You will also need support for 802.1d"
 			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
-			ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
-			ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."

 			if use amd64 || use amd64-linux; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
--- a/app-emulation/firecracker-bin/firecracker-bin-0.25.1.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.25.1.ebuild
@ -0,0 +1,81 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="
+	amd64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
+	)
+	arm64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
+	)"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RESTRICT="test strip"
+
+RDEPEND="!app-emulation/firecracker
+	acct-group/kvm"
+
+QA_PREBUILT="usr/bin/firecracker
+	usr/bin/jailer
+	usr/bin/seccompiler-bin"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 4 14; then
+		eerror "Firecracker requires a host kernel of 4.14 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use"
+			ERROR_TUN+=" virtual network devices."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+
+			if use amd64 || use amd64-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	if use amd64; then
+		my_arch=x86_64
+	elif use arm64; then
+		my_arch=aarch64
+	fi
+
+	dodoc "release-v${PV}-${my_arch}/firecracker_spec-v${PV}.yaml"
+	dodoc "release-v${PV}-${my_arch}/seccomp-filter-v${PV}-${my_arch}.json"
+
+	newbin "release-v${PV}-${my_arch}/firecracker-v${PV}-${my_arch}" firecracker
+	newbin "release-v${PV}-${my_arch}/jailer-v${PV}-${my_arch}" jailer
+	newbin "release-v${PV}-${my_arch}/seccompiler-bin-v${PV}-${my_arch}" seccompiler-bin
+}
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@ -11,7 +11,6 @@ DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500
 DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
 DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
 DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
-EBUILD lxd-4.0.7-r2.ebuild 4445 BLAKE2B 4cb00d02df28930c549617e2b2e2b0633ac6d59a97f6d28cfa5071a96a5004a4448401a9c7ab46237981a9f8dc2d0b3c87e5e89a8a4db3c2ef200f63a80d303a SHA512 b75e872370ed56205ff1517f4eca96f895eab2cb4364ee3402d14b5d61cd7cc7ba14aa5afc7387c7d7d87ae5c2a6f899422b23b52f02edcbb72cd9ed04cb9a00
-EBUILD lxd-4.0.7.ebuild 4190 BLAKE2B 2938b717899c7ad9199b13265c4f250959d1b353ea4e591b8e77470c31e2cb72da47733dd823bcfbd842c26bcca9a9e820fb56784c0aca048b8221ac5ba7fbd6 SHA512 5699cdbb47c6752012f5500abae8d0ff655111d6d7843583e97e3ebd000bb63745e77dc7f3d4099c80d60939cf5d1972f74e8f90012c195ff135d7e9e3b6e749
+EBUILD lxd-4.0.7-r2.ebuild 4444 BLAKE2B 848852a0d5478f6b116b70c2f1637851a26c9f59c2961c86fec585c5b2470cf351f3a03963edd1ee0964d481d73a72789415f7ba291ef732717d306d054d7629 SHA512 5f2de1d5b825d38d4e89152555a2ffa25c149546c00d349cb04656c0fba9f83326e232b6de5adceb281118a1c0f915723577af8e1dbb80065a4af173de8bdace
 EBUILD lxd-4.0.8-r1.ebuild 4502 BLAKE2B ecbac318c16a60b23c22fb8c9c6376ded45705939be6481b4e735c91057481acfcd6bf459e38dab5ca92dbe253fb28f84962aefc33beeed1d775214715c60247 SHA512 4170251014be93ac7b145c343f772329d76f3f409bf53e011476759605922781c77028fbfbe8803200f0104dbc6cc8e93d42d694f829d094fb86c9b1bde4eb4b
 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c
--- a/app-emulation/lxd/lxd-4.0.7-r2.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"

 DEPEND="acct-group/lxd
--- a/app-emulation/lxd/lxd-4.0.7.ebuild
+++ b/app-emulation/lxd/lxd-4.0.7.ebuild
@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-	acct-group/lxd
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
-	sys-fs/fuse:*
-	sys-fs/lxcfs
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-p2c
-	/usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-
-	export GOPATH="${S}/_dist"
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=off
-	go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	export GOPATH="${S}/_dist"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	cd "${S}" || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-	if use apparmor; then
-		systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
-	else
-		systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@ -1,5 +1,7 @@
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
 DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
+DIST carbon-c-relay-3.7.3.tar.gz 575680 BLAKE2B d2d07c7f1ec356a16bb375bd740ffa018a0d256ef1ce97ae0555001411a05e28173c2009f3980b0d711977068392b5a0baca68f9dda3a677c7c3d245cad70a0e SHA512 ba3e4b7173abe5e3b018413a8d46d91c3f433e785dcf3d7643836b91f9a6ff993b22c3db51192476c75d45486d1e2541ad73056671b4bdbfd1447dcfc3f26ff3
 EBUILD carbon-c-relay-3.7.2-r1.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
+EBUILD carbon-c-relay-3.7.3.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
 MISC metadata.xml 654 BLAKE2B 9cf6ce108100d80ba05644a782876997280ae4523b07366b3a88942fad4392fed358b134e8f33597fdc98540698531e3e7b0155e63194b4030de227f4a4c75e1 SHA512 954f00ed3ccde9cc651e9de24bcc2339deca58b2cc27f923801862fdc5298771ce5c0e729fa03c2d4d5b03624dbcbd3a17295b7e4e31fbb57221da861747d545
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+	pcre2?     ( !oniguruma )
+	oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+	snappy? ( app-arch/snappy )
+	zlib? ( app-arch/gzip )
+	ssl? ( dev-libs/openssl:0= )
+	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+	pcre2? ( dev-libs/libpcre2 )
+	oniguruma? ( dev-libs/oniguruma )
+	acct-group/carbon
+	acct-user/carbon"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local pcrecfg
+	if use !pcre2 && use !oniguruma ; then
+		pcrecfg=$(use_with pcre)
+	else
+		pcrecfg="--without-pcre"
+	fi
+
+	econf $(use_with lz4) $(use_with snappy) \
+		$(use_with ssl) $(use_with zlib gzip) \
+		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+	default
+
+	# rename too generic name
+	mv "${ED}"/usr/bin/{relay,${PN}} || die
+
+	# remove libfaketime, necessary for testing only
+	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+
+	dodoc ChangeLog.md
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@ -7,6 +7,6 @@ DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 3bac953fc7f49e19f1914186044c75d7f8b5
 DIST mosquitto-2.0.13.tar.gz 786806 BLAKE2B 83c5c93a209225a24812c494e6065fb4ed4c65ccb34ac60918e5c32683702a9d44f162ccc366d8c2612c6fa867b56e01aaea04b2387f44b77294259198439ad0 SHA512 f22331c0a5a501b3df50b5c4788b735599024837eec4f455d422253a20e6f4ac528044ff4a7611094af87a8059e9a836157e5dc092efedf958ed7c96e5b9f9d0
 EBUILD mosquitto-1.6.15.ebuild 2851 BLAKE2B 26a548e531174ede82c6c5e02477d3bb0b468e607265e9aec0c7fe65f216c728fe93b18686e1b64aa421f28f8f14413b07da4c00a7353955c67549bc2e8ed605 SHA512 20049ac366395029516de8e693f731e88ca10c30762ab03ba7f7049e0031a901696dd1868d410052e0796c1f26a50c6ab6125b149b443ea15eaf636984eb6088
 EBUILD mosquitto-2.0.11.ebuild 3268 BLAKE2B ae0bc1b791caeeaf623a1c908a278f42ee3a20e966cbd83df3a9042b293b667be2c19ac918fb08d83308fb6addee13face0ca42b69e36c1353ddd5ffd5da45cb SHA512 9426eb68a7b478cbad82bf7c2a515689542e8198446b7f27775d51ec584a9ca3a59c4dcfa7942855eb923a139ef924b5e4392ea4ae2143621a62d5e2a56338e2
-EBUILD mosquitto-2.0.12.ebuild 3024 BLAKE2B 8b140baa34906a956a0387dde04385b3a8367e1ccbd34fcc98980a4906166682e5af87044cb8ee672ac5b7908fe69ffc80e301b2c95e387ea51c16750a28935c SHA512 1ad16fd61135c60c42c0c7a6ad5e16e4643a763ec101a5939d4844ea51a281284e43b3f1a94941c656cc27b61ac17e5b3275d80da0d194021ab4159f6c7fd3c6
+EBUILD mosquitto-2.0.12.ebuild 3023 BLAKE2B be6d1e74a65ffb75542f6f560411972e82fb9098c749d1c67f2d777b780e010a1eaa22a6d5ede4f42ee2f0c0b86abe11d428fc4ddd49a1411b61e5da0f801e89 SHA512 b0fb8fa9e1251ab8fab4c99b8ab1564a59ccd074655a02d6acaa6fecbd30a6d5114ed5d8aa261d184f5de8a6085af294eb6967ce1a894065ac13282c14643135
 EBUILD mosquitto-2.0.13.ebuild 3026 BLAKE2B 8abd72d5c31bea16f1f9982d9df512b255e214d8ffec63a5f6d1f2fdc368eaa191906fec61ec2c75e2210d64b948126ee297250a82b6206f46b2a3929574b7b8 SHA512 a3a5bcc9a4bfd6a51b68a1ae40d7995709ec0d17aa8d2c9d91ebabbb6f8edf637322e1a5a7cfc96daecf152e1eb35c187564981d34756d5cca8dc7b16481178a
 MISC metadata.xml 612 BLAKE2B 414070cdd858c5fd76b266459ff7b2a66992e8b11e672212f78e366863cd221aa83516a546c69668217a06b087b7b81853fcdff332368355cd1ff8c1292f0c4e SHA512 64242d12473aad0f0d80865da2499679849f6b55f751d27c3cf38e0a5555a305a2cc59f8dfbe4b9d50f0a6b6bc85062b989511c7118045b2c9c3e1e0d1022747
--- a/app-misc/mosquitto/mosquitto-2.0.12.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.12.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"

 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"

--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@ -2,8 +2,10 @@ DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edb
 DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2df8a57566195fca3bf170fec621c27e7da00a1a5a8493fbbadca103a0db7b8c3051abe95d5c2aedb7c289c050a5 SHA512 df4c7a5e624933ccc7ce257a767a4621728a4dbcdd5b551b47845ed0fcffdd5a6f7f617a466404c5e8d8b62c81e57986e1f21e01d643899755623a2dc597d712
 DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5
 DIST recoll-1.31.0.tar.gz 3679099 BLAKE2B 6d02c0e0487ff02957ffc3c824152a14307e5a9ebfd472ffb84d047ce37f170ff7738b0d15ccfd6582840d22d19aa6e509ca50b98fd88d1a3730e58304cdb4b1 SHA512 1a740cdabab158737461ab8f097ece79844e1f0b64285871217049c0619df400d99db18eac8942e1986def555c5ab8364f3320eb403d150b061126cbc3be2116
+DIST recoll-1.31.2.tar.gz 3689921 BLAKE2B 01eb0ef96362e214022a96876c10246c0d183a861c1e3d791717c3d77d4244ed90bbb9041bf23a613e59b5c099092c262d1bee1760ea527fe60f01383bec8a5f SHA512 365cc152715cb89c88b4271fdda4ccf963b1c6e3088f69684cba2a494bf9b0192e4553b1412607f3acd61ec85eb2fe92c46cd258b3fc2977f9528bb0a667e6cb
 EBUILD recoll-1.27.12.ebuild 3477 BLAKE2B 95fa8b50e3e2036c4fb6ef72a69f394f04d5aacb9919d41c33782ae8e9688de7b993f9386b0a96e8b8b1a6ff5a0be8d49f21900b69a939e200131fdf7b439198 SHA512 e33fd31fc1e9ba7bb0eca7fe82237d94a8db3049fbf442de72f49f23bf2f7370d5b5e933a5d23a85bf93628247ee7180e3830da2c98b9b83143af09102cd01fb
 EBUILD recoll-1.28.5.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.29.2.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.31.0.ebuild 3323 BLAKE2B 4528bdf2ebae5ba679acd7fac1d8f1dcf6951ff12aa8cdcf2baec8f132cca304999cf2c7b7de62ce862898133515edc1bd1a809f44497b54c9cab7d8876e2c26 SHA512 b592e129d6f1d91b5ba5a03d7dbde0b424fee04f7815668f59e1de998aea5dbbbece34d85d830ec4f1f2569f9c07ae33cd846d9ce3b8c1ef0303263f8949cf60
+EBUILD recoll-1.31.2.ebuild 3500 BLAKE2B 771d1de875c488266efb8681a362393bc2c749888f1a4e8097af6252b48fe6361a71a20087195531e244ff5316bb75b126d48e373ee1385ab49f66991a338fc6 SHA512 82d2178bff571909b5f3e711e2a27c602d5e0b87b4c657d719a33afe50c2fd448543caadd26eb6fb8172b3b5eac7af35519a29cf533b734e66c73e847205c175
 MISC metadata.xml 1413 BLAKE2B ffeeae4a0a0d5553e7ee8bffc85262eff920ca0d2ee2c8db767662f6f37c4b9702123fdf1cc1f804e9d646819d8523a360018813233ec6277d9d4d819397a67e SHA512 855cbf30c1d6216d52c1655ed20caf622ce835a6c9c0798b871206c29e946bdde2759e25f2d3003c0c8478d8cda78b28f1c3c0435db26001b0ea323858355a69
--- a/app-misc/recoll/recoll-1.31.2.ebuild
+++ b/app-misc/recoll/recoll-1.31.2.ebuild
@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils systemd
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase chm +inotify qt5 session +spell systemd webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	systemd? ( sys-apps/systemd )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_pretend() {
+	if has_version "<app-misc/recoll-1.20"; then
+		elog "Installing ${PV} over an 1.19 index is possible,"
+		elog "but there have been small changes in the way"
+		elog "compound words are indexed. So it is best to reset"
+		elog "the index. The best method to reset the index is to"
+		elog "quit all recoll programs and delete the index directory"
+		elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+}
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	local myeconfargs=(
+		$(use_enable camelcase)
+		$(use_enable chm python-chm)
+		$(use_enable session x11mon)
+		$(use_enable qt5 qtgui)
+		$(use_enable webengine)
+		$(use_with inotify)
+		$(use_with spell aspell)
+		$(use_with systemd)
+		--with-system-unit-dir="$(systemd_get_systemunitdir)"
+		--with-user-unit-dir="$(systemd_get_userunitdir)"
+		--disable-webkit
+		--without-fam
+		--enable-recollq
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support" app-text/poppler
+	optfeature "PDF files with OCR support" app-text/tesseract
+	optfeature "MS Word files support" app-text/antiword
+	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+	optfeature "Lyx files support" app-office/lyx
+	optfeature "GNU Info files support" sys-apps/texinfo
+	optfeature "RAR archives support" dev-python/rarfile
+	optfeature "7zip archives support" dev-python/pylzma
+	optfeature "iCalendar files support" dev-python/icalendar
+	optfeature "Postscript files support" app-text/pstotext
+	optfeature "RTF files support" app-text/unrtf
+	optfeature "TeX files support" dev-text/detex
+	optfeature "DVI files support" virtual/tex-base
+	optfeature "DJVU files support" app-text/djvu
+	optfeature "tags in audio files support" media-libs/mutagen
+	optfeature "tags in image files support" media-libs/exiftool
+	optfeature "Midi karaoke files support" dev-python/chardet
+}
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
--- a/app-mobilephone/dfu-util/Manifest
+++ b/app-mobilephone/dfu-util/Manifest
@ -1,6 +1,4 @@
 DIST dfu-util-0.11.tar.gz 152462 BLAKE2B 3734698dd62de8a1c781f7631ae17ee9755241ce4d614b028fe6d6c3a117f3a301c174dcadf52252d55b08cfd75298c27a588e880837317ff73c32ab8863ccdd SHA512 fc5304a483ac10e35bf1b9304becdeb407b2e44d8ac51474d2fa17877e6cf71b0126f7e12ebb331d75e7adeb9c173ff5cf083a06ded5847dbe477534cf26a553
-DIST dfu-util-0.9.tar.gz 138397 BLAKE2B e3a9db3276204d25fbcdd7d50caacd28a8e043d2781b5f942cd0df343d046870003abeaa1005a2774d03c4198ce96fa2124040987069c5f444e36e4f365a5e0e SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952
-EBUILD dfu-util-0.11.ebuild 623 BLAKE2B b1b1f704f3bbcb1fd79bc8cb2f840f0e1cd2e3ffad9682d9681d3cfd917252a31b3a7e7a80ddd48f7d217bfc9c818d79fd42345756534d7cacf7aa5cd3752925 SHA512 f16d2e1d33d4f9c5795a564ee28fdb7115143eb6e9d7e9be936b72428800fd03106d32a3b749e7221048e98e9e3b3a00350ebcc9b113d0a01332491f89da5b92
-EBUILD dfu-util-0.9.ebuild 611 BLAKE2B 1684c27777969c7aefefa831a4f93b1e58bee27042d2f57d026aaa3cc8a71597211fad44ee5b7763c22ba307bb6fac6b89318ccaf94998673eccc2f9e536774b SHA512 3df4947a9180bdd44cf3125dfa3d4f8cf4aed05b45397a7365a42de045dc7ed3ce12e2f6c1ae5f0fa5b317fcd0501ee8a40dae514af6baaae48df39cd9eea46f
+EBUILD dfu-util-0.11.ebuild 622 BLAKE2B 36024dcc0791a880537dad68a13bbb102ecfa51cb244512891a26869ff81ce55beb96fe8edccd85445d5263ae0032c8f2293c93a37d3704f97205c069fbc6650 SHA512 c4b744831eaa09f74d46c424f9386b239d3bfa2b2446db9718beba7719c96329f0ee06875823b1aad5114394858a9d09d8d6965d58f06349b2565a513d84478a
 EBUILD dfu-util-9999.ebuild 617 BLAKE2B 47e3d3d28b1e22d26ea01b2ffc2b07987940877038463607b316a7f2d30e2bd9896f5df06bac07672f4d3489d0511bc4c8690702f19a81d4126a5b88795e3641 SHA512 7b992b0c8b4a73eb8ca435010564c937439ff37607b30d8446c95cc9d3adfa2200325a5c337ce42b43b80074bf8161e62de1a95c5b8033f86cfb019879651dcd
 MISC metadata.xml 330 BLAKE2B 8dd6ce23111123463d3a9585b1fdff4cdf8a7670803dc36c007daa02796e764a29eff3b420dba2651e8812ae39d7df0a7de6f20a10ad5447c0b799074346fb42 SHA512 fb9646c59340854d13fb4f82e13f467a34090eb629937cf846c9db1a6ed2095d9bf6456741e6ba3460709d95f9a36bc6bdbc6063492eb5222330190b52c961df
--- a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi

 DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
--- a/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
-HOMEPAGE="http://dfu-util.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@ -3,5 +3,5 @@ AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 EBUILD opensp-1.5.2-r3.ebuild 2010 BLAKE2B ee4008fff75f756f431bf13d49cd26e079b21aff80b5eb12d5644899bb691fe9fa5e4d1050c4541db7be49ff3c4083fe7b25f1c6c3e9414787cbf055658d1383 SHA512 e076ab203bb3f86f15647a85c99dafe128f6ad46aba9d4ace4b89c96b2647ee91af3f1f50b7f595a8ea23d960eb9ee9c00bc87752412f7f5e8e7c52e064e0725
-EBUILD opensp-1.5.2-r6.ebuild 2096 BLAKE2B 2a96f02273194613073c18bc403c80ed0b22e9a71665aeab0e8d9ed966b176c9e93cd4b1b3dcc7c79f456f92a14f90b7276ae9270dac511f0a0edcae0db66523 SHA512 508e58f936a896312a5a3494df1cb32426abaee55bc3fde259d02df996f8582c35c8d02f7708a155e9c528c5314280f28f271e8a2367e30e778b5b83a1a0d087
+EBUILD opensp-1.5.2-r6.ebuild 2094 BLAKE2B bd575321e925ca92dbeac261135c2e496f2c29eeee7aa1ef62978871648ce42118773e46cf15cf549fbf4395948d57f337159676ea9328ba4916b3e89d973821 SHA512 bcf5f1df2f2043417003c9e3c403efccedfb0bf40f956129d7238eaf138a3e7f36e34b75fdc38ac16d278c996ab29e03617d29fa2ebef12a4441a90d0acd6127
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"

--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@ -1,6 +0,0 @@
-DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
-DIST tidy-html5-5.7.28.tar.gz 670474 BLAKE2B f1f030bda478f09f1786b34f62ac547249cbfe9d7d06aa7a3a07fb993ee64cf9911d04e4c487c9854e86493da08ef8ca5ee65faf0ce6473cd5914c74ad8c9251 SHA512 557cae0c00d581c9272649e0b3c143b70bc1941a59c497dd0b7266d70b3b2ff652dea075a855737d2d02ea58bb57d9403d61287c1ae40ec0281e7801991b57d7
-EBUILD tidy-html5-5.6.0.ebuild 622 BLAKE2B 365c2b9c65a461c6bd460d8a1a74071968c63576256b901fea5ed1a3b309a6ab5f0beb92029418aa938b2f61c1565e2e334f7b8d49a687c3a190297636f11e58 SHA512 819f2d445f0eef9ed960f72d714299b1fd8652e1389cda4d029eb8fe801405f1f27bb2349afeab57af995057b70707bf2f41441156da324b434c1b89c8a83f67
-EBUILD tidy-html5-5.7.28-r1.ebuild 657 BLAKE2B 56d93051d4a52625a04378a25a580a2c5becbe17054cc981e661266e5cb622109cb4409777643523cd4cad1626f3e1a6aaf37dd817e3e17d1f9ae8ae46b73e51 SHA512 742b207ab47895fe8f658a835ed7f8d7bc93c22f813877efae9d3f97314b409422b4644141475e3f4ce25a43255547be05406d0718d215cb38736dfa0a6e5b5c
-EBUILD tidy-html5-5.7.28.ebuild 629 BLAKE2B a439eab0e94c83d7ce3773c6517d13bb100444465c0c18ed22f48d5fe9bc93b8013ac46f629e8b43a1ab80418170973cd50e22925e55f0d493308645a397c486 SHA512 46bcf18c55ec48c715ec8ccbae7f8fa917d30e3f048b1fa878bd2fa93cd8be8590f171b99af4615c4c2e83cd65d862da59a01a554afced75675f84c6ad847025
-MISC metadata.xml 333 BLAKE2B ab8e7b19f5faee36ecdf53b1ff84745eca5de48a57ae7340e4ffcf41de8b1122954056731c3332149051258bd86fded7a59e59d2251ba69704a2a9d923ce275a SHA512 88610a32e62fcb5995d66f78060384f44825d65644da4fae79cba5e5f93bfa150767873b0864dc7317d7e84c563ba54e48f53cc7d15c448a65d4bbe3154380f8
--- a/app-text/tidy-html5/metadata.xml
+++ b/app-text/tidy-html5/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">htacg/tidy-html5</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="https://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
--- a/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="https://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIDY_CONSOLE_SHARED=yes
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
--- a/app-text/tidy-html5/tidy-html5-5.7.28.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.7.28.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="https://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@ -1,6 +1,8 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
+AUX xmlto-0.0.28-dont-hardcode-paths.patch 782 BLAKE2B 400e85b97d2683943279b2f88f87cd3074f575376a69ca068d29b35cce266351847f267b4039a640bf8c2aafca39b48dc0cfd997db6e1ed64b847524d117e25a SHA512 f621d70836db82e300473679d7a5f88e13886273de48d87a8e77b790641d0142e7cde02fd5fd3e5f37d363fe93000025ac3d7df6991b9c151f5700769ccd9da6
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
 EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
+EBUILD xmlto-0.0.28-r7.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
--- a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
+++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
@ -0,0 +1,35 @@
+From: Sam James <sam@gentoo.org>
+Date: Wed, 10 Nov 2021 04:53:33 +0000
+Subject: [PATCH] Don't hardcode paths to utilities
+
+The path to e.g. links at build time is not necessarily
+the same as the path at runtime.
+
+TODO: Could chop out the checks from configure but
+this package is fragile enough. Leaving it for now.
+--- a/xmlto.in
+++ b/xmlto.in
+@@ -272,13 +272,13 @@ then
+   USE_BACKEND=DEFAULT
+ fi
+ 
+-LINKS_PATH=@LINKS@
+-W3M_PATH=@W3M@
+-LYNX_PATH=@LYNX@
+-GCP_PATH=@GCP@
+-SED_PATH=@SED@
+-GREP_PATH=@GREP@
+-ZIP_PATH=@ZIP@
+LINKS_PATH=$(command -v links)
+W3M_PATH=$(command -v w3m)
+LYNX_PATH=$(command -v lynx)
+GCP_PATH=$(command -v cp)
+SED_PATH=$(command -v sed)
+GREP_PATH=$(command -v grep)
+ZIP_PATH=$(command -v zip)
+ 
+ # Process any options
+ ARGS=$(${GETOPT} \
+-- 
+2.33.1
+
--- a/app-text/xmlto/xmlto-0.0.28-r7.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r7.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="latex text"
+
+RDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	|| ( sys-apps/util-linux app-misc/getopt )
+	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
+	latex? ( dev-texlive/texlive-formatsextra )
+"
+# We only depend on flex when we patch the input lexer.
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
+	"${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch
+)
+
+src_prepare() {
+	default
+
+	# fix symbol clash on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH="${BASH}"
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+
+	econf
+}
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@ -2,5 +2,5 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 EBUILD xmlada-2020.ebuild 1978 BLAKE2B 80246ce9388d25e62c38d48b76e404fea38c71865a1fb31710b7caee425dc453139e158243fab8ac65315e2c6bdb6556d6f15f7551fbe04f538c7dfe432890e8 SHA512 7ca808b394c9fd8ef70ec27789513ba315221f1eb472ac8b5f035a6c6bfb21a747e350b26714eceffa01d62f81be0747ebfb314874c45466ec3eae417075ea7e
-EBUILD xmlada-2021-r1.ebuild 1991 BLAKE2B a06bad661ab9c55fb081ae4de2696f0c48a34bc58be767bd73505635dfea84c69699a0159138d12e586c911a421f8b361e57ddf5be82d11be9e2cb3ff902e311 SHA512 762472ffd8db6a9fbcab6fcae2a63e98663e1f9b4873b94dfb30afd61f282e7bcb06762a7e0fd97d2145e2e8dee4e31df30851323d66ef95b8116c3b228ee6c2
+EBUILD xmlada-2021-r1.ebuild 1990 BLAKE2B f944e9584c490d6cfd5e39969a2f43b3c51eb760c771367bef89fa869642f3572df19e0e5c271e5bf4b4b18f6cc7f8554d3ad051ee0348058caf7af9810f83ea SHA512 058234e250aa38d808447c19829ea6977a5f4d25c1436d181a76437c18757aa9b11875426388bf6fb55e3e38462e660ce496665db1ca129ce010fb8ee0fafa9d
 MISC metadata.xml 908 BLAKE2B a29e2bb61aeb10e05688b87817fa6ee4d7bea40d1aafc6e417c925237cc499f6688bc0d4d95ddef435ada059df9e982378e82a11069e8fd0037cb03da851837e SHA512 dc34947845e621b35021fa15d049757ea1a48aca68f40126d1dcc3fb50e02a34b5319028946944c4e7f432d4899c701da8c7dad28ea666766ab0197ed196519b
--- a/dev-ada/xmlada/xmlada-2021-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-2021-r1.ebuild
@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@ -1,5 +1,6 @@
-AUX cdb-0.75-errno.diff 170 BLAKE2B 806a8f0b83fef34796705596f7e4c2896d3ef56d0209a5a181d46dbaa87268620a2d1cf4ee3ae1fa8890886d8f9db2b8c417cb51a4b9dc11802ed33f1b14c4f7 SHA512 00b39bf8cda478a3e3e5851eb7e2dd154bd547d6fdf73d3de5ca6f6ac565aca7a275b67bbde988249f4daabddbcee4ba5509cc079c2533f42268cfa5b39984cb
-AUX cdb-0.75-stdint.diff 8956 BLAKE2B af2815290b395a23cb58a48b49361aa648d461ca247f6cba5fec7dfb0634be4fa1c09e4fc11536ff22dd5c221024cd0391d714fbb7fb160b91343111cebc37ca SHA512 2589722307e4b8c9e6e010a0a452a987bf5190bbaf20ece85b54666dd6633f30c85b443bddc31e70ea4024912a3999cd7197a0ac06cf86dbaf00c8b82551ae36
+AUX cdb-errno.patch 170 BLAKE2B 806a8f0b83fef34796705596f7e4c2896d3ef56d0209a5a181d46dbaa87268620a2d1cf4ee3ae1fa8890886d8f9db2b8c417cb51a4b9dc11802ed33f1b14c4f7 SHA512 00b39bf8cda478a3e3e5851eb7e2dd154bd547d6fdf73d3de5ca6f6ac565aca7a275b67bbde988249f4daabddbcee4ba5509cc079c2533f42268cfa5b39984cb
+AUX cdb-inline.patch 251 BLAKE2B 16c4dd5cc00f243a51196977988fcae53365bab4b1a0034d44e24b5c5c0b3c6b819dfa00f6fd7ce583722f97847cba7e6b24b53596639a7df1fd0da42910c35c SHA512 c8d4cf0772b7373160c600ba1494f4933c62c9e1df929695c754c4e51ebaec4387d5f8e8739c88e0b82463bc26e8bd0c2060c43dffcfdb79431d2038f100a617
+AUX cdb-stdint.patch 8956 BLAKE2B af2815290b395a23cb58a48b49361aa648d461ca247f6cba5fec7dfb0634be4fa1c09e4fc11536ff22dd5c221024cd0391d714fbb7fb160b91343111cebc37ca SHA512 2589722307e4b8c9e6e010a0a452a987bf5190bbaf20ece85b54666dd6633f30c85b443bddc31e70ea4024912a3999cd7197a0ac06cf86dbaf00c8b82551ae36
 DIST cdb-0.75.tar.gz 54162 BLAKE2B 7b488bf330b2aac88a1cca82a6a49e24d0fd953c77935231a31bd72cc0936a37628736b5b22ea0d58aaa77cd118976ab8aa82ccc080f99e190e3f1db5d51b622 SHA512 6faeab91a77457348b58f685e81000b83fb609691317198a06284c5c62dee1e4d6138f90be1e727021f279d740169c175a21b23c96adb39a654e3f7fafdf36c0
-EBUILD cdb-0.75-r4.ebuild 1378 BLAKE2B ca18aac66d31e06c6db4e7361dade8e8a827926cf4a6525939488d93ad4b7eae176e35f2f37e25f83be2443f365409acb17e828741bb7b8f15cdeff5da09de54 SHA512 662bfbef457bf45421c29f3be534f83357b54d54155d15c8002b0b370d6295870356500801d45f462895ccbb3f8b88b1c0230a3a8aeb16398497992d99101f9b
+EBUILD cdb-0.75-r4.ebuild 1478 BLAKE2B 5e0d38757d8db7afac61ec175cdc7022443a6c22c42613feaeca2e208314595cdb27248e79075fe571e541172a58e2777a93c3a5a40608e5967e7a3f61ea002e SHA512 d665984fb16810f4da7efdbe2720775b007bba22ce23c357939d4896a3cc704a48d9555e51ebce014b1fe7309a261fd267a5c9c3de05fda1b739292831c833e6
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@ -1,54 +1,59 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI="8"

 inherit toolchain-funcs

 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
-HOMEPAGE="http://cr.yp.to/cdb.html"
-SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
+HOMEPAGE="https://cr.yp.to/cdb.html"
+SRC_URI="https://cr.yp.to/${PN}/${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""

-DEPEND="!dev-db/tinycdb"
-RDEPEND="${DEPEND}"
+RDEPEND="!dev-db/tinycdb"
+DEPEND="${RDEPEND}"

 PATCHES=(
-	"${FILESDIR}"/${P}-errno.diff
-	"${FILESDIR}"/${P}-stdint.diff
+	"${FILESDIR}"/${PN}-errno.patch
+	"${FILESDIR}"/${PN}-inline.patch
+	"${FILESDIR}"/${PN}-stdint.patch
 )
+DOCS=( CHANGES README TODO VERSION )

 src_prepare() {
 	default

-	sed -i -e 's/head -1/head -n 1/g' Makefile \
-		|| die "sed Makefile failed"
+	sed -i \
+		-e "s/head -1/head -n 1/g" \
+		-e "s/ar /$(tc-getAR) /" \
+		-e "s/ranlib /$(tc-getRANLIB) /" \
+		Makefile
 }

 src_configure() {
-	echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo "${EPREFIX}/usr" > conf-home || die
+	echo "$(tc-getCC) ${CFLAGS} -fPIC" >conf-cc   || die
+	echo "$(tc-getCC) ${LDFLAGS}"      >conf-ld   || die
+	echo "${EPREFIX}/usr"              >conf-home || die
 }

 src_install() {
-	dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest
+	dobin ${PN}{dump,get,make{,-12,-sv},stats,test}

 	# ok so ... first off, some automakes fail at finding
 	# cdb.a, so install that now
 	dolib.a *.a
-
 	# then do this pretty little symlinking to solve the somewhat
 	# cosmetic library issue at hand
-	dosym cdb.a /usr/$(get_libdir)/libcdb.a
+	dosym ${PN}.a /usr/$(get_libdir)/lib${PN}.a

 	# uint32.h needs installation too, otherwise compiles depending
 	# on it will fail
-	insinto /usr/include/cdb
-	doins cdb*.h buffer.h alloc.h uint32.h
+	insinto /usr/include/${PN}
+	doins ${PN}*.h {alloc,buffer,uint32}.h

-	dodoc CHANGES FILES README SYSDEPS TODO VERSION
+	einstalldocs
 }
--- a/dev-db/cdb/files/cdb-0.75-errno.diff
+++ b/dev-db/cdb/files/cdb-0.75-errno.diff
--- a/dev-db/cdb/files/cdb-inline.patch
+++ b/dev-db/cdb/files/cdb-inline.patch
@ -0,0 +1,11 @@
+--- a/cdbmake.c
+++ b/cdbmake.c
+@@ -26,7 +26,7 @@
+   strerr_die2x(111,FATAL,"unable to read input: bad format");
+ }
+ 
+-inline void get(char *ch)
+static inline void get(char *ch)
+ {
+   switch(buffer_GETC(buffer_0,ch)) {
+     case 0: die_readformat();
--- a/dev-db/cdb/files/cdb-0.75-stdint.diff
+++ b/dev-db/cdb/files/cdb-0.75-stdint.diff
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@ -5,5 +5,5 @@ AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805ac
 DIST pgbouncer-1.15.0.tar.gz 588042 BLAKE2B 3dac09303e1c86126dd9cb44823c6f3fca4195e3155b360719c736c6e1327cc10d05e7f1e45c08d14c1dd0cb5c074b32263eee3be9e6350db9a8c5cbdfe61aa1 SHA512 5f78018ab80ab8d81f20ef3df1314ffc9557f1c6469d485d11ac822f596e3d4b554743fd9e9fe19b008a8aaf93bcf3673b42a8fb82bbd9611bd735cd2cbb98c6
 DIST pgbouncer-1.16.0.tar.gz 592136 BLAKE2B 752d5cfa18dacfdb72e9e9f12d5a1ac5346649e3a0c49ef530dd29ca16039949af0993d54080a7cf558c6eb6a919254c1dc4a36ab22f38992e790469ecd973bf SHA512 3b6f23052ca3b8af40a618da6bed2577b92ffe27b627f8980cda2d645991434bf298f720c1d423a272961c9f3f52a9d1b28154ed7f355d539f71dc68c028b617
 EBUILD pgbouncer-1.15.0-r1.ebuild 1934 BLAKE2B a683d31bd0b0a2a002d37fae0f728862050b7a785fad1041ea1eb1da9ef06ad4df23289ab65bb4cfe900ea61be1325a929018ae12fd916b5eaf9a16cf008ba98 SHA512 720770f595979da91cebc28ebbccca227ccca566911f5edd3ebd8e929c4cc63ff9d2f5737d213dfeaba16e1ea45655b39a538c03a231c3581bfa1441f51d2159
-EBUILD pgbouncer-1.16.0.ebuild 1935 BLAKE2B 0c1da0e75720ae0d6203306180a782b87137117d444da49ecc5dd70de62fe836c66f1fc0ec304360dc651675a8d3f281bd3ce9137002517b6c9b41f69e654661 SHA512 1f992b446f57bf8cef0b5372fbd1c99ee52c1165b046ae68961ca5da94b8b529acb46878d7506ea4f8c69e1e4bf47c0b7a7cf94a5548158cd9db65238b746de2
+EBUILD pgbouncer-1.16.0.ebuild 1933 BLAKE2B d816654f8131ad65f2b9facd969bf61caba16840fa3a4dcdcdc7824839c47875c0790d59583d4664a99d9d32565eda6d25079bdfae818a3b9b0ba6c92ce0395e SHA512 1c0debc00034e017f235ec2414988b0b7307494da759b9065b1ca637542d902a63f0e415f61753379b6defe7f69755aeb807bf1cb9b43d5a945d736a1f092d67
 MISC metadata.xml 473 BLAKE2B 9a55701f54f80f87559e57543574c98ad69eb8af4f6f93df3f115d55f3f3a8abf712a42e6f7b36dccb9813ec37d03924f001f4dce2b626f80658d29618068bbe SHA512 82f8d497578074d070bd0ee269ad49f58809524e17f444fb557a7a2dfd7f143d40700208a66c074d508d33be94efa4c021486642624fb416e6da735855ecd66e
--- a/dev-db/pgbouncer/pgbouncer-1.16.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.16.0.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://www.pgbouncer.org/"
 SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+c-ares debug doc pam ssl systemd udns"

 # At-most-one-of, one can be enabled but not both
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@ -1,3 +0,0 @@
-DIST sadisplay-0.4.9.tar.gz 9536 BLAKE2B 0265eb470ab600b761cf6d0e1872c3225e863de8aa602fbcdb1839c33ced8825318d4e4f8ee24de420847c077d1830af069af37ea8d3e3e6c76f47dc2335e1b3 SHA512 30fe8dd2a6247328bc4d7640e5a34b15a062322729cb8a2ffb66c740145475a95ac924f752017fda8f347268ce598957cfe78e8fd6f80413267c72b143b3e8b8
-EBUILD sadisplay-0.4.9.ebuild 476 BLAKE2B 47175e13c1ef36529ea68f98b6b5b50e0a659233d3fbfa445b9b5d3e544c3792c0b005eb0df802839239613bbef283170791b1e9125ed1126e973dedfa64ad01 SHA512 32e5eb90291bbbe461111058f5fcaa185ba6ab004baf590687a152798f180c42a56e7c82e2177a95230bb255caf9ee7c7d45a45f7ad34c953c899dc5e1af7c64
-MISC metadata.xml 746 BLAKE2B 1d7662352841799b1ceef390a109fc8a189f14fe8426c556bb49f504a1ec0031ece4abb1e5eb2136a757630579d843da2539ce5098ba8f31e6f9555dd73f27c4 SHA512 5e6dfd34d1db54e822eed63835cae0fcdc9df7ac0cb2c194f5a91788cab179138e075cb2373a005b6b7fb9ececf0bd8a4c8b8bcb98cf454e81881f7b531980cb
--- a/dev-db/sadisplay/metadata.xml
+++ b/dev-db/sadisplay/metadata.xml
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@chymera.eu</email>
-		<name>Horea Christian</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		Simple package for describing SQLAlchemy schema and display raw 
-		database tables by reflecting feature. Works with mapped classes 
-		and raw tables. Relation detecting by ForeignKey columns. 
-		Supports mapped class inherit.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">sadisplay</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-db/sadisplay/sadisplay-0.4.9.ebuild
+++ b/dev-db/sadisplay/sadisplay-0.4.9.ebuild
@ -1,22 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="SqlAlchemy schema display script"
-HOMEPAGE="https://pypi.org/project/sadisplay"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@ -5,5 +5,5 @@ DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2248 BLAKE2B 6dfe3adcc1bd6ce2eaa4a391647f108362903e72f70a96d97a9a8b19ad34c5455c835e4ec507d24f6bf02bc7d001e372bb76ed89ca2db4539ac1e061e3f03791 SHA512 228ba8e194bc7336bcd349f45a7325450ad918c4836e9f4352a70d69d7bda6c267a5f97ed94f55e98fd8da5f0724005ac925ecd436d1e0ba9c788aca85d188f8
+EBUILD dom4j-2.1.3.ebuild 2247 BLAKE2B 75f009a9e0a120978601965e07647c15bb348cca29f7763e38613b542f70d0e58fbefdf96ccf725fbe0da59d8cbbb1dac0865c083ef2e6e5825d48e98a63f7fc SHA512 2b7dd256d0fe31bb35a63fbb4575e0de62ac58248130b8dd6d4610938abaa26c26fb6b81da49273bb52e8320fa67ef9206ee0c4da2cb8907ef8047357ee2d7f6
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -

 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="jaxen"

 CDEPEND="
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@ -1,5 +1,5 @@
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-api-1.2.2.ebuild 1592 BLAKE2B eb1f1dbe3ee12433b56f3ef5b7fe385655c2676fa9f688614ae6696448a4b4ebbfe4b2cdb4aa8bb29fbac06c15d8c9b14ddf1e2ee7cfbfd33c2f222d96cc76b0 SHA512 6944260c2ee150bfb8791b8ed5fe98342d00265a6d77183a2aed6d29795b29868905b98d27865a5c3f72ee225d4bc48cf47684cc2fb01ae12ef5c63459f40f84
-EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1557 BLAKE2B dd5267a1da3377e5e4cc353669ebbc1e3eb5f1eb74d16a603d8ab2b4b4975c0872fce58ce4e9ecf89642912863831c505a647c4eb6735cc13dfa919bb33c2a31 SHA512 65ddbb0368c76a42c25ef08140dfa6c789c4b45a3d0c11939faecc7ac480e2e4f8475c3a1866ca5031af4d68101adc81f47910babf79a8e7f004d991af360e29
+EBUILD jakarta-activation-api-1.2.2.ebuild 1591 BLAKE2B 32b289a43503d097c85874cc79029ecc79a53b6d390abfa92f55c5ea23f4cb1875236fd4490e3e8c0378dd939602125b4824a6cf23391014a08d2239bf6bb4f8 SHA512 3aac629f0bbfc52a0bc7afab3c275f70c917e229024e13a36fa8f92e9df1846b6b7808b77efe388a8d3c32a884a7270af49aede07556306632fb5b36491c1c7c
+EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1556 BLAKE2B 8b4cdc1b8139f03d37890f6fe44bc021468dbc12f6c519dd0e79630cd21ebe6bb2f9d05de35f303303ec00a1556c9c3dc8402fb40f65fd27d239d267a2682489 SHA512 3146719d2e89d9f187f907b42ae72b92e61be8a9a7ce040e557a12a183547f19fd816af093dafc84cdcfb53f9b96774961ebd572f5df19c9c36cb0b913d7889f
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $

 LICENSE="EPL-1.0"
 SLOT="1"
-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/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> j

 LICENSE="EPL-1.0"
 SLOT="2"
-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/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@ -1,3 +1,3 @@
 DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
-EBUILD jaxb-api-2.3.3.ebuild 1789 BLAKE2B 6a99e41ecadf4bdca4965de8a15ad93265cd56a94ae4d990bf5828b3f349b45ad7262077c4a89c7a8c0cb4050cc7c98428046ddcb214c4e70bd14f4d11c14830 SHA512 d9f744e86197601f301714c363759bd219e4f89dfcb0aed23dcb06288f04c052ac4834641b06dd3280ad93567e0370c5bf6aa5cb0f6a0e0acb6eecf97e946189
+EBUILD jaxb-api-2.3.3.ebuild 1788 BLAKE2B 98a6aa803e717fc46a855c241c520e614ce4d712aedec3a0ab2ec79750a18fc353fad2fa0323d684bfe0d539c8bde64f09ffaa735fa072913afe7c1471f35dcd SHA512 3cb57600e7c358b820cb77723e669120983c711356855c7e694a4e91e89a1fe2ffcc9dad957f81059218a4185f4e609fb464a048aeb1898358e0a586c607cdb6
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
--- a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->

 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"

 # Common dependencies
 # POM: pom.xml
--- a/dev-java/jide-oss/Manifest
+++ b/dev-java/jide-oss/Manifest
@ -1,5 +1,7 @@
 DIST jide-oss-3.6.12.tar.gz 4751908 BLAKE2B 731e2c2308e1a7d118a348e3f88258078e16b15f0b3c5bd2ab2ded72d75c4a4c2649e6928d9fbdd1ba7d7b99589a7c1090cb10798e678c44f830df26f0afedff SHA512 a2a60a2af653a1c20099fe81479aadfd252eed086c1009c20a17b561502748cca1cc4b016fe184a60dcb281fd5843c63ad876ca93062bb788e55b485d0e46124
 DIST jide-oss-3.6.18.tar.gz 4752506 BLAKE2B dae7fa89da88295ef5aee03e54778c971b44cc2fc6c017d2e9b24ff9454b9691c34849c9649435ac0a04b28f7fb1ac6b1c147e7fb632e2e30461cf388b3dee7f SHA512 c35f4e5b0462247bb8cc207e1f2120f6a861e796893ce6e7c55e06cab76da84402b3465d420f3fc8d09490f0eb98361d3609bb1675beb9fbf145be4c0bd5ea8c
+DIST jide-oss-3.7.12.tar.gz 4819086 BLAKE2B 9f84b8f9e87b6e74844e11c925546b9a43ae99476c91b84be9269dd8e31658889c3cf38cd67c4a5ec94419d8c5ccecb600c55f747d15e3427e01eb146b0ee755 SHA512 f17ab94fd77237fa0891eb87972b0630a0709fbd7e5d07e6d8389fd18668747d13ca9f631f81cf1153f7d233131a0500e8e76dabf8d33fdce846db14f9958456
 EBUILD jide-oss-3.6.12.ebuild 705 BLAKE2B 9033662f779b7768f4ad56e1771409a3c476f0ad30d3bb5c54ef21aa0e966c3f26533e4e19a3710f871c258e27fe85cbec10679afc889cc3e474d0a05926ef44 SHA512 4bd5def7916adff670bef949d78ff3dc70d07280b7e75060e6e2bcb3bf3fb98c571d3911e53abe30c5be6bf45188466f73d0e97e566febaff5c1f798f8cf2fa9
 EBUILD jide-oss-3.6.18.ebuild 658 BLAKE2B c3c36d5099d427427dbde7169d11411699966a1f8476e3da8215d96404f36247d74faebf9daf451325c2eb40f8a3e3f081758db97313fb9407936758b4523e8e SHA512 ba47cd9be0cd006fc0beba591e4982734050b98692fbf12c09fd1317029b2e930aa69f2037cfbd1912b16b7cad2146c734385ad1ecba48baad0483d9c5d23a9b
+EBUILD jide-oss-3.7.12.ebuild 1808 BLAKE2B 529bdd602f14f22dc744f11581f476b91cd23464830940b21baeebb8ddd4d946fbb19ed1b4a8be42f8010315511bca34460bb2d5e8db7f17ff6a822621e58705 SHA512 dd8b749515c3bb4f0125a32b5c37c0a0e90aea620a9cbc323a574e6c81aacdd0a40b30a918849c33a98c73c5e017d9428dbb883c9155bc3bb676a0a6f95c024b
 MISC metadata.xml 648 BLAKE2B 5cfa79058c3e1e448ea36658dc31dfc7cabad5e9b182c0323a7bfa4b5a2731fb1576077efa90f9b884c02581cb1a27690e4ff36a52d604ffc1fb6add83d2d5d4 SHA512 ec85bfd3f9a4311c5b0ab7314ff9f0e9806eed63cab859f7315b1e693bb74a516ba32786bec62ce826b4eed8e149f4d0e60de4a9cf1311da970f5b7ba443b865
--- a/dev-java/jide-oss/jide-oss-3.7.12.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.7.12.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jide-oss.3.7.12-r2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.jidesoft:jide-oss:3.7.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+MY_COMMIT="19083238ce00ecbd7370f856cb64ea69dae669a5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
+HOMEPAGE="https://github.com/jidesoft/jide-oss"
+SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Upstream does not support java-11
+# https://github.com/jidesoft/jide-oss/issues/30
+DEPEND="virtual/jdk:1.8"
+RDEPEND="virtual/jre:1.8"
+
+DOCS=( {LICENSE,'Readme JDK9',README}.txt libs/README_lib )
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+JAVA_GENTOO_CLASSPATH_EXTRA="libs/ui.jar"
+JAVA_SRC_DIR=( "src" "src-jdk8" )
+JAVA_RESOURCE_DIRS=( "src" "properties" )
+
+JAVA_TEST_SRC_DIR="test"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+JAVA_TEST_EXCLUDES=(
+	"com.jidesoft.swing.CornerScrollerVisualTest" # No runnable methods
+	"com.jidesoft.swing.TestResizableWindow" # No runnable methods
+	"com.jidesoft.utils.TestCacheArray" # No runnable methods
+	# junit.framework.AssertionFailedError: expected:<0> but was:<100>
+	# probably the test is wrong as a cache entry is created for each font size
+	# and each iteration creates a new font size
+	"com.jidesoft.utils.TestFontUtils"
+)
+
+src_prepare() {
+	default
+	rm libs/junit-4.10.jar || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@ -59,6 +59,6 @@ EBUILD openjdk-11.0.13_p8.ebuild 7885 BLAKE2B 366fd32dc6a43829566d7571f69c856aed
 EBUILD openjdk-17.0.1_p12.ebuild 7801 BLAKE2B de1e5e767add36f98d18180bb57e2f65e73d2119e68f025cd315264bc486979ccd5e26b1c748c2c7b246b39ed67f9749bd0f484408549064c267c00356b06462 SHA512 3b0301ce9ec2ca457e687661b6f1444db69cffde4b5ba3c1984cf38f9c2d20fcf41b197a8dda4427c8fa8a4c1018eb233bce06c5205f9bbed03e026bf5ff6c1c
 EBUILD openjdk-17_p35.ebuild 7801 BLAKE2B de1e5e767add36f98d18180bb57e2f65e73d2119e68f025cd315264bc486979ccd5e26b1c748c2c7b246b39ed67f9749bd0f484408549064c267c00356b06462 SHA512 3b0301ce9ec2ca457e687661b6f1444db69cffde4b5ba3c1984cf38f9c2d20fcf41b197a8dda4427c8fa8a4c1018eb233bce06c5205f9bbed03e026bf5ff6c1c
 EBUILD openjdk-8.292_p10.ebuild 7401 BLAKE2B fdaac61668973e591bc885b6a2033da7ac3ffa3263558a507f800df7a013d873eadec2259b324c1f56823e7c36629f7af7e470552c58e29a53096de212309a6a SHA512 0972113635d2c22aa7cad3b847368d0ce89f85ede1441488d8f13df19fbfbb051513188513960299b0ef1d57c8e5c4b2a898ee01c171cc6ebecc0d8ed954ca39
-EBUILD openjdk-8.302_p08.ebuild 7401 BLAKE2B 7371dfcbf9878786dfc77da2a5eedfe192b8f1888c51c591af4f6c9742ce8bb2d94b818fc504ac18f775e138aa36dd9605232d084b00fd2854ed6e66ef2fa095 SHA512 55ce5cff152528e51b39ffec7bac69857d0f32f34b26689d20076a19825d3ae98ec9bab7e1b0037c6b133bbb31f315d6c7720bd42dfc8a41491ab5d71fd093a1
+EBUILD openjdk-8.302_p08.ebuild 7400 BLAKE2B ad43ad78fb789a080b35a78d932ede47359f2c810122982d23c6974f1d491ecf229a04b454518e8356a5d606c7c59e4d8ea35535d00399985570bdbb526f07a0 SHA512 d520d183f5341f78c0332bf18a9acc8f70bb27cdaee8344c9b18313c0c990d94f06b252c5f11be5666d561bfa452d74ca100dc647eafa967ae280b49ee26267b
 EBUILD openjdk-8.312_p07.ebuild 7404 BLAKE2B 3575a44599c210502598bd53e994f0eb4133695a4bcdb6941cffa8b988271b2b71d417f416d5d60d13dcb1aa3d338761cd0b934e32ee225af3938a56ead8f2b2 SHA512 9734ee5f30578fe5a46172a29ccf3970fcbd32f4cbef849206ce178296e7410744cac85a0587b11e028f11a53e09ab7c4d71b05e30ac14fa713947415a0bd471
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
--- a/dev-java/openjdk/openjdk-8.302_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@ -43,7 +43,7 @@ SRC_URI="

 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"

 COMMON_DEPEND="
--- a/dev-java/picocli/Manifest
+++ b/dev-java/picocli/Manifest
@ -1,3 +1,5 @@
 DIST picocli-4.6.1-sources.tar.gz 13467061 BLAKE2B fd7dc19d572e975a4b47ac0bd9a7ab4be0f5fdf1e3e03c2d3b5026ee9ad6cbcf5e6214234746551d61c427915095e067f44c1d3dfb27071456e76db26d567b23 SHA512 e2c6c6171c3ec9cbe35e7034e119dfe922993c9e7b8d81ea94faeb8b24c9c4c26023be1edb5d67041119c4bf73077d522fbe711e8c1af788063663e2bb06ab1f
+DIST picocli-4.6.2-sources.tar.gz 13488726 BLAKE2B dbec032bd0f40a45172e7c72884c32c9f769a9df0bdacc1904f3d45f4b02d1a3cc7c541a2ae4ca8a6754d67b5351412e4d91f2dc6fbbb3fc37bc4e2776ccdd68 SHA512 83ae37666a3c703b186cdb920095ad46de46de9a092841c352ec7db33877fa102afbd24227a1f73cad8be8a75b800f5c1487a8720d7080bdc8aa20dd8acafbe4
 EBUILD picocli-4.6.1.ebuild 1247 BLAKE2B 56c3c7700421d893aa08bc19f31a868ecbc6d8347883c9f88b5e01435e9aab49bce8725bffc8ebae621cbbaaa477a3490424fbe38cffb728e15cdde4cd40c938 SHA512 d4822745a22635ca00fb9870ebd8ac4ed7996650138d9107722ff38a5a2a800338fd70dce131569b2a268ac0dfb5e4789340f39cfa2b742bb0d7ef518c4d03d3
+EBUILD picocli-4.6.2.ebuild 1211 BLAKE2B ef88ce4a8f08d847b87a183f1fc7ff611079dba66fa405c0c021ae3da632ac442c1e84886d0d4f242780bea0272f3c934454944d4a51067dde4e8b5d41e20f0a SHA512 2ababe0418c0992436daea6d0a3dda255d1144dbddec1e469d2ebf814bc86171305855e1ec24f16ab67f51e2b655157ac41693c01c5083f2242d1b8b847f171a
 MISC metadata.xml 701 BLAKE2B 67e85243551f69c831b4a91807a5dc0661da92e2e7c21fcb8fc9936dd047defa9382d659b7910d5929e193a0a97397c1bf7f8a4d20c86ce46185f5fec4ec15c7 SHA512 6c6056c3e204886ccdc9c6ca28911cf6a5e3cf64e1830fc5c3acca736d28f4c050dba5d1a4ae4bab6c3ae48ae3e34d6b3187d695b2275d20bfb2722bfea753a6
--- a/dev-java/picocli/picocli-4.6.2.ebuild
+++ b/dev-java/picocli/picocli-4.6.2.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/remkop/picocli/archive/refs/tags/v4.6.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild picocli-4.6.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="info.picocli:picocli:4.6.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java command line parser with both an annotations API and a programmatic API"
+HOMEPAGE="http://picocli.info"
+SRC_URI="https://github.com/remkop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# package org.junit.contrib.java.lang.system does not exist
+# the project is here: https://github.com/stefanbirkner/system-rules
+RESTRICT="test"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( LICENSE README.md RELEASE-NOTES.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@ -11,21 +11,14 @@ AUX gnat-gpl-2018-libsanitizer-p2.patch 2162 BLAKE2B 31fd332aaf66bd6b1a967579274
 AUX gnat-gpl-2019-gentoo.patch 1408 BLAKE2B 5234c542cc33af3c1bcb256fbe266613ec2e9f0b21d143029bf527ee03b4b363b2de7467eb79fadf4c8e8d3f39e589cfa3c0fadee1723e87938c74b8547d5ecf SHA512 2b9f0081d7aae5c71f73ebf43683fde033966288a937769e9b49e21805f31b5f0b4190e31431def58fcc93cd09f9b0e061096cffe61616073612f53d7e3e724b
 AUX gnat-gpl-2020-gentoo.patch 1629 BLAKE2B 76d67a7c39c1f578c25f2a15ed05145f7997f2232d79dc767f1a2c7b4f00a11d23ed86383756fabde39f13c570d46a1804344ed1a3ad2e9df256e70132f3a7d3 SHA512 98be1f33755cd26896f7398305b0e2decb3830a0abe84de89307620288e81b1ba7db9eb8e2aa59bf80e7191e1b65b7d1c41f57fead78c951891e1bb45ded28b2
 AUX gnat-gpl-2021-gentoo.patch 1631 BLAKE2B 445343bcc5e12ada65090ba9f9a77bcf63f09f2a01eaad8732c645f3910e64068402ff01c16e6b17e6b78f2c764a1a03ec58c3cf3029b49a93c8f8ae6ba516d1 SHA512 04ae6351815c23f71e8164c5eb5cc9577303ae17331eda6282fd56d88ad2c824f7b3fae84050e1a87b2d3f081ea0dceb4128dd5d3a2fb464c363d1f2e3c08cc6
-DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550 SHA512 2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6
 DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
-DIST gcc-6-gpl-2017-src.tar.gz 88045488 BLAKE2B 5df712eadef723df9057653e49d215cef6b59032e4b4a62c8622a7b735c660f42ec4135dba628a2080a7540d407186a4e4b1eb373e937374bc4e407dc9afe97d SHA512 bf8f786b5ad28a6b7d184fb5263424b7ed62154e308e259b61c24a577efdae56939fbaabc1fc53a0f467702c1e6d8598dc6e489ce074724799130a793cfb146e
-DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
-DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
-DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc SHA512 50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc
 DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5
 DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B 843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8 SHA512 2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631
 DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
 DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386 SHA512 0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d
-DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
-DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5 SHA512 9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381
 DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61 SHA512 c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38
 DIST gcc-interface-9-2020-20200429-19B10-src.tar.gz 351113 BLAKE2B a786532194a5ac57dd91b5c207aaf4543e99a3305dccf175908bee80cc96d112b9c5531497516ad1edc33e9bcff62374dd473aed93bfb1d0aea13e017473d98e SHA512 445744a745eee5e3a686ec59f7880a3792d4fd30425a38090e40e5cc85379e6f877745d7ea61ffabb42ed177ee90f01e2309dfdd5f060027cfc86ac77fddebba
 DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
@ -33,12 +26,8 @@ DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d8329396
 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
-DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
-DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-EBUILD gnat-gpl-2017-r1.ebuild 3871 BLAKE2B c4ccc2e03f13202ca0fe7c6bdecab7e17bdd28a866b088bc51b7915620cadbed1d35ff8dd3e134cee94b4bd960f02cb86d3154599c4779ed6daba5c7574f78d4 SHA512 7d8a81004f4332d4fed01a79edce3503cb1055797341f956f585935dedf54543eb4eecd72793c902a273c1b11ff9dea8cdab6e44ad074bab84dbe907f041c2d9
-EBUILD gnat-gpl-2018-r3.ebuild 3833 BLAKE2B 81698959e5e8cca3e58981132d0bee06473d935310abfebd808128eaeadc032b6b88bb13b529f653e92cf1e7009aaa3936f47c2aef4048071971f04a4921311d SHA512 1933f29978b0a9000ae9b5bb6cf38d186f912fce8d5e89a97a4c6386680ca02fdcaad71e18f36599f3d0974613c2de229776dbd2398bc2875e3c15885e8b7c18
 EBUILD gnat-gpl-2019-r2.ebuild 3578 BLAKE2B a2bb2a094b2c47620ca08156962425ec8210a27ad2ef712ab99f6e759a4a4f41a8b59c09230de8d12abebcce8b271c992c3a83a129b5ef93f1e8f71462f6c217 SHA512 7fccd20ad3b6cee151b8f7a4ea3b1d6b2d882aaac3a0903502f14df7d292ebf984fe72ebeffb8fda8f36288380669da5d4da6fceec795090a36eb01b9de2b833
 EBUILD gnat-gpl-2020.ebuild 3698 BLAKE2B 730861399d70fea2a78ef911cdcc366ac75b9e406190d549f9ea4df3e483f1abbec099d2a29a64dd91428a5ee68b55395dc087877500ddc8b96417332ff2a364 SHA512 bc0b8bc473a40122a18f756c81597dbecd503e45d21b03e91dfd7b4679d3006a268d452031ffa8c63ebe189de5700a237b5c609f321f436dac019b192569c376
-EBUILD gnat-gpl-2021-r1.ebuild 3584 BLAKE2B 81add2321a9a46ad35fc6c74bf6e7fcfdb5e3fcaafded5156ff78213e6d7092ca0f9c4396124ab901d3182c62a637d96ffb37c1336502056dd4629335803bf74 SHA512 6da07e79c6e56aee33ae1ed5530a3742b3528ebbe83d3aa180846666bdf0051c89ae6f64b703b06364cf29979a9865e2779f4ce665d7a41dbd8562743615e712
+EBUILD gnat-gpl-2021-r1.ebuild 3583 BLAKE2B 912dbfb726860fdad94320bcdc6e6fc00fde4ce53a707ca12710667373963fbfd52e11fd05c92e2bef52a1fe40edc8db7819f84ca97c70205acff8daa2eb499c SHA512 3dfa1c7cd341d4eba75a50f09bec369a33c332488b0e5a31a3206d7791537f421cbb360923411bd33753c74c85e22d1c18839cd32317f56f799e92ccb4df6177
 EBUILD gnat-gpl-2021.ebuild 3583 BLAKE2B 6904f410201e36e970f39c86ea866c2552b662d46268d7c64cba5be2c19fad4f0345629144692292d39d5c1a25a319efe35cac71610185e0e7ec66a70a8bad02 SHA512 b3acd9a07743eb4486a0f5db34b31713cddadcf2735c675b7f9e1d525da0b6b4f86457d953c3595b1d25974e53b4fa5f516974929191a8bada096cb8544dd540
-MISC metadata.xml 2216 BLAKE2B 42f2c51317e8f5eae541611ff215863abddaf33a00c3964be97a9257ccaa5875fe3693ff616002a423e1e35175c34a0bcf2de443e28ab2e132d17571b03ebd57 SHA512 c908e7a9faeba02dabdcfbf66bdad189a64c954e10d68dabff67c55134405e2e5d6e98a9f62df9e87bfb88aca38ae9707ef7222fbc94e6d143418a093fd5b656
+MISC metadata.xml 1914 BLAKE2B af19471300e8ed287eb5032f70f53144bcaa001bda0ffe711f7f22d326b69727ada802988530438074806c9e5db78b71e54fa57d510210d15c4f38d25fed4062 SHA512 4cb80fa6e5a2261a67b5f0bce5526cebb3db5e3a02af437bb5f595ec2f8506b6e741291e1cafa7a6ce8f8c5b31bf32761d588a34f9a3c5a788bfe68fcb87576f
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_GCC_VER=6.3.0
-PATCH_VER="1.0"
-
-TOOLCHAIN_GCC_PV=6.3.0 # upstream is 6.3.1 but ada.eclass already assumes 6.3.0
-
-REL=6
-MYP=gcc-${REL}-gpl-${PV}-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-# we provide own tarball below
-GCC_TARBALL_SRC_URI="
-	http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3
-		-> ${P}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae
-		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
-	bootstrap? (
-		amd64? (
-			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			${BTSTRP_AMD64}.tar.gz
-		)
-		x86? (
-			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
-			${BTSTRP_X86}.tar.gz
-		)
-	)"
-
-inherit toolchain-funcs toolchain
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-
-LICENSE+=" GPL-2 GPL-3"
-SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="amd64 x86"
-IUSE="+ada +bootstrap"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=sys-devel/binutils-2.20"
-
-S="${WORKDIR}"/${MYP}
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
-}
-
-src_prepare() {
-	if use amd64; then
-		BTSTRP=${BTSTRP_AMD64}
-	else
-		BTSTRP=${BTSTRP_X86}
-	fi
-
-	if use bootstrap; then
-		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
-	else
-		GCC=${ADA:-$(tc-getCC)}
-	fi
-
-	gnatbase=$(basename ${GCC})
-	gnatpath=$(dirname ${GCC})
-
-	GNATMAKE=${gnatbase/gcc/gnatmake}
-	if [[ ${gnatpath} != "." ]] ; then
-		GNATMAKE="${gnatpath}/${GNATMAKE}"
-	fi
-
-	if use bootstrap; then
-		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
-	fi
-
-	CC=${GCC}
-	CXX="${gnatbase/gcc/g++}"
-	GNATBIND="${gnatbase/gcc/gnatbind}"
-	GNATLINK="${gnatbase/gcc/gnatlink}"
-	GNATLS="${gnatbase/gcc/gnatls}"
-	if [[ ${gnatpath} != "." ]] ; then
-		CXX="${gnatpath}/${CXX}"
-		GNATBIND="${gnatpath}/${GNATBIND}"
-		GNATLINK="${gnatpath}/${GNATLINK}"
-		GNATLS="${gnatpath}/${GNATLS}"
-	fi
-	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
-
-	# upstream is 6.3.1 but ada.eclass already assumes 6.3.0
-	echo ${TOOLCHAIN_GCC_PV} > gcc/BASE-VER
-
-	cd ..
-	mv ${P}-src/src/ada ${MYP}/gcc/ || die
-	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	cd -
-	sed -i \
-		-e 's:$(P) ::g' \
-		gcc/ada/gcc-interface/Makefile.in \
-		|| die "sed failed"
-	# fix missing ustat.h
-	eapply "${FILESDIR}/${P}-ustat.patch"
-
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/${P}-libgomp-Werror.patch
-	eapply "${FILESDIR}"/${P}-libatomic-Werror.patch
-	eapply "${FILESDIR}"/${P}-libitm-Werror.patch
-}
-
-src_configure() {
-	export PATH=${PWD}/bin:${PATH}
-	downgrade_arch_flags "$(gcc-version)"
-	toolchain_src_configure
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
-	einfo "Even if the c/c++ compilers are using almost the same patched"
-	einfo "source as the sys-devel/gcc package its use is not extensively"
-	einfo "tested, and not supported for updating your system, except for ada"
-	einfo "related packages"
-}
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_GCC_VER=7.3.0
-PATCH_VER="1.8"
-
-TOOLCHAIN_GCC_PV=7.3.1
-
-REL=7
-MYP=gcc-${REL}-gpl-${PV}-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-# we provide own tarball below
-GCC_TARBALL_SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
-		-> ${P}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6
-		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
-	bootstrap? (
-		amd64? (
-			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			${BTSTRP_AMD64}.tar.gz
-		)
-		x86? (
-			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
-			${BTSTRP_X86}.tar.gz
-		)
-	)"
-
-inherit toolchain-funcs toolchain
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-
-LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="amd64 x86"
-IUSE="+ada +bootstrap"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=sys-devel/binutils-2.20"
-
-S="${WORKDIR}"/${MYP}
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
-}
-
-src_prepare() {
-	if use amd64; then
-		BTSTRP=${BTSTRP_AMD64}
-	else
-		BTSTRP=${BTSTRP_X86}
-	fi
-
-	if use bootstrap; then
-		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
-	else
-		GCC=${ADA:-$(tc-getCC)}
-	fi
-
-	gnatbase=$(basename ${GCC})
-	gnatpath=$(dirname ${GCC})
-
-	GNATMAKE=${gnatbase/gcc/gnatmake}
-	if [[ ${gnatpath} != "." ]] ; then
-		GNATMAKE="${gnatpath}/${GNATMAKE}"
-	fi
-	if use bootstrap; then
-		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
-	fi
-
-	CC=${GCC}
-	CXX="${gnatbase/gcc/g++}"
-	GNATBIND="${gnatbase/gcc/gnatbind}"
-	GNATLINK="${gnatbase/gcc/gnatlink}"
-	GNATLS="${gnatbase/gcc/gnatls}"
-	if [[ ${gnatpath} != "." ]] ; then
-		CXX="${gnatpath}/${CXX}"
-		GNATBIND="${gnatpath}/${GNATBIND}"
-		GNATLINK="${gnatpath}/${GNATLINK}"
-		GNATLS="${gnatpath}/${GNATLS}"
-	fi
-	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
-
-	cd ..
-	sed -i \
-		-e 's:$(P) ::g' \
-		gcc-interface-${REL}-gpl-${PV}-src/Makefile.in \
-		|| die "sed failed"
-	mv ${P}-src/src/ada ${MYP}/gcc/ || die
-	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	cd -
-
-	EPATCH_EXCLUDE+=" 91_all_bmi-i386-PR-target-81763.patch"
-	EPATCH_EXCLUDE+=" 93_all_copy-constructible-fix.patch"
-	EPATCH_EXCLUDE+=" 95_all_libsanitizer-avoidustat.h-glibc-2.28-part-1.patch"
-	EPATCH_EXCLUDE+=" 98_all_msp430-partial-int.patch"
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/${P}-libsanitizer-p1.patch
-	eapply "${FILESDIR}"/${P}-libsanitizer-p2.patch
-}
-
-src_configure() {
-	export PATH=${PWD}/bin:${PATH}
-	downgrade_arch_flags "$(gcc-version)"
-	toolchain_src_configure
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
-	einfo "Even if the c/c++ compilers are using almost the same patched"
-	einfo "source as the sys-devel/gcc package its use is not extensively"
-	einfo "tested, and not supported for updating your system, except for ada"
-	einfo "related packages"
-}
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild
@ -41,7 +41,7 @@ DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"

 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+ada +bootstrap"
 RESTRICT="test"

--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@ -6,15 +6,11 @@
 	</maintainer>
 	<use>
 		<flag name="ada">Build the ADA language (GNAT) frontend</flag>
-		<flag name="awt">Useful only when building GCJ, this enables Abstract
-			Window Toolkit (AWT) peer support on top of GTK+</flag>
 		<flag name="bootstrap">Used to bootstrap gnat-gpl</flag>
-		<flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag>
 		<flag name="d">Enable support for the D programming language</flag>
 		<flag name="fixed-point">Enable fixed-point arithmetic support for MIPS
 			targets in gcc (Warning: significantly increases compile time!)
 		</flag>
-		<flag name="gcj">Build the GCJ Java language frontend.</flag>
 		<flag name="go">Build the GCC Go language frontend.</flag>
 		<flag name="graphite">Add support for the framework for loop
 			optimizations based on a polyhedral intermediate representation</flag>
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -9,8 +9,8 @@ DIST php-7.3.32.tar.xz 12142436 BLAKE2B 375092f7fade8b93d2fbf409552cda42a6852672
 DIST php-7.4.25.tar.xz 10376304 BLAKE2B 75682840a9e978d2ce350892bb8d743238f1ca86d4e1bb549637ad259541264c911128d3fbb2a89768acaa366eac91e66b26f8411f6b9f6d55475b139f5ae95a SHA512 7fcb236f6d2a92514059b2e107c2b592e6139e3c65046566ae98fb9d2c09eb3e9ca1a41ea6535fc814bc7127d8fd9f8bb5a80bd86eec32120eb150a34b9b5c34
 DIST php-8.0.12.tar.xz 10713980 BLAKE2B ce8ca0d671e8613a81744a55cf94ff43254482a08dec365c05eb4ca22c1b31732e5ef93a51d383d2e8daf0cf332ed7946e79ba3b385386ca0773fc673fe58307 SHA512 927b15c4443f3741a5325ec7bf387987b405cd5e64e40fd81f1945bf073adda30eeede8e1f98185f505cb61f969cf1abe05b8dad57a3c4e87971e8037bb16b23
 DIST php-8.1.0RC5.tar.xz 11717432 BLAKE2B a1f468a17267684030c5350452d20a352c05c1c18b66e305ea86e8fd76210d8795623f8feb82196170037cacc9a36802ae63dc6922e2f1b118681525412177e8 SHA512 ee8c29b0bbe688346837e7f3227f07b354f20b8e783fbeb79d692528089b8e23ad1980659c6ea470d98b07da1735b81ebb52eb378b3161b4cde5e22678bbb0b7
-EBUILD php-7.3.32.ebuild 22595 BLAKE2B 29ee950a8d23fba9c1cbaabaec318b5bc13fa06a6afc5977b8e658dc4719d09293c0453010b81e85b48ee24fe51b34db9d1839c831108488b5306a253e89e2a8 SHA512 c8daed05f8b44058e12c2509af0f800e5acbcb33219dd72fe317e5e3df2483473d2fe95632674efd52b4df148e36b851e298d3b4e445f853e45acfee40a190f1
-EBUILD php-7.4.25.ebuild 21313 BLAKE2B 8a2498a81321de18140ec31f9cf582b8f74305fc5442748ce44baf918fb76160ce0380ced4df64bb4785bbbf4ae4baeecb02717884b57fbf854c43db40c26cc4 SHA512 0c129885dc8934285e2f0b7b2417aedbf0236f94b8ec69a12cccbcd6fd06b45db4a62dc3b5dc10232f7624d80e46f4f6d1029af4180430237c7ab92e6437d59f
-EBUILD php-8.0.12.ebuild 21331 BLAKE2B b674ec605652faabdadf5eaac5e29c62e2c661834cf72478c78057566ea56181484484665fd31d920d6d1e099e4523b85f9a5cad561f2d540f49cf9486d45e4e SHA512 5ec3412218b5ba79bd6a60c135b49dfa6b4a65f2637a0683c1567c855c017f666e8f5c965c4118985c5fe75736be8bcd54dacfaa235fc4b416de95a86cb031c3
-EBUILD php-8.1.0_rc5.ebuild 21368 BLAKE2B 339b11ae2ce6951abcafb348b40a73f08b76af209683957c4f2f69440df58028824de55a7407f676476c60c554f037172bb3a72eab7c5c972654ba46836acd16 SHA512 2e9ae9f4b35ca03f67b67b98fffe153e1392f18f7e063bb9f0bd9842f1ec4a115c3ed91763a32c756a4d374a3bc6f32dae88455be2860ee46333ae2322f69ee0
+EBUILD php-7.3.32.ebuild 22568 BLAKE2B 86c3929c8261163a00873817e865544e6e073a990700c7f7e1a6a8e549fcd5f1b829ff857284a58eb9e75b0ecb0bfbbb937b250553e039e5614fed189c595d8e SHA512 44d786aa0fee6e07fcf59e3974fe94fb6d090d30cffb50c5384f7e60d6700e1b09f567b4c4085e8afd9f805976bc8ef9a5ab7f35c7f3254e8b975174d745ee65
+EBUILD php-7.4.25.ebuild 21286 BLAKE2B cf7e22f6f715d244c5b4732ac38fc0fe56fc20645ea7233862fbf09d8819df121433cdafaeb277b88a10d53fd4e7a39b116a14f44608e58b830301de22f888b6 SHA512 61e883895318f0c88754a5d5f2f07eea3d3d9b4456ff5abc966dd0d18753590ad96f1eb71fc3196064e2ac445e352ef63bbdff80e883712abf60b0f1191140e6
+EBUILD php-8.0.12.ebuild 21304 BLAKE2B f2dcaef8c06bcfec21a1fcfde511a2c61d697bed002e1666c961de1aefe78a71c7718dd825d3ee763a70721665110159b5e9821ce564760122f12a3c8e880c7d SHA512 46558ffb0b96583e603fa5bee4777abf55363040e6c2b9184cdac1b3d4637f68a02c18c04ec2a6c40fc805f2b60106ee570538ee23faf449f29c88f29136f808
+EBUILD php-8.1.0_rc5.ebuild 21341 BLAKE2B a48c321093f98142605b43924df3917e93ef0750043f4e0df069fc165623cf0497cc57b944126500996d769c4ecc379bad0d0d3f2095c0bb1d6f64a39104bea6 SHA512 0e18a8a82fbf2e8c744555c92426db55e237c2b2780f5fefa0bd7f682ab0ca90aefd771ab97125439f140e900d79fdd92e4a4e1380d34ffb240033f73a00f82a
 MISC metadata.xml 3378 BLAKE2B 4ea64ce2404205f33be7d0be217ad8eeef2b82bc50700664dd89db5bd6c3aabfe2b0ab72497493bdb1214d3c30d9fdabe0e8790938aa68fd3cff8bb25249057b SHA512 21fc30b50fe9d5fdbd63c19e1bc7856bc2e7d96ff8fbd05aff4fc07bddae68cbe8dffecb1854de233031257dcd40da265463887259f95ed886dac8bc2b6cc535
--- a/dev-lang/php/php-7.3.32.ebuild
+++ b/dev-lang/php/php-7.3.32.ebuild
@ -87,7 +87,7 @@ COMMON_DEPEND="
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tidy? ( app-text/htmltidy )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	truetype? ( =media-libs/freetype-2* )
 	unicode? ( dev-libs/oniguruma:= )
--- a/dev-lang/php/php-7.4.25.ebuild
+++ b/dev-lang/php/php-7.4.25.ebuild
@ -115,7 +115,7 @@ COMMON_DEPEND="
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tidy? ( app-text/htmltidy )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	truetype? ( =media-libs/freetype-2* )
 	unicode? ( dev-libs/oniguruma:= )
--- a/dev-lang/php/php-8.0.12.ebuild
+++ b/dev-lang/php/php-8.0.12.ebuild
@ -114,7 +114,7 @@ COMMON_DEPEND="
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? ( >=dev-libs/openssl-1.0.1:0= )
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tidy? ( app-text/htmltidy )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	truetype? ( =media-libs/freetype-2* )
 	unicode? ( dev-libs/oniguruma:= )
--- a/dev-lang/php/php-8.1.0_rc5.ebuild
+++ b/dev-lang/php/php-8.1.0_rc5.ebuild
@ -115,7 +115,7 @@ COMMON_DEPEND="
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tidy? ( app-text/htmltidy )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	truetype? ( =media-libs/freetype-2* )
 	unicode? ( dev-libs/oniguruma:= )
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/cJSON/Manifest
+++ b/dev-libs/cJSON/Manifest
@ -1,5 +1,5 @@
 DIST cJSON-1.7.14.tar.gz 352028 BLAKE2B 203795f004496793fb04577df1e4a917df2424bf7866e32459584d3dc776ee13263c5e62ded01e3776973d2210e642d1066d3126e2c737bd0fa048464f3aed84 SHA512 8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01
 DIST cJSON-1.7.15.tar.gz 352278 BLAKE2B e0de3b8d56020853d56f5512e6e7216adafd238b6f69bbf6965b153bfe8ebfc23593dfa7cfb8543d8730d90820153d263c8af276c8e9588ba8a5ad76a50f8b72 SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124
 EBUILD cJSON-1.7.14.ebuild 589 BLAKE2B a08975e4959f167a9739b7b3a5f269ffc98e517af3f13cd21ee4527e85ae9cbf3262be0a8473428134c549fe3f6cfb581d8758898452de0091302932918bbefc SHA512 09eefdac63278701a652aabe6bfb5d8e08fcf8c4738ebc0dc65668e4835d5f268d786b58840b1a231028bae0f105bc49b0783da43acea396229f4783ea78af9f
-EBUILD cJSON-1.7.15.ebuild 590 BLAKE2B 2f10c73ad0ae5d9fd3bcc9da2de7e23210da6bad0d77adddfdbe6130e249ce1dfd9136ab07140d04f0835d36e729062c191fd8d2feddd5dfc01f14c189dacb47 SHA512 361e5be24503bafe6e0fdb92cf7fe42459b663aaf96f8d87088c849d9a3c8ce7acd69b0e58999129cdcc9b1596219b0a01c2e09e38be86146fcb8c13e5745773
+EBUILD cJSON-1.7.15.ebuild 589 BLAKE2B a08975e4959f167a9739b7b3a5f269ffc98e517af3f13cd21ee4527e85ae9cbf3262be0a8473428134c549fe3f6cfb581d8758898452de0091302932918bbefc SHA512 09eefdac63278701a652aabe6bfb5d8e08fcf8c4738ebc0dc65668e4835d5f268d786b58840b1a231028bae0f105bc49b0783da43acea396229f4783ea78af9f
 MISC metadata.xml 338 BLAKE2B b738aeafd4cdea33ca773f44c7c5d6e8f9734fdead87884b92f9fc25235b553294453d514751a624210495eab0d472430cca625603cbdbb92bacc39da5579a3d SHA512 61ec24b8fb154b574b2619ac2fc8235c1d783653d6c0880982ac98271d6594a16dce3d1c8fd72c8f37d3a8f6dded21e8ae47c9556a9f1bcece54c58741961ebc
--- a/dev-libs/cJSON/cJSON-1.7.15.ebuild
+++ b/dev-libs/cJSON/cJSON-1.7.15.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

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

--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@ -1,4 +1,6 @@
 AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
+DIST hidapi-0.11.0.tgz 232631 BLAKE2B 770c0663b007aa36580af217d0d38be72923e0ad84cee137594ca3e174e589cebb9188003a50999e1c561b0e4e9ca68bd1af29029b89fde2b0a46020b12f9744 SHA512 0de4abc963600d159ce231416c468b9e81a8361e4d2c2202988d6eb2e58a923700e9b9be639fbddc6bc14625131848409e2e88dbc4b34a1f8a726c8fa4692d92
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
+EBUILD hidapi-0.11.0.ebuild 1418 BLAKE2B 37ed27c4ddf04fe81e7e8eacbf82844560ea5304c1bfbb8880cf0047e36f3d8b4300ae0706b177602dfd098b5cc792d207562ba57ed412b3db2ae45ba8bc942d SHA512 b2a40de6a0434f3e7721d3624ca2df662b657d123691713f089e662689c45fa5d119e31aab52c5606bc14a411692f3c2ca5b2cded6fb446f2a6caaea555af37b
 EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1851 BLAKE2B cdaa39c57a17a17720ba075f722339df5b6bdc84fca16e1d8e2eba26c3fdcdb749f40fb773961c40eebf13ad92f50d57fb1d0f01fe1c15c1e6f5b696bdecab09 SHA512 fb003b0a9dd3f64b2e4615bb27af95fa705e48dd62fea56a5b811e5467fd87b37cbfcc8d8be361555825bdc61c68d884bb45a3efe677db5f9dbae01a08d1f7b4
 MISC metadata.xml 571 BLAKE2B 713eb7b09515bf42caa61286df10e947377a5d1c11deb35144caf0c1138da6e740d876070c4e37e8f47d05b46ba4ca5ef8d5873ab884533c8544fd1c86c2ae99 SHA512 46734233740eb28856db7c56381fd0a4cb84c6dd84ee489c00e537a5435eff4c6880b095a7341f73f606929818a88d74e197337bb441378d2705690eac0a10f6
--- a/dev-libs/hidapi/hidapi-0.11.0.ebuild
+++ b/dev-libs/hidapi/hidapi-0.11.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
+HOMEPAGE="https://github.com/libusb/hidapi"
+SRC_URI="https://github.com/libusb/hidapi/archive/${P}.tar.gz -> ${P}.tgz"
+
+LICENSE="|| ( BSD GPL-3 HIDAPI )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc fox"
+
+RDEPEND="
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+	virtual/libudev:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	fox? ( x11-libs/fox )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+
+	if ! use fox; then
+		sed -i -e 's:PKG_CHECK_MODULES(\[fox\], .*):AC_SUBST(fox_CFLAGS,[ ])AC_SUBST(fox_LIBS,[ ]):' configure.ac || die
+	fi
+
+	# Portage handles license texts itself, no need to install them
+	sed -i -e 's/LICENSE.*/ # blank/' Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable fox testgui)
+}
+
+multilib_src_compile() {
+	default
+	if use doc && multilib_is_native_abi; then
+		doxygen "${S}/doxygen/Doxyfile" || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	find "${D}" -name '*.la' -delete || die
+
+	if use doc && multilib_is_native_abi; then
+		local HTML_DOCS=( html/. )
+	fi
+	einstalldocs
+}
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@ -2,5 +2,5 @@ AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
 EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69
-EBUILD jansson-2.14.ebuild 878 BLAKE2B bcf501239b88fe0e185d155a7bd053599a5ee682e94f461a865bd6a28b31df845d9f0512e8ebef8c0fa8cd4cc42f08f14c30a50c583661f9621e77e72e35bd19 SHA512 859fbbe220b20b915ad63a3cd859207c49a6bbd5258a1a111e7059fcbb1a4fc096d9bd9f3eb5ba8497b4fe5eeadc40dcc2ace065c28239695e77eb92d36a3f03
+EBUILD jansson-2.14.ebuild 877 BLAKE2B f077530c8016d4db9ef2179a5e4a8227082a8c37ef5f8ec94b4d73d29b2d28943a8be94495428e97b567b9d6ba91cb4b3c9a088ec46fb7c0299d24e778087f72 SHA512 73bab14e8a19a5d1e0318155b01d3fc26308d4cdb98ed038e63327aa948b85fef51c4d6e802df09d20cf7113f46e6d2f5dca7171a95657317a03f4663703f2c9
 MISC metadata.xml 395 BLAKE2B 414a914de07c51b1fae68121cbeeff2b4975fa351e068d250c7d88f6ac8832a2c954f311f547494e10a78dbc5b9b7ccd1fdbb46335f28bac7b23cb5aa13050ba SHA512 067ae2c24fdd77747a78590731e1946bc0a2150038e9722d60ef97c428538046f20843bea2bd970d9591c7f7dbbef2fd81b605fcc2d67daaa55551cfd3d7dd24
--- a/dev-libs/jansson/jansson-2.14.ebuild
+++ b/dev-libs/jansson/jansson-2.14.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz

 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc static-libs"

 BDEPEND="doc? ( dev-python/sphinx )"
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@ -2,6 +2,6 @@ AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f
 DIST libbpf-0.4.0.tar.gz 1015782 BLAKE2B f3bb1a5b1808d30612d9d3852400b71cb5d2ba4c31a177dd72b1f6060bc1d97f8d4ea7bb071a1ae2c5e94e3a4745593a0cc6b8ab6e56288e6cfb046d6de43717 SHA512 5d247f724f0dd3b2dadcc1ac10026ac57d3029b9dd7eb2831e282c58a4143042ef024170781139d89d85c4e9a3849b9ec0d3604a00bb3433be7622682b6dabc1
 DIST libbpf-0.5.0.tar.gz 815083 BLAKE2B 9097d808f03cbbe61cd59b24347075e2937603f51350f83f8897123900c911392d7545af8135f39f749132c6518296f1a4d22d37c0c7b4371631f5c63a0dd9ac SHA512 3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85
 EBUILD libbpf-0.4.0.ebuild 1218 BLAKE2B 744c309ebd4de13663bd1cd6b8eb61a521e4eb27075e7a1811bb152408c1eff00a3b561b811b3d9fc98520712e5c08dcd115741bd9180264ca88f1776ca242c8 SHA512 6d0ca0f36f5cd2c311924dc56e3c2d16cca05e289080244ab301cd62f0e3165238914c00b60af9063e7d46d801668006cb91dc334c296207790d2197d0f7ea75
-EBUILD libbpf-0.5.0.ebuild 1075 BLAKE2B 6bd6c570767a3e147416eeeb553551d31dedf98eae2ad58e41646f355896ab6f5bc78809f903705fbbe65f8ff024f1e5f1d2f7a1a01652a77ee0fa2a8390d581 SHA512 b459d600983cd46d31b6b5db06bd30e9306d1142cf244084cf52cba07e65c3889221b63069bf3a5bd7887dc7dd17e8f402d14ff8779ee6e6cefb07180bbbb3e2
+EBUILD libbpf-0.5.0.ebuild 1072 BLAKE2B 5b45765b79404aa61883d6a0bff1eab6e149bb9b3fb63197e835d547db94ce352fe5628a299ced292bc2edb9357b3b9ac3f0f905095283a1fd34875eead573ed SHA512 6bc11300826f298451f73d801c30a496826878a064804982e82d5b5f1d9169dd3896caf16d7e6a4cd266c9567a310a765e7879f71651c398c891621516d217c6
 EBUILD libbpf-9999.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
--- a/dev-libs/libbpf/libbpf-0.5.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.5.0.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 S="${WORKDIR}/${P}/src"

--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@ -1,3 +1,5 @@
 DIST libtasn1-4.17.0.tar.gz 1906654 BLAKE2B a76798bdb8e68f2ca2337fa2648ff42adb7a9a51f27efefee5b9856e56ac09672237bd9a5b2afe808298e462eda31f2e8d3601c35ac00b84935f307ad981b2b1 SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d
+DIST libtasn1-4.18.0.tar.gz 1724441 BLAKE2B b5f93a7575dde46741b6fc97183105efbc934e44041735241ba40ecd578c94637741df193dfab0d97e0348e2dde34b8b89a33ed616afa0bf64db6dbddebf1786 SHA512 4f2f4afc7561fda7a1f1c6c525c3c3b08228a1a4aa8c3d3d5e02e993d8f83ccee1dd0f1b201cec0fbfc97043d4b1d7a95ffd34d65422a38b85b931ac7a015831
 EBUILD libtasn1-4.17.0.ebuild 1215 BLAKE2B 601fac3afabc551f721cb9e810868a25ae481a353afa824300bfd86616b0fecca923e5cdd652cedf31a61ec409409a90b36d129a135bea274c4d4f072f06620f SHA512 0ee69325271d2f133754034615e2c73a9d73dce9e9b8de4990509d5f0cd90283af187c56933d70ec5f0090ef4cf777bae56901870469aad4262d8bdc69c89fe3
+EBUILD libtasn1-4.18.0.ebuild 1223 BLAKE2B 4cf24abf2d407b9c8a3c8a7ab82fa62f80fd014e7b9ff22782f08c10bfd30419b95186f3cf5b704c8f0e691e93157d0a6917eb92f638d00a6503adefe6d32b4e SHA512 93136d7a2a9bd1588251fc15204f970f702b7ee02b227717f62ec8d45b2eab850879790e0ec1cd77d6027208aeb05605c0ec728da0ba4e72f491c766a80e0d79
 MISC metadata.xml 446 BLAKE2B 1d60c0db5d09d0b9c5f3bbead71748684f665e68e0b29b0e4023a80fbff349d4c4f5dac21e59fd222dc46e436a4336b5bbb410136dfc34d1fac44aa9a9bdb6da SHA512 1d486b356548451e21c494d267e433216e01d16673dbf1090beddb69cc6a6d13d279b11d9ec7884174a5c2109222b6dc5eebf86ee7899df4280274f7b98a0a60
--- a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="ASN.1 library"
+HOMEPAGE="https://www.gnu.org/software/libtasn1/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/6" # subslot = libtasn1 soname version
+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"
+IUSE="doc static-libs test valgrind"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-apps/help2man
+	virtual/yacc
+	test? ( valgrind? ( dev-util/valgrind ) )"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README.md
+	THANKS
+)
+
+pkg_setup() {
+	if use doc; then
+		DOCS+=( doc/libtasn1.pdf )
+		HTML_DOCS=( doc/reference/html/. )
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared library
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
--- a/Show more
+++ b/Show more