Sync with portage [Thu Mar 10 22:35:29 MSK 2022].

2 years ago · 6165471473
parent 8cddaea78b
commit 6165471473
342 changed files with 2965 additions and 17839 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29612 BLAKE2B d2acdb67fbbfdb1a268b92ad7cddbada316fa04b79101abd25f4e346cfe1624c05d8f3308e7f99acdb67891b9c658858f1444fef9eeacc69aaed27389ffa23c7 SHA512 b43da4db4f1e58d067609b78c456cfeb9b8dadbee636934ef7f8f59b65cda325a1faa011c062c6c5ec37a97c6abf877711a8159d5d3ddaccff5fb15f43a4d741
-TIMESTAMP 2022-03-10T05:39:34Z
+MANIFEST Manifest.files.gz 29619 BLAKE2B 7a32e1c34e3b5545259c0d799924c2126126f2f9e5423a2d927c5cfd4476efa6b6a0f0368dd596330c8ad0c1f350186539e36f84599f0e7fe456888b3908fd61 SHA512 e6b8de11823d5e6578c3bf9d5be31900591971127a89309cc516b7496a2a29794511afea2298f9651b028b338fb39ba5e80cc98c50f7e9ce4d278ffb9d6724e4
+TIMESTAMP 2022-03-10T19:09:13Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIpjxZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIqTNlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDnOw/9HV7JckHK3GvE+0nkljDKm1H89k6QMM6pSE6L+S+fpX1RtyAMFO3cvIvS
-i4+zK2cY8pxdrcqmW4/qSo2ze+sDzRe/nGnOxLMBlWThuTAfmCD4OdTepYckjiut
-Q1JJrHHcjxm+a0Rr5d2qy7xxKJp7XYWDLVE/W1rX2Rw17m1QIqSh83bK6+lfY5iI
-ZCofSTsjK1Y4E+Gb3KNMAmDCyC1OlXlQ+6wSPf9jsuuvup0i5l8e5jhXdZLzhCEz
-HAGU4vT6KKqpg/oyo6pgp+g/EbqN0yp5gqyWqUnKhyw3CUYYIbEbwSd6vhwvc6uw
-T2V39FWe5a5H7g3Wamyw9+kexcQgH1UcMWxuyDIpRAN5cy4fwyvB3JSGDvF+l4fa
-9MliQvVg7NvHbgHAgB/oJOT3PnpJeWDC4NSN/dDNvsh8hfIfnhkdi7Xq5rO7d3Nv
-wIiev5u6lhpYynAiQ8IRcKSWdqPlDx5wFEUAWElr/Hemd+4T70KaUkJjIwjVsFU7
-ud+32EeNy14JYoX9hn4oROj5iKt4ZgQmF9ratlsUpykajOuaKnuJLeeYuXNfELdM
-MYyB7abpYws+NW8EJWSG33LVJp1wdVWfyC/drQ5ushGAYgbhtlpYAJA0Ilornf5g
-Jw4PXX5BosGscJqpoTRckcmqyu9lBHHC+Zt10KAc8QLpWKKXXZQ=
-=tieg
+klAaqg//Z9HD8qtSyZhW3jkJjnhGePUIsWNThUthmnP5Tcn77xbx86ksKbDVKtfA
+qwCWHXQjt8V0wL95IU9qiTk6YQ5CczUG/KtkjiOsGWCjJx+/zIMEA26Ypd+ezb9i
+7YZsgnGhegZNrbNSkT48N3bd0Uk/pnyUBlyfYGSfy2RdFTNZ2ou+bDtL4I5TIPV9
+UxC4AucmuUStlkEOG7kLb/+AkktOlYvP4atKZ1MKupfCCJ0KsBoM5x/rOkrrXDVs
+7lnCjbVInKExwj0PSZOQaJ5iFaw6Fwj81f0IhbGLWMzEpT7v21USTDy60O/KaUuV
+H/p6RGxdZqpcm3JA9J2+Jo5duHPg0ZsDQfKIXzoOaDYLBOMIbXiG38yDAt43w1qy
+nau/NGZqUphtO4BeMfvTAMNNkPKZdRZpEdPxDW4pwFZqqYkBGcb4c+zsPC5K/OBq
+QidNVxA3qAyFLdXFqDzwZ0Y9IBR1dAsEIslmLC9nMYrujpWQaFyTHTxf5RAR9ftv
+Y+QGdrbpO5N3SHdJua4Fh/E3bLqAsaSd63Oc7XB74eKNaTQX7EGk6Z26DLP1sayU
+yUNXr/1NhGvEISZSr0uZDlgyBfzi8KrGnYS0jLZ/3M1hoqVK7pHeNmIrzuj1Cnh8
+tnzdPQu/XL2qs2OoN80Rg9VZ/VPbaVOpW357hZibAwVQEuCcvIM=
+=XTly
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -13,6 +13,7 @@ DIST awscli-1.22.61.tar.gz 2166385 BLAKE2B e260968803cf274ec6f260bd45bfed4243f70
 DIST awscli-1.22.62.tar.gz 2167585 BLAKE2B 39141893c979b0047a45a9aea210d03340fc8fcade9d092297caba07f487faba6304f755e6ab878079a7b9fa6d49a995d57a06334cabcc06d1d1eaad430af03c SHA512 ef9d826e51aa42582a7efa5b599482411e39e056bbee1896a5c67a12c726ece88db0fb314abe7f3c9a7f361ce45fe8de53304bd1375d7a72b822aed79752f5e4
 DIST awscli-1.22.63.tar.gz 2167746 BLAKE2B e72126578c9bac30c6d66bdd178961a7a36a045788d8079e8f0ab4c85d18c29454255a13f089c03ef53bdce0949d168c858d03b59cf5d5326fb3de9925a3f487 SHA512 4d8a6ee8b81445fbb51dbb31e899bebb5610b0a1291654eb9b6555685dcb85528c2b928f587d9ff98507f60d2b199ac71c48f6e204e7eb2ce2ba5d7abdd31ec0
 DIST awscli-1.22.70.tar.gz 2177284 BLAKE2B 1ba770ba1b1404d6ff31d95ee198cba41321fe79d618d8b2ab8258da75f9cc56d5af95851dbed837b65e4fdbd82193639da5614551fe2d7f0ebc20df44531615 SHA512 0f246e82cee70b8d16e1fc7e30aae67554f5186eb2a0251295b25eafe23d7b29293059be7ebffbe7a45c665d0bae210699093b86bf7b3e188017018d8329af84
+DIST awscli-1.22.71.tar.gz 2177492 BLAKE2B 2634de77b67aedf1684370b18da614d8092da277d099a25aa9ca054743e851df0e4ace5ff8fd884faebb012ad4cc8f0c94892a6c2bc2e1f284c28663b029198b SHA512 a404177ee0b5012553dfa95734d424f744ecc3b4a800ccf6d7f27a0f3b9a93722e4f53e4aed095306ba575328686ef1768095cd796b11064e0b707fadcd1e90c
 EBUILD awscli-1.22.31.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.37.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.46.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
@ -28,4 +29,5 @@ EBUILD awscli-1.22.61.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c27
 EBUILD awscli-1.22.62.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 EBUILD awscli-1.22.63.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 EBUILD awscli-1.22.70.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
+EBUILD awscli-1.22.71.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.22.71.ebuild
+++ b/app-admin/awscli/awscli-1.22.71.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -9,5 +9,5 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e4506527ace432af314566b20a8d82ae91e96e3aa039d035f3baf096bb02e16143a35446ff2e3cbba1880c61c1f708688 SHA512 f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10
 DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da0291b3d5a6dedf0222302ca16576f49734d31891265c8c1d218a0308a76074301babbaa39b37e1564107e2ab6adf8a92 SHA512 7a0aa149d3e01b256e0f3168ceabebcbeadb0d8bbee6838d646cb425571b26330cccbcdd3a221f7b57a4605e875f48e48cd367825623299dc43d5ba77f94c50d
 EBUILD syslog-ng-3.34.1.ebuild 4875 BLAKE2B 67e9fec7003b0f0da9a90873a009f20ed3f4aa66fc33b3acb6bbfd0a317d380c1b2306b6043a135535cc44b7802568c611820eaf23fc4819dc7c8968286c8481 SHA512 1c5bd39853364a1e1dcc79e97ac88bc4bf38b4e94152eb7f4a8acafabca9da8e6a71a509b28658b92871672a1e518ca8ac2355515c3506a742e182c2eef04e72
-EBUILD syslog-ng-3.35.1.ebuild 4877 BLAKE2B 050f47522e80b42ee62dd90c8e355e0021310542bb04a1f0c9d6e338a5e5cb7277e79b7a35938f7acc19681ec1defcbffa277a8b1c2c12b8bdd9403c08e0bfb5 SHA512 756ffe50f6664185089e93bcfec224106c40936c0f74bf0d8cf4f920c6b99fb74d81c9c33261aa1fa28f8f2641ca9a68207a672cc97ade2bbbec2ef5834c0e5b
+EBUILD syslog-ng-3.35.1.ebuild 4876 BLAKE2B 91ff5899b72a81743ab3dc7fb26076ce83788b2068e5ac7cc30ff5e375add7fb5f4957ed2e5e0320f80c47e4dc803778c3423079426649f6d47dc16bb7e7426b SHA512 24e3c0b98dd9b50e442d4be5fefa9fe12aba92847bc2f173ee59aaa27a75b9d1323566b3f2deea065ac7a3ef620dba11b1cf152206c77e650b1c55780be54eca
 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@ -1,11 +1,4 @@
-AUX docker-compose-1.28.6-setup-py.patch 1899 BLAKE2B 391331a3b425cde6657151f35883fcba40641a04063624ab49b6dfe3a4a376211d01547731d810d404c69befca083eb1116265ffdaf0fc4577255233f8391539 SHA512 94000982e32db3a874868565d326b5738ddb642e09759545f7652e2abc55fcd654ad7438ebaad3e19417c9b25fbc3cd93bf005c22ac9dab22f1bc25e01f0be3a
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
-DIST docker-compose-1.28.6.tar.gz 319216 BLAKE2B 6f35f13fd35e08223fd17406b219fcd8c97fe9a2e96a3210607d23d54923496a9a51271f359b1537b73bc5e407d175822075835f44406fcfe028cc23d8eaf9f9 SHA512 0aef0066e58ee3e9ac6ddfef71cd29ae46ba52ed641b6da7ffc74b9e9a60b3974593173e84ac863475bb5d2a3896a0d453fda4decb69101c91abc04f33e50d45
-DIST docker-compose-1.29.0.tar.gz 321019 BLAKE2B ba20ae83e0f2d899da2d39cd9f2edbc00b22eaba0209eaa1dbc5d376fc94b16d454713f5d26fed8b06eceb274098dd1155430d43a723e096643a108023de19ed SHA512 41bb20a405a0305093b0678e24c57582393806bc617bd09f98c43c9cd1c38af51011c7ab1c0afd1a91159c5a3e19a1b8df575c5be4a7e8317db96dd37ee9a339
-DIST docker-compose-1.29.1.tar.gz 320234 BLAKE2B 7efdfee009d293a3cf46af54113750877a105231ad2bb0a643c15431ebc39017d4e5bd06e5e486a4aa0c95de6af165828818b21ac665437156a3e5ec734ece06 SHA512 d28298e6a80787d6ed822039214aa8b7fc10dca45e52f7ba499891e0a2f20715dc503edda673c239fdddd33f9941beedcefb34a79dd00ea2fa724d17d54be2f4
 DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-EBUILD docker-compose-1.28.6.ebuild 2052 BLAKE2B 52534ec3d68cf0bed0ec0d5e9e74dcea7b5eb09a64f89729fef37641bf7b6f2a7dda1330e2c2a570a1a52feaeff84a2fc933ee4843df9b048461effa4c04efda SHA512 4e3660ec7429886d26586503625b0e7936b78d00903335eb4b56450f05f20c89000e930d5a5e25b6cffdafa4a7d70563dd833a85240cc9716742c248ad616bbd
-EBUILD docker-compose-1.29.0.ebuild 2048 BLAKE2B 4553099ed7dca7b1b20a292a0c243948ef99ec1bc0f4a45e08d673be323324def8ac197b503a75d019c6d5e5e378fc02dd144a254ee09641ccbf9d5442eab59d SHA512 cb7c64a9592204723282b171ab816f504264676446ada4b973eebf4bc27a209de8af76b85734a94bf47fff8547e61085bfe601099798fa615846f283db5ce8d7
-EBUILD docker-compose-1.29.1.ebuild 2048 BLAKE2B 4553099ed7dca7b1b20a292a0c243948ef99ec1bc0f4a45e08d673be323324def8ac197b503a75d019c6d5e5e378fc02dd144a254ee09641ccbf9d5442eab59d SHA512 cb7c64a9592204723282b171ab816f504264676446ada4b973eebf4bc27a209de8af76b85734a94bf47fff8547e61085bfe601099798fa615846f283db5ce8d7
 EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
 MISC metadata.xml 490 BLAKE2B 8c3c3e42032adee05919a0c0dcaa95e500b2ff6de2589c092b97866b36b3a8c5ea5d7be5e5d389ee58a231bafa90544a645d3fa43ed3d6b85c50e16ba1daaeb4 SHA512 1cddad6ede1a3f006fe00356daaec908945e4cab3ec286ca0abd4acf343479be0ab3b59f9c591e21f3c94628afaee5e318ef50c2740e470cda85a33563c6f642
--- a/app-containers/docker-compose/docker-compose-1.28.6.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.28.6.ebuild
@ -1,72 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.28.6-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-containers/docker-compose/docker-compose-1.29.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.0.ebuild
@ -1,72 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.29.0-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-containers/docker-compose/docker-compose-1.29.1.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.1.ebuild
@ -1,72 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.29.0-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-containers/docker-compose/files/docker-compose-1.28.6-setup-py.patch
+++ b/app-containers/docker-compose/files/docker-compose-1.28.6-setup-py.patch
@ -1,67 +0,0 @@
-From 0efc455303f08b6a41df021972dfa337c527b9cb Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 23 Mar 2021 17:25:23 +0100
-Subject: [PATCH] setup.py: Drop generic upper version boundaries
-
---
- setup.py | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 7669979..59df626 100644
--- a/setup.py
-+++ b/setup.py
-@@ -25,33 +25,33 @@ def find_version(*file_paths):
- 
- 
- install_requires = [
-    'docopt >= 0.6.1, < 1',
-    'PyYAML >= 3.10, < 6',
-    'requests >= 2.20.0, < 3',
-    'texttable >= 0.9.0, < 2',
-    'websocket-client >= 0.32.0, < 1',
-    'distro >= 1.5.0, < 2',
-    'docker[ssh] >= 4.4.4, < 5',
-    'dockerpty >= 0.4.1, < 1',
-    'jsonschema >= 2.5.1, < 4',
-    'python-dotenv >= 0.13.0, < 1',
-+    'docopt >= 0.6.1',
-+    'PyYAML >= 3.10',
-+    'requests >= 2.20.0',
-+    'texttable >= 0.9.0',
-+    'websocket-client >= 0.32.0',
-+    'distro >= 1.5.0',
-+    'docker[ssh] >= 4.4.4',
-+    'dockerpty >= 0.4.1',
-+    'jsonschema >= 2.5.1',
-+    'python-dotenv >= 0.13.0',
- ]
- 
- 
- tests_require = [
-    'ddt >= 1.2.2, < 2',
-    'pytest < 6',
-+    'ddt >= 1.2.2',
-+    'pytest',
- ]
- 
- 
- if sys.version_info[:2] < (3, 4):
-    tests_require.append('mock >= 1.0.1, < 4')
-+    tests_require.append('mock >= 1.0.1')
- 
- extras_require = {
-    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
-    ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'],
-    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
-    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
-+    ':python_version < "3.8"': ['cached-property >= 1.2.0'],
-+    ':sys_platform == "win32"': ['colorama >= 0.4'],
-+    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
-     'tests': tests_require,
- }
- 
-- 
-2.30.2
-
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@ -2,5 +2,5 @@ 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.7.1.tar.gz 353819 BLAKE2B dcabe72fc93c9e8099b879457d7698bf16a3c1b72ff3df9c040b1b0f3a72b3a3c453405626ade745e62d0aea4449f743c8039680accc496709915f689a69395b SHA512 c6eeb79f85550f2a184fa4a1e0d2e5b110f988b6153489001b356c2c16ee332fd462abeb77ca31268e71c3dd1680596f46dcea5031fdce185314cadb6a354c2b
-EBUILD swtpm-0.7.1.ebuild 1434 BLAKE2B 04b042d543ef6ed76532f9b3612dafb3670fee8604e9719babd9073237609c678752437e4e3491af409db7aa223d2fb5b1f224c7239c034d09ff44065ea60777 SHA512 8a3de5075ff461a22c21473ed18f0356a0101cc78c7b5c08ef5b7ca06e8d89ec6ffbdf4cde6c6cd863d7ea28e6e96e360db683ada9be597d36cdde4e6fbba646
+EBUILD swtpm-0.7.1.ebuild 1441 BLAKE2B 650f9464aedf2c87df79e3a0544817284241ca0564492e62a6d094dd241a4d28be785c203b989fc3f966c089a5401f4146e22053437f1cc5070fdd68f628b4e9 SHA512 19ccd142d8a80f52abf963a6b58eec4d64edade0f0c22481e74b5661d5a337b629a516b1d78bd7a746b7e2152724dc465ee3086b371bcc009b7a2f3b826b3779
 MISC metadata.xml 623 BLAKE2B 10e2a56c1ad2da7890bb641cdb368f0f512185cefd18356ef96c8e7b34a873c439e9f7d5d98e0e2f339a0a9f090cb372a1ef8d1cd7251efc115fc021ab05825c SHA512 edd9f7ccc6147cb92f32415ba3ed6ad9351a49fbff8655866c99e80f1782801df90a63f3ca40153bfb01d689ab642823cea5d6e144b0aede0ce6d7da8b48f5f1
--- a/app-crypt/swtpm/swtpm-0.7.1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"

--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@ -6,5 +6,5 @@ DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b
 DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
 EBUILD tpm2-tss-2.4.6.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
 EBUILD tpm2-tss-3.1.0.ebuild 1730 BLAKE2B e240c1e2dbe8ec07ea76f3106b4193ed07c59c69b769259529579838500d2b8431119116fa03ee8b712778c59c8aaca680c4a20462a76deef81e7a19387b2f35 SHA512 1856795cde9db35aa62dbe81872c7b01c62f5383927b0f7f5dcad7f19cd4d92885eacebcec3a56e9e1389a57f5548a2dba7f52d11afc4080840ada1e3b924e01
-EBUILD tpm2-tss-3.2.0-r1.ebuild 2305 BLAKE2B 3ee561692a1d4eb97d6057a62707986cbe9a4957f77d73c33f3d860a1c11a0529387609b27885af6cf3daf3bc2b9392bb7167a494504c09411216637b5836cde SHA512 44957a658437aae09f7d439c57f4577e2e36081753a1ed077bc12e42b3937f419c50bacab0bd68a354bb092e1a01c90c55325b212f56874b2f2a6f62554ea19e
+EBUILD tpm2-tss-3.2.0-r1.ebuild 2312 BLAKE2B f301b652b4f349cb6e0fc0fc779d1ce39814fd2a1658b563f7315c9befba0c484a5ad56324dbdd96df336e2f914975859ccc73220ec2f8983b132c2d867fab1e SHA512 d51a44136eec9c92f703c8ee4adbd132504e6a8440704956fd6e6953247d3bc0992d107e991e7efa687f9547d6bf7e1c9527eb884ff425d063de19ae0df97686
 MISC metadata.xml 827 BLAKE2B d771c64e37ccd09adbf4c40c412b744b1fdecc5497116e1fb5518f26921195a9141710f4e4d8daaabe6fb9076719bf87c088665fcd6d037d4875bfa761f9bcb6 SHA512 9b1fb93de976edafed96599a093aa4f8058d2542b6dd9be0fb2de5849f77394f2e17b6f4397c14b1dc13b679fb91c38c7852cfaed37908d4c0a2f216a56c659c
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar

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

 RESTRICT="!test? ( test )"
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@ -549,6 +549,6 @@ DIST LibreOffice_7.3.1.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1090830 BLAKE2B
 DIST LibreOffice_7.3.1.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 1111596 BLAKE2B dd7922a0b27fc36f1f3ede15ce06a89ff4c60382d910fd8303c8b584f0fb24bfee4dbb16063f4e7aa26ca25abbcbf9e57f956b0aa6644cfef1560cb11604109b SHA512 79f1e458617fd63a45e3da9077a70816d42e973aef08286862207b7067c627a595318a5addbebdf55fa8589d225e6acd8028f753f70639f80c5fcbd07970109e
 DIST LibreOffice_7.3.1.2_Linux_x86-64_rpm_langpack_zu.tar.gz 317682 BLAKE2B 0abc4aa374566d8d2268751b62c9521ebe97b6b0c537ff1cd4f9d09a07e48f0e5ef914b7a80fbddf9833871a565d823d192459827b4cd62e4cb2382717a2245a SHA512 6e4843152a71df8a4342c7a0d8a5998c43bac802c004bfb4efe84e2aa63d768e270fc0e2fbfb7a78dbc230fbd501b919cac675d77cf5b2261d388c274bf604b7
 EBUILD libreoffice-l10n-7.2.5.2.ebuild 3685 BLAKE2B 211100c98aa7de3fe26216619f983268fc6a4f9b8cc48026f38d305a649fff759aa33e472cbe2ca51257dcaea58ba55e88ac4bdb0d8147af0392299dcf902b94 SHA512 e583f8dadee44268371f7f784e06e4bb54c3f2684a4a8882ae9d533651e0e3d6a34eb9b76a2ec6378e167a4d60b56699551569c748787cca1ace4a129f6476cf
-EBUILD libreoffice-l10n-7.2.6.2.ebuild 3690 BLAKE2B 3aaf8631f87c644c73afda9b8350f2ef7c849c42f24fbc29c1d48840751f78ff436e4813d232d9667c4a881c20fcfcc1ee6a34e497d12dd4da45af8bc301fb88 SHA512 f5858323e28e066bd63f78cc680c775cd56c8d52d949f0a33249d76cd62e7daf86b65d9541a2a74293684262c5bba7aa76d0e858da7ca7161e42a680aad71e2b
+EBUILD libreoffice-l10n-7.2.6.2.ebuild 3688 BLAKE2B 363b476047788fe36ecda6ac19bcb145438f9fd23b280d7704a237501846b0668bc62c7e5748f580ea3ef6ddaa26d4c29656f27143f26c40c3036040bc132965 SHA512 457f15f4e1ad4d4b2076e52679e6e3b9ac7b0dd380ac37bb2c7f90772530134a9ab66a75082e58cb7284cdefe63447bc1e39d012f6b487ce3281867f2b480240
 EBUILD libreoffice-l10n-7.3.1.2.ebuild 3191 BLAKE2B 88b41f921a15c6dc895cdf38ff7dc5909312d0ee38f372a2e3a050741b7474d03ab5fc5f91ccc59bac318b5ba918a3d22046cb333f9122d5b66637ed4dc4f131 SHA512 3c7601fda0264deafcbaa6ed480305762a6b9038c11c8facef4244c96d6216ede1413b69d825f25d4ee63b8a0b9a26aa74fc9a0638a4e2c3a64a77db36ed4892
 MISC metadata.xml 370 BLAKE2B 19bdb15f0dd1c100e450d6bcbb07dd79b6debb6d278d0bf08cc668b916c3fdef1431256aaf184997c95556ecff6da5811d1a1cd89b6e4beeae7b55116c5739cf SHA512 e39c0062d9f3a4845d86539861c1b2caffb5c44c4334449b6bc97f23bf134df100c06d244a25a34f625db318f7607210ecf3c9d7ae3d3ce5444ad685717969a1
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable

 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="offlinehelp"

 #
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -33,7 +33,7 @@ DIST libreoffice-help-7.3.1.2.tar.xz 112208144 BLAKE2B 29b295d6ba4d078f4b4861755
 DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.2.5.2-r1.ebuild 19583 BLAKE2B 645cfbb38360c03188ba60a7d11be6592d84c2b530335e67a51af5d403991df913b64adf24b577ff92f5836dc73c33a8562bb03c68c0f8e95ce0cc530000e684 SHA512 18b550a0377ec771810bf63ada84c2b741a96be91600e24ebe92389eccde65674c5df6e66ef3f2dc7000efac1abac6c16a276e93c14e4618edf58c60029195f4
-EBUILD libreoffice-7.2.6.2.ebuild 19517 BLAKE2B 828234f145620a8b0b9c5d97c83cfc8998342a9754bfed0d9414d5e517ca4eabb5d5220c6adfc505e6a88b471a230c206b034dea7b0b14c439a58af21ed8cfa4 SHA512 3e6f49102203b216c529afa78b3714d83a92b71ef45d807c4f67f640040fe6e987ce15d2773fc4863d96dbc902086ac5ea29c000baf9117480dfd29c6ef485fa
+EBUILD libreoffice-7.2.6.2.ebuild 19513 BLAKE2B 2b546f74ca5fe5bc00571da482809076686049cb396f1bf09b84e9dfa5ece7aaadd959cc636e0ec56931b5c346471ba86a089fe6f6b952498733c9443e1b92fa SHA512 6c9c954914d35082de66481a80f164f9bddfce1a4907a93f97ed42c71fe3c6dd49bbb7ee0342a105a4ce95eb07047d4549b006071c2eeec1b45040558faf8acd
 EBUILD libreoffice-7.2.9999.ebuild 19572 BLAKE2B 04f45972967c668768b5f58ea49071fd9d4755c249a07f20b14909b29ac1847e38c462ebf204c8c0b2522484829597be3df2a91933089f972f562183a233d8d0 SHA512 ccb49fcf08bc6c624bde1539b1cfab2d8f9da818ccd2a615b0ba1584f74aa1953ad60c0be84cdaca77776cc1fc881b882df9e4b6741098416daf6f15699a5868
 EBUILD libreoffice-7.3.1.2.ebuild 19616 BLAKE2B ebaa2815cfe039eab96b29284d440165ba0b5fa3e72050b193a632703a30c225d26238988f7009557fffca2386b1f3715fc15cdc9f98d9f13df476ae9fae2cf9 SHA512 965b17453de86c9614ec9515c5d3b73c7fc522fd6e4202d4b72719f5ac8df7479c046945da8964778037a9d4dddff8fa17668fc7dc7d8e2ae18e9d2ff0def90c
 EBUILD libreoffice-7.3.9999.ebuild 19614 BLAKE2B 630eaac942c472bcd8fb90651ebbb953f9151f90ddb9c9478db36c3f8da618301868e49d0b7a1193f01d180271d9bc7065bcaa082557201e08121127138a6ff9 SHA512 e4f3695209cddc005875e3d4fbe09fba9e0c0796032cdb8118589ce8486e5b5c729db4055316f426b67950e8999a57edc10eb7799f8a9ce3c76ce253b0c0e8e8
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
@ -102,8 +102,8 @@ RESTRICT="!test? ( test )"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"

-# [[ ${MY_PV} == *9999* ]] || \
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"

 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@ -1,15 +1,9 @@
 AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
 AUX mariadb-connector-c-3.1.11-fix-flow-control-statement.patch 401 BLAKE2B b5b2a418ffd3ab03304bd9dd8914aa3673f24b9ebc4dc53e9082d3a979fa5858b1431f88c0cd51d23450fe798047a3844774bb89cb0b3c4785e0575ceadfe5e6 SHA512 f052eccae09d6aedc1ed47578a102e72984b39be8fa903421e285eba18eed5d449d1c82262c54ffcec39af044a014edf0dc1102bed1384d575557372ae974d88
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
-DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
-DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284 SHA512 0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
-DIST mariadb-connector-c-3.2.4-src.tar.gz 991053 BLAKE2B 7378ddb47e7cbb8b6bec4d7daa1572e05ca494cd1585fff8c3dc9fca088d11ca523a2571fdda570e7a68633a6cf753fca12ba6b505dbdfa7ee9c9cc07223d0b7 SHA512 3debf8b31f280d70ba4f163351658dc1d15f2d250e0d7098200516f96a782cb66ef38855b2436d3d23a3385f79309d5c41b05b8d7d673001de4b4a62555511ca
 DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc
-EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890
 EBUILD mariadb-connector-c-3.1.13.ebuild 2094 BLAKE2B b664df7300417147a35d9b665409d55f6cdfee3090778d4e92f5a237f4dab91976ce36a7ca22329410f90a404efa77f5977ee6481fd63a676f2004cee1a6aa9d SHA512 dc4151e07b98d77c95aa2d26c35bb78fbaa278ad8380399a7d09d673e16a2c4fd317b5e841187983f08020b3eca03777ccb8d547f023c6c1ffc3c45f7c88c071
-EBUILD mariadb-connector-c-3.2.3.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
-EBUILD mariadb-connector-c-3.2.4.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
 EBUILD mariadb-connector-c-3.2.5.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
 EBUILD mariadb-connector-c-9999.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
-fi
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib toolchain-funcs
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos +ssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-	"${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
-)
-
-multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DWITH_ICONV=ON
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib toolchain-funcs
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos +ssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DWITH_ICONV=ON
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib toolchain-funcs
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos +ssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DWITH_ICONV=ON
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -1,55 +1,19 @@
 AUX my.cnf-10.2 140 BLAKE2B 3a56b7e38c3dc00215cae4bdc3270e30e85299d3290c0c995a611e4b8b15e66f40d6ac40ab18369e7863742ab6eda94259be5a7f363a26020c6fce28a7582e94 SHA512 85c650670e364f5f71842d9ab07b59c5de6e26e774e7192102562e56f94ed5f8fbc487cef31c134209c22b72fde38f7f53b7279cead97a8af608436d1ecc8857
 AUX my.cnf.distro-client 643 BLAKE2B 5ffd286907ee28c92c85bbcc9a6266555733f1115f2d6b8009183dba6939b978ae8d1b8e0a53e672b8e1a1f621650399231723603fc5f96ef7218db84236e176 SHA512 801f6ab8be3110bb4dc38eaa4367715b8d342b69cadfe13dff987ef6c3aedb67d19449f8f2483e63df5d8b444ca30701b0d96f85e211de6b1e3db923b029acbc
 AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e5ca4a2c10619278796c328931a5ec076c15b60afef370c2e5da02ca0c628f330e876b4d2c984eeb54df5f SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882
-DIST mariadb-10.2.38-patches-01.tar.xz 5796 BLAKE2B 51a574eab28c16394e3e953654d31f9d6fe88f55292ccaea35b0463d122a749ed52cb8d5e19f14b0d630bf22381ee0bddcf1e1b80c1445a82b931dd9461339ac SHA512 48fcfdb685bac516ee3388fc05adce5b53bbb42bee7b3681a887c76c63cb71b671d4089721a9b16f281496be9e9a87a556d44e4a6834c96345c6ada900dc9fe8
-DIST mariadb-10.2.38.tar.gz 74250852 BLAKE2B 5d75a38d7d892d93c5971713a4ab47c2803c03934ba301ea239b0a7565692272339ca0c3360a7bd533adcfef1af392c906b8f0136c18a25f5a1dd6127c8a6902 SHA512 4918a04877e16a0d33baca61b7c207b21b646df3be5e9ac125cb65404c0c6d6706b054106f437acfeef402238b35018a3cd764ceb31144a98791137c44e273a9
-DIST mariadb-10.2.39-patches-01.tar.xz 5804 BLAKE2B 08d763d87f877870737a972748d15dceca920f341e004aa8ed401864db4208eee4b0896cea413bc27990f0405b202eba2d2e49849a574bcec1f8618962b09c67 SHA512 2e26f3dbd504672c1504a4313581ecf05383bb62e2cc23d51109b5b8bb02ba5cf951541617b26581806994769587ed5978e42e8e6b4daf271045df66148f53c7
-DIST mariadb-10.2.39.tar.gz 74253393 BLAKE2B 15a8f23817cf6a22fc0c2caa81865349c2dd93e3c7ffeaace58746cee376940db453cbec02a6bf65d344c18dfd342604e6f54de255cff10fe7d4a5bc5f7e1f9b SHA512 4ccdbf9bcedd3205834be963f00eb85e318aeba97765574674f60f8356a83591e7904685d72a2ad34111dd7a705ee6c4d5f0b2be4fea7a008a36907ff645da49
-DIST mariadb-10.2.40-patches-01.tar.xz 5804 BLAKE2B 0efbd0c3ab107808644e2bd34a7c7d9347f337c769d9cc5bb2827af660d009ac490d78c084e2e5104271fbbcd65c8532d5460793bfa4a74910f532fa7dff33e4 SHA512 66a7960a6827ea32dbcf0390d40614e4b8edd8114a1e472f96cff01c075020466d84f9d9783c3f2e418ac341d84332c060bd4d63840979be3ebdfd3b5ef08eee
-DIST mariadb-10.2.40.tar.gz 74275587 BLAKE2B ab310b19425e3631c9090fa919e8867c7c8f62ffab69b36851aee9ab40aa18814dc50ae185d1c0832c79785d25a82177aa92bb6614cdb49359ec1acd7105e08b SHA512 8d3438c5044fc63e02d3e49f5fdd3561ad0a3f3ac29673d05fc71dfdceefb7cdcb6dd623d18fb222e9552ede4dc3d9b6e413d3ef40d86054a36b4b3a6433eee2
 DIST mariadb-10.2.41-patches-01.tar.xz 5840 BLAKE2B bfc1404ef7a856e1588caf6ac4b61514125752b298adc7d7b575f5106b052b33a0344a51c0b0974a4664ee13059be30d31d2a12436009a39f34567124ee81ce6 SHA512 3105d291d22a9085dd92c516f0af999786d78328e8a8970a000c7be9d2df211e544c798ba9882a6da94abcddbb4cf16d100c5e1ccda6dc98e7a16c2ca5914bff
 DIST mariadb-10.2.41.tar.gz 74358994 BLAKE2B ca7fedebac0ce05bbc0797e58347041b098878fe565b5f3ae8ac149b30eca9188335e5e4afbc158f644888de13a5bc264916c77e315b5f489b2449342bf46f8a SHA512 d6f04d5866c6179c8df796dcf2407fa6289f7b9a57590e6ac793518dd805da7799e76f1031579b74e03dad6adcbcd204dd80394a68ac0105fcecaacea64b74e1
-DIST mariadb-10.3.29-patches-01.tar.xz 5280 BLAKE2B 262c8f89508d915a13c3c309c885af68ff044ba28b4c3d631a5be90b709c882fa3cf521380c9d2a2f7695477d7bcd364ccb98d90750e524deb0aa0daddb94bde SHA512 95d04edf54b722ed7022bd2b915d722ae4153eb2c12a3d6c499469be0de4d03582226ef525be9e9af265674ef31ce2376442a09c583222c64ad9994ddc51c8b7
-DIST mariadb-10.3.29.tar.gz 73261682 BLAKE2B 81ac5c7d1ad343c7d1c6788dafe07c45ec096d975a3197c6a6940da60a4a73383dff18e15d1940f1248dc34f290603629e95fbeca31c0749c5b0ae2b3de92b8f SHA512 fe868cde5ac3536ff5bbf34f235253c79e897e61bb34f7fdaca8fa8fcdb83e4a19c615beab27d3fdb5daee64ac0c8f36ec7e8089a9422c8540f7e92b1999a769
-DIST mariadb-10.3.30-patches-01.tar.xz 5300 BLAKE2B 14a0110477a5b3ade80ba05cfc038cfa0761b06e8a58f4ff69d39a9c1d59ec3fd323d7401fc7bd76a99dfcd4c8369d04d5eb1313d5ce20d2f57b10d2e0f6ff5d SHA512 a546908147f664189053d201d3d3d3dcaf81956bcd7348b1385bb1046636ec189a95f7bbe80839eba7a09b378475af6971af6d9e6bc72fad7d01ea139119ba42
-DIST mariadb-10.3.30.tar.gz 73266479 BLAKE2B 4f2911fed8f470e60f98f3aff044bb7979e32ec86a13d8ed8ca36cd8f3e1b45b541412de0f1b53bda252dfa2c4e3d2dd2a718a94d44b632a1f3e569be4f37753 SHA512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc
-DIST mariadb-10.3.31-patches-01.tar.xz 5304 BLAKE2B 145bf6185edccc726549479ec1e75a1796c405811316de2d6bf02564c4398ae82978204c3a6329ed1742b1b91e9c80043574370ff23571fa9cead899f8ac71cc SHA512 e59605938eeb1373e84a15f6c501bcd1ad5fc92b75e67b5d93da77066b5cf7ecd77db7cb684de494a6ba98574473aa484be1b6dbe4edfbc482a391fefd12dffa
-DIST mariadb-10.3.31.tar.gz 73298653 BLAKE2B ca0532c1adf830d8d364938ca3c89b9d162aa4e75ceeaf1455085f0a3bbe8eba5bdfdf13a5800ab82f2517e93c746db7402462d5b334fb6fe823629d7feab790 SHA512 29878ea381d6a6b188cb6ab9f81e218f34dba0e85e5eb1929a6cc72904f1b629dea89bfdde4dc83b5fc5a735f46114a193184bceb43fe30336244d3018a45c19
 DIST mariadb-10.3.32-patches-01.tar.xz 4388 BLAKE2B e84de23ff97e0fcff9867bbba615f8054cf1dd015b44aa5d64bca38e150daf66d4e5149b1408485330af3e49006865c5d598797199cca1d74a31d77df2715627 SHA512 fdf36b310823b15ccb2fb921d694998ce076442ef4086a88b76ebc81c7ef778099c5dfddf1152bb54bf653c9f99a335502e9a34ee200846bd6ee14d407ae127e
 DIST mariadb-10.3.32.tar.gz 73389214 BLAKE2B 476d293f41804e2124859019c25df1bb93509741e8893939978af9ca6b83dfe238c3079bef0023281a1e2a0b89cb63d9a3de8d8a540ddbb96463f3914490d5ac SHA512 d74c8bdf9cc8126385e1ca69c098e2bd8543de292d36c6c88ffc8228430fd246386f675089e7a1a11c830a947efde755845eda279dfb202c89c641962edf43cd
-DIST mariadb-10.4.19-patches-01.tar.xz 5288 BLAKE2B b97a8b2c55ad2b78b4f27dbab3893c777e15ef237fc66a9ef62d391772caaada3e23949a63ae170aa72e4b07f9bf34f32da72614756bdbe0712efe6c39f0da59 SHA512 e26b12230b965fe0facfd447a815a88fe8edaaeb8e209cc53df2d76c580dacdab59afb09c09ef471fb0b46c0cde8eeed84f3eff851751316eb12f06de235d52f
-DIST mariadb-10.4.19.tar.gz 82042449 BLAKE2B 6137c84852b6b770efa908b49f03ca52726a537bda410b324ed388a82667bf0e3ff37cbb62d6a541ca39ce4841efa861553c7cead11030dc9deacdeb7cdb0d5f SHA512 837bd4e46e2033d0e996c33125c50b98e141e4c31cf4753a4bd1a7bd1e6a25ebe2a0ea7c8061d29f3c635e24d8e4bf2bbca62ea3b0089bde6576c39ffc6f5e28
-DIST mariadb-10.4.20-patches-01.tar.xz 5308 BLAKE2B 0f725743d78c3bcc8ca86a365b84ff797e17454adadb14e122bf94e04bd1a433e63c6f41eba21cb705ec7e9e64333e9ee597cff7001d5b8248f826093618f37c SHA512 2050e0bc3acbb9026c0a2cb8a5b00ff618f12ee7b6474bf0ed918d4d018c624eb4c40894172bbf31b135a73059d2e27efcda742a23010303a54aadf76fa26af5
-DIST mariadb-10.4.20.tar.gz 82043644 BLAKE2B e116be643f7243cf5c09611c79c60cb109dd2b69b4c1f06d7f2492858afdc3bf55e4568a7ed212a6458a3cf5a092d4e0d87e0a2ff6e71af9923e4b33c843a79f SHA512 ce8e0691981b39de380276cea5d553a9968d9f6ef19f54395128f01d611499f3fc203651b8d7cb56697c6ee55f5f515c960d7700738cdc50f228df7443505112
-DIST mariadb-10.4.21-patches-01.tar.xz 5312 BLAKE2B 0520313f2431cdf7c779d04ff9c8473eb89d054bacd98e9e325bce735ee7a311458020a4dfb1e032dde7a32d33126a9502bab2f54e7a19acbb70e077181830e1 SHA512 ceb0272fa9ce936d4601e93af3692222f5d6a9110a084e4a75a5d23432ddadf703bf9bab94ec08b2a65cb4e00eaed23c1958c40b6d140afa2fa47e961644e7a8
-DIST mariadb-10.4.21.tar.gz 84809537 BLAKE2B 85edfecbda9a9d47c0bb8efa3e86d9df473849dbd10f9348814598e8cce848a6727850c5d5a3fce54c04a81ea5de09f86cdced87a72dcf2ed7fa480d7bf81228 SHA512 2be398cd80f0b8c938ab310f47ccd410f0209f8308bfc202014b71aee3f0bea7f535d1eceb82a4407202d9732c77874d773c6f13e54cf556fc79ed0d49390345
 DIST mariadb-10.4.22-patches-01.tar.xz 4388 BLAKE2B 0e615ddc4db93daa1f4ef1d8755b97502bb19b0ece0fc0d6d8620cb69a7db2df81ef5a06fc0a6b0f7b61fdb5431f919da99afa8068b064d905cdeaa95df807f0 SHA512 7bfff381b7fd19d12f64caaaa7d598ee476e286def9be9acd6f808784ecd47e715f222bd07fd05cd24b3342053f46c22d03041413a6a55b7194d1a5c66b0c03a
 DIST mariadb-10.4.22.tar.gz 84916052 BLAKE2B f5f7623101cfac6b209a95de20ee737ce0afa574766340471a30ddb81abacaf2acf3809d54ecb62f9377f924b11fac04faa770802c2bdc8dc10e3286b1c8e648 SHA512 e505a56346cfcaf5b8fba80abad6b2ce819dd410f6e6f36e290ad4127aaa9fb580264c28068f9f9e04c3a2fcccd101ef73d2bf5944aedde6b2d4369163fb9248
-DIST mariadb-10.5.10-patches-01.tar.xz 5944 BLAKE2B ce374e58b7730d45a8dbca4cccd459c1660182d6aed4ac54f06139e28ec254d4993b2135b2774e08eee740099803398a25b28ce9d227702bffab1867f1725fc2 SHA512 9d41b7796c5e43d037e75eb8d6c9b570a9b3d72166f832d3d0831646b2ec8c838fe94eb8eab8c6e427e96640287d58f7eca2c653a3c503bf01240c9f7c60a8c5
-DIST mariadb-10.5.10.tar.gz 99019617 BLAKE2B 85b5c43ae9eeb1dbf9ff7935d4cf4bddbd18cadeffb79a3bff172b4522e196c7ac8916c63a6750d0b3b910c6f0f933213b3b4f6c7bf0d43bbb07714ed9337750 SHA512 93dd1405f8b31989e130dee5b7d4a0b447aa0e017fb9ee02c792c52142d84d1103e8fd591101d72deda1ac65b10c48053582f6e61bd1757e6aa92e42d98c56cd
-DIST mariadb-10.5.11-patches-01.tar.xz 5960 BLAKE2B a198083d6dd9d16723dc40a0c6fea9c900c766ef22f59b1c7b6b65f6cbf441cda08da7701b89625bcab3022fa00226b84deb215aede41c05195ce9cb9b218530 SHA512 d7c642f64ee013006e4880ed50b6d2b7d00c53f3d3bd29eb939689a4f78e05dce82e3258e80fc22b9e266c5beb09df2323dee94b994d2a913e8f8b6a675ac7bb
-DIST mariadb-10.5.11.tar.gz 99037098 BLAKE2B 7eb5b91e34f3098df7a801becd614a99b2124d3e0b3cee28533a7197293317cba28d88ad112ce5f2d6e8d971ac7fdbca1e120e3e1746f2e6a57c359fe7c68457 SHA512 5ccb3f3d7cedf5ff79dd8d9304f0b7f3eb99a5558b446d1baf24cabe20c709360e2c99a737024793918fd6c23fc5a9bb83ffddfb5549310774d07294a3bbddf4
-DIST mariadb-10.5.12-patches-01.tar.xz 5996 BLAKE2B 202804c0c41e8f646f1430f387e65390afc66d76daaf89a453cddfcfa65847f1026e2db6c70b1b16803cd0719107dbc7d4611e35bbb21486e04b2130d9d30f66 SHA512 8d84ce7601a14a3b37e87dd50414f59898724eac7f8ca93332b9c6d1ad6060ac58d61e8972451065b196fa8b6d671be03c280c95a92baa71786191e054ee67c2
-DIST mariadb-10.5.12.tar.gz 101914615 BLAKE2B 98910fee3ae7c300ab1cee7b9373695f642b1ace88f8a3136da3a565a97810754633a7479d863e324b6b94969356df7bb92e7fbc6e9b90a1e8a77c4c1d52b659 SHA512 c732c2033304f273900b3dcf21936e28aebb147316fcabc7efdc43b75bc47c198daacfaaae082b997d4e695139d2aeaa2619bd29935f1b6f0aa25b9b9cde9ae5
 DIST mariadb-10.5.13-patches-01.tar.xz 5012 BLAKE2B 34a5af415737f71750a8fa47de4f2119e31723686f000a7f99f9892a0a12fbd2be3c7bb635197b131691d73ae663e34c1b010b154d62e1ea16535265f96200f1 SHA512 71e7940558fa863835ef86f04c48c4a1ca927dee0d9ae94fcb32facde857dfef1757ae96b5a738653c341fa19a67916b0b3a03ce473020edd5c8b52ccedc0bea
 DIST mariadb-10.5.13.tar.gz 102047279 BLAKE2B be91ebbd05b72d8046eaea73075510e160d7985b2766f64a1cdd3e5bbad1f4eebe9f371caf070a0e9fab605a90588539a4011ea4b2e4243ea4fd8f299ee836fd SHA512 5d5ac04a3c8099a982cacb98dd4c162966fc7957e11c28e8b5645e49ffcf0513b9c8956f43d215c37e5eaa34aa8db6c71cfe993c89d62cab123021ee83169e7f
 DIST mariadb-10.6.5-patches-04.tar.xz 5916 BLAKE2B c9a6d087057ce732cfe7789255d2a5106baefc70b4bfcfc6806c0165ae7b56d440e88c5c4b0aa10a8f0c1b9478826f1dc89a785ffec76764b8bd4e824960edf6 SHA512 29b22e99a6be137e5c2832f5c781bfbbacee40b716089e24150ac72198f59a8a3f46b6a056ee4d02588a06d32ed9c3b815a59c302c48b493afe9a21a7d4a884d
 DIST mariadb-10.6.5.tar.gz 85061860 BLAKE2B 668fe327e6a46c66bc0b77339d71279cc8bfe468d1e634035e639e88aabaa09ea27aa50e3b9d27728a275e1e7861e8db1209d372d751084ea486ad31f6f1fd29 SHA512 5aafe0a8d5ae54a6f798a6fd0cf922521f5b8e54ef5fb5c7db1cf798a7755f5910bb0b8a6c371cb8253dfb48f4ebca0becd6eb543b68473d564d2092df3185a1
-EBUILD mariadb-10.2.38-r2.ebuild 41778 BLAKE2B 77d309bc1784385c3cdb0ae708b9b90cd9daaf1fabdd8f60b725df068ea79a49e5c84af6e1658225526e3f18f3edde00d63dd784a1a5f8ca49d4ebeeb78933fe SHA512 a2bc372c1c360ad73832ce826dee5a0c8503f705cca5074da2880c17c616ac3821f84fb89d947cf3221a531a45e93b49607cafe859bc82210d5042248ecbd8c4
-EBUILD mariadb-10.2.39-r1.ebuild 41784 BLAKE2B b3597c2c2b4319978241d00e4852d9dbe971d32c9e075761be880847b72fa50d21c2af2755bd30c1c6bf0caf1060d2011a1f5bf3cc7cb9e2abc91738801f6b0c SHA512 713f4069a1b782e366481048eaf5d63b801ad88f6d0b2b260be9c4ee58fd643d6d72cb6dd06668726ac1e99bc18689d900178ee11ef11639a71d1dc9d53fd6ff
-EBUILD mariadb-10.2.40.ebuild 42592 BLAKE2B 43a4239ca6eea4bfc0518abb857e7ffa77e4d1b05a7a6b3939e73547d7009c88adfb5e7bbaf8bcbf0b40d6b2fb34c2bb700e840957c06267053fd825324724ff SHA512 54b49150dde6a02607cf8e0a1189d057235e6067cfdbc45d4ec1c7494ac2bac18010d409e67c56f9125809b1426bd12ebcc75f23ab7ef830bbfdb37b612ab774
 EBUILD mariadb-10.2.41.ebuild 42510 BLAKE2B c4e0ca2ae8b7a704d618184a8ab8f07227a7095e27d1fbff6143754dc15381e4ccead56798397c0fada861c19e588934ed034317259e2767885a89ec913148f9 SHA512 d758b92e8e6f21aa17e37a7e3e024678218c81f47f2bf9dc3887f81148975ab668cdf3286f6fdb7bfabdff31605abcc252a37aaafbfa9ad3c3fabd6b4874187f
-EBUILD mariadb-10.3.29-r2.ebuild 41335 BLAKE2B 60449bf1e598d7609b866ca9bbfb82d226daf01f2f70bba17cad02780ec1acc2f82417d44dcd0cccf2ac5f92feae1e42264af1cecd2c2bf0414a1c4d0bbc7cf8 SHA512 34f26dceb1ad04ac26b4d4c059efe61d3674885206ddb568e0a0abf17985a0d449db3b91c89ecc17835863bcd7c8a9ca0a56fcabbc5d8e482e643fa7126d03b5
-EBUILD mariadb-10.3.30-r1.ebuild 41340 BLAKE2B 0fa156292226a79bcb122fbea9c62e03ccfec5f5fefa55d9942d77a136c5ae6f09fd9cbbc9e3a64ad582a44a0739975ae454233d89fdc55e7d295b39c16dd498 SHA512 821bdf1efd994c7de8416fd602675d252f150f7bf0607dcfb7b1b34b63dd4bdb787bf69655736acf9cc979b6b6ddc777d77dbb961ce7185477d528d4e4f13ef8
-EBUILD mariadb-10.3.31.ebuild 42148 BLAKE2B 6bf255bf0b57037a7f4621f986671cbe89b77fd7031af422af76d6955961f132bce09a3b018faf18ffeb194a92c73a7c24622a1921de321ac4a093a488644396 SHA512 fdf1f08c54b2926eb72ce4bc791dbaf2f6244343fd4ed2a9afc5ec114c241a19c672e37b4ec7e03f72354897c86325a1196d63aeb6a91213f90cf5a226474705
 EBUILD mariadb-10.3.32.ebuild 42066 BLAKE2B ad56df5c13fedf2cf70eeab9fafd59475a021afa0f4ce61a9607b5ab7643bfadc6c38b8533e99c7b0ecc486adc120bd1a79ae427203319e82221669135d2de60 SHA512 a27514318ec1fb5b3b5af20b2ecc07ea5eaf19fc2df7aa62c6010aa495072c4f13c661638c6a38c147e61494274277488bfe8b7fd38f1c71c49c74ef373e7cf3
-EBUILD mariadb-10.4.19-r2.ebuild 42046 BLAKE2B b6f4beddbd27d517e09677ea35f5d8830be5db1283617404ef8fe92c0cf64dfd637c01b1ee8c0f5a96b2bf830df9eafbf4f819edd6375704a1e661e1a02dbd68 SHA512 185c4f71b319c038c90018f5621a674669261da26bcff1890ac9c5780e2c2e2d9efc388fa78753fc491930f0a54f35f256d187c8ef19030b5c8a478deb390b53
-EBUILD mariadb-10.4.20-r1.ebuild 42052 BLAKE2B d4aa73577cf7e76b59fb2b3317b73236124f2c7b941287c75bbe1e5f7fd337187e7e0e1f04cb4a29e9f58d5046cc3c8788fca6f30471f002e4447c27edaaf38b SHA512 4cdae3c948cfaa9dc28935a7fcb8ba3963ca554568d75c89f579f1ccc17abfd4b1246327f5e60b6e38113bd6cc3d85e99a1c832ea0b79af3bad75f8b93e51977
-EBUILD mariadb-10.4.21.ebuild 42860 BLAKE2B ff39ce3452746c749bb0c09340aebb0ad8487ad6b3b9b2d01b17efe4799087e3d05b1947520151fa0a57a925792c2c7a0f8d2fbae93808115fb2dcd42c0ff641 SHA512 1f076a734e32619184271a4df62ccb8296bd332854ef2a82e8044f5f4f00a2021be9047af45751d1b6ba7a1a8c271d16efbfc189a2a004c5619636fd14f085d2
 EBUILD mariadb-10.4.22.ebuild 42778 BLAKE2B 1ab09da26a26770d3f36671525b453736b36a2bd0c3de3f701ae1671b3bbdf8b7ec71f7ec566f38d9cd041b3d6b4b4d381e302205566915a7967ad58b98331da SHA512 69f0f5912b4e289043cc18643b86e06292ec0bdb81369c799322cb28b6dedb9ff9d75fd2b9180c0a262bc1768f37a5ba50b69f0173d9a40dfd0de53fbaca27fa
-EBUILD mariadb-10.5.10-r2.ebuild 41471 BLAKE2B 1f4e6991cd21db2470d24a90dd8c0757c961bb42a9f2ac9a17756398f9ec9d7f543c84ba045f332fb2cedc900bd8f14f8bbd17ee4f68b9ce6867bb5068c917fd SHA512 d720b727d1b56074dffd0928ca2463a19a90a124266127f416fff095f551f0d83449e486c01fd0322fd77c0955f1481c023e2764220057b2d5841440b26d230a
-EBUILD mariadb-10.5.11-r1.ebuild 41476 BLAKE2B 3a73afbfcea1aa38f8d13f1db6f0707a4cb43b9bf407f93cefe433c893f504c88047f4ce7924912c8e6a238f5dd00d5fa6cada2d4214c814254ab27de3782d03 SHA512 0af663e45d2291d129962c96d66243d0a999b02bf573ed0e1d80e5f784df39c9d19575e5a5ecd74d547205fb033eadab3311fb18afc6e9d1a661bc96b9e6955f
-EBUILD mariadb-10.5.12.ebuild 42291 BLAKE2B 1639d616cdf556ef65f227d0caef6ad8fa100d0058cd7afdbccd3e49934cbf583fe02884396ef84fe64065fa616cd767b91a155345980c617d2070853a7db59c SHA512 cfbf194886a021e4e86c182f53de095231ddeb823efafb0274f0903e9aba55a114ecf7a469ac53427ab0529a1b3c921a0a1218f9895df5d4809275f9eafb6750
 EBUILD mariadb-10.5.13.ebuild 42473 BLAKE2B 2c72e46b1a263b580ae7e7595290c2d14d1f49bbad2065129e6cbd947a73ad80deb5f43cdbeac9a07bcc84dacd1298eb2aee8dea06f9f75ecdfae86bd302b2d2 SHA512 0b22a5a9f2a5e8ca06b0fe51587f1deac05de9183790dafd1ec65c2d6f330d3ee18d95c94c21a51a9544e2b6a8a47d4a914cc0b797f3f3a36d333a43fddff716
 EBUILD mariadb-10.6.5-r1.ebuild 42720 BLAKE2B ecbb8f58c4fe84595e41b1cd610e226a03e54affe6c0459e5a93621241cb5d3efea771336f4f7a32dcff2b5e554665a84c9a9351a550a5762d52003a5eae3b86 SHA512 04d120d8012e70c34f656d8e4516d8de549dfa73f9df1b0ef6cf2afd543a003a452744183a27e9991354f22286bc28894074af74fc1f9a37309ccf11df04bef7
 MISC metadata.xml 2626 BLAKE2B d545d75827f63ac4ff1ab5eafd559b36ef44d0d5059dcdd5cbbb162d42e3a5117ff09c2c2eba82af10bc2f6c53e366f5f0b6a9c744c35d76b8bab12c6e517b64 SHA512 adf783a34647eb8299041d9125ec290377fc17b910e9f1660a33ccacd0a380cc4cd338f55f34e958ddfab1aa6dba85e25033b0dfe8dbc8fed4656ad5df63f6d8
--- a/dev-db/mariadb/mariadb-10.2.38-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.38-r2.ebuild
--- a/dev-db/mariadb/mariadb-10.2.39-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.39-r1.ebuild
--- a/dev-db/mariadb/mariadb-10.2.40.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.40.ebuild
--- a/dev-db/mariadb/mariadb-10.3.29-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.29-r2.ebuild
--- a/dev-db/mariadb/mariadb-10.3.30-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.30-r1.ebuild
--- a/dev-db/mariadb/mariadb-10.3.31.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.31.ebuild
--- a/dev-db/mariadb/mariadb-10.4.19-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.19-r2.ebuild
--- a/dev-db/mariadb/mariadb-10.4.20-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.20-r1.ebuild
--- a/dev-db/mariadb/mariadb-10.4.21.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.21.ebuild
--- a/dev-db/mariadb/mariadb-10.5.10-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.10-r2.ebuild
--- a/dev-db/mariadb/mariadb-10.5.11-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.11-r1.ebuild
--- a/dev-db/mariadb/mariadb-10.5.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.12.ebuild
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@ -1,8 +1,5 @@
 AUX mysql++-3.2.1-gold.patch 196 BLAKE2B d4bd1e259cdd8a4c52f0900ddc42a0001156f94e3aaf7d62515c120316b7affc821a3e7c30ecbcb7e2d4611154d54462531e4e87cf609734a0761c3d41ac41e6 SHA512 34cd99548f5f23371fd02074017329ec4814c59ab02b114a6fd4c811d30015e1e3192a8d5d6a6847f57a076dd606d44e74d69dae6f5581d5b8d252ea359ce658
 AUX mysql++-3.2.4-only-unit-tests.patch 331 BLAKE2B d3bee079ad466aa3f2e21d831a4ee77959c8a1f2d1ea9124f17dd081a7d39a99433c9c8dba10a8638fe72f4e0ccd8cf02751c3b036c9082a1351374a19e089e4 SHA512 02bb7a370a3f7eafd9111c01e6073a71d33f53d59eb7d8e04a40415ab2fc88011a1b2c79cba455b976b03613597d49f9256cdacfb3b984767959a707bf3ba7b0
-AUX mysql++-3.2.5-as-needed.patch 18594 BLAKE2B 39baa700bd643205974e1e96e48f0595eb001421a6701e8905a6f2f9394b93ee1d107d984cb2df99ac8b65a97651c152fee15d2c75a56e917a488ccf3b755159 SHA512 6ece46847bccbf9612d1575eafe995f48133860c942b7acd99cd459dcd3a4964bf767b7c1963596d1c68e6738eae2fa07b699a4ec775547ee6905fa682e383f3
-DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
 DIST mysql++-3.3.0.tar.gz 4635623 BLAKE2B 0d5bb3dc7eeee92d10eb82b0537a7caff7faec2f330bb3081790b63544caa2e6967aaaf2adc8f68b9b0854da8f0374eda73d4ced50d77fbc119f83fec84376e3 SHA512 cd50f9edc9531b385d91d70aa292629dc7b839fd296f07db470f37c4748617c5c2dba647adf8965d70e2788e9264288d8ca941a6dcd8d08ff7d838e7947e6465
-EBUILD mysql++-3.2.5.ebuild 1689 BLAKE2B 02ab642e69128f159ae66a288fbf651cd9c6176ebe1eaf2f26c9276b0235082c3bcda507ead81b812d41ed4bf8e9f327f9cae7b558af29cf72b401d1f6b59012 SHA512 cf1451689bb7509e58358e49ad526b94b89997756d420a23f4592fe3372974e9f243a9cdd7dd28db4db020e121eab2419ce45f2ccb1bece30c2d6876526201b7
 EBUILD mysql++-3.3.0.ebuild 1651 BLAKE2B 4ccd8ec626105d36173443dc8a4d456bc1889b7f79a795c47c35e7bfb72425ffcb19e32f3c42d35e72d257554ce6012ff94b7fd1c9d3cfaf0fc533cf762d9c57 SHA512 c7548ce309d6bae38cf7b30d8b8b413402be0ec809fe7450d63e067b80c37938a3a43f073c4da5478bb094570f2a31440b671bb2e69ac1b4c56372888661085d
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
--- a/dev-db/mysql++/files/mysql++-3.2.5-as-needed.patch
+++ b/dev-db/mysql++/files/mysql++-3.2.5-as-needed.patch
@ -1,178 +0,0 @@
-https://bugs.gentoo.org/635414
-
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -408,55 +408,55 @@ $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT): $(SSQLS2PARSE_OBJECTS) $(DLLPREFIX)mys
- 	$(RANLIB) $@
- 
- ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_MANIP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
-	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS)
-+	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_STRING_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_TCP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_UDS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TEST_WNP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- $(LIBPREFIX)mysqlpp_excommon$(LIBEXT): $(EXCOMMON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
- 	rm -f $@
-@@ -464,76 +464,76 @@ $(LIBPREFIX)mysqlpp_excommon$(LIBEXT): $(EXCOMMON_OBJECTS) $(DLLPREFIX)mysqlpp$(
- 	$(RANLIB) $@
- 
- cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(CGI_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(CGI_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(DBINFO_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(DBINFO_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(DEADLOCK_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(DEADLOCK_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(FIELDINF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(FIELDINF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(FOR_EACH_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(FOR_EACH_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(LOAD_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(LOAD_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(MULTIQUERY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(MULTIQUERY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(RESETDB_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(RESETDB_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SIMPLE1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SIMPLE1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SIMPLE2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SIMPLE2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SIMPLE3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SIMPLE3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLS1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLS1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLS3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLS3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLS4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLS4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLS5_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLS5_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(SSQLS6_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(SSQLS6_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(STORE_IF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(STORE_IF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TQUERY1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TQUERY1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TQUERY2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TQUERY2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TQUERY3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TQUERY3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TQUERY4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TQUERY4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- transaction$(EXEEXT): $(TRANSACTION_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-	$(CXX) -o $@ $(TRANSACTION_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
-+	$(CXX) -o $@ $(TRANSACTION_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- Makefile: configure.ac install.hta.in mysql++.bkl mysql++.spec.in doc/userman/userman.dbx.in lib/Doxyfile.in lib/mysql++.h.in ssx/Doxyfile.in
- 	bakefile_gen
--- a/dev-db/mysql++/mysql++-3.2.5.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.5.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools libtool flag-o-matic
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="https://tangentsoft.net/mysql++/"
-SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
-DEPEND="${RDEPEND}"
-DOCS=( CREDITS.txt HACKERS.md doc/ssqls-pretty )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-gold.patch
-	"${FILESDIR}"/${PN}-3.2.5-as-needed.patch
-	"${FILESDIR}"/${PN}-3.2.4-only-unit-tests.patch
-)
-
-src_prepare() {
-	# Bug filed upstream about deprecated std::auto_ptr
-	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
-	# Bad symlink for libtool in the archive
-	rm "${S}/ltmain.sh" || die
-
-	default
-
-	# we don't use eautoreconf to avoid dev-util/bakefile
-	_elibtoolize --auto-ltdl --install --copy --force
-	elibtoolize
-
-	# Current MySQL libraries are always with threads and slowly being removed
-	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
-	rm "${S}/doc/"README-*-RPM.txt || die
-}
-
-src_configure() {
-	local myconf=(
-		--enable-thread-check
-		--with-mysql="${EPREFIX}/usr"
-		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
-		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
-	)
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	ONLY_UNIT_TESTS=1 "${S}"/dtest || die
-}
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
-}
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@ -1,7 +1,5 @@
 DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
-DIST commons-daemon-1.1.0-src.tar.gz 298028 BLAKE2B 5e8a0719467523438559472270ac7038ecce040f2a5a8ea8704e181557df726b9c09267b57336d9659dcb3528fecb8ac61937ef3d56e5cb12b562b88b5f6f218 SHA512 a370085a991cd6b121fcfb49822660dfc0aac19f164677dd2e6373750c1a526ef5a10334a8e075fd965c038198f6638b9e9130b5b13256f4a23a6c5a29959701
 DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
 EBUILD commons-daemon-1.0.15.ebuild 1232 BLAKE2B 78bc104748e2134d37d137570be7cc16191060ea0c4df790563219de67e085a89e5d4bce0b0b5b6ea30bce39afc57066bae8c56451faf1c265228bd3e998e397 SHA512 05a543c150095c0125c3651632884945439f26d4959ff9dbbc503be461615362f3b9e24208c2b2faef72c73ffac6c848884478e8b7f2b2c8dcb4665196f03c83
-EBUILD commons-daemon-1.1.0.ebuild 1197 BLAKE2B fc07b31feb931246022a5633b253407d9cb9f8e9ae00b7f11b62b4efa4435ad9ed2ac430fb76f5955386d8d9f99419e107e37af7be2f9021c136732231936784 SHA512 60a4f508609fc201099ef8b8341c384ab1a5411ef4c6e9fda6e2586b87cc901eb83341154c5b7c9ad63f26861382aaa7a0eb520858236f74037322b7dea399a8
-EBUILD commons-daemon-1.2.4.ebuild 1460 BLAKE2B e728ef7875bc52ba57a8a69b548f65ea58d0301fa630774a5fc8ca8c6c07045c95a24091e0b1cfb52ea42a042a62b4ed81b539cdd20e7f59b2d081ca28a0937e SHA512 ae9ffaa5571c30c6ed9b3d0f13773183077bd19d4f54c6521478e315a00b4bdac1dc08bc0d75f7686c95a773cdbfa0da64653bed09b820243bb0b5defa6f2359
+EBUILD commons-daemon-1.2.4.ebuild 1458 BLAKE2B e6f360ddfe736650f071b87c5221db7ea590c793980558404ea98d648d5f7fe6a3de29085874f8e3265f1b205174cf520b3c1585b36367dfde460142e29401fe SHA512 f43de5d3a579deef5fb26c4f6ab688ac50a49c0abc82ae4bfa1e1074084cf55a7fac4607391beefe976f779bf104339bdad42c7fe2adeb9a315dc2657e80d58e
 MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
--- a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit autotools java-pkg-2 java-ant-2
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-HOMEPAGE="https://commons.apache.org/daemon/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="kernel_linux? ( sys-libs/libcap )"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	default
-	cd "${S}/src/native/unix" || die
-	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
-	eautoconf
-}
-
-src_configure() {
-	java-ant-2_src_configure
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_install() {
-	dobin src/native/unix/jsvc
-	java-pkg_newjar dist/*.jar
-
-	dodoc README RELEASE-NOTES.txt PROPOSAL.html
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use examples && java-pkg_doexamples src/samples
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"

 DEPEND="
 	>=virtual/jdk-1.8:*
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@ -1,4 +1,4 @@
 DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
 EBUILD cortado-0.6.0-r1.ebuild 734 BLAKE2B 07a8b8685ffa611ff2bd577457b8a42b09422a9f445ef4bae52edf920a1fa5a65f3af43cbdf76c673797c71c83792ec717507b6a2b4f08f220b4e91eac588df6 SHA512 f8c0690ecd8789fd2c4010abe713a1860e7db4651f4493c27d5ebe02308308dbebe57019d60c20041343a0bded91e3ee48f63573cb6ef1958c9a7743beca895d
-EBUILD cortado-0.6.0-r2.ebuild 745 BLAKE2B 6f5fad688b57684deb1bf737f1e23bab31057fc09adea0988421437d8b83b743f04bd7ec41ef336b1d7f846c74fb7c21fd0423f7b79f0c8d760bb101805b29ae SHA512 38d271bde4b17bab72606f4ba88da2a290bde4a74778c0c84c48ddbae53fdc31841ce57330e00d45e53934b7cfeecdb84296cbfdc28bc7b550b78e6cc29612f9
+EBUILD cortado-0.6.0-r2.ebuild 754 BLAKE2B cc215254820d0b48e414ba8b252e3b44bda8974b42a83ff0c0e17f75ee267b0cdd35fdd6e274a0cf4aa5df4c26e6947328f7c5af824b04e85a3a3bbfff6e0260 SHA512 c79fccf636c39cc6b33f1fcd80fd0747a8db256f7764a44b11a469a05cec550475e2a601f16e36c65388d8aa031f5b042e42f92e77c2ff429286dd132d4fe038
 MISC metadata.xml 1039 BLAKE2B 2c718f02922e15112d22a0f9289787c129f7bca4b2d448e31a42edd961b2d238f3e7bb4f24a11a5e029d40fae48c521fb904891f32fc7e80140d51bff1a10925 SHA512 f4a9cb54e8b282812f1e73db192a575ca0cee2827c049ca1585a04c4b2f12557ec3df8b530f95dcf6af056fd7b50a733d29a09eb9b8c4d373ebccd3467a5fd80
--- a/dev-java/cortado/cortado-0.6.0-r2.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r2.ebuild
@ -20,6 +20,7 @@ BDEPEND="app-arch/unzip"
 EANT_BUILD_TARGET="stripped"

 src_prepare() {
+	default
 	echo "#!/bin/sh" > scripts/get-revision || die
 	echo "echo ${PV}" >> scripts/get-revision || die
 }
--- a/dev-java/jchart2d/Manifest
+++ b/dev-java/jchart2d/Manifest
@ -1,3 +1,4 @@
 DIST jchart2d-eclipse-project-3.2.2.zip 3203952 BLAKE2B 99f3058184e02b682e288675edd68c7f53f2961a1888d096c7834d011ce279b9cfc8228f801e8fc4d3b20250875c5db59cc945ab46ae62c28b85545082e684ca SHA512 aa369b78aced9f7884d51f5298a6772d00cd4003d970e0bb401b717b4bdd2fdd543cf9a382edf7c9a6d1837cedb483a04aa89aac1e66d6e365655e99c76ee812
+EBUILD jchart2d-3.2.2-r1.ebuild 1277 BLAKE2B 8e7935c0ae45ce1c550389f414a42c46220e6f429179d134da37a3ada3c6bb8f48ec68274bdae7591ef034921f94963824e443cca51ff2c19cc1cf38740906ae SHA512 7517ca26379c108b84fde30d29e16ed48854c6b74f08390873056bddd5967d28d56c9cd5efc63503558cdad3101e5e09cb96796106ff4fd51539869609915b8d
 EBUILD jchart2d-3.2.2.ebuild 912 BLAKE2B 1d03ce8959dd57b2d714e8afec81d740054a8b113c1564e80ec37e720c5d1907a9acdb21f9f1cc168a173f42f2e83c813d1485f0ff4aea3838d29f85f606f95e SHA512 abf365afbd13a3f2ccc937ff68926ad9abf0e53deb8c96b24b3dbf0a8c361813e51d4e9b0cc95a0fa145062c36a51b412c0d037b75fcc8442df4250002e1ab49
 MISC metadata.xml 888 BLAKE2B a0930cd934de146950dba51ca961f8b1679e37062f24fe4ad2c2a375809da6a2489855afd638552652a3aeefd9fd20dca50250ba0022e32372491a191e09e51b SHA512 b88619b0447efbd55015786afa2d2ab02a23f29cb16b6d2b78123bfcb1ca4f500d0124061856d88ce4ffd5773c104e0ae043e1f6826e65e1b8242e9bb3fedaaf
--- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
+++ b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.sf.jchart2d:jchart2d:3.2.2"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="http://jchart2d.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jide-oss:0
+	dev-java/xmlgraphics-commons:2"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( ../NOTICE-apache-xmlgraphics-commons )
+
+JAVA_SRC_DIR="src"
+
+# FAILURES!!!
+# Tests run: 212,  Failures: 119
+# JAVA_TEST_SRC_DIR="test"
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# src/Bug3553696.java:3: error: package info.monitorenter.gui.chart.tracepoints does not exist
+	# import info.monitorenter.gui.chart.tracepoints.TracePoint2D;
+	#                                               ^
+	rm src/Bug3553696.java || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@ -1,4 +1,4 @@
 DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
-EBUILD joda-convert-2.2.2-r1.ebuild 2005 BLAKE2B 9e0baff66dae307f609d57d093474a9bfe13f8f9012a27766baf16b1b78843acfba55f830c7bc29a1f825ac08b154c8b796ba6e456beb7c719ae9a733ba2bf8e SHA512 e8e238cff934a5897f919d9229feba8fb1683e84efa6b0f6e5da3e717e3d7f81075534037ba09ce5a445719b38e4da1a9e8e8bd821bfcddbcf0e4c3e3f53a115
+EBUILD joda-convert-2.2.2-r1.ebuild 2003 BLAKE2B 626fa1a6359ca5bc418bea46db4cd1cabe0fcc1aa6b3865d0170476b9cc08206dd28ec5b773b0129acb064e88040fe799b93c569de1f174a58ef9c73cbdc37d9 SHA512 cdff796a2ef8add7d941d0e40dad9f994c952ed0cf5ffe66a2bfe07535b456341dd1a2869a3a6038cdc941306ebd90386ada2a48b493c9b7a36825120e265298
 EBUILD joda-convert-2.2.2.ebuild 2015 BLAKE2B 539a3f32140a5796cef6e0dd083dcf26965d68662d5a77e7a843dab9007ea1e4f4f58c8c75f9be2a06807286c2259fad6b0dc07a5e211a5c0cd4174452ad92d6 SHA512 667bb9c85af1ef67a9f3bcd3eb738ef488202f4daabbdaba940f44e1f4d4b61392a77a17fbe03095eba111cfa2590efd39e088eab38f4cecc6c56f77cfddff98
 MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
--- a/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
+++ b/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"

 # Compile dependencies
 # POM: pom.xml
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@ -1,4 +1,3 @@
 DIST jtds-1.3.1-src.zip 3377625 BLAKE2B 2c5ccfa4d7c6fbb1879007b5f0e9bcfd1ae1061fc68174d1679c72f3f9806433af842d5ca8e47da69acf53b8d517522f33a901adfa35867c96a63446da5269c3 SHA512 1744219a52c7167449388d774fd5e834ef551f60548569c4c54e6caefaade1d932a3879a023869d8d9ddb29ce4ab52b6d08bc4c364d5f372ff5fa96bed6d9864
-EBUILD jtds-1.3.1-r1.ebuild 870 BLAKE2B 5c5a833157a50d5162924fd8a8f748da7d2c2100a941ab5b1ddbe2b51dd2e838303e6537976d2def2713cf8eb5038b731bd14354e7317dde1de2ccdf408803b3 SHA512 9f78e57acf12f8be54459bd9b6605646583291160f99a8e4c9eb403eae4906b1b9fd4573363a54502c4816fea6753f3eb9077ed830b4aef74837703533d2fcba
-EBUILD jtds-1.3.1.ebuild 829 BLAKE2B 692867bb0c1c9f82f98d5fa30cfaee62025d6c16a2411262ef2f11fc375b20fca5d8bd5efce3e53167d0045df22a2dcc358f6d94be28e347ec31f346ecf24241 SHA512 482f2b94a427eecbfd3bccdd678635bd733379c7cd5b04ade41e12dfa5a30f7cc9f5dfa9e871936b0e74b77947bc141a75fe45d23de4509ca9cb8b75adf6adeb
+EBUILD jtds-1.3.1-r1.ebuild 868 BLAKE2B 783013e023f8d46d80749afadd51d04b573b14fe2bdf25a094720fd369d2c0f4a26a2d0bb7251ed8e031f06d7edd21b37d24fc330872448d06bc2f13381893d4 SHA512 69b78588494af578bd5897b166d51fbd43d3233eaf8579e27ac6fb18dc5c12e6c48f1377088010ae512933183fc38ac8912fc6359defaf87bf230ad37688574f
 MISC metadata.xml 878 BLAKE2B 60f04108c7209daad88d8dd27f45274f7dbb2143f6524b968ac344f84f4155ecfa2a1842c4ce328862e5d341d4da7ddec564816a9d26794d2d1684f889a736a9 SHA512 90012315bece0d428ef9e8546fb439379f6a671b01338f7b112fd0f7f6002250f20a265f366e168e93960587312f28e463a621523cc3843a3748c168ccd481ac
--- a/dev-java/jtds/jtds-1.3.1-r1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}-src.zip"

 LICENSE="LGPL-2.1"
 SLOT="1.3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test" # Needs a running server

 CDEPEND="dev-java/jcifs:1.1"
--- a/dev-java/jtds/jtds-1.3.1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://jtds.sourceforge.net"
-LICENSE="LGPL-2.1"
-SLOT="1.3"
-KEYWORDS="amd64 x86"
-RESTRICT="test" # Needs a running server
-
-CDEPEND="dev-java/jcifs:1.1"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
-
-JAVA_SRC_DIR="src/main"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_GENTOO_CLASSPATH="jcifs-1.1"
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc CHANGELOG README*
-}
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@ -1,5 +1,5 @@
 AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed791af9fd5df929b06609831749a65fb9c7d79aa4aaa86d87c6796872ef1fbc077844a3ec7e431970bc3a094d65 SHA512 18b5679c538aee7821456acd44342a03e79dbb4d5b65ec7f7103a4d2b883f3726f346804d6362e7775b7e2826ea0e002663bfc32c0282a431254bf199791cd9d
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-EBUILD jtidy-1.0-r1.ebuild 1054 BLAKE2B 2a96019e0aacc66c2a55b980d16df8a487af8a159f2bd89e19e6be1c30a18e6840161e3ce41d8a019ecf0429fdb5170f4a5646687979e346e278f4da9e6863f0 SHA512 9f680ab0b460c1889dfc34b5facce72e3d1a85ae24ca118d10c790eb07f4bf065e4dcd57b323217aead422d0d4f8fc59240c8edcafaae6c0b5063f484000a4c1
+EBUILD jtidy-1.0-r1.ebuild 1052 BLAKE2B d68128aa11d59ee1ce812887d7e348303949b4cbbc3bd58b60381ba336c37814ac0d508856a9352b761a5d0daf0a5805708def62a90cf28e4ff088026d249df6 SHA512 70865638f0ad42d6f0d433cf0b6dc4e79302c276cadba5e0e0b4f44f2aa2b747a208a2fc48aec29a4b1307b04c9d5c7046df43734eef01147e1b2a9fc3d1622d
 EBUILD jtidy-1.0.ebuild 1041 BLAKE2B f08794ec51cb9effef5e426632e4096cb3f2f09ab41d9d858623794d849c212a72185593562dad437b5c517b35bc289f2f33d93daa14e67f3d4fc8b02fda6cfc SHA512 cb06626f07e65f7e58dca3e4629a1bfe5b9ac3cb8f720f1659c0f38e3f458d1a220ddcec5787507d5df809a880dba6d6826832ce7d0fa485642f413d03851422
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
--- a/dev-java/jtidy/jtidy-1.0-r1.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r1.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="http://jtidy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"

 CDEPEND="dev-java/ant-core:0"

--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@ -1,5 +1,4 @@
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
-EBUILD metainf-services-1.7-r1.ebuild 581 BLAKE2B 35c28ce97bd4c808a3c4b9a3e95f983b006a95a4e91f462526c42bd560cb3de11534799fb899ed2669770ba2f2d7ef4930ad3a642bcf342d100507ea74af25c4 SHA512 c196202feb08d82949b14a24e74425d02a35d0830e5080a356193ac2c52b0d2906a2a07a6485738ce5be217f36beba9b889903c0bb088eada0d4851be9f8ddb7
-EBUILD metainf-services-1.7.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
+EBUILD metainf-services-1.7-r1.ebuild 579 BLAKE2B 204d9b2856a31b0b0b8132e5ddfeaf4f07f81e7920a4ddd41d09802ef94fb804d92b682736c7dd1d7b2b4ff6b2c8547ab63a085e05cb6f20a2a96b37ba1fe4f9 SHA512 30b4b933a1648cc356335df4005d820fa1c7b040452aafcf5f5cc2386d350a2bc8480c6961173ce95a31ed3926898c42b4be98cc002f7a078981bceb04f2c0b0
 MISC metadata.xml 336 BLAKE2B b113ab8fbfc9b92ca28ffd74d92fbea63d51e156566c0cb5292186efe18e8cc6b1e4c8d53efa1bade7d7ffacfed5780e699838805ac7ec6e2dd6684067fa9297 SHA512 1e1092dca56408b2ea5d09537f33d685c6ee97d59e62b1894f2fa24255d699b82c6aeb6fe7af90045bf4498035a6f45be93b843784ee1e89fdcf7ce165aeccc9
--- a/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"

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

 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generates META-INF/services files automatically"
-HOMEPAGE="http://metainf-services.kohsuke.org/"
-SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-}
--- a/dev-java/spin/Manifest
+++ b/dev-java/spin/Manifest
@ -1,6 +1,5 @@
 AUX 1.5-build.xml 8638 BLAKE2B ef4667e88f82c6284c592574822b88fe66fc5ca22626fd12164be6e18315b139e18636420cb7bb832167fe26f2b2bbf48a2e928a169f094786d770816cfd157d SHA512 8126661b264cac4a86dfbd646a8e88598075173479d1d952dcaa3c756793394bb50ff1bd5a57f4a4a86cad99d4b49cd5bd398ad608fb199a12adeecb64228583
 AUX 1.5-maven-build.properties 673 BLAKE2B b014639d8fccc8845dc632a06b25f8a0a4c00ed96b76ac8d8ff74cc2957d98d56f585a53b2cd3028d1d9d6d9b0a96c3fc29dc85dddf21678d6e8f60fcbe73a6f SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2
 DIST spin-1.5-all.zip 482286 BLAKE2B d1b1de891290ed465f2886bea046d9aa106626be91e5ac37dcd795bb0ef5e558b3d81b1e86cfb168d660f4c2884d321d560bece50645822a0334848225c6638b SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466
-EBUILD spin-1.5-r1.ebuild 1012 BLAKE2B dbcc56a3a70e6f85803ff8ed8872aff88d575831c437ae255030f3442abaf52eccc256b3bd9ac797e8f0c1d6abb76328abffaa1b222dd390bda8b31f7b33e58d SHA512 1e5a42026101717f93dcb30384bbedc74c222f5acc34042f09630df8ea3f869d9b6731526bc7af1e377a3ba7a7319f70bfe0bd769c12a4ff72bc01e715c4a707
-EBUILD spin-1.5-r2.ebuild 3051 BLAKE2B cf9e889aae5861b110c9611c6f66b2ed050215affb73e1b35772959cbfa12a5400d1ae852414de2102cb893a1639abfb2ea2d8883424896e3675fa3ba296bc04 SHA512 982b24a0b0e6f2260121027770c86ca2567dfa4ea5f4764aa83f33044db6e607c51719c68537d1bccc08272f0ba719a564d8af0a6e7cf5f9579c09e18e8d2a5b
+EBUILD spin-1.5-r2.ebuild 3049 BLAKE2B c93e50ea27af69cea44a6b34ef6afc72eee4b49eabb5a85f0d966828c760e4e354cb6aa8e71c7d7a71ace9e23cab2ad4815031e7a0d5fdbbf04677ee308c9e58 SHA512 496cc013453570add3ffbe23ea5800fe8e43416a31007034ed9c2b401b4f0062aee915cbb98c3e65ac954fc8f35569a889b6d5cd5a6f41420edce80e09a4faa4
 MISC metadata.xml 311 BLAKE2B 4b74521bd09bf6dc5cc23756c20b979e6bd0def2976e74cc5ed62dca4482e460bbd43c98517828a0396abce3623cf16cffff230c8a92015a9d9894196f9480ef SHA512 fa0bd5bc4452ece5f45815567016bb38b79c420ea5050f66aca8062839360d0c4e563f56316ff1f98e02e088b3a7e15d8bfd583c94fb494df643d24ba3b7fb90
--- a/dev-java/spin/spin-1.5-r1.ebuild
+++ b/dev-java/spin/spin-1.5-r1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Transparent threading solution for non-freezing Swing applications"
-HOMEPAGE="http://spin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-all.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="dev-java/cglib:3"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
-	cp "${FILESDIR}/${PV}-maven-build.properties" maven-build.properties || die
-	rm -v lib/*.jar || die
-	java-pkg_filter-compiler jikes
-}
-
-EANT_GENTOO_CLASSPATH="cglib-3"
-
-# Needs X
-RESTRICT="test"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/spin/spin-1.5-r2.ebuild
+++ b/dev-java/spin/spin-1.5-r2.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/v${PV}/${P}-all.zip"

 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 # Common dependencies
 # POM: pom.xml
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@ -1,4 +1,3 @@
-AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
 DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f SHA512 e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
 EBUILD xerces-2.12.2.ebuild 1736 BLAKE2B 7fadb87267e36e3354a83fb5fb124699258455c4e9f077b1af4bedd337933179d3db4fd6b0fdfadcfa9b354f58202852be45983472b95ceb721ccc622d2a14b0 SHA512 ecdeb6cb34e09cb4ffbbcc66648f79ec5b4608caccef7c8ba899643cda632762f71d12a055773d879c9362371191443021152b0a287f2db5d6c3f23bdaebc1e6
 MISC metadata.xml 1778 BLAKE2B 458bcbd9e8adfab1d2bd25a5fe9de0bee48292cb57e3591821fade58a987e59cb9811800273ac62b525738e7e955514b8b77c27fe97d9040bad0db203e6171a4 SHA512 ccbd7007ce2efe5b19d300ba939abe4e756d65eb1c910c74c5f3f13410de0d75e83bfd82d1e226e5dc1180982a1bfe231d30cb849f60142a177cc9aeb087c91f
--- a/dev-java/xerces/files/xerces-2.12.0-overrides.patch
+++ b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
@ -1,66 +0,0 @@
--- a/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:08:03.187783332 +0000
-+++ b/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:09:38.640274335 +0000
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLIFrameElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -161,6 +162,11 @@
-         super( owner, name );
-     }
- 
-+    @Override
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
- 
- }
- 
--- a/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:06.833172177 +0000
-+++ b/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:56.755428976 +0000
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLFrameElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -138,6 +139,11 @@
-         super( owner, name );
-     }
-   
-+    @Override
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
- 
- }
- 
--- a/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:17:26.624199895 +0000
-+++ b/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:19:23.691802087 +0000
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLObjectElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -251,6 +252,11 @@
-         super( owner, name );
-     }
- 
-+    @Override
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
- 
- }
- 
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@ -29,6 +29,6 @@ EBUILD erlang-24.0.2.ebuild 4685 BLAKE2B 4591f62978ee5d34cffa95b167e344a886ea3ac
 EBUILD erlang-24.1.4.ebuild 4690 BLAKE2B 6f3f592d4fe976b84ec3ffaa322c92d44dd512c5001547dbe06529bdc7b6db4e034e92e80f4673614a4902f8dea1c791c6ef1067e8f3515e369de17b1eb6ae2e SHA512 d9eed3198a59e82ed5dd02593e802409ea886688f2eb29ddee16903999247bee458ae81641751168b0233788669a6ccb428af71a7d7b1d9a681f475572836881
 EBUILD erlang-24.1.7.ebuild 4703 BLAKE2B bade70e5ac94cbcaa7cb60f10c076a1381ce399772f7a1946ad119d678d25fb3f0f9b5127b97197f373b48e28859ac5785d404202bcd89e40b3ff2693638e2ac SHA512 0140531da4fdb85386f137a7d420cd43a6d7b4c6eb1ba2a7e99645cbe887331271647000b73e5aef99f5dc2358d8a3ebd2deeb66fbca99e308c27c506603f58c
 EBUILD erlang-24.2.1.ebuild 4703 BLAKE2B 5502ece670c76c5d4a0bc4d91bf3d4e02410be2afe92b8e84617ec6c9c766975982816fbfd83b08b1ef21523cf3e7aaf3b828afd81803fab74cd086668caab09 SHA512 e44980e0f1f8e4b157245aec9a3cb8d70fbde26982c04c0953fda7811cc186d7d29f692bf97283aa218cc3a93b7901eb16000df71b053c9a2c3686a94e9dde73
-EBUILD erlang-24.2.2.ebuild 4703 BLAKE2B 5502ece670c76c5d4a0bc4d91bf3d4e02410be2afe92b8e84617ec6c9c766975982816fbfd83b08b1ef21523cf3e7aaf3b828afd81803fab74cd086668caab09 SHA512 e44980e0f1f8e4b157245aec9a3cb8d70fbde26982c04c0953fda7811cc186d7d29f692bf97283aa218cc3a93b7901eb16000df71b053c9a2c3686a94e9dde73
+EBUILD erlang-24.2.2.ebuild 4710 BLAKE2B 3197563703f89759aa88fdbef736369d0b72963f026405e7cce671399339d2098c1e5bc9d727208c983155a563d7c0456969b291125f9af5144736fecedd7b2d SHA512 6bb04e7566fddc275be35a0f848a932a913d5dad1cb79ad43b6e93981bdc8b983518f05e44d11f5282da871a38d541be8e06feeb3a903041f68deb0fafdc7ea0
 EBUILD erlang-24.2.ebuild 4698 BLAKE2B cf50182fca921fd40817a06c4858b8ec6613629bae1cb024a71690178a3d98041dda2ce18a243c40c467ae0aed6aae46cabe6e73a7329df4a59e5103974481e8 SHA512 3c12cefd5ea038586589e972ad7b84f52a86acff631f9ee6747a50b5f6cfb51c13709395e4afdefea85e9c81c92489dee35d6dbecdbfe94fe465c2cb71b02fa3
 MISC metadata.xml 735 BLAKE2B 6deb116831085a15f4a06368d1d1f3e9d57501799236c7d1fe9fa8aa9a72da0151e92fa13e14427177679c361f8849379784e9c0124f28468f71e2eb54b78bbc SHA512 8ac9f9f29494b5aa9ff023460009c8b69cc3dbc4cc88ab419b62f715066ea3789a4575eab545eed5a430a95f4d0709e069fd240f2cb256eca4dfca7ce3838ab8
--- a/dev-lang/erlang/erlang-24.2.2.ebuild
+++ b/dev-lang/erlang/erlang-24.2.2.ebuild
@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"

 RDEPEND="
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@ -1,5 +1,5 @@
 DIST execline-2.6.1.1.tar.gz 92495 BLAKE2B 6b901819e49c424d52ce2d87b6b42aec1595fb97fef7905e93eca2f3ac029a35f826e37e519e2c6ab9e2638f625a446db363f5fbfd5530a93b52c831660b7a11 SHA512 5826abb407742ad8a2cd48c09b966827d129dda420db07c893cd7a27e806441d7b117a0c61fdc0222e527aada976da26e4779a4896fc084cdf6efa8294ffac5b
 DIST execline-2.8.2.0.tar.gz 98438 BLAKE2B 66860a1abb3f8078bd625d13dda2caec71bc41d54a35275548897018818b8b881b37d4ab4f4dd7a9a36386802f1f830d345e7ade0e9638b49acc80314ae60ae1 SHA512 9a2c21fbddfc4bce69857fa906fcbb7b17b0cd1009a33a9f3bbcce69ff443af82704d74b792e2d4393eb6d7de9888a5bc74ff208c31485d3398b0dea07368a15
 EBUILD execline-2.6.1.1.ebuild 1187 BLAKE2B 89933b7e1562cd32f28649014f1715aa5438f8c327b8e65f28e77474590eb867eb60deb3fd1c31f8891e1a629997c2b22d7e0526e82a2ce3ce2846ad5db73cb4 SHA512 a21e236fe361c40ef6547c06f55929c95e4b60b47d4e906fe5ae2c41a43f2368f8d8d3d4480cabb99805d9a874733942e43ec4dc279aa215e38898bdb8c1d00d
-EBUILD execline-2.8.2.0.ebuild 1135 BLAKE2B 98df9263f47778eb6430e57a4868cf9f3e9e92c109ea752de7134d1a7606c699eb1c232c599d1d17f0e8e2c3dbcbed2eab2595a79ca5c3f876132d31474916d9 SHA512 dce9be469ce921ad1ed407652fa1ab4f1faa4f85070e259de2d9e13cad87db7c548fa5ee84978675d2298ef5d00249f21b72203391ea7facf169c22d039c5e65
+EBUILD execline-2.8.2.0.ebuild 1134 BLAKE2B d0ff16b91157462b0d9c11ce66537023e14cf1e89ae97aa3fad3ea929af6fcbf33f570cb5d3d12bdca2852b5b24515a92e20dd2741f6764d33ea0d1086dc85d4 SHA512 973886804233e89945cc09333b9cb5762b83f7de17b7df42ededce1434d92bf033865a5cea993108c82f4b2c6fb239a3cb8bfd16eafc6671bc8fec6700540985
 MISC metadata.xml 730 BLAKE2B 0144183b0f42cc421c44f8cfc4e0b5dc6b1639e4279facd59b70ba76d8399e63a9b5d053fca41fbcf987d6b5b8ae1c653430f3fa2d63488f6f73c134344d0a75 SHA512 b30e6f0bcb3499104c0cfcfd5687f6ac1016e89d4ffd8ebdf8409eaeaaae6dce9c4fcf6f97824846527b95cfb61a812bffe7017304ca94af74d7bde6ed0586f1
--- a/dev-lang/execline/execline-2.8.2.0.ebuild
+++ b/dev-lang/execline/execline-2.8.2.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="static static-libs"

 REQUIRED_USE="static? ( static-libs )"
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@ -43,7 +43,7 @@ DIST python-gentoo-patches-3.9.10.tar.xz 12844 BLAKE2B f342fbdd1a580787e2d699ded
 DIST python-gentoo-patches-3.9.10_p1.tar.xz 14080 BLAKE2B 7cc21ffc439b82661e151ce7f85e217ce7cbe674296e7f7fc7f9b9215486d2845e8314130d1d378e24a0c2c9a6340055b1e4345426b136c113b7e833c564e903 SHA512 1be7ccf4dbb29d4b19985000baf98e54d77f493069f44381b5a3629b1e5b275755ef5a4736a7490d0bec037ab4be88ca1856d615bca9c759b0995b066dd2dbed
 DIST python-gentoo-patches-3.9.9.tar.xz 13200 BLAKE2B 672e3b79094cbc791988639a5dde4c9e5622e91bef4310d26838716c65763ca69a12c6afef2f19487f4389974af009896e452c19783b0a491072d13f893af7e9 SHA512 3cd4ddd070ab48d9978e1136d237fc24030fd3ce6704371ce99815702a45d839ee26c7e9552b004661827759edd30222434e4166f9ee16f873ad4783c83f723f
 EBUILD python-2.7.18_p13.ebuild 9899 BLAKE2B 89bd80ccd09e15edb4b8be45b620d17f7d220551e25f373cea50e9aa593cf2e42660a54a65f56f46783964a23076e182afd4fe36d709c22cee0e5745be75142d SHA512 4e8916ec74ed0e2921c50a9d7f27e62922fd0c0f52d87b870c3ae36161ac303c0a146ba3a61d0e2ce5b6c2d2f6d5798f696fc750642594a5cad6b396caa626fd
-EBUILD python-2.7.18_p14.ebuild 9907 BLAKE2B 948149c8dbd5490907c00e8c9ff617b1d002e5f7694f4274cf4b6c74c7c584da0bda349d2663adb03987c503c33de546d7cbb1bb34254744b702bb846e4cfb77 SHA512 d82b89d3149cc8a3124f6abbe7049d495dfd2eab0fec44d92302c8adddae06b2b0155f3a2e80c07b1ddf4d736c31b0df4f3aafb33e7557b889e4f9f1924951ed
+EBUILD python-2.7.18_p14.ebuild 9905 BLAKE2B d9402ec41f34b31ec1c852628ca29023189e921290454b6c9e7a4e82cade876c64d3975838e03c020acd68686a055577889795060c45eeaa2d50f34286b6e8d3 SHA512 b08486d1a4e888c4e9a682612bd5a60a46bc49b49013304664a46e94298f22460ba69446fc122f20d259e1f5ab06c72bdfbbbef53923350546262759d76c6f61
 EBUILD python-3.10.0_p1-r1.ebuild 10649 BLAKE2B f6c02daec9145c17967964b3c2c5f12fe3549eebd11b939509bb1ebef5e480c121839005ea018e9d06b524f029834e8feaffb6c1b2e5c78aff023bf0a7fa422e SHA512 ed8f377ff9cfe136817c4e71e22e63e290023d9318a1cc85aac4db8fe273a82863a4fb1dce9c954d03aa3314edbc8f44454a187976bb9ff0759fc0642f94c3de
 EBUILD python-3.10.1-r3.ebuild 11101 BLAKE2B 79eef63d0ae92af7002a860b4c7c1e95e3f6c3d07b15a37222895e8f2008b7d76b86200e4c69b2faa8d684d8dfa81f76880a1ad5c2932a0fadde8c69ebb3a6ce SHA512 647da8d99768c94c290cd7bb5f11505865cd7273c57804e6c90d8a2a1aa321b498966905655c171ecb8c64b975ccb8fa07e3d0926e83249baaa2c18a75708f92
 EBUILD python-3.10.2-r1.ebuild 11354 BLAKE2B b007f5139432b40f652de4cdf292b42fc27a8f080c819e248339037e95350ffdccfd99b1b5c0b37c5b2b7f2cf0e5a65f7fd6dd93ee2b86202726b16e7baa157e SHA512 f4a7ee1791ce593432cb5a4b4c8d437bab6458c2a9bf337081c6a51b3ae47c356e61bfd0b14d4522355941a731f65aaff170aeaef8a8f401b450994e78a32b25
@ -63,6 +63,6 @@ EBUILD python-3.8.12_p1-r2.ebuild 10156 BLAKE2B f7db2d6df56ff646ea8099a6ff2ae5ea
 EBUILD python-3.8.12_p2.ebuild 10284 BLAKE2B 8f24835811773f85bff7a57141c66234ca6aa1c309e9c77d5e5d3f587d2f373236d0a95a65469775f896a249a961d82dd3f812fbfbfadfdcc71b812285312e60 SHA512 ce9addae4b54f27416b0f179b552a3d2b2ad6cf0a291e792d013e27feaa62cce15940f865bed6f75f913589bdd2a3a402468d7691bdd3e92d00d821e39f89d13
 EBUILD python-3.9.10-r1.ebuild 11114 BLAKE2B a38807323109748a38c69356c20e43382578dfc3bc2e2bf254e633d44dcdb068b88980f28804e692c6d360b5ff8a9d8f3e800223971bd7591bb414c17b25cf61 SHA512 3596fd5d935ce8408ddb4e5ca05035380aa32d9ea5ff7292f9e579a77df1790cb5f8415871241d0ff5d4aa7676ebf2583954a224f5236fb068507b16a06ea807
 EBUILD python-3.9.10.ebuild 10904 BLAKE2B 6bb39991fb2b61f960fcf762bbdf2cf2948976d30b9837bc9d5cd6b9c4a934bca144f18898b2e7975ceeed659da8158d4e2735ccc56479ec1bfeb4b783300a9b SHA512 012a4cfd6f6ca69008b89ed9fcdf91624bf34102fda4f4ef02c81dc82a5fbafc8e6d4ded7138223c61f1042c168afaf91fdd61a2bca0e9a55cf43c0cd3bb3738
-EBUILD python-3.9.10_p1.ebuild 11243 BLAKE2B db7ee73ddd0109e235671fcdd29fac7f1a7b3d9ab5ed7d0f244738a3684f6b811606540888dab012ef79a4ffb32a305b259068492c454aae0146c3e2b2340d4e SHA512 530f1c14c68417c9ab322736a41fa36a96b8003077f3638e48e7e50b22934ae2ef4d85af254196ad416648a3a59664ee6a318b8fbf9e3bf1be163f9165397c45
+EBUILD python-3.9.10_p1.ebuild 11242 BLAKE2B a41c38a2e3624b6320210ecd40fa11cad252211bfa89442f581a72802343ed49a799c3a851315d600244ff88036bab297107142f4de550a3c008d4bcf70d68b5 SHA512 977b6cdb6c756b635a3396dbf9f544d561abdfd231141e5f12ddb9c8cd6de41df4606aa723bc6862dbc3ffbae5f047417f17617ad118e0b21ce515f136c4ddae
 EBUILD python-3.9.9-r1.ebuild 10896 BLAKE2B fcbda5d3be808babce2fd7bc00e7fbad40c83afee571bcbccf3c2b51e5b5eea355228ad99f849647e76482a083150d22e00d968e9432fd10952f5b7324e9e917 SHA512 e4dbf2b45a93046369bb276d4033e3aad77257843990a567dee7a03e67e9cdbfc2b15a7ab6e9125623b62cd799eacc7722d7e3ee547bdb3c1a6c676e251ad8ad
 MISC metadata.xml 740 BLAKE2B 31abd8d03440517adf39f29f36e87f821dbf029602f40d4b252b1ec8e6a52955ad9325fe66a9a3bd2e9c4436e6c6865853f75c3169016c7a44327a06b07694df SHA512 b601a773d5fe4e29d43e9ce5d857bb525b706b95745056a74a2476a37f182075363cb44814f9d6f73b8be08a63d75ec322b608463796c6eef7aa8d636a2350b8
--- a/dev-lang/python/python-2.7.18_p14.ebuild
+++ b/dev-lang/python/python-2.7.18_p14.ebuild
@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 IUSE="berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml"

 # Do not add a dependency on dev-lang/python to this ebuild.
--- a/dev-lang/python/python-3.9.10_p1.ebuild
+++ b/dev-lang/python/python-3.9.10_p1.ebuild
@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@ -1,5 +1,5 @@
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
 EBUILD ffcall-2.1.ebuild 1465 BLAKE2B 94c45c5e0c32ef02e7eeb1922466dabb4c5ad239e992403796e84a803fb2901384da0b029af539b8d71d960e207530de48bc49a72ecdd7143721d0982af76e13 SHA512 4b4fd2c30aaa9e7039e3797df97ad9947f960ba22d65fc5ae1a8d6c57c1cf6ad04ea6726249d3e2fcb34940ebf30b2c15f270f19b79dea9dd2e8b0fabdce062c
-EBUILD ffcall-2.4.ebuild 1483 BLAKE2B f5802d5fb500792c966ece4d9c5fb3b06d9525701108834e681f2a3c149b1ed2cdd868d46ffc8177c03867d4a6f1d3f2f8b29b726f094c178b57e1d2b53ef96d SHA512 d9930c7ec80dbb59143648a04b20444883cc74d7470db0f2305f34cf679856d3d357f1d3d420b16020631ef668c2c01f3b09739b8d2dabbd4d095948c07420c4
+EBUILD ffcall-2.4.ebuild 1478 BLAKE2B d698e14473c405a1df3303637aa06483a8d26956e5e3d1dff7c0eb372d5cf57b3c91f52ea1aa8e7e7edf2bc5c6ccdb3f5d0d282f97509f21d16ec2e7d7ab689a SHA512 b09176dc77882cfd995c70b1d94a02a98cbc1e53d8589f293fb33f56025d4c358182c6754d04ae159f4bba852ed0a271d2596aed61b8e35ee613fc3ac2f295ab
 MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0
--- a/dev-libs/ffcall/ffcall-2.4.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"

 src_prepare() {
 	# The build system is a strange mix of autogenerated
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@ -1,4 +1,4 @@
 AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12
 DIST libtpms-0.9.1.tar.gz 1261528 BLAKE2B 8a81fbea7dff44fe55da048f5121511c22ce264aaa64778ec28b6e55be64677f46f8266bed9edaeb57605ccede755ddfa7463a10e8fc806a86ea09d7a1f9283e SHA512 15ae14bca4ac24391ba06accae37d7e914e410ac9dc1aeae0743295371c9a0e0851f191c55bffb765cb731e8d397188be6441d2b6c1f5011b56a354428c4dad1
-EBUILD libtpms-0.9.1.ebuild 1297 BLAKE2B 60e19a6be447a90167fa15bfda53f9e8ce1724046100a59590c1e27ecf609e0ff0f6565325f24ecb43603e1fcc655aed7a51b9d44c0d5b67a0bc4bc0f1578276 SHA512 6a979e72dab2bacca9bd53d97984d667ecb588878127d7b598873e46e4279a1a53b5e66fe4b49b7e648974caab34b05cd7362de2d21665a30b7de11f9789e24d
+EBUILD libtpms-0.9.1.ebuild 1304 BLAKE2B a59602976b1c6564c1a75dd97418dc35c9537e4adc997e8a6ac63ec833a9d8d4e154425d9ea82311cbadade514a26a60e8c5b7ae2008f434c1b9ee0568c239b8 SHA512 59fe0fa80df39422df62858552384ae88613a7d037ec1ac9de3687d80959903a3d422c11fd6f6ac196eab9d75573003ca9f2adca59d28f1034e8d7a619b43d31
 MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721
--- a/dev-libs/libtpms/libtpms-0.9.1.ebuild
+++ b/dev-libs/libtpms/libtpms-0.9.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"

 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@ -3,7 +3,9 @@ AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec5
 AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69
 AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
 DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
+DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
-EBUILD link-grammar-5.10.2.ebuild 2955 BLAKE2B 9110a507c8574d8fcd73441275831e59b35b28d824ffbb0dd3b21143241faad23e4d906f08abcad9fbfd44ab4b0ee47a4d154c380dac6b2f58dab6813fa2f13c SHA512 2f2fc15e568326559ca3f65db137ee0a0948c63e4c99f7c0daffe5d949c66818be1eaf4e2df561b7e6656a5b4193e9560cd2155e37a6de4a61fd9ed33d87f057
+EBUILD link-grammar-5.10.2.ebuild 2954 BLAKE2B 312d2b9623cf5781bdd1683024bc8bb095132fbf7d006b299f1d66c1fa273abb90cd285d0f256ade7d05af8be7cc1832d43930cb737e43b6b1e887341ebbef1a SHA512 b7e60bec4e1210aedc581ea83563896899b3eff312e7a5f3426be4a489de2dafcd9bb0aa948b7ff463f1c6fdaf87a4f6e3437a2091d88466a01af5299ad09188
+EBUILD link-grammar-5.10.4.ebuild 2923 BLAKE2B 8559d949ea26e420c97628d02f9f9ce5b467cc9339fdd59ab60c406af6807177ec2cb4f046d039d8e2d3fdb124320a7e6b53b121caef5524b7c0f719c97a5bb6 SHA512 635ebd792e697ac282ab9451c8e95dfe2e46064aa7f5919c5ee62927c347c77a1dc6739d2f09be266dbb39307aa7e955461250e215581e999ad3a8e40a971951
 EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc
 MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
--- a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="aspell +hunspell python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

--- a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-r1 out-of-source
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
+SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aspell +hunspell python" # pcre
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# XXX: sqlite is automagic
+# Does not build with >=sci-mathematics/minisat-2, bug #593662
+# add pcre support: pcre? ( dev-libs/libpcre )
+RDEPEND="
+	dev-db/sqlite:3
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	python? ( ${PYTHON_DEPS} )
+	!sci-mathematics/minisat"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
+
+pkg_setup() {
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+		ewarn "you want aspell support."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	local myconf=(
+		--disable-maintainer-mode
+		--disable-editline
+		# java is hopelessly broken, invokes maven at build time (bug #806157)
+		--disable-java-bindings
+		--disable-perl-bindings
+		--disable-static
+		--enable-sat-solver=bundled
+		$(use_enable aspell)
+		$(use_enable hunspell)
+		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
+		# $(use_enable pcre regex-tokenizer)
+		# $(use_with pcre)
+	)
+
+	econf \
+		--disable-python-bindings \
+		"${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf \
+				--enable-python-bindings \
+				"${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+my_src_compile() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_compile() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
+		}
+		python_foreach_impl run_in_build_dir python_compile
+	fi
+}
+
+my_src_install() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_install() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@ -14,7 +14,7 @@ EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b
 EBUILD openssl-1.1.1k-r1.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
 EBUILD openssl-1.1.1l-r1.ebuild 8467 BLAKE2B 5416eaf449db4d7e785cf8ba2b83a829a9b57237c9d561900029ede389205a3905411b9b19d170f801d781fdb7ff3f8e562c0b037a87ad1cb48830cdac8091f5 SHA512 826f4e77f5388fa0b3cdd754c5d39c049987f4c7c038fa416da1611e084c866339ae95ccae722fb2058689953c60ed56562247feb11baaaf869516eea5a56b00
 EBUILD openssl-1.1.1l.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
-EBUILD openssl-1.1.1m.ebuild 9037 BLAKE2B 462189ad20945be9defa7ac1d2b03c749babedc9ed17092bc8c4a506eabb8ec001b55004224862ce9c8b58a459b67c8268199663f97b974016f216b9eeff836e SHA512 4c5a75392e5c958d05fcb6eb90d71a65d99ad57e57a354008d8e1fb167463121e4bdd5ebdedd5d44701c2e09f9c5684bbb0c6293514783c40659c606dcf4ccfc
+EBUILD openssl-1.1.1m.ebuild 9036 BLAKE2B 998fbd22a08de53c635cb928dc236827e0982e5758f51d179d92a087771f46fbff227624868bb0a682d0df2daec093d7c64bfb3812a6c5035f529030bbec7e8e SHA512 d976a3e28a9914a6ca0cba3d6a852c787f80d51b381bcb400ab88bcbc9d6e956c60dbb439781cfbffe47d1227301aa4ceb7729718f49a239f784dcc239815f93
 EBUILD openssl-3.0.0.ebuild 8207 BLAKE2B db8b946532034cfb9a9daaebca0202eff8af61157ad73e6d755de66dc9d249ea893bfc753f2a423be01876e184d439e6b9508dcc3ddf4a345181bbdc864cd4f6 SHA512 625c7bd53dfe8e96d50b6ea8b52d7386cdb425af05ec5a17475514cdb7d29e02a2283b2e58a1785c78bd5d7817f96fbf4af3747bb68b2107720326893f50b300
 EBUILD openssl-3.0.1.ebuild 8207 BLAKE2B db8b946532034cfb9a9daaebca0202eff8af61157ad73e6d755de66dc9d249ea893bfc753f2a423be01876e184d439e6b9508dcc3ddf4a345181bbdc864cd4f6 SHA512 625c7bd53dfe8e96d50b6ea8b52d7386cdb425af05ec5a17475514cdb7d29e02a2283b2e58a1785c78bd5d7817f96fbf4af3747bb68b2107720326893f50b300
 MISC metadata.xml 1486 BLAKE2B ddf79f8ea66471d1aa2809dce9b3b87973c38a1367566ec77222dfd22062963535241314bd4fd56387f2d133825e43627f363edee9329c14565717511b5cb870 SHA512 92f53ca3d3867ab8cfc4093ac92a9d9885eee8c10ac43f80c4dfb87911fc253557118064ecf1b1fae48c50e1273ef3821c9db84f00760dd0af8d5104a49595f0
--- a/dev-libs/openssl/openssl-1.1.1m.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1m.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
 RESTRICT="!test? ( test )"

--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@ -2,6 +2,6 @@ AUX skalibs-2.11.1.0-respect-user-provided-flags.patch 1207 BLAKE2B caaf3b25d9b5
 AUX skalibs-2.9.3.0-respect-user-provided-flags.patch 1215 BLAKE2B 48efa77149dfe60b2c77bdbc778bc71e73fd9d90a2e33ca1c2fd922839c1c7c03d8f85b099640d0994654c7b82fc1404b687207fd36a058ae0c0479ef93d62bc SHA512 b2f2c44a9c99ee56d9773673b8edd335934b9342d1560cd260e4ba773b7596e1fd9765454e47270bf8c2d0f6ce21afaae76a3164b8184c88d6ef602c02f7a1fb
 DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
 DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.11.1.0.ebuild 984 BLAKE2B a6de74599b83362820b14241ee24370dbf2c39b69f68afbfd66b0febe9cb286e1ff87b2b0ce30ac3e856c770e3ca27dd278bffafb7ddb230bcf3a2df1dccbb7c SHA512 10222496b25a0404a4485dde0336e90c85f5ab95721a2e2bdec8c826883e61fc74e3fe489f0926e5cec4440b806bddfbe81e58916d499506bdb7e114be8121c3
+EBUILD skalibs-2.11.1.0.ebuild 983 BLAKE2B 3fe869abdbae938681c9cf39ec25e171338d0404c03d903ffa01877319bd5de2cddb3d8416ecadf758274e81c3db38ebccb27dccbea6c3d274bb90b3146b5d72 SHA512 fe640fcf574f1dca0c839d33d80248a81931b5fd6d109dccf58124029ff631b21bedc1c34aacd373784d63fb5859bae92c454a0cf77e687998d8539fae49937f
 EBUILD skalibs-2.9.3.0.ebuild 1033 BLAKE2B a020fd7b3c911e796d3059d4ae1263b9cb5285f2908af24d8f5b0b767ec87f037da81e3c0a3a0b397756fde1943eff9fc59cf25e74e7236610ad79de2bfea18e SHA512 b4de37ef321d442c12ec8a6e2ceae183b6ec7c577f3f2d849bc0ee89df36732d4abc4b50bfeeeaebe6288084987644c7f38ed18a393502c664e63e8f983a9b83
 MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
--- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="doc ipv6 static-libs"

 HTML_DOCS=( doc/. )
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@ -1,6 +1,6 @@
 DIST wayland-protocols-1.24.tar.xz 77120 BLAKE2B 912132cb2b65b99184f25942e02000444ce5d37b60f33363999e8431db5835d3c0dab41dae312f0dbb02d03ab7e4f3f588e7b507e767ec132a82fd816700b09a SHA512 4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
 EBUILD wayland-protocols-1.24.ebuild 748 BLAKE2B 8b993cf653000a28fb907eca38e142b92a78d91f3e8a57bdf77650b3310b9c8fab3e5445e3daabe6fd11af00d2ced745e00ab0cf4b5a84086a6425107b65d891 SHA512 dc0b169ce9c4ad4fc89f47d0a09cdea9217046d0dc40cf6d79cf1b8f780cf5f9b94ff05d2d278cb53c798cdf265198db836bc4da4367e8d5943c5d26a6802434
-EBUILD wayland-protocols-1.25.ebuild 753 BLAKE2B effb508cc0b3052d789c8b9ba548d2482a15c2dd20afc61e28f18da9041ecff51278c4847d6d67e7d5de503369926d8af0e4286b0badab6656828e0fbda79645 SHA512 105d77f7e3a8989c30f605de1d0b8fcbee27233ee20d7d71f5a1683fb4bb94795be1466b6884a37eb8a53384bfcba39480e46403f71291ccf02fd90412bfe234
+EBUILD wayland-protocols-1.25.ebuild 751 BLAKE2B 5da6dfb1ff75c2f05aa3a35a9cf31d7da3698114fd7fdc49272e49ab7018e559e62b7fcaf0f9cda09c9d1b18688c0f854918049e13cf26b50d20b14a3bc3923c SHA512 b068b66703cfca0a5e2a30a0095bbd851b78ab2e3f4fb6a093a13ad58039305bdbb2461810bdf27dfef641a534134774e90ec6b50c01e62580c5ad8d1214fedc
 EBUILD wayland-protocols-9999.ebuild 755 BLAKE2B 78a1f3259f92eebe946bbdb6306dc6fb3ddcb3cf25b548f456b599be5b874fa73c19b6d0e492164f99fae8fc22528d962305b3fd48690a6a742f929a1eca334d SHA512 e2004b5792af48ec8dcbf42694644d962231b97991ae03fb40e640fc2c0668ba7a91fd4417e109381d9f678dd3f487e94df9d4a0db4dcfabee872d3a9860f9e0
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
--- a/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	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

 LICENSE="MIT"
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@ -1,5 +1,5 @@
 DIST ocurl-0.9.1.tar.gz 111393 BLAKE2B 83ec8f5e2e83b5cc519683556ca97818a092a80f41305394cc04088371c1179f256dee3d8a8e80597837fb156299698450c70ca00f1ec336ace46b02b84bb51e SHA512 f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5
 DIST ocurl-0.9.2.tar.gz 116659 BLAKE2B 3947cd82343cc9246c930f8fc89f7899f41a06f41358b5a014fbd05f5c85e70eb3df8c10690e62bd76d345c5738fdab63a936deed53fde0c8a3b040c5890129f SHA512 de9b06a2a4cbf804b6c947ef1011a75f45e3effbc29db054a9b72453920a0f554baa06d06b2a36eeee33090df7f9eb35280404237e2e3be219fb2dc98fe2bc82
 EBUILD ocurl-0.9.1.ebuild 787 BLAKE2B 822a2742542e929bab10b3389872ed454217efe61603cfdd6779d8312ed9e38de1be370a0bc22ba27dd1e06603cf9f4c18382fd42e52620fed5d3a5edda0bdd0 SHA512 fcab828b7206ca2eb66716095c8216cfac7ad098689301e239ff440bb155ac9625c99dddbd70e017d6d2002f4bfcba94762a4b920fef2e2d453530ca55c1b696
-EBUILD ocurl-0.9.2.ebuild 791 BLAKE2B adf5bf85d3670352ec29e6af449ece3364253988f66baa7d46220b8b766b85290e377c77430e8e4fae1200ce594dd7a270d17fbb33cb24cdf2c06b3a0936e594 SHA512 cbfbe81a2d1b87d046333f7ab367da876d5b472fdbb0ba36f541864627a6a1d55cd5b98e1d1a3638a138579414e0d316e83c27cf4cbbf3ed1a0e4bce05f96e25
+EBUILD ocurl-0.9.2.ebuild 790 BLAKE2B 09b3f8786cdec192613823cd3c84d01c7d6710b45583a77138143647a3ced2994ad588860d836bece4e8a41e030f4f515a32b2ca988253fc6daf34038e0fa2a1 SHA512 a44a3b6d45166aa822ea26c117b3360ace9b8462bcb70349b1c870ebaad375c997d4455ecd12e22a110b7a37c0ecb9ecd4c98e7e252e887e203dee27f2260e94
 MISC metadata.xml 249 BLAKE2B bc891d69b7055dc76869f08ac74ef4a5f9d4e107a21263e1b46e5e9616c8a28b66e6924f04cfec266256eb54a93d6c00a88bf2c180b6220c4cf93ff627be1487 SHA512 a47a8f47c4add47bb718a66770f0a180e4303af427aa696928abc621d94313b8c9d68b21994f6acf6c4866ce295559244063a9e02aadee4decc273f1be8dfa2d
--- a/dev-ml/ocurl/ocurl-0.9.2.ebuild
+++ b/dev-ml/ocurl/ocurl-0.9.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/ocurl/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="examples +ocamlopt"

 RDEPEND=">=net-misc/curl-7.9.8
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/antlr4-python3-runtime/Manifest
+++ b/dev-python/antlr4-python3-runtime/Manifest
@ -1,3 +1,3 @@
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
-EBUILD antlr4-python3-runtime-4.9.3.ebuild 529 BLAKE2B db30f0ccfa18de73a2f97d511fba140226e7bb5ed32641159014cc9a80fcf7c92a63b046132397008e31b4c3c99ffeab45e3f54b7918fd42fe58af7fe3e50443 SHA512 45af03ccf454d8246648b5d071fe3a27c77dcca335d45191e200e09ec6a251352b0efb95584d1ca0b388739073ac275050f263c229bcede5ddd97eda8e90d831
+EBUILD antlr4-python3-runtime-4.9.3.ebuild 534 BLAKE2B 13394f582021232d8a283bcb7cba8d0dc608d7200e95067c8d19a3a20c364ad60df42a7195af869e97a954f15f190c46816a6fdddbe47abf5c2b0fae2f90456a SHA512 64f383bfbfc4fc0fa2b8dae0e9f41d472183875cfcc078f8cd2b9be9e17cdcbd4718d874792286f91386fbff840e043ff10ec5722ff8605f4ce09400363c115c
 MISC metadata.xml 475 BLAKE2B 12dd34c09572017544a99c3985f6a7ad6c163f999f43fbc7ef4903456fe2d7fc59a8571fa3337ebe5a49eb6efab0a657a1b82b484b55887c799af11c0e64e716 SHA512 44ddd959d9f77d7beb97f84888db46ca468ed79ca844f89bbcac57366f42e1c2a1689497e2c25a659d2a63026b3c85f8348a43ee0213573d4a85cbf77fdfb993
--- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.9.3.ebuild
+++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.9.3.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/antlr4-${PV}/runtime/Python3"

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

 python_test() {
 	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -6,6 +6,7 @@ DIST boto3-1.20.54.tar.gz 468340 BLAKE2B 4b7406411200f7af7768c2ed213d623ff6ce607
 DIST boto3-1.21.0.tar.gz 468664 BLAKE2B 7d118b2d91a7d8fa38c27a218fc2eb8e8964f0974ddbaf84b92a9bf2ada884738b22d603fe9665ee27191508ea916e1bb8aeaa2eafb43162b7bbf0c48424415e SHA512 b3f9831c43dd3223dd72daeb4aeba9483927913570ffaee7d2d19736dca4fe587cca8703e8ec887440bc0abba55c0094bc2cf824f3e1982b626af11acec18290
 DIST boto3-1.21.1.tar.gz 469079 BLAKE2B c2a30539709c7c9741e3a34d5d352a31a0997cfadc29bb3b86c32c602229077414485b77c58718f2a519a5bb2ec8a3d7bfe1d6ef2daf26a8a4ae3c804c636464 SHA512 a94d195cbcee2b18877502eca9a79f231519f63712c7522ede23357d1117885e1fd2cce91d3698527d7f19140e08d68dd7272ef1278b9cbad86c77d81aa2661b
 DIST boto3-1.21.15.tar.gz 476516 BLAKE2B 306c7ee69dec5ff1fbd76ed32aaebdf0f52cdc49df600562f49cd543e5f331c6dbf88001070022043b9fd01c651af83b1c8c0966292c90791831f2e9d9fc4a84 SHA512 9d431fcbdcd42658cd52094b97c151fd10a68f2c83a457dccdf7991c8358c17b32faa09e3941f6d6e72bad8cda1b93dcfae8d78585dae43790c0ec248f0ab15d
+DIST boto3-1.21.16.tar.gz 476669 BLAKE2B 5ff8130a168841cd885f1f3f4752a5362910f0fd3c0598bab9db6f36c91570b4ef2ef598c46ebc5af870d9a12f12343213d44786923b3e0388bcc929d51fbca9 SHA512 86abc6903761ef740e3144a70acc9c3ef6f06e980a81b5384f8ad382080e8a5865df4e84b04ad54d6160ac2e9b7e1ff088395508ceb80861177f55b3a4eeeaab
 DIST boto3-1.21.2.tar.gz 469425 BLAKE2B a49c1280610bcb0564ad357570712224abdc032e807926be7bc0d0652503381b2b854e94ced12c95765f9c30ff62128ec0bff4d38d33e8a7a3d5a8d397de084b SHA512 bcd578c8b0665fc2951897d67279a7075d451a47cad70b59047c1cf66e26fd07f9f90ff8c69f9bc21038042dc6398944c02ebcc355dc8750d0613a11a0c3a2c6
 DIST boto3-1.21.3.tar.gz 469833 BLAKE2B 97efa041762cbb1b2f493195ca680a6c1631c6f599c631ec33939295d41df03ff1faae2d9178e60a34343a9b2fba33759cbd3d07222e8fabdc923e1a7dc8464f SHA512 57552b96dad6694dc7df34a83fa3822843e9f912c92146e1d11e2bf66fc85c89624752207389a612fa672556a9a02d62af573cbc9c2e264a97e933eb7f18a728
 DIST boto3-1.21.4.tar.gz 470233 BLAKE2B 3e6d8c5264ac66829e468633700e155ac935aae9fb148d892c90bb629699a4fd726f4e73aa399d98fafbffd71c215d141d682e49850f6d046a4513ab6dda8208 SHA512 2366cb0c415ee0497912a2369b3f3981562324556f5e7137d0b52069c63c778406802e2434bec122a047ac14dbdc44e51f6bc3c90fcee12d315aa30c21d45f0c
@ -21,6 +22,7 @@ EBUILD boto3-1.20.54.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e363546
 EBUILD boto3-1.21.0.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.1.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.15.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
+EBUILD boto3-1.21.16.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
 EBUILD boto3-1.21.2.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.3.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.4.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
--- a/dev-python/boto3/boto3-1.21.16.ebuild
+++ b/dev-python/boto3/boto3-1.21.16.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# 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_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -7,6 +7,7 @@ DIST botocore-1.23.54.tar.gz 8766494 BLAKE2B 27af2f4575fc133a253a4fe0671375f0389
 DIST botocore-1.24.0.tar.gz 8767222 BLAKE2B 9cdcb7677544230f006783d5a666c39c0ec27cf4f854f5dd47865ed8a42ad416b764e81e2b4b539c3a54934cf254f33ced562cd933cd2bd37c36dda0d16afe9b SHA512 1a60073f825cbbe50a8a45c1630391ee0c40646e520e60aef67698f121d1cc31ca5d9ff034ba5c05560193bf24438b5541e9b06c75b9d13888685565d01ff5b9
 DIST botocore-1.24.1.tar.gz 8768807 BLAKE2B 649633afa85cab9fb248ed9907e2ea3e57aae7325f4f53271669fbb7fa3f6932ce693878905bfe09e1dd1102a05e4be9dec58f9d3f53778a759c5afd85be6e32 SHA512 192113e6d072897d6eead85d31f44ee3051ab4610718cbb7b49bfc1e1b884fda9b9f793445275d6ecd678fea12b789fa137c41d1effcafd2ab50cbce81a57927
 DIST botocore-1.24.15.tar.gz 8820413 BLAKE2B 1a842d811b0471ee6881fc6fbae9726912636c9a83ed9e1395ae96705f6ef47cbb5d6b134a011da747951b7570e722af5a60c949e9301d509a79f431a797ca70 SHA512 d614d6f065a77e5d4dda9c8dbe401feae4e83398c5d2508b0807984fc8783b31cd6c507663c90a08daa5ccbf95b450633928599cd340227ab5dc90ea00fa1bbe
+DIST botocore-1.24.16.tar.gz 8820938 BLAKE2B 53e88eac6f0a0eff43b7f934d978e06d86debb5a99f112c576281978499d29627a5f8f0ca988ff05c8f24d08336d7a1bc0206037c8f0a89b2485b66af2b81294 SHA512 fac23333998ff790bc06829d576593f7031964d3399bd0cd71ffe160574ed98b88e64dc0cc84ca3eb04f6da130a8906d02f092e57d4074150e13611fbcacce33
 DIST botocore-1.24.2.tar.gz 8770474 BLAKE2B ed0f5920ae29bc5d51ca5d304f3cc13feb3ca45667d397f77e982d283f1b5551eccdbf41c0e274f56c59cca3398e47c6790d97374f189d4a9411107b0fd7490c SHA512 93811544f756419d6a0a9f49dc836e8c580c7c8ab49f90a541f2f8a24203959976a974056a0953f4d137a19254059e25c356843fb5df91a6d752d23c004f0c34
 DIST botocore-1.24.3.tar.gz 8770454 BLAKE2B 35c77a5a65a75844594673d3a1af23b087cf88ed7c61177a3f422d4261f907c9ccd1b3beb9eb6f67dcc23084b27078d49e34102ebaa2b868da8b19b1c6e677b4 SHA512 313a1a94b985641257b3ee6b7dbfab88fd28efbfcec2cee6e5826ee6e65b174892c9ad9afa2b46caa4b262feb1e731823875d8981c6bd092f5f423ad4cac9430
 DIST botocore-1.24.4.tar.gz 8775103 BLAKE2B c23256daab72fd60dbc9c3cb665816970bb168d6e63e0d53bc16dbda6cdeec30a87a864a6a3107f104c3e9d7aabdd1bbe5e43105a8fccad606cf5ac250282738 SHA512 73a717b454ce715446e75852b37207691118106e45fd0484101527adbb7e9062d78b200bb650e183bb1a40c0a4d9b0e1c9cc8621e5b5c2d9e7a5de6d46c34297
@ -22,6 +23,7 @@ EBUILD botocore-1.23.54.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221
 EBUILD botocore-1.24.0.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.1.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.15.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
+EBUILD botocore-1.24.16.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
 EBUILD botocore-1.24.2.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.3.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.4.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
--- a/dev-python/botocore/botocore-1.24.16.ebuild
+++ b/dev-python/botocore/botocore-1.24.16.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	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() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@ -1,7 +1,9 @@
 DIST fonttools-4.28.5.tar.gz 2948092 BLAKE2B b35f4be68cfc2be6afb209c2caee38f7088a1a17dea85fac0f40183b61a3eded59fab47f703587097669f8823a8dbc2e84b0df58305597784bed7f8c2e2b0f28 SHA512 5d87f4fadbcb447d1c1a1e97550f6a477d74bfe8647d14b35097e03e6a45a1a01632d2092483d675c523f97d4a04f39aa9b3175e535b1e1a4f19d619eb40ad5f
 DIST fonttools-4.29.0.tar.gz 2954211 BLAKE2B 47b7228b2f0f7332f54df58d8be8289b9bc3a737caa57ffafe9a8467e4d7e35db153f7e02caf8c6129af8dbb2bc18689af3f3122b0be7afee19bece83c846aad SHA512 0573970ceaf43e4987eee970aa93a6aba5af2b592b5d92a1aec36b102cb1967f380f8170f7a14bb80cd6348ef09737ac17a0f82eaa1ad73f9f5e246271d34b32
 DIST fonttools-4.29.1.tar.gz 2954962 BLAKE2B e78a55e240975e12e9cfd56368eab0d18e104211d8416db833a20208c78f6e5dbce2d24d7338017882f0bd1c3c181c0af0c069025a750cba4e9f41c1b4b2489c SHA512 36f4272be18d19748069289bfb3d3339cf0b16967a12976971f9e2dd56a1e915d3176e0dd9cad08cee69b20f3d6ac1a966365d936bb091b39e23b6c693e28dc9
+DIST fonttools-4.30.0.tar.gz 2961097 BLAKE2B 23b592daa16fd215688f149d99258209b819caa843d26c889fb4016aae6d6614a9f87dd13fa1d2aa254fadb5169cf7d57ba02b7b15af79611995148d698ca2ec SHA512 2b4e676f956c3456bf3ca435a7d80e1a0a9f36872ba3a820072d1e13ed5751a8546f424369731afd4ccddc298ec0658bb4384d2e18670b108dd1b3a99fc205f4
 EBUILD fonttools-4.28.5.ebuild 1425 BLAKE2B 4a2f7de50c982ee26701066d6f1dce56018299c7d2f0ba41c5c50eba6017277870c0fb564ec570d17dac33ce5acdefe509ab3f6fd60680f3ca08420e22140d35 SHA512 8b003d64c12b4f9dfc988f096df762305d10e0d21d66d5ae8bd98dd885a42d1525d8559709b64e36193b819ae9da7ab6a71b3c8f10d55a5394f3c069cbc22145
 EBUILD fonttools-4.29.0.ebuild 1509 BLAKE2B 4490c55c63dde9563f592e9d9b15a94226fafc038f76d15b13025c15144ba72c185c7fa0bf91f9eb2af00eef2e1b2a0ac705153b59cc17fd2b8be0385c1496e8 SHA512 e832e3c70f9c71b97cddd3bfbd49ea23403a42aa05ee068b4e073109f534778344e9149df4da377fedc52f7bc7e5f007c8d714d6cee2a8210a39c8693f0b12db
 EBUILD fonttools-4.29.1.ebuild 1503 BLAKE2B 7e2973941df8d1b45dc8be93d5898ab78664fabbe7e7aac6ea5b91607c3f2f39125855a182454b91711ab57bf0fafe72bd7f8373a47b50ea7bf5d358e8db4c08 SHA512 aa15f062e52fa501928a4d6dbbb7edb8d5c6e7dfa85ef60026c08d775e6ad8823d588063d416ac51cc8f117c14fe9cd415a65028560ac1547dedb36e0d4c0c46
+EBUILD fonttools-4.30.0.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
--- a/Show More
+++ b/Show More