Sync with portage [Tue Feb 1 21:59:02 MSK 2022].

2022-02-01 21:59:02 +03:00 · 2022-02-01 21:59:02 +03:00 · a38f8f63c7
commit a38f8f63c7
parent 8296166240
293 changed files with 5755 additions and 818 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29630 BLAKE2B dc0c1edab4f6df9c195074639accc85b27b5dad7ce6acaecafbc613bf192b3544ab124d8668fe484ec80f3ea7683197bedeb6808fd4d5b2c0aa4ce1c11e7f428 SHA512 6c78c4312390521b9e3d3a522a2ad35db9101e1fbe2773b20cfa971629fb0c8523f1d76066e7e32676f58a23d8a0d56bdef3635df8f5d3c5449d36eb640f34df
-TIMESTAMP 2022-02-01T05:09:11Z
+MANIFEST Manifest.files.gz 29606 BLAKE2B 1f243fc85f0aa354fc47e75f817e7c8091490e4097f21ce4bc6a1e8dd06eebefce12e76fbae4714f76aa466c0cbabe0edb0a87330f8c258a835023ca5180149e SHA512 7d4be74fd91fe798ea6612eb19fd61727947eb531173fe97d179f005b1601946999c24e233ead3beab3291a797d8469af8f136ae90546f93deb78bfbb70cd928
+TIMESTAMP 2022-02-01T18:09:07Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH4wHdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH5d0NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA2Xg/8CUi1E3SKUPY9iOw0HhL5am39VdcEgm+lev/lRCx/aNQduf+Lx7ujPNAy
-MiTaVgOqJ+X0yZ7a9hntGgqykucak3zvJTmbiBox+IWg9JzAjSLQwMLh5Ab6umI8
-l9ePj+crDk1cgcSe3/ME/qlD7y0WWFTXBRE8gCtOiZibnGFD8JWv2Cv//SZIMU44
-xeiwFTmM6XexzsdX1L6DhIaBvD4hWWxJ/MCYvQWeiKxdAyCUGsv1mjd9xUi7u8Zh
-GQFa7d31w5oaS3aaY0cfiaLKvDUsLIkozqGwsgCa9m3DZhYWctco18ZSlSg9QiJk
-9AeZDirjJU+9e7VS52+j3aKSebBJxks+xhNe/V3jTxPna8PtMTYocDkNKdH/WeNW
-xYLjvKHxhPdFvBLLHfg1os+GsCLZ09gkBt9iernA6xC0H8F3+zHRj3AA6pqgXpFz
-7pUgx44I51omjbTLPmKGLJbXy535pVz3uZeAPArQ8l91FP0BFcf61tBpOZ7tRt3G
-hBUiwAGRiyXjVuS6ILJe/Z+cLe+in+kvfwWA0kYobWhcPFKeM1MHcWm0/iPF9tIr
-3ve9WznEF3DsXnz5rvqeP4pUxzX7Y/UmpyrDoOEFzVgK9kqGN74uXMbTOTRr9Z2A
-NyVsLxp6xCybzjU2y4oZ1A1isMNHNvGLC9I2F4XFdsHkPtn/W4I=
-=3uFq
+klBilQ//WbwkI7qA15d4cL4GUh83O5WZOfd/lUNngr6FGXLTrcd+FzlGO6EEAsF2
+qRH/7t0JWfLepti06ShuuRAKrvW8H2iDn3KL7VdGWkeSZ4R1pfQ9HTBpT6nBgxo
+pBbJCYYlwr4GwXQSrtp9BIl9rTc36uD3LNeYyLnXViUs+CPvCR9ihz6MzbagPyo
+oRrZgjIP9nt5GJNffWgh+9HDS7arLYhD+zuNCSA+q/c7Nq6MqqxYdfRhxapgZp7z
+QG/CvKAZ5uF42yHgsBNt1nOYvGOVedq1PF+1YaysSJPfOL1k9Y1bl64+xffgp5bU
+ka+ggNTPZAHdqdywctgqoZ16PRi/nXllnVdLCmvB78ZZDV4OtoJ/OODv44U17Jac
+HfyiJda6wDRGLHlqXOjB+SbuE3O/UZaRuhHbc1pzpIbETOS3yjEEhcBCaqAnrmKx
+4hhWGWc6qOgCYY59daTiLhIO+IDyIP3qvCclNLoGyr3PMtrgW6TRQo/WrcGKTh2F
+dUtUITqTJPiB3y5ay2ANSOZKzRO0zG4u48uvEjEin+0EEIDfMKAxIGf5tsoEWThe
+fk8CFNKqoT/05jEtOtrZ3JIoKT5WrYhoNkMy6ddSBSqFfvcETkfeEBbVmXmJoVIC
+Aut0U54/7HV2RG5E4wUJhQjgctyESxXeUh1+BZEhNrR+lL+K26I=
+=pO0Y
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/biboumi/Manifest
+++ b/acct-group/biboumi/Manifest
@ -0,0 +1,2 @@
+EBUILD biboumi-0.ebuild 151 BLAKE2B f87f423bcdf9f62bc0308265ffb19739b471747be382a5753d957c6e1d2017763a8c4f73e5469b92f516330a678f5f3f66b11b67e5e5f0f52c4c51e88d0d3b83 SHA512 7978756fb79cb8c100f5907237afb9f655ce4d07e6b6eb002cdc037161d4a5c8cc4181954874e2104cdeb183c03a8cded800cd5057164121cc0b4a23618908b3
+MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
--- a/acct-group/biboumi/biboumi-0.ebuild
+++ b/acct-group/biboumi/biboumi-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=508
--- a/acct-group/biboumi/metadata.xml
+++ b/acct-group/biboumi/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/biboumi/Manifest
+++ b/acct-user/biboumi/Manifest
@ -0,0 +1,2 @@
+EBUILD biboumi-0.ebuild 236 BLAKE2B 458acccd702c6fb762a779433f18399bb572d17b6194b85f28bf545e2cc558662ac2d56ac8de2797ed64519498e7a08f128cf6c2702226d5998a038eca8f04f0 SHA512 51124a78e9fd83ba3df510a74b14a6055ac15c61a40b71e8e52fa2a5cd56f7d08fff08e4268609256d294c17f22f2167bb41bc5b7adb47cfdc212628b320f972
+MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
--- a/acct-user/biboumi/biboumi-0.ebuild
+++ b/acct-user/biboumi/biboumi-0.ebuild
@ -0,0 +1,12 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/biboumi"
+ACCT_USER_ID=508
+ACCT_USER_GROUPS=( biboumi )
+
+acct-user_add_deps
--- a/acct-user/biboumi/metadata.xml
+++ b/acct-user/biboumi/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- 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 4879 BLAKE2B f934dcc19cbc6ea40995d2ac07b73ed1686dc7047b1da83cdf363c54d7f2e07114feae5034babb2ec63fd2f46fad3de5968498f9dc269ee657e6ce1df7806b5d SHA512 1b4a9714ab52b705649ae9fdaac0ae0382c49ae41c84ebc2aacfd2db128e8cc7d9773c72c9ff66058babae4de3222aaa33c617fc1dd58d4733f4e808ec993491
+EBUILD syslog-ng-3.35.1.ebuild 4878 BLAKE2B ec170b9eb0a9db3bd2ab68d0fd0d71480e0a94b3f24b91ffd4526fdeb599f3a709abed4705bf4f5b7bfd161f6ccf237c04a0072a2a05ee553945173f8845a4a9 SHA512 110af937957ba6a757b62a57225688c0a9919631479d3e21d4fc433fe18dc99ccd9f15ca85d0ca8cfe2e3af6e67596a149299da4550a37854f8f273b846561a3
 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-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@ -22,6 +22,6 @@ DIST clamav-0.103.4.tar.gz 16425023 BLAKE2B beca05941ce462bd98473a5ac72b36e63afe
 DIST clamav-0.103.5.tar.gz 16434316 BLAKE2B c5a21b72419a8cd731656d8a8bbc79c5850895f1d8cc56cb5d19eabe2356a5dfcf88e7dc9553071a24b2719bae07cf1a941da3dbed69da8ac4ae3b8897ab32fe SHA512 242423b507eacbbd31dbae6dd0325dff87da25bb8072f2cee7a5e7cab4b8eb5ee6196c759570c1d75986a2777f0f79f92cfbd6250a30ae5b53390c75b238c29a
 DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 7d7eb9d22ca519f7ad0c171b6cab4b59cb52787a897ab31b9567166be2223f9ea89e79f42f1e4e0caf32fcb4b008f5ce755fa136566f85fe1de7808b436f80fa SHA512 8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5
 EBUILD clamav-0.103.4.ebuild 7353 BLAKE2B 6e08edaf316ed94fea7c0c78d40ef673cfeb7f42a39cc7f6de21dbce7ae030460271e58671099a468d07284a733eb497ef7d0a7c0c4a836d1b68c3e8d5b769fe SHA512 93b548284c7697bd69ba92505b673ead50b684cc213c24c2488de05c4dab6e3d311cef0aa6b78fb6ebbe49e86f3e25823b8cb7f45c5b3393b57ca736c05982a4
-EBUILD clamav-0.103.5.ebuild 7359 BLAKE2B 95f3aebd8de5b0cac2ea20d5bc30848dce838d0cf4b56765c4b9a19aded0e430f132ab82eccaa08fbbe5e718c1d0bb6bb9b9fb904964e438087dd9b2ead6b848 SHA512 158ca8a5f39932198e0fcb89c07ca492f0db9b527f2d321e11d36403f7830257412d5a6cbb5aece5fb7f3f643cbaa338f1ffc377e69b84a10ab69ba64ddf88fd
+EBUILD clamav-0.103.5.ebuild 7354 BLAKE2B 5c247a7d3e0b1d8c85556e3b3412e94599e8b219758e55e38522e916a780749a61dfa27b895e7dbc8a1755a338ace8ff0556f0a4e8514316c34e6b5541994849 SHA512 5c3497f507a0cc61c7bba3b1b46d3d4d702ec4f839f4db4e9a9277080a89937ffc20b3b7284b0e13ab46c542d2205bbf4eefa2f1f676eadd80aa942799e8cae6
 EBUILD clamav-0.104.2.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
 MISC metadata.xml 1287 BLAKE2B 75d0e2ee639919863a0b12951c04f6338fab836812a930b5cae82adc9546f0d9115c1c12a233b08e7bcf1810b38f8d0c119ee44a7640ade191f9bdb5c2bdf759 SHA512 2ef5d16db72356b72cfe6334b5a9b6c6e4d491ab445debbf9433d44c843e27d03aade9cc49a4fcad151ecfbb3dc4d99903e5a27eac8954991822eca3bad2b6c0
--- a/app-antivirus/clamav/clamav-0.103.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"

 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@ -1,7 +1,11 @@
 AUX bareos-20.0.2-cmake-gentoo.patch 1332 BLAKE2B b84158913e0bf051013681f8583546add34d48ea56647beb057525a0da1fff57dcd06c20dd125f300e34a42adb450c3a00456077de914dedf50b5a68748ef1ae SHA512 61e2b119d12daa60bf1fa0bc1de81d4322df421c6c5d2de4e823686f8a8657f521d53256533b52b17a105a25ef8070058144620d71aa295b491d2a39bc7de2f4
+AUX bareos-21-cmake-gentoo.patch 694 BLAKE2B a01f469c1f61a5887dd75779c96fdebf666989c9ec203d478291bb58d8ae974e624c6d83977247f47fdc9cdcae0761552a2864e31ec26cbd64317610bc87613f SHA512 225afe4c2d9ee7774d34776071b8b8430c0a4c28e8a2b301fb5f3963ae4b02ea6f6020082d4bcc0ba937728cd57f77ba19fbc176f8f14c0dc28fa98135fb3c80
 AUX bareos-cmake-gentoo.patch 516 BLAKE2B 685734517fc166413250782ed35445761b19efd9b7ffedb8436a71f5aea84e38633c61318c914169d3ea40daf0c45e3fe229136cdb1a98dc087cd56b91a4b1d2 SHA512 c0d89844a66f851f556e00faf42e85157c744f1547b37d95f5dd0c58a0ab62fb60a8aead87546ea37f5f9d0eb247a3e1a715d042aafe9b422a3eefe37518b743
 AUX bareos-cmake-rados.patch 718 BLAKE2B be3c5822a122fb9d6a5bdd6cb388e3edbb59c6e2aafb9e16991bf0c62ab2dbdf0757de88382318bbd9f6b0fb7d48de11c9d0cd6ab276b6fb6c4f61f8b756237a SHA512 46b6ced3bcdf7e6a72029803a60775cfc06b2313004214dfe7d7ffa64f954fb80cb93f7374b967b33b4035aac8fce4412f13833aa57a83e4ce98c503f147918e
 AUX bareos-cmake-symlink-default-db-backend.patch 779 BLAKE2B edb161632215ed8bdc75cae27d54f603787d5f3cbfcf19e180cb7234f661c35527c24dfef38b7c455fd28a46539eae94d157c4777549381c0db64c5fe531d35d SHA512 f5c07d611b7e9f5dc85e0e1440b5bcf43f80a6a6a3b7aead0b88a7a924c9cc8c42bad016d81a0ad55baecc5888e850a516bc86b52a65ddf460c3059fe7f299ee
+AUX bareos-dir-21.confd 357 BLAKE2B d2cd8da7fea60011752d043b307d0df08c655201a384dbe9406ba491a1463412e1353239c6933b6cd44258f452393f92d80760c657c44cd92c613d6b5422e777 SHA512 4a4b3a2aac3d13f3ce9192652cbc2bbd6c5723e13cf4f602e4094c1df8ce646b3ccf2e56ef8125e2cc410ce885fe1a7b483f2aa167ddadcb25e7c781075b8356
+AUX bareos-dir-21.initd 886 BLAKE2B 6ea7ee1717c5ab5241cbd4427b5eef1c96eee8c2e297b8d1cf0cd77ee8564bcb69add8b29daa6676a31640b33c40df332a30a41e28abe559f531b30053a8de47 SHA512 c1a61e7c5c2c9cbafb3e599e357c598cc4e3c80d9cc79dc8c6d93c21188c1a7820d1f3c86b5b897cd5e3509a63dbbfaab50c0dc2965a21f13aaa8d7ede374561
+AUX bareos-dir-21.service 884 BLAKE2B c0a4fb957588136cd043be2670a03e05bd5ffad4ae87275636642961e0e105ff07fb0614490a71771bb7eecfb551e6f860d8d41104e56ea8c5d434c84c5602a8 SHA512 187e331f8495d27d14434bd71baace7051d254e2886c3814493600973cd830cb01f27153321821e0a3bd2356d55f39cf0878488297079ed80bcfb2693cc77809
 AUX bareos-dir.confd 640 BLAKE2B 0c80793f66ef9f3b46995a2dcf150b3d7a8a9f53ff97896887314ab31d6082949ac3db2c260b2fc7551c035183c31558cc853f768eca5b0bebdfa483280780b5 SHA512 af71699773ade63c98e2016f48b4d108f29a419a7533444245df4507a7ad7b807948986f9f850ce1f9af58fb445ecd44a5d880f68732b371a7a87dbc5a25ec7c
 AUX bareos-dir.initd 869 BLAKE2B 80fec7cbe9b4f80f2f5b6152243ad7aa79760dc5198473515e5642ca29255f869d59b83465f87543e42ffc80ba0b3b277e437ff3446c005c5338350e1d04175f SHA512 ea54b7e569cfa69e6b2d996352dedd52487d1eb6f7776d970c3a9efa7e13f40d12b3b8d7388f035d5d84c2096c7644f5834495cc5b4084203e71b2bd0d833e8f
 AUX bareos-dir.service 841 BLAKE2B e8c9508984f2823b334c3ef3c412f51e50666cd45aea1c5491a3ce6b1fadf09e7e0cb836d0658f5398209aa0a478c5a6b4fa1b67476e0fc317d6e25bc0fc54a8 SHA512 8f886d3c60959f009cf5f626f64071eb5d768ebf6c5ac0dd0c0c34d866d29563a2f0c68519363170ac35595cc743b432f46a54ce10bbfa530971f56b9914b0a9
@ -14,8 +18,10 @@ AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646
 AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef
 DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015 SHA512 1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
 DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0 SHA512 46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
-DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
+DIST bareos-20.0.5.tar.gz 13343612 BLAKE2B 78fc178b021165377cb912593f56c248fed68b44deab3626087c9fc10d2eeb866730b734e0ba5982424b4bbb875d734e62351c8114c947057478d4929df2ca2c SHA512 a61141944c24042f2b9f977672564923d4912756c821abe516f94a2c21f5b990236f22187c8567956edef09029f740552c3bc6c30f8c6d65c3f0b06b84ef00e7
+DIST bareos-21.0.0.tar.gz 11306618 BLAKE2B 0363465c40a8053bb5ec772c18ac0dc852f379979e3afc45dd29c79f8187238363c1f07e2f39d25613404b1b6e253700b33b274389ca2dc4655d201bc4888166 SHA512 0a57bccca0589f3ce8a5664afbeb1eb1b17ec7142722e2d0bb2a0bbd9007688725b39c6db59646c180ce096e55451c09934e6479a2b4deeb4d3ee738ab2c32cd
 EBUILD bareos-18.2.12-r1.ebuild 11168 BLAKE2B 952379f3531292e6b20e0e81d9be6d8384b8a76b1747a340310032c1ed0cf5b38415e6b6fc4edafb46b4e836cebce2dc73532fcc7b5737b1464deecec3c1e3ca SHA512 f8878820c0eeb8fc178b65579fe55230b8534b9e37b69ccacb1818635066a8fca016dbd818394b9b1e5916b49c31cee24abb9591dcbc7ed2a094146bb18adb41
 EBUILD bareos-19.2.11-r1.ebuild 10915 BLAKE2B c0101e1fd5a33994bb42b9a460fca12ed422eb4a99a23d6e7333c29b94bf117c39efb1cde61f82b9fda9a00ccc0452187ab8a74ccf6d4e3fdcd813fc9d219908 SHA512 0880c16abaad7ad94bdb75d77e4069994872bfb74b03f496127a936c46d21bb5bf2bbc5b8c078d9a0ecdd3aca40845d72b67bd475b006edabfd57657401979b4
-EBUILD bareos-20.0.3-r2.ebuild 11407 BLAKE2B 3892f00374c4da0f3447ae12308f8147cbadfa6d5f5a3c8995eeeb2d69312317d80233ce25ad4a47bad021917b9a4aab0a29d2ea842470d9bb3737f991297243 SHA512 72441b8e5d54836691209c8e4e9de9b9371c59a8e698095e47c82341d5885ee9070e1556bbce26674da0560362790248c496c70a58d7a80a752f2b4724e86d88
+EBUILD bareos-20.0.5.ebuild 11407 BLAKE2B 00a225c47f39abb02990a088a7b763c73f95aca2b98d3fd49015b7ab852b50c9a0b7455aa881f63071b4fd31676806e13ade6001d8465e41e8b88bbb83524167 SHA512 0924dd4387fcce3821dd039729e6395e142b5de067bee06219de5362fa1068238928c3e9dc243f8648e76717428d80b304acf5ad2719548dafe18b705800497d
+EBUILD bareos-21.0.0.ebuild 10262 BLAKE2B 59c69eea0e81ef4f9d0482a6c29a50806afe561ae4d01ba9b078c1f7d9e299435763b789ed4585701c01ac0ff12d23cf6e39e1e1f2a06b5b8d974aae31da7961 SHA512 5c10b93da2a95081d3a7a7304507c92c954e87b79be5b8ac86d3fddeb44c616cfe21e58f7833db8ca8448a84041897cb30e2db20ba5e1208fbaf98b4ead22f14
 MISC metadata.xml 1552 BLAKE2B 27a6ee8fad25a63be91e5bc712ffb293174c6bfca8df772be3821932baafe510b1fa271b2e36a22a11296c7a7bd23049b86dc9cbcbe2f7f30409a1e7c7b55042 SHA512 40b549c30e36a495a434c607467efa914aec228d886ee8560e77b39e4d6d6396ebae5e4a5cbdfd01b6828011ee9922112ab0041d9a9aa944d68417114b14ef53
--- a/app-backup/bareos/bareos-20.0.3-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.3-r2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes

--- a/app-backup/bareos/bareos-21.0.0.ebuild
+++ b/app-backup/bareos/bareos-21.0.0.ebuild
@ -0,0 +1,359 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto
+	static +storage-daemon systemd tcpd vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+BDEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_prepare() {
+	# fix gentoo platform support
+	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	cmake_comment_add_subdirectory webui
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir-21"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script/-21/}"
+		newconfd "${T}/${script}".confd "${script/-21/}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	diropts -m0755
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		einfo
+	fi
+}
--- a/app-backup/bareos/files/bareos-21-cmake-gentoo.patch
+++ b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch
@ -0,0 +1,12 @@
+diff -ur bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt bareos-Release-21.0.0/core/platforms/CMakeLists.txt
+--- bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt	2021-12-21 01:00:49.000000000 -1000
+++ bareos-Release-21.0.0/core/platforms/CMakeLists.txt	2022-01-30 15:09:41.949529813 -1000
+@@ -30,6 +30,8 @@
+     message(STATUS "adding subdirectories debian and univention")
+     add_subdirectory(debian)
+     add_subdirectory(univention)
+  elseif(${PLATFORM} STREQUAL gentoo)
+    message(STATUS "PLATFORM: " ${PLATFORM})
+   elseif(${BAREOS_PLATFORM} STREQUAL hpux)
+     message(STATUS "BAREOS_PLATFORM: " ${BAREOS_PLATFORM})
+   elseif(${BAREOS_PLATFORM} STREQUAL archlinux)
--- a/app-backup/bareos/files/bareos-dir-21.confd
+++ b/app-backup/bareos/files/bareos-dir-21.confd
@ -0,0 +1,10 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-dir
+
+# Options for the director daemon.
+# The director can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u bareos -g bareos"
--- a/app-backup/bareos/files/bareos-dir-21.initd
+++ b/app-backup/bareos/files/bareos-dir-21.initd
@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need postgresql
+	use dns bareos-fd bareos-sd
+}
+
+start() {
+	ebegin "Starting bareos director"
+	# g+w until #631598 is resolved
+	checkpath -d -m 0770 -o root:bareos /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
+		-- ${DIR_OPTIONS}
+	# harden pid file until #631598 is resolved
+	ewaitfile 10 /run/bareos/bareos-dir.9101.pid
+	chown root:bareos /run/bareos/bareos-dir.9101.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos director"
+	# check pid file until #631598 is resolved
+	if [[ $(stat -c %U /run/bareos/bareos-dir.9101.pid) != "root" ]]; then
+		eerror "SECURITY ALERT: pid file is not root owned anymore?! (see #631598)"
+	else
+		start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.9101.pid
+	fi
+	eend $?
+}
--- a/app-backup/bareos/files/bareos-dir-21.service
+++ b/app-backup/bareos/files/bareos-dir-21.service
@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Bareos Director Daemon
+#
+[Unit]
+Description=Bareos Director Daemon
+Documentation=man:bareos-dir(8)
+Requires=nss-lookup.target network.target remote-fs.target time-sync.target
+After=nss-lookup.target network.target remote-fs.target time-sync.target postgresql.service
+ConditionPathIsDirectory=/var/lib/bareos
+
+[Service]
+# see bug #631598
+#Type=forking
+Type=simple
+User=bareos
+Group=bareos
+WorkingDirectory=/var/lib/bareos
+#PIDFile=/run/bareos/bareos-dir.9101.pid
+StandardError=journal
+ExecStartPre=/usr/sbin/bareos-dir -t -f
+#ExecStart=/usr/sbin/bareos-dir
+ExecStart=/usr/sbin/bareos-dir -f
+SuccessExitStatus=0 1 15
+ExecReload=/usr/sbin/bareos-dir -t -f
+ExecReload=/bin/kill -HUP $MAINPID
+#Restart=on-failure
+
+[Install]
+Alias=bareos-director.service
+WantedBy=multi-user.target
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@ -1,3 +1,5 @@
 DIST ibus-anthy-1.5.13.tar.gz 265252 BLAKE2B d35299dba3260b85f80f259e0a40ea1ec061ed8082b6e5c872eab6398b6242342b2ee4da0c3b191aa428ae2d8dc652b0e414fd0c9f7b93ca8dcd6303c0586b4d SHA512 058feb49b2fe50ae3ca959f4754b8070f3ebc1e6727fef4bca791aa45a23c95018000e2a8bca496d6592b052298a6fb2869a07c2cc56cc473c81cc437efa175b
+DIST ibus-anthy-1.5.14.tar.gz 267418 BLAKE2B a4da45588d8736f10ccf26af52179da85bd3a17a8f1fbdba622058d1eaed933b0102fe12357613574e377df323145487838c3f74c052c813462b435905d5c941 SHA512 4d06d4e177df62d22c61bf6ebfda04ddbf545ea1947d0c315e3dfe5e48d9ddc57e5fcc89919ae3b9f7430e6124a5dfb1295f4ca7362fbc35714d627f80fae6d8
 EBUILD ibus-anthy-1.5.13.ebuild 1310 BLAKE2B 448f52507f33bbcea960398d1ff9e2b177c54bd3523ea63cd3ad034758cbfbc4708b668bd368fc0fb9cd73027f4d290a765f97d4f2cbf03a0fbc403dde28cb7b SHA512 0cbd544a986bce8d41829ec6b3d391ef1bd09e9a8ae7ea382aca72410d778e28e11ffae3c725f94833aaff6f2c132549d288a46a318307ac1e5b24096764bbb2
+EBUILD ibus-anthy-1.5.14.ebuild 1312 BLAKE2B 491e76a279bc1a25acc93ff98db1b6b742ad09d79c3b6f25d84ae5f9cd243f986ce6fd4d719cea1b37e8047dc03f807c2f405050fbea349d0f776350759aceaf SHA512 ae3879999fbbb0696fa1e9a35456c1dab3da437b24b75bf2831a8c9fc0f874a5073071bd4d1a3e3c12c481d4f0bad8b962b9c5711f1a2e72f3b02ef5e09db729
 MISC metadata.xml 325 BLAKE2B ae0af274a4321f66c02696f5f6440ce55a1a8406efe0f5c17c76606ab536b157f528eb93508d1ac95a893a54ada06c538d627754f8795271e3bb99eb4bbfdcc1 SHA512 64b47eae1d72f07324b98eb1dbc9a2a4b7cc0c74172e0df55e9d5abdaf10ebe1d90f4217b973979e3b53c5a21084fcad6785203a7b4280dc0706d4e6d1bd74f6
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
@ -0,0 +1,72 @@
+# 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 gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Japanese Anthy engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/anthy
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+	gnome2_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-private-png \
+		--with-layout=default \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	python_optimize
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version app-dicts/kasumi; then
+		elog "app-dicts/kasumi is not required but probably useful for you."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@ -2,5 +2,5 @@ AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
 EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B 439002b6ce33a663b68c282770dbb3b43f86bb8e3255a8e15027c5a480f0642cfa71359be9628a5ca0a77520d1aa45ff337aa7c00902a77ed198941b0b06f6f5 SHA512 5ec8979802319c426e7899a56700bed2beecc656a5469b86f86cb353efe172cd221e0940f65457894b1af607b511459e947a02eb488b55ca27a8b2089df9e544
-EBUILD antiword-0.37-r2.ebuild 1332 BLAKE2B 7d61d4074104c1d4702cc1c22e19ed45f170890f4f645b581e87f26d77f8eb888af19b13b55ba4f4e725800efce77777023eccf946e6d5aaff5a28f20393ea83 SHA512 09fca86d8918aa9bd137d43a7c41abe8a519fa19de32f38a570a0d0be97db6a282b5b71a71e40e8848cf19fa6c4e5df8970f7239bf9f5c64f1fc3e7d3e711dda
+EBUILD antiword-0.37-r2.ebuild 1331 BLAKE2B f42119acb912de393b39f19df9815b8b00a2fc2a808400e53f16939eb089e7e69ea901e73252782ca8cef6719afae2cc8f5c3a03ac5990215bc0ce1317cab4be SHA512 a0a417107e6c9443308aaf715f1f369b91dce63b1f32eae49a7cabd330ef5791bd16d2cd585fa29b8ea9bc87d3120cc2297aaccbc158ef404ab14a723e2e7190
 MISC metadata.xml 343 BLAKE2B 43a8dd808338ef2c570ac118c0600029bb805033af3f7e70d8b3afd7e9c685949c4b4e006e1c5bc51b72f9b8ab54104a0f9c731223d73dd5909f04a5bd964526 SHA512 184ff7031a9864c1ee3daa6c3714d148216f556fd112a62c1c2e352f3eef08bd6a1813dbb46dde3a163cc69f59f06ff99570460e4af1c2d4a31085b9aa7043ce
--- a/app-text/antiword/antiword-0.37-r2.ebuild
+++ b/app-text/antiword/antiword-0.37-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"

 PATCHES=(
 	"${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@ -11,5 +11,5 @@ DIST sqlite-src-3370000.zip 13141152 BLAKE2B 72e3ba37dcc1e10ab822ce080319c98e67a
 DIST sqlite-src-3370200.zip 13145234 BLAKE2B 296eb8ac0e83552c348847ea1d0b06ce1b610ca1f53d8b56fa872196ccdc29c343a3b5cc671716854950c97425f8a5b78968e1b22c137ea1ff3bf386e94d8acc SHA512 2db103965934bb34c8336cf82ff7d77e75dc1ca00fa6324ac5697f3bf4b41bffff355dec7593515a68816449e5c9827a9503f6d7841c4c13981c231d3414ff76
 EBUILD sqlite-3.35.5.ebuild 12985 BLAKE2B 09e7ce9ba2d0ce36aaea8fd8fb2c3886eaccf0bffe3e756273fd84aead4ae1dda99c76865745f77907bf9bc32f8600becb8fe6af3e593148e2cda050bfc6437c SHA512 71b522aaf44c07f4632877c3626f260659477df560a5ac647e698794967b5554e382abfe5aba5df4f73adbed685a806d34486ee5a1a458c15faa1b34cfee959f
 EBUILD sqlite-3.37.0.ebuild 12993 BLAKE2B 759e75795eaaeac75fa7e70a7b0c13ef48a589c3ed6a1355fd842eaa9b6fe2403912c0a7acab52265191b701b76a7c08815609f286fd40b75cf23ef5704159f4 SHA512 7e62c74a728e6e713e34431f85c0904a6c38d23b672ca5e62f425982784e6eb1e80023264f7b5181c9098f24ce9e010ff3719b8beb272cd81ac163599f99cf17
-EBUILD sqlite-3.37.2.ebuild 12923 BLAKE2B fa99a4f89af40bf4521361909d2841bfbf7b1222c0ecad2ab515d5ba14613e84c7d84a8a94a707a0e9d416dda2842d4d7e47c361f98bc256676bd6ccf30b54f1 SHA512 a8965b97d220218cd9b54ecc71a295beffb424d59d343919b695b7ea1336a230bad340f19d56976be1e756c474c5541453f52b67f1e20f9865d5d3ad42726bfd
+EBUILD sqlite-3.37.2.ebuild 12921 BLAKE2B 1777c52692e6bb5a0757b4892035c6071b330310eed9ae37ee15da719de24cdb9c5ccbc474e3526685e3a35f69f533ad866686a764722286fc2623709003c2c1 SHA512 dd993ce43c0ba4effeb54407c23f17d3ddb39e6a66102b31e26af98c9aee16b06e03e93b74f052f08a22938fb66f1c5dfd16b5f7d76c446bbb63a75973f3a6c6
 MISC metadata.xml 771 BLAKE2B 34887e6d8a43fde66998787bfb3ca4bda644918a3a80afc650546547f132a9ff482a955ea5df8dded47a971a317be099bf5d9708a00ab25f00f78b714c3ed521 SHA512 e5955f59348abdee15c7fcaff38c220ab0ad84a717600525686e33a1fb7d29498c5b510d81c87ca49d48d7d11da782cf3840f38f1d4bd0e696fd7166aedeb597
--- a/dev-db/sqlite/sqlite-3.37.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.37.2.ebuild
@ -22,7 +22,7 @@ fi

 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
--- a/dev-games/irrlicht-mt/Manifest
+++ b/dev-games/irrlicht-mt/Manifest
@ -0,0 +1,3 @@
+DIST irrlicht-mt-1.9.0.4.tar.gz 4158897 BLAKE2B e03c3ca28ae93e5fa565069b67ae7f60e7e023a3b5434fbd8c080be719e40a67f115e4459f082b7a27181ff81cc591e527120747aaf91efaafe93d997f5dbc9e SHA512 6f6fef27d534a0046a04cb504992586f5f20a757f2c3a35ea6e1fb31d2781e3d81ee0172b03e2913ddd894fb937d6830005613eaed77a29bb9e91aa6d248fab8
+EBUILD irrlicht-mt-1.9.0.4.ebuild 625 BLAKE2B e04335daaa266a2a33de0dc090685436c86d28e180a2337c74473caa23f263d9ab2b0b7c773673ead87ee2bbb70cd57f54cf1e473a882b4865ae3aaa9826253d SHA512 783f438bcd64602056e60817e84b0dc215845150bf4451a2014da99ffe39aa40eacf40ecb60f8af4b0deec86f830f1e067b0b87f18f99214c890517c72236717
+MISC metadata.xml 328 BLAKE2B 65f1524f204dce6e817727e3870a3154eb1333d68d92241b17ea9a9089081d56947e7cd0dae6e4addd55594953cf27661e02774814f814465363df184842d37d SHA512 dddf11f78c1fcc61b3b98246ed7c73ae7c0e3f1765b60fbbc8513d706edec666c405479f45a2259c513f3bf298bd1d0810f756110aa7757b393045c4c18e17d8
--- a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild
+++ b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN%-mt}"
+MY_PV="$(ver_rs 3 'mt')"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Minetest's fork of dev-games/irrlicht"
+HOMEPAGE="https://github.com/minetest/irrlicht"
+SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
--- a/dev-games/irrlicht-mt/metadata.xml
+++ b/dev-games/irrlicht-mt/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">minetest/irrlicht</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@ -1,5 +1,3 @@
 DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
-EBUILD commons-jxpath-1.3-r5.ebuild 1789 BLAKE2B 09fb1541a9a6ef07effe129b6e02c416ffed48eb36fa6bb37456c7165f94ff75a1e2cba5da12aee532962f48b79bbd2f1657a211d6354032f11ba0e0cb0197a3 SHA512 f15b3c57a20cfd5ea8ece29de3edd80bbbb9d6f103fc032b0ce78157e520914315a3d683fd57d41e4bb8acf1e311df06e90f4f46441d3e5cdec2f24bd1229d61
+EBUILD commons-jxpath-1.3-r5.ebuild 1788 BLAKE2B 2d23caef7b4c7b06c2bf159d4e9d8816e4593d4e303f42a0693d6faa8877d8647e6dc5728dffac01a485de737f9f69d65a2ee0e497c69b575baac899991a79ef SHA512 5cc043334288a3a42f2644b1591f61fc3ce0b8dbdb30294944b451de6e7406527f4f45a700212abdf46d8fca20d8a426e6c68d5bb9119e8a7d3631f1cc201672
 MISC metadata.xml 463 BLAKE2B 1b7774556b00869ef427316f8ce3465dfaa4a666ac45e35099054c09c8956743ead7e1f3483169ac15c9bc208e9d72b0abee49d7103db93f8ae8462f3ae2408a SHA512 a703759ea4165486b35c1ce02dfc35ad5cf5899af03c1bc0580288ae51b931c0fd12da6a741a42d365bf452ed1d56f4296fd6afcebc6c490ce7e48f9234087d7
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
@ -1,63 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="http://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-S="${WORKDIR}/${P}-src"
-
-CDEPEND="
-	dev-java/jdom:0
-	java-virtuals/servlet-api:3.0
-	dev-java/commons-beanutils:1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/commons-logging:0
-		dev-java/commons-collections:0
-	)
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
-ANT_TASKS="ant-junit"
-EANT_TEST_TARGET="test"
-
-# This one needs mockrunner. See #259027.
-JAVA_RM_FILES=(
-	src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
-)
-
-java_prepare() {
-	# Don't automatically run tests.
-	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
@ -19,7 +19,7 @@ SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"

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

 # Common dependencies
 # POM: pom.xml
--- a/dev-java/javax-mail/Manifest
+++ b/dev-java/javax-mail/Manifest
@ -1,3 +1,5 @@
 DIST JAVAMAIL-1_6_2.tar.gz 1107140 BLAKE2B c0f84bad014af1146bc2bb7f4f58924edf8f6762c222f979d1fec787e8dc93861691cd95c23eb663924597277607d2ce5058c232ad1e8626ed2d0f1e17c34a98 SHA512 6c07490fabbcf5969a2d8946bd9f38187cd33b864985e8183f15d9e1ba1508e445f2050633d9054f9ad546fede7790e64d31956bf23eb2ff8dae45129bd43534
+DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08
 EBUILD javax-mail-1.6.2-r1.ebuild 2066 BLAKE2B a1bee101bc627a3a90e48368eb20662bbedda45d573e045869bb1bd4a9f336dd047c2e5d42c830852776335e75422af6b8048fb68aeea22d131c678a170a1de4 SHA512 2b6265523669dd4d7c5eaf68e67ea2b34a141bc07a44f53f229144ab1d19a9a55c2242f834285594ecf8ce8140797d68238668eb9e12309752177c161280a0ec
+EBUILD javax-mail-1.6.7.ebuild 2055 BLAKE2B 279e78b4dddb2bb03502ada8c94d838a42ab67ce5d870a9bee08966a425b78bf2804f3f4c0d46d3f6af04bab9140486e668f7e97b9b3c4b92bcffefc91d30e37 SHA512 43a435d6c4866bc5fcdb7db97995947b2f0f254be98c5ea83c41f1a71e4ef448426fe263488cd30e41a7a01419282d2718b301e72abc6656076f57d30d2be32f
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
--- a/dev-java/javax-mail/javax-mail-1.6.7.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-mail-1.6.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:jakarta.mail:1.6.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
+SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: mail/pom.xml
+# com.sun.activation:jakarta.activation:1.2.1 -> >=dev-java/jakarta-activation-1.2.2:1
+
+CDEPEND="
+	>=dev-java/jakarta-activation-1.2.2:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DOCS=( ../{LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-${PV}/mail"
+
+src_prepare() {
+	default
+	mv src/main/{resources,java}/javax/mail/Version.java || die
+}
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXTRA_ARGS=( -ea )
+
+src_test() {
+	pushd src/test/java || die
+		# Selection according to 137,138 pom.xml
+		# 1) com.sun.mail.util.logging.MailHandlerTest
+		# java.io.IOException: Permission denied			
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*TestSuite.java" -o -name "*Test.java" \
+			! -name "MailHandlerTest.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@ -5,5 +5,5 @@ DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc1
 DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
 EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
 EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
-EBUILD crc32c-1.1.2-r1.ebuild 860 BLAKE2B 2f2c3ebbb17db3d2e34a1e15397f08554b7d23528ed5fe0e42a66aacb1f51a8df7f54356773012bf026cf4ab092656625a889677fc69bd7f8a48b8c83f1b03cf SHA512 24e445d0753ee0340fb99a27f0fa0a95a388101986f532d7982345d22432a143eaebd50b0e32413605e91b556a0fb1a3b36cb0b140bb18f0385bab23116f071a
+EBUILD crc32c-1.1.2-r1.ebuild 857 BLAKE2B 5a235e32ac2650d82811d8d9eee2f9e1e03295a8abc8a4cea3746ddd45f4125489dfa656cafa6443acc4dc187e2a09593ea4cee8e173724eddec09e8caddf873 SHA512 985fdfc66ab9caee0154dddc8f98f08a85ec7c1df812ca8dd6e31e65967bdf7e3d5b70477571caaa3ff146cc59107b0f269477655cf335ce25b07cecd987b466
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
--- a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"

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

--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@ -6,5 +6,5 @@ DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
 EBUILD leveldb-1.20.ebuild 1696 BLAKE2B cf3635413925eb7fda325336206a17ba3449559e4c70b8f66db79dc0704d4acd5c1f5f08f5e5a9b7b73ebdf9366ab0cb09e94b3957497147e8518e266235414c SHA512 2267e43e96a97110a190882aeb053aee5ef40e6735059989320ba272db5e86a66e384883f10afba274d05c41054f050d22851b89c6be769c6e881e5a9762a681
 EBUILD leveldb-1.23-r1.ebuild 940 BLAKE2B c8845aaaedf9dae20e102864641a6562f402c5e13673b17bc9246b721aeddd2e3a8abf2188a8da5327f66176e9749c900c5a541c564d44a5c0bbe1b1bdfe0004 SHA512 9b34fa37095e60d03c2f04e14bbb774e671bc6eefabcdd15f472c03ca4a72d725a6fd0da442df8ad9d2112043bb3422ac1cc000649a10ee08cd434c47d1011f6
-EBUILD leveldb-1.23-r2.ebuild 1029 BLAKE2B afa5fe700f4e29465ca0c58acd4177053711bf2c70dfb0a779d55bfd7c9cb778a5ad15e55b9ecb2cf0ade0f85047d31b1509cbdfd277815062208c329532e6e7 SHA512 04035a78159606bd994c966ea255568e2a0701f141f0939e9c63256b9d7aa2752d8c46327dd8842930fe496cf3ae730cbc031c2ab27b232537922fbe175f5db6
+EBUILD leveldb-1.23-r2.ebuild 1026 BLAKE2B 5b3232e693b5e6314250b9387be8767b19e8e9afee3dc0050d7bdb88a5066102addb0af2261d27222c4f2f2348139c82b73ae610e85440fbab46534396bd305a SHA512 9d8321e5199085c127d11451b136434b1c53a76fc9191ae446e526009aa019edfc8380b045274804beff6bc687d617c93f676e1b07a730a10d928bbd02b6494c
 MISC metadata.xml 511 BLAKE2B 2108f2600f79e95a7afe0d3f2b96afe529ec8b2aec0eba1e4231e902c118b9332f11dd952db93c95f2d6133362d2315435e17da153cf17fb7382da18a8651377 SHA512 44a3726f1dfb71c1abd07b2c3b0c9e0243ac74fa23f87c8564c503d192944879196433e3cae9849ad1fec79f20e72156fed412cbb18d0fbb573d987830f640d4
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.

 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+crc32c +snappy +tcmalloc test"

 RESTRICT="!test? ( test )"
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@ -5,6 +5,7 @@ DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce06
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
 DIST opam-full-2.1.1.tar.gz 9275192 BLAKE2B b5729bc938633073efdf979f8e160c42aee682fe311b613d4d82be7add64b42506d1b6c107f3770fd8de4dc9eed7076f7774a34482d1956b8bd6315f551aea6d SHA512 7876a015fc2a421f70f9e8fa35c7ce56397dde7b679f3aba73c2a38f4967afc410c707a00f0a107baf353efe8bb6d4eee0601a5e205dc05a0f9c3d2a0c4d44d8
+DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
 EBUILD opam-installer-2.0.10.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1014 BLAKE2B d5152345b50b7475a4f19f8e34bce269a8329e85ad7ca86f89373cc20f5ffc6e5e233c8ccf5247797fb86880a8bfd37005941e753b2bf6a06d3a7194462da18b SHA512 4d91c847eca096f95654cffa6c26701e1c4e65c1bf0e28c3eba3b01da9170071449a7e335954da270764581b4bc7a7dc1b0210d50e254bd22c9eeeef22f0223d
@ -12,4 +13,5 @@ EBUILD opam-installer-2.0.8-r3.ebuild 1187 BLAKE2B d18cdb65a28ed6043ad63c818ad7d
 EBUILD opam-installer-2.0.9.ebuild 1187 BLAKE2B 66e928ed3ad5a8b836ff39ddd594b1f02684d5e0cd7b8e80b0b65cb9e1c844d261abb1241c96afa1f9ab93a177131c033763959b383ffe6eb7106fc13288219a SHA512 be5af56fada09cfd66422f7344ced66a55ecaba663d2cfdc1b95a3a79d27386f78115a932c6ca75e8f1eb486608c9a2fd8211680fb661345d47ffaab74091d5b
 EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 EBUILD opam-installer-2.1.1.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
+EBUILD opam-installer-2.1.2.ebuild 1025 BLAKE2B e0dbb6f64946ff0442e28c2b26d44ec185c3e0b5c7d047743b0b454d53b01aebc39ffb43ec57dc462aff71ec24df41de48527f0520c07fc08fb594200fabe127 SHA512 30998c9cb9f839cf3405f0bdff0cb8f222dcf624c7cbd23b346ba6f0ec99eafd7685f2ac666ee5d654b3b7f9b63d30b53941c50eb261c8519ad25149c1e57852
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
--- a/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+	>=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@ -1,7 +1,9 @@
 DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb
 DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4
+DIST parmap-1.2.4.tar.gz 47584 BLAKE2B a4b03f4e3aaafd2c8e75cda045741b21b9d72998a6a4ca406147cd6fc88eac1ffbcc996f862d4ea090551a6e7219e59f3df0515b48b4155305b49f8ea9b3b123 SHA512 7dfe3bb2ace3547c426bca4974bad0ccfaa1fddbe0ba6f574a0dd8c4c30e8dcd1b90d0938312fcef9468ea87358db096bf870f64467ba822b13465773054a8ed
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
 EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
 EBUILD parmap-1.2.3.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
+EBUILD parmap-1.2.4.ebuild 608 BLAKE2B 02706f5586f201675462f9d0a751ac1e932ddd5214c0f791f92588a1c76fab830956245ccdf23f0b209ed7b0830aed7cee9e8ef065fed6a07e7bd48af32bba79 SHA512 752ad0e32546db9257824d3731261dd0b0eea72380b87a1cfc8e8a932deb6d44335888ad655160c2a4336edeb54fd4f1bc4b3e5fc0b0676bab87a93da2d6c265
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 323 BLAKE2B 6e7bcddc8f305eb0ad28f81bf09278c703c7dbfdc7c9825886dae7fa1d8489460a816286f0849cfbc4a1b641cfbc43f6b14a74b0d669593324050f5aefe01c80 SHA512 42cb14a0c6f2439fe053d45546efa9a8a66b2e116aabf02c64f7bb8c28316e302cd86b586cd2d6717f37228a0b04598e99d60feb45d16d301ce8a39da1f02d0a
--- a/dev-ml/parmap/parmap-1.2.4.ebuild
+++ b/dev-ml/parmap/parmap-1.2.4.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
--- a/dev-ml/sedlex/Manifest
+++ b/dev-ml/sedlex/Manifest
@ -2,5 +2,10 @@ DIST sedlex-2.3-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e191
 DIST sedlex-2.3-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dddaf204531533b79bd58b7238395ca25db7346bc916bd85aa0343abc194b4aab499d481f40a6fe1d8ea287e873ff1199a1bdd195be7 SHA512 b45324cb2791be1d1cf10862ca1ca4008fed2f482aa20042cac7190d4a8d46f840cc65b7367379343d209c06fdf37cd677f887a99bfbf3aa7022fcb3d4212c2d
 DIST sedlex-2.3-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
 DIST sedlex-2.3.tar.gz 114507 BLAKE2B ba777d90ceba41136ac552a2aea860b2932dc2c27d02a5875e8533d6740bcababe444d27427fbae59739a42901b3fb85f7b2ed8fd318f984734e7283ecd7e69e SHA512 f91bbda9e79417e0a7c723a8efd9644404ffc91c60898b8fa07a514c38bc8472eae34419405354ae80966feb8d3203943f78776ad395a16132c7c890e3dbd7d8
+DIST sedlex-2.5-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e19124cc4d6d2f0eec6964d4dcf17c05e4a1f4a6031a821740a34e373c3be82c5f25acdb93a77f9591eafe37d026d40e027054e717c0f SHA512 e6b54579369edf361ee961171d9b4896449e16327d77749201e07a7022a4d9bd9e50ba25cc7397fb4e40c852347b1ef8599ed45bd5bb96a1b8dc5cd04ada5fda
+DIST sedlex-2.5-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dddaf204531533b79bd58b7238395ca25db7346bc916bd85aa0343abc194b4aab499d481f40a6fe1d8ea287e873ff1199a1bdd195be7 SHA512 b45324cb2791be1d1cf10862ca1ca4008fed2f482aa20042cac7190d4a8d46f840cc65b7367379343d209c06fdf37cd677f887a99bfbf3aa7022fcb3d4212c2d
+DIST sedlex-2.5-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
+DIST sedlex-2.5.tar.gz 134289 BLAKE2B 47aa67ed34ee0226b92d538e61bbf7252dcead236dd51d4a291c7b81f7d0747d1024e9eb0a274d7648b25cfa078108e3e62d54ea2702450171b9ff4ab60f7706 SHA512 5c511a89e43999b34e50cc820a4ac71ecd0315ef144da2af1653077d7497b2ce3658898b723a7c558693766e6bc57369349cdf78c4a4b962a23d4528161b78ef
 EBUILD sedlex-2.3-r1.ebuild 1032 BLAKE2B 8f270fd378c861c23ed396408e3b2bcbec55f463a51680bf617b673afb06db9a4d570b14987f90fc7b6e4b37eef016d99c101301ec10f4022548cffdefaacdfc SHA512 a865b7adc9af6b6302570555808864df07ebc1a6738b2946c7c83a56217e993dc291650f99c79559b8c1591eb2adcd35d5de754011005b32ec70041e68946ecf
+EBUILD sedlex-2.5.ebuild 1032 BLAKE2B 4c37ea8e62183196c36f8e881433ba4ab9c1a0711ec0e671dea9e73ace9edb14b4499d4a75e941da8a7b559a01e6dbd26123cd85fe8364384c7de4d6618025ca SHA512 f95e4d19a976c5a5868d152fe76a9fb7c9b246fe1f54b2570639a1f48ef50f8f77e3399901cd505506f8e7b10fa7260e4a13a98be67af05655cf652259c2781f
 MISC metadata.xml 704 BLAKE2B f2c21c5c672a96091107097a5c4b27e7b373b56982cd4c196c56917997f52da334768f2b51b14bb2ab553478edd60530bba06e328b92437c470f22be10c1086e SHA512 c3ca46b0fafb0f393d5c79b415f3ce46dee477aae4ec8bb8089204415e9bed5d4a3826e02e82a50c7e5d6d5ae88737018cb064cb335b38b9ed12f2312ad96b6e
--- a/dev-ml/sedlex/sedlex-2.5.ebuild
+++ b/dev-ml/sedlex/sedlex-2.5.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/ocaml-community/sedlex"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+FILES=( DerivedCoreProperties extracted/DerivedGeneralCategory PropList )
+for file in ${FILES[@]} ; do
+	SRC_URI+=" https://www.unicode.org/Public/12.1.0/ucd/${file}.txt
+				-> ${P}-${file##*/}.txt"
+done
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/gen:=
+	dev-ml/ppxlib:=
+	dev-ml/uchar:=
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	local file
+	for file in ${FILES[@]} ; do
+		ebegin "Copying ${file}"
+		cp "${DISTDIR}/${P}-${file##*/}.txt"  \
+		   "${S}/src/generator/data/${file##*/}.txt"
+		eend $? || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Remove dune file with rules to download additional txt files
+	rm "${S}/src/generator/data/dune" || die
+}
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@ -1,3 +1,5 @@
 DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc
+DIST spawn-0.15.0.tar.gz 15808 BLAKE2B 72c29c012c3aa700b345e6c5b5a5b8bed4576c721cd9fa435c652e0605cc88bb545247e5a8284b7603e22ca5ab27d36042c6d8020742fc5e9e7b762167a9f864 SHA512 3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013
 EBUILD spawn-0.13.0.ebuild 453 BLAKE2B fd5176e78cbe1bfe8c8f6206c529ad971ed22b165176221cdd2c841738ca1070d3b83e8c58cdc89adf103c0a02ea063ebeffcfcc32bc6f8bc31f3eee5cb6da5c SHA512 e48a10c70d884263948e5ce5c7341de84db98ca53194e451aa64158931df57150a2d754efc06361f463f0465554c5ff5574e7f565b89cdb82dab2d4a35997567
+EBUILD spawn-0.15.0.ebuild 459 BLAKE2B 62a5da443361a62a047a469f5a89a844effb326498582ce5d9ede13484d86e3ab9edcf80021232993b8a0567793b9f1d559f3760c2f8530093aba1df628bf21f SHA512 d63f5d632ceec5c3a6e108238d9c343a4ca51f59561f23b9942c16963e1741482e6dda4362837947b130d5a0e217b46aa85ed5e84cd0869c172f0f0011464a14
 MISC metadata.xml 314 BLAKE2B 24e080f5ed71e296ae2f0009a34fbb934250f84a002dc06bb7ef471ef97bfe8c1a38ed518b04be7ac0321fee38aa4c5688661e5b635edcb4cd19b468a92582e7 SHA512 8d2d7910c38d0272244e16bc337c787f520786d22986904a736da319eaa2629b136c951147e190bbaeb8a161cd38578daedfcd3101fdc7376635ed3d2aa35417
--- a/dev-ml/spawn/spawn-0.15.0.ebuild
+++ b/dev-ml/spawn/spawn-0.15.0.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"
--- a/dev-python/Faker/Faker-12.0.0.ebuild
+++ b/dev-python/Faker/Faker-12.0.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@ -3,9 +3,11 @@ DIST Faker-11.0.0.tar.gz 1199121 BLAKE2B e5c4e17daa969249dbf1ae69630a79c50e6e51d
 DIST Faker-11.1.0.tar.gz 1214021 BLAKE2B c4b7b44d19566037135d47bce19895da7bb0eba17c64086ad5f0019bbd49a77aaf4231e6aef8f40aec4811bbe4df209b796773ac5cca6a859ff9b43ea57fe9bc SHA512 646d16bceb3fc5ca8a9004ab7369d7fc6012f0766b2f6b58922a1a415a4bf1ae1af0d5977d58f15792bd794fa2235fb44e626e28f5af168d4e4def8112bab0ca
 DIST Faker-11.3.0.tar.gz 1215886 BLAKE2B 01a0e9cff30597536cc1d6f4ae3f67c43e0e1ec5268d5c544a0cf6ea905c4528f07567515e615b74f32ea4622c9090e63141b0b526d656cbb96a449c23e7b047 SHA512 cb95ecd4cd781c6a08621fe75a1d019349232f8be65d4c9b5825987cb98bb6d031569d6e3253cb36a68986707515540f6ebd7503085aea68d56642b08f86192f
 DIST Faker-11.4.0.tar.gz 1347314 BLAKE2B 0399302df718a9283ecb59ab044f438891f2874a2dd752d97bd88cf7e2de4536ad34ee818576c9c9926d90b5a18626759fb12dcd2cbf6ba54a3a9d2366caec66 SHA512 a12dbc6e3011839852fe978004520c546a42fab7b84ba03d890fe12a40299d36b7ce0ffbe1e678dfb74879fe17410589c459ff2ac904bdd15c9c03b816e8c7c0
+DIST Faker-12.0.0.tar.gz 1428698 BLAKE2B 3dbf231c0969d3f5d0826d69362f57a3bbb8e006c42453d7a6178663b3947b74f773aad8d22237f12c6e152d30a91a883b603d65f562b69a298f34501f6b65f6 SHA512 1998eafec97d16624c4d19f5abe3f083ca75d4a72f49e6fe2df657aae1ce41ddf7ec198ab601bd6a377f86ef8b4e027e031d6830149972b7775e4b656eb2c3b7
 EBUILD Faker-10.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.1.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.3.0.ebuild 723 BLAKE2B a041a53fcb013d95d7f4d112cdcfbfca8f1f37e7272d091a9d1bcfb338f549dc192b9f640d66a7ae2ab165855341c1ee4a0faeda231b87cafaab6ae483fc1180 SHA512 e753ca5e5ab62029a7107e492d6c6f0ff2a422979e59dddfcb7cd5db21f11f3d1475fa9016e3ff2e8db9bb01ad024dda668589c457e82baaefb08b159b68e88f
 EBUILD Faker-11.4.0.ebuild 756 BLAKE2B 9f0c28032ac2f992e5c6a42013e25ed4f49fcc7cc8e942fa43c725bcb260ec04199c8c537ab35d936e8144f011d604a11c24525e173fc0b2d7e4766e9579b568 SHA512 4b4867be319ef0a3951ee30b93b8a92fcfcdb080c865f408a9a0a8b13767b0b08922bfaba6850b97e919138aa1d05eaa66ea8852159fbecb2417785522bcb7a7
+EBUILD Faker-12.0.0.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@ -1,3 +1,3 @@
 DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
-EBUILD commonmark-0.9.1.ebuild 1004 BLAKE2B 231253f9cfe80ba215e36b11a5a0ed5a369d02f1c3095e20ae4db58b159e487f3161a35d88a833ff3d805f21a1d1c3737f8e2008a6f02eb10472d1fbd7f671d2 SHA512 8a609ff128db9f10f7ccc6bb0aa7beafef6f82c529c4e2ef87998c7b300436a3b8914e0ef69bc991f58199bba5d9c9e9d947b937fed86851e1c836774403a642
-MISC metadata.xml 764 BLAKE2B b4eec14c6816151aba2e6cfdd67dcd18ea73406193e10cf0dbcdf8c2a6e6d2c5355b4f22757f81abee02cd7e2285c69ba47885ae724806e6658796b87afb0049 SHA512 5c9141bc1c5dc745e500b72e87eff6bce24ba64cd09a39ed73031e4bf7cde24fb05c5b8aa72559146fc5e5c2771795c02a6f8732dd9fffb25d78a45e06e41df8
+EBUILD commonmark-0.9.1.ebuild 1051 BLAKE2B b673b11adb4b91c23418cdf846b010719aa8e52a7f7ea434a6f60810a196885a2783cd54c0cb424738305684f1950aa32b9f6d6c031033d2a7a788078e5af118 SHA512 485d4bb59a84afa59cc69f38418008c94dfcb6db45ae60bffe0729416f8386e6cddc07d8b64d264bdb202bcb6e3ad10f8495a682fce9c6ac4bfd958528c6e170
+MISC metadata.xml 764 BLAKE2B 4cac2589118c2b971450bf7aaffb1acc288de1d5d7f34760eb49a2ccccb531e35cb2c8719ca81c49dae3221271d7340b1f238cf1cba20c35c9708438b68c4074 SHA512 9f2223a67f87c806f7beffb03454790ec828975d7bf58e5753733090713869fd10584c84c43db988b6d02eb1210c14239dec433a16353b530f128b3c31c7be0d
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@ -3,11 +3,13 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1

 DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/readthedocs/commonmark.py"
+HOMEPAGE="
+	https://pypi.org/project/commonmark/
+	https://github.com/readthedocs/commonmark.py/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-python/commonmark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
@ -13,7 +13,7 @@
    keep up to date with changes in commonmark.js.
  </longdescription>
  <upstream>
-    <remote-id type="pypi">CommonMark</remote-id>
+    <remote-id type="pypi">commonmark</remote-id>
    <remote-id type="github">readthedocs/commonmark.py</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@ -3,11 +3,20 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
 DIST Django-2.2.26.checksum.txt 2561 BLAKE2B a974c7d5c8cef76e781e4fa1559725cc7d77de3d16b08ec20d034b38cb39a986b62397532bbc81d4414b3eae8a5487a9fef9615eed73946a54a2b43cdf34a6ad SHA512 7c1d3e04913237ed0dc9955eedd02cfb5113b9536ed0b471d873269ec82099561714a061b74bf212c2e99bbe47e6cf72e639358a2f9134f751fdd7cd53e6ce17
 DIST Django-2.2.26.tar.gz 9207984 BLAKE2B abd520bc5681b8450e51c4248eb97558daa6a87f74915bea8857843a5ea9be6bf3a04c9f5871c35d2076adb644da266c7b88ac39bb2837ff1eaa71f885bd08bf SHA512 2005b081e7347f6f8fd4837219043bd1728cd85aca00c62a16432f63272abec7d30b7461675708fa0f55e3273af5bbd67c26d31934f8a4a38f48e65ea721916f
+DIST Django-2.2.27.checksum.txt 2556 BLAKE2B 770dc5670d0d4aebcfd1956d644b9d7e4e5bf0b511649ae072de1b8ec8d2ea12dbc48563f5372979dead9e729abd9b5174c99323a14170876b1f1b5e61de96f6 SHA512 fb76f2bef6e6d0a3002298e4eeec5b335bfdc365ae55f0c26dcb050d369864c504dd32d40ac3b49897d56bc0dadc10136b588361ddf3598ffdc03830a97e1d63
+DIST Django-2.2.27.tar.gz 9185716 BLAKE2B 26d509c722c62b5bf784331466a97ad1b961715572da9e6add4be1bdc7cf999c0ec7c763d9bc8ab2fc1ca35a48783feaf748c3c9388ae9f5f3e393972deea734 SHA512 0db670651a820b49d855e38a336c0c6990ce4701bb686c5e8a292ccb03342e995c61c2c628b1d625d2715404e969fc31c256e5bf0fd6c1ff714d1c1c1ee30bff
 DIST Django-3.2.11.checksum.txt 2561 BLAKE2B ece4f40d4d368e2e5ad3cc3ed6072aa8d1693b47d68b76020059508bfc10a30f6291f5e84c68bb959fa973c4e060bf4fd408beefaedc13b68e81b721cb78aab3 SHA512 4f2c12088cfb69f547ba687e9cac34b68a9bd28c793482430bda078f51e780b1272de7ec7816dc31d2fa93bf1c68973f847d67c01414fc8bf07fa6f6ea09dc39
 DIST Django-3.2.11.tar.gz 9821958 BLAKE2B 8f83db578e31c3cbeca67bd826b4c639b346e449de83aba6ddf6bf4eef1fc58ebcbbddf91227012e592516d7796d9f3cc468ae4ce51d684b4aa0a417bb39ddb1 SHA512 ea1ca9a76afcd7e20d0ce518efc0497bbd11f4ab7ed20bd4490561bfcfc6c80db8922a22d8aca94c1dc2743e7366b28a0ae76c3d64f55afc142c38a744dd5120
+DIST Django-3.2.12.checksum.txt 2556 BLAKE2B 7ae6e41305b5b07969ddad3474a0819359dff888fc3bdc1c5000ded1b9b726a7c55aa7aaffc85184558edcc6c12b617c8270cc569fa8e645622206631979a9c2 SHA512 5098dde440a15ad066fa7927943f4ec66bb925798afcb42101c5cf50b8148301866c39ad37ebb5db9d7f9e195953337c03dc6fa2c49758716f969ee2ce414d24
+DIST Django-3.2.12.tar.gz 9812448 BLAKE2B 39b6e7e8f50b79d7be62be171eb358ab815c9dd630b8b2ad2cf085c42c79a6a8c92914fae3c471f41578e65fa09f011f959dd0794c804e7b30cfbc9411cf4f4b SHA512 fc8ad3af019b268d514cc5240cac9c6b2fbf3a169c7933e8ab2da92e9cfed72df7a2784a8d92eaec8105bc9c245763acd307178bdf662e5d51407e72ae9d8683
 DIST Django-4.0.1.checksum.txt 2552 BLAKE2B 123a613af7ff1ccb423c11086501a4419d86cf07c0ae7a4751f12d32f1592916e72e3e47cee13192944a3fc05ce5ee7ac81038118e346545536f313a10783de6 SHA512 979a7c5efafd4d8923d6c769ddd7d73c67482c33fd1a76c64d75aee0a03399e35703e7cbde9f5ad25baab969c33ab53690400e39c879e54066a146944e5d0ee1
 DIST Django-4.0.1.tar.gz 9995484 BLAKE2B af05ec1ec1d079e383efc590de78413b7fd769e7f03c5d4bdcfd26f193a46f783b4c3428558f5d3281cab9a7fa8be4cfecdc4edaf1bea72f37e8e983b3c061f1 SHA512 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c
+DIST Django-4.0.2.checksum.txt 2547 BLAKE2B 532139126846e1758bbe7b4dc4ad4aad6c6b3607e298f4373366239637ceca7d01a26472b2a87917e64db7140d28a76c1f5fbb396e7022b1a42b723551770d1f SHA512 eddd8ac31fc60f803f1e6f975c079e84e5ef997e8ac93b7dcf3573bd0c5d057adeb6f092acaecb200529044d81aa2db9849c1c13525678c8c2bd27bd14d6b280
+DIST Django-4.0.2.tar.gz 9996300 BLAKE2B 422b0bb000e7f62a854dc8fa686001acc3f629ded462d2520fad9486a9c8eb5d501d29c6a9f30f63ff8da128ded6f40281439371eb688fb9bc95f2377c5ca0f7 SHA512 c64b25aa69b826805cc7a3efcd63ae41bbc31a61e68cdbda90e6bcec6bd8e2c5fc47b82176d0c1708f55d2c7b082c71939b89cb0621fcf1929d1475e3d393a97
 EBUILD django-2.2.26.ebuild 2676 BLAKE2B fac142da15bc8f27726191808b107e7e49be0d68d779259ce4a1730aba104d3fc978292dd8c5ce7fbe9020a802eedad02d5cf1c50e6cbb314e540a254f78e2d9 SHA512 a7cb898618b31a624561389e19fd318bfa9afaf7609e9fedf1d049b7f3dd99b45c39d619d0db3c895f305dac09ac39c33c947cb60422908c394a2a31690d8a8c
+EBUILD django-2.2.27.ebuild 2680 BLAKE2B 99951c73539e0bf7c48447f1ca53a60d411a5caf72cd348eaec211c2c3527b6d3f1294b84c2a8c55cd636457fe6299c502baa608f6596917a8eb6f74075c79bc SHA512 c54a300717fb5a3d03c366e2e403bfb63b929e39c6bbae3b8b0f25124f0f8097e438c31859bdf4f6aeff64ce5fce3e6b8a2404d483674844c4d5fb1bc0966553
 EBUILD django-3.2.11.ebuild 2896 BLAKE2B e152a21beddeb46f0b5ca0210bf362fb4eafbd8ac1152964bab008d4fe47d7c250e6f8d082055797a89c0ef34a9fe1137d9f9fe46a45376c53ba433d78fd5e60 SHA512 9a0788fb8f1c916d79871eeb24b67e8f9fe803db707533994e3087c641e430f6eba308f95775b4006f06b7576bb5b9a19c9bf906c4f50cba1f54fd281331532b
+EBUILD django-3.2.12.ebuild 2900 BLAKE2B 6dd78efc84394b9ab6a23227750c4b64335a1d81f283a629b4ed4b42a4738fe44e4a74e2668032cebf2b70c02d41fbf12835a87e5db88c4427b45ceb99a2f0f1 SHA512 f115b5ab733566d8f17507baa2f9b21e5f26cabbdde84b6bf3b0887e585c4396320d489678a97a566c1ea6438c7e1ef1feb5a6157f099f26b4964977b97d1a14
 EBUILD django-4.0.1.ebuild 2960 BLAKE2B d04166c92cbcd1fbd20884f198d3dedc26215f31501d17d10dabd240302a96be117a4b793af6161aefdffe82d2a23de9c2f5d445d00519fbf9bfcee5d7d39dbc SHA512 6dce1aa3cf814809d01b6c69a02d6f2c979d4755c709b606106b62ed4f71e0883203f50bd1ef0b12d0d8a135ca89d57da2ee27855a068b0b427e753f1be36bec
+EBUILD django-4.0.2.ebuild 2960 BLAKE2B d04166c92cbcd1fbd20884f198d3dedc26215f31501d17d10dabd240302a96be117a4b793af6161aefdffe82d2a23de9c2f5d445d00519fbf9bfcee5d7d39dbc SHA512 6dce1aa3cf814809d01b6c69a02d6f2c979d4755c709b606106b62ed4f71e0883203f50bd1ef0b12d0d8a135ca89d57da2ee27855a068b0b427e753f1be36bec
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
--- a/dev-python/django/django-2.2.27.ebuild
+++ b/dev-python/django/django-2.2.27.ebuild
@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( sec-keys/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
--- a/dev-python/django/django-3.2.12.ebuild
+++ b/dev-python/django/django-3.2.12.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
--- a/dev-python/django/django-4.0.2.ebuild
+++ b/dev-python/django/django-4.0.2.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' python3_8 pypy3)"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@ -1,5 +1,5 @@
 DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
 DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
 EBUILD httpx-0.21.3.ebuild 2013 BLAKE2B 14043bdc42c5b3a1dc352836273f935b6c0ffe034e5aa58965d8ce7d422712d8a6fbeb3ec14a1e4ad60b62a1ef80755f84481bbe0eecaeef32ed68f9e780a5bd SHA512 e87c99ff77474483c607933152cfc053efd5768cec2a85b0a4f187c14f608d4c11c331a89e7f7b778d6a5695c2833c5cd2c772752068c106971ca9bbd8736e80
-EBUILD httpx-0.22.0.ebuild 2297 BLAKE2B d547a63878fba72ac8d145f1f0f4d1f6625f11dff28344c39f0a23c4bc4c298a3bc3abee6ef739c20e784ddddbb5748cbb2ff1bf1c4807237aab8dcbed473152 SHA512 07efe3f46a8daaf2a380e0b887f4e4fca71109167dbd910487a645064de92fc776e7493fbe31c7c046caf5ccb9c5e936960d27350f5b2decdb6086a1b8f826fa
+EBUILD httpx-0.22.0-r1.ebuild 2349 BLAKE2B 80073590fe425876072dfe5434955f7031c9091d0838dabdf1f7b1dc26cdb9910815f5d01185cba835d98f4ca811688b6e8ec33474b51730ce7be37d5d41cf0a SHA512 bee92cbc6d8288cc5cbd800103b56e353a2ddb01e211ceb7457730e3f5e615e34398140d4343079aa58ff530630af6481164d22ed4c0a37c190c15a45ff4be2f
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
--- a/dev-python/httpx/httpx-0.22.0-r1.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r1.ebuild
@ -33,7 +33,7 @@ RDEPEND="
 	cli? (
 		=dev-python/click-8*[${PYTHON_USEDEP}]
 		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		=dev-python/rich-10*[${PYTHON_USEDEP}]
+		<dev-python/rich-12[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
@ -54,6 +54,7 @@ BDEPEND="
 distutils_enable_tests pytest

 src_prepare() {
+	sed -i -e '/rich/s:==10[.][*]:<12:' setup.py || die
 	if ! use cli; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@ -5,6 +5,7 @@ DIST identify-2.4.3.tar.gz 101282 BLAKE2B 5ae76ac22ca462ae3dc7d71ed8d07344729ee5
 DIST identify-2.4.4.tar.gz 101270 BLAKE2B d5e31a8b74a724cfd0c169def52b434bd2b722aa7dfb9d92636a8eb28b1b1a7ccd9c9544d97d5fd359fb995b44b6d8a6428f484ee033f70292717053b1f5825f SHA512 34a93640ca96483599e0cfdb1d69f37f8f4cb659b68ee84824079ee177e93aeb259ebc654f5fb39d5a0b68d267ba3c963870c9c55b6676e12c21b7f7573438a4
 DIST identify-2.4.5.gh.tar.gz 101319 BLAKE2B 78e17e88ad5c463a8bca5cdc2e66433f38e41ad67fbabe60706d7154841ba6fefa52658550107760d521257366806999ffc24b9eb0ebbd37d3a94581df573b12 SHA512 f2c6ac86ad88431e835c723a83c7b8d0578166ab620e2681f5c16e9634592f58761551a1360491edc4863538c967b793fe8e0730cbf4c92bf1690e50c5669ac9
 DIST identify-2.4.6.gh.tar.gz 101330 BLAKE2B 3e1a0d09b52fa7176f4216d7be40b6ae797cc7f8fc75364efbbaf5ded61db42f5aab7f672c7585466efd96aa33bcc4a3628080dc0a16737c322c4f7b6c915de1 SHA512 61f0420ba9067a3b4a85509d52d7dbc1e5affca555bd429453c9fd0d2b0937f1d41a36ddf6c63b323a9af1035ecc470545f5dcba28d7cee2dd6b6d6d3815059d
+DIST identify-2.4.7.gh.tar.gz 101364 BLAKE2B 279ddd2ee01f4556ddf4fa771aed14522168f1764848a7c4aad0d7c29886ceb303eeadab8bdd9bbf52853ccf4dc0951a3fa6c53ddc4eaccb020e6b5f02073847 SHA512 9de65f0adbfc91c448a6e689cbb514d87bd3aa4fba286a77ca45b30b7822c54e159a63d68702334503a990ba7dcb8f9e269eaa43103126064ee883f300dab125
 EBUILD identify-2.4.0.ebuild 516 BLAKE2B 9e67c4cbb998fad7f8fee2583b0553822dc9dc7d589a092b1127938f48999afc05e1aaef3ba5d3eb1f85d9ae399268c82869eb4bf3ae4274bdbd65b41f14ede8 SHA512 47c7d88fda8e395b105ea8ecbcff161729a21d89717292d393b31e538bcd8c5cf6fe46b0f7249ce20ebe9b10eb7105bbb99a383358bb8843b0754d95d2fc2e3e
 EBUILD identify-2.4.1.ebuild 518 BLAKE2B 4327428e4d169fceba95c9d444157fd626ec810e3e1036514f1e241497cbd1f72c7fa014f7011d8b65e94b0fb750ff442ced7d5047ef9c04ce79a7e26f947148 SHA512 9d8f344351ebbf673680e90335a49802ad3534da08ec2d1fe81df6fd5e8f5489974f17c264a6d34ebe26e99fe27331fbae9f808f498b554e8d3aed0e163f31f0
 EBUILD identify-2.4.2.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
@ -12,4 +13,5 @@ EBUILD identify-2.4.3.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a
 EBUILD identify-2.4.4.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
 EBUILD identify-2.4.5.ebuild 546 BLAKE2B 97c5375972a242b01b4ad04331c1cfc2b1bf1864b9157e278ddd2a086bddce7562988ccfb05269bc6b27878ec2b14d0e21e26b101e174408b8eec941c952f9a9 SHA512 a9a652f8cd0293918e0c1e575cb0ec3c3215cb76799a526881b24d8bdde259235c475bfb682ad79dc80294f31ec0dd73655ed264ef8a70f8b9f996abd8adf69e
 EBUILD identify-2.4.6.ebuild 546 BLAKE2B 26114479f3e21785bfd3086181862fd1a07f7e0e37cd01e11389e19fe7bb81a663b6a472e952f013db33beb825cae04c979bdfa359818f8f3bfae1bdb4fd9e6d SHA512 777b56fec1fdf73b2298487c8b9ff0da8d073544c21aae7cadad4df74a0aa5946ea6cb8dc5eb34a8d60f3b1ae4a9c14f491bb9452d7804baaf181a77a788b9a7
+EBUILD identify-2.4.7.ebuild 546 BLAKE2B 26114479f3e21785bfd3086181862fd1a07f7e0e37cd01e11389e19fe7bb81a663b6a472e952f013db33beb825cae04c979bdfa359818f8f3bfae1bdb4fd9e6d SHA512 777b56fec1fdf73b2298487c8b9ff0da8d073544c21aae7cadad4df74a0aa5946ea6cb8dc5eb34a8d60f3b1ae4a9c14f491bb9452d7804baaf181a77a788b9a7
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
--- a/dev-python/identify/identify-2.4.7.ebuild
+++ b/dev-python/identify/identify-2.4.7.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@ -1,3 +1,5 @@
 DIST inflect-5.3.0.tar.gz 74127 BLAKE2B 20c591012a5a6692c3da3a39f4aeaaae290da5ba723af5c9ac90f7d28112a1894acf082633f8f673f6d903f756b9bb70c6c3366762e872cf7ca6c6d5edf1c99c SHA512 f5baf65fb7a6ba59c91a36a17acb0abda3efc74fef56b3a3d99c100b2c6e94c5aafb08ab37310ce410631ac928e9c24a4a4c5e6b5c7d8f907c3d999f4a70cce4
+DIST inflect-5.4.0.tar.gz 68594 BLAKE2B 60898e019c04b9d86a1591c341f48e7e3093eaa4f93bb4f902f4d405f1151d705f902b792028ca97a85ed47ffe509bab758b3ec74878ec82f5dac3c953197ca0 SHA512 48b7d38faf41b3f682226b66ea5493b7d4ff58a8db52c9b90092fc329aee761b090791deeda24234b9f9fa47d8db9b499e1f4304367ef3637c441959e8b8d005
 EBUILD inflect-5.3.0.ebuild 693 BLAKE2B 93956f86b918a514e41d69cb299105b103ffc17958745019a2c01a4f6585cf87126bffef8048d74755f3697c209cdf45809f7a637480e421ead88c298b80721b SHA512 3f076cb75a6de1b7a18b841c599b396a3055375de73d4a0fb419d7e3e4c4ae8b031c142fde3086d642ef19439750c531a328afdc1bae39f204e31251d7e256d2
+EBUILD inflect-5.4.0.ebuild 698 BLAKE2B c744306f244e8f4b73d7e4b76b9db92ef766a80240ed341adcb4839c33eaaf6a24e589d1e7ea8438e12e740b299b9f9cd0ab01975f8c6e4fb9dae84c246b510f SHA512 1f1e130195f816845c0a984e6069c86cb3823f1d93f0e773880253c80a47b902aa0db6effa6d26db9ebfe8d57cec8974873a1436da270b62818e50f013d37970
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
--- a/dev-python/inflect/inflect-5.4.0.ebuild
+++ b/dev-python/inflect/inflect-5.4.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jaraco/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-8.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+distutils_enable_tests pytest
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@ -1,3 +1,3 @@
 DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
-EBUILD jaraco-path-3.3.1.ebuild 983 BLAKE2B 3dfce78649bf78d52b6d7ccabbb8a82cfb3ad8d2b3a6794578bf159cf647b9b98c17949eba87ea61e5397e93dc2a73aea485f3995f01342c09564cf798b320c0 SHA512 e3317bef79dec0566c06dc8405bc5532671e7cf282b414f545506d67d11d56ea22700ee4c13a09a62cdb8384126115740e142b61c09851311653372fb224dcb3
+EBUILD jaraco-path-3.3.1.ebuild 942 BLAKE2B cd85b796ddba7cb8ef289619823dbfa19cfa2f35a105c3e0848a2b17b0a089c88e0d7edcd0e053216cc76fbd75201d4396a821fca57b44a5cb9a4723fad19c56 SHA512 946a2d3c789d82d496523004984cea4eb186c104dd75a18a9164ccc48e873a33830e1b2d8eb869ae6dcbec6e542fc2b450452909c9a0afad201a9b09c35674bf
 MISC metadata.xml 397 BLAKE2B 899056eaa6d393d9c624e20ff93a644bd93f39505f701a085f22d4216154a3c1b19bb879bcbe45f077fba7d91ad5e34617283b10f535305b322c580712df10fc SHA512 104c1a8d8a2613ed4355b6537ce0733b36e915d98ad69204d2a7763dd6e7bbdf74c2cc2e66f34000426e04e79f19a84ca1d8a57e504c62adaa4386f372d34dda
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@ -36,5 +36,5 @@ src_prepare() {
 }

 python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+	epytest tests
 }
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@ -3,5 +3,5 @@ DIST psycopg2-2.9.2.tar.gz 380253 BLAKE2B f3b649986f8bec56df33858373e510ea69623f
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
 EBUILD psycopg-2.9.2.ebuild 1306 BLAKE2B 1321dcc989d4b26cd7aa7717a0620aa8f0149b808ae80289dcd4888290202db43ed061c2d887321f7db6425e01502d243a794a8bda79a037d5704eda44d61ed5 SHA512 b579bfec8510acae8b911c214cf06b5e9e671d617550fce0359afc6a8441f6542866d71360cdb5d721c2fb664c15a490c79a529e8f56209db66204079a8bd89c
-EBUILD psycopg-2.9.3.ebuild 1308 BLAKE2B 569422cb4c30bf346c76881af55d6a413fc833a6dc0d4938bca8d31a37377152ebb4dc8bfd74291d80335e1757472656243e3375b6f9e45e420cf6fb3526fba5 SHA512 03b3f0897a30ea5b828af98fa4ad49fb5677c88d80e1f5dea213e2845687b6e76220c9ced594908fa960a958767ec012327755bc2e27d667bcebf9528f0070c1
+EBUILD psycopg-2.9.3.ebuild 1307 BLAKE2B e6dd5afabbed810c9f82e396d75a776bdd070364ce15e5bcc1a028fe7dfe289d0a464183ccb2d0d3d10ec5dfdc0a9bba5a0a1ef8b72477541177193a9238de44 SHA512 169a201f78a6f00f532c24e36615f7005a833c47000b9d104d32d970c8df071228a7a2f4384df7bb82d3ecfe810bb144af07b0f59e73bd5da78b8f62026550e4
 MISC metadata.xml 322 BLAKE2B 2656ba386b42acf8e45737cf0f2428d80f91a05de732bd7db0e76bef480c6de927c0bba1c0dccb3d3404054d78354f698e75f03b44940fea6a7683c0c160a71e SHA512 01a60ea486677ccd335e348e90608ee50ac1ff6351d83a2ef4df76675a580f47b72e79ccfa3fdb84f725592bd5c6ef85322fbf40488258c45bc3724b5ff9098c
--- a/dev-python/psycopg/psycopg-2.9.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.3.ebuild
@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"

--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@ -1,3 +1,5 @@
+DIST pyicu-v2.8.1.tar.bz2 242774 BLAKE2B eeb3c45124301b7072addcbfc3c97521d21fbdb5bdf2b0fe94f0181c225927a0b3bd6ab6271140fa9928d0220e5cb33c800b367cf4b0cf844ad64a2438aa016b SHA512 dc7fb292322c565da045db9d91e9b4cd58a559d6f78bf3f050bf25fbab942179b463b977340e08bbeb107e3a2be8a2eb0a0a91911e0c0b8b96327ba85fd13c46
 DIST pyicu-v2.8.tar.bz2 242791 BLAKE2B 0492b1fbbb97a92fb90620fb720cf82ddb2e404d4ce4d20d4204c271ae0c32c526e5832f5658205893381c074f6b1e2a3274f1935efac094241fe2afbc7b9c07 SHA512 c8ecc11322de79d42aa0f0336cdc47637af203bbf2782107132d3c194cef3725114ba6fc40bbd2bffc26ce168d6d4e39f069904aa268d0d095c506ddca292051
+EBUILD pyicu-2.8.1.ebuild 664 BLAKE2B 7659910ee7439bee9b8481bb48774d0ec27aea45c61d46dd889ba08909321e83c8a2de8879ff9d97723ab0d94cc786354c8d59fdf0e34817f6f3a7c78c9592d4 SHA512 98e141501c82314fb2ebed34c4224e07008071e44595ca26d85004aab7a7d49c69a8bbc41faa6fb6c0d6554ccdb64577019564f22cc03a29d03508b0ad8b1937
 EBUILD pyicu-2.8.ebuild 629 BLAKE2B 644be8ae4aae181ea2be74b2031536f80fd986521d7468dc6bb843acd75328e25c4100c0f3015ffb5fde3e811dae101bd1ed11fbf70f4775babb95b6adc0e921 SHA512 830eae0bfd9d3c0d55a447e1a8d13c8256fd009338932fc4497a4bb4ce0034b4a76030e4ca773754bed99ff9c031f30a2a6bab6fc6f8a6c0fb454e68de34b147
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
--- a/dev-python/pyicu/pyicu-2.8.1.ebuild
+++ b/dev-python/pyicu/pyicu-2.8.1.ebuild
@ -0,0 +1,31 @@
+# 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
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/icu:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-python/six[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@ -1,6 +1,6 @@
 AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262ddb0e331d24c2e950bcd0cf78c92d5f5f79804a9f0eb4a52a7203d353a6be297118e3b951823a973f9a99a8211efb5a31be458 SHA512 92a4497733efa551d9c966f39ba31bc9d3443ece6591f4d664c3732f01f10c928c07de13e2b9e65725f30fa18da7a4a9ee172e0b627d98e1d991c19b7762e2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 EBUILD python-systemd-234-r1.ebuild 875 BLAKE2B 1db3cda0b08804dea24eca69c805e776576ecdbfc33ca7cb8c62272e966f4c79636c88684048f87f8c63d657e849c02f4419896c18d4d714e84e1e245cdf6963 SHA512 990969d50ad283ff3394aff73d5e59728edb23d85868f74d370742c90a11758e86a917e5138e560d935d5ecf1dba6154eb0e98e4ec9c1391d9d3f17cd167d348
-EBUILD python-systemd-234-r2.ebuild 937 BLAKE2B d9b9aff2e9bda6b58f42dfc36b53d9773b7e9a136e56c591df581db2018de349925837ea95946c82be28bfad4a1c6322127af4ed2931658beb3293ab1d5087f9 SHA512 efea502c4d43377b2519af4431ec321c7d334d515e51bc193dff16f63811544f69aec1487d5ca3815371f66d31457311de6000d5f453c5b86bbd5a5afa857caa
+EBUILD python-systemd-234-r2.ebuild 867 BLAKE2B 31fae39480e6f436230c1c55d78c131fbdf2c43e8d0a2f7ca20f51c228a5aa6e4c95e3254a7976935857aaf499a30b0872cb9fb5d84bde32c2e708b2b47dd336 SHA512 588a21ca0acc19fb1f8f944605475676a11140e1975f06d17d286b8e5d4add4f2d28f36c6973328c6f3d493e94fc5c805c4a8028e96182c139eb33d261687ba2
 EBUILD python-systemd-234.ebuild 894 BLAKE2B 809e9e3314b2eaa2ec4f849f9a1d6c106ac29d53c64d2b784362a6d9e50cf351c8e669e20b9e30c4320a5838461e8be8c287101512f3d62337d93c2e8aee0e6c SHA512 d3cab8c01b42501028d11cee51b97ff7ab5a73984ae7afb857f5e596c04f45024802ce1c14ad8f29a6912af6ec4fea65495f9fde3f3f707f11711b7856285dee
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
--- a/dev-python/python-systemd/python-systemd-234-r2.ebuild
+++ b/dev-python/python-systemd/python-systemd-234-r2.ebuild
@ -32,13 +32,8 @@ python_compile() {
 	distutils-r1_python_compile -j1
 }

-src_test() {
-	# prevent relative import
-	rm -r systemd || die
-	distutils-r1_src_test
-}
-
 python_test() {
 	unset NOTIFY_SOCKET
+	cd "${T}" || die
 	epytest --pyargs systemd -o cache_dir="${T}"
 }
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@ -1,3 +1,4 @@
+AUX rich-11.1.0-pypy3.patch 4348 BLAKE2B 3969d19dad3258d95da3f4bb05bef998e7d401ea39574038f573ddb82f6a8820a2daf11e7f1b33306a38641e5c4ed298a91ff6d1c410a8cbac5dd1d4a5bf1bef SHA512 f56c7cc7520ab9de7803983dcad46cb79351ca3e8cf169728cae783de0f2d1bac974099e6ae577bf2e1b668a7827ea58a3d363e12b3beb2c1d5f181009ef1366
 DIST rich-10.16.2.tar.gz 16282443 BLAKE2B ccc7292e265770880539d6a1a6b2e819b45e2e3d4d152f1a16c56f2da74c9a472ae49ea0a4a677ad71c4dd087fade2c415484073b4b2cd86869ad7c43c32b162 SHA512 9cb8b0c8105589db22d7efdc47cbfa20531cd184f07855db4bfafb667299c7d3e520b19e3b33e7818affb7a5674805849ee9f2e770927e285ccd7f4f838982c3
 DIST rich-11.0.0.tar.gz 16293684 BLAKE2B bd38f84a7e0623dc9474bdc369b452fc668cd4756f00f6dd1b185f95dffb3d55f6b95a7f6dfaed5ee1ec5f2d9514af6080835b9ffd010f150005b15afb761d97 SHA512 bf8218ff43a101c4624baff1ecc316eb95912d0b634c41293b44de135ea4c6ead0fa2c6a96ab1403ce4dd80961915dbe7753415a74c7d41fc1f2d227113e9ff3
 DIST rich-11.1.0.gh.tar.gz 16295117 BLAKE2B 1d326edea18b1eaad633665c2e50aa789f9eba19ee9b4cb50b94a160a69d12604fdf87d57ffbc903835b6e1e745fe17e0c521801b515ae73c8a44bf9ef17b6c2 SHA512 9da2015a66e0924bdd04deebd8fe8e963151d0a912f78320f8de8e61d656a693595c4feb0ce2436610602308d690ed96c8d10b5c81a9fc12a350b2e40907dbcb
@ -5,5 +6,5 @@ EBUILD rich-10.16.2-r1.ebuild 1068 BLAKE2B 66f3d38d863fdee5f75219b9b567303d12787
 EBUILD rich-10.16.2.ebuild 1072 BLAKE2B 3a85a0b5333b724420adc2a8ff611f4200fa15bba5473c4cb99a188263e09d0e162d21ce77e72dd76e05ebe266b79d7cf14c9d72d91a8ac00ea81be4e4dc09ca SHA512 18e887a517b7b921ea17beffab5bd65f691047a89fcb3ff6cd594a595fbf92b7f854e3d2ef6e3c2dc2f9529858b910990490f489225fbbffeacad79db7dad2cd
 EBUILD rich-11.0.0-r1.ebuild 1066 BLAKE2B 489b7e3f2d249e1ec6109f789874a15fc98bbec8e9f1444a2cb160e4cbaa01124776e40642f837dd803f123564cb5540daeedd14f00369c93d38e6d10411b78d SHA512 d2f0876e2fc18b6b798808e303fdd74bc044f2269de2b00da6461f43a831e9475ebbc6542ce0cc7b99c32d8fc21dbc5fee339030b90a255f1080bfb8c707050c
 EBUILD rich-11.0.0.ebuild 1078 BLAKE2B 27f15447f6ede675694532b5d37bf07514cc25bb5dfcb17bf476c9db511a665c6a262f47b96f474cb4ded18efdfb23f1e1b7a8727b3a926959b06f1f346548ff SHA512 0e242ae01743c40d31a47ae340923366df509679d87d87adf6c0878563379038a12adf8e212788370196c524b97e3958c4b170cec74a73e420d099c650fc53ce
-EBUILD rich-11.1.0.ebuild 1074 BLAKE2B eae25f5f249ff8c3d5665af09997767433856c272e36101d5a4bf9d19c05cb1fdf9dca21eeb2aa8aceb2dea71c18099ed7e83d10dd9abfa8845abe34453039ca SHA512 0254db5309564bed0f4622aacc0f089cefcd0ab0bf9ad6dc1edecc624ce1374169e2cf9abf9e436322117b7e565e591a2f0b63b601b5a42e62328ab6917ecaf0
+EBUILD rich-11.1.0.ebuild 1125 BLAKE2B 794f8e97600b1d96f76aee438dfbf0489916d1a44d7bfb151ee89cd15aeca6b24457624a9004d88ce396242cab0131d775e96d1a6a25084008aba3a304a51038 SHA512 5591f6952d42c86378fbbf884f73f656fb9389ab3398dfb649c191626a8effb6f0485fcf1602efc0a5e94a376f5dee8ae8669cd8b1ec3f2e7c91871f75e0c90c
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
--- a/dev-python/rich/files/rich-11.1.0-pypy3.patch
+++ b/dev-python/rich/files/rich-11.1.0-pypy3.patch
@ -0,0 +1,129 @@
+From 8e3a0be6fbb9186fa45cc42ec833d0895d2313ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 1 Feb 2022 12:24:18 +0100
+Subject: [PATCH 1/2] Fix test_syntax not to use identity comparison on string
+
+Fix test_syntax to compare strings via "==" rather than "is", in order
+to fix test failure on PyPy3.
+---
+ CHANGELOG.md         | 4 ++++
+ CONTRIBUTORS.md      | 1 +
+ tests/test_syntax.py | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 4997ae3..17f3028 100644
+--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ - Add support for US spelling of "gray" in ANSI color names https://github.com/Textualize/rich/issues/1890
+ 
+### Fixed
+
+- Fixed `test_syntax.py::test_from_path_lexer_override` test failure on PyPy3 https://github.com/Textualize/rich/pull/1904
+
+ ## [11.1.0] - 2022-01-28
+ 
+ ### Added
+diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
+index c29cd79..06e0618 100644
+--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
+@@ -27,3 +27,4 @@ The following people have contributed to the development of Rich:
+ - [Nicolas Simonds](https://github.com/0xDEC0DE)
+ - [Gabriele N. Tornetta](https://github.com/p403n1x87)
+ - [Patrick Arminio](https://github.com/patrick91)
+- [Michał Górny](https://github.com/mgorny)
+diff --git a/tests/test_syntax.py b/tests/test_syntax.py
+index 46d0126..e5d904f 100644
+--- a/tests/test_syntax.py
+++ b/tests/test_syntax.py
+@@ -277,7 +277,7 @@ def test_from_path_lexer_override():
+     try:
+         os.write(fh, b"import this\n")
+         syntax = Syntax.from_path(path, lexer="rust")
+-        assert syntax.lexer.name is "Rust"
+        assert syntax.lexer.name == "Rust"
+         assert syntax.code == "import this\n"
+     finally:
+         os.remove(path)
+-- 
+2.35.1
+
+From f15dc3ea0b59d5fc04341d3f634f0e61c05a84db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 1 Feb 2022 15:10:32 +0100
+Subject: [PATCH 2/2] Fix test_inspect failures on PyPy3
+
+Mark the test_inspect tests failing on PyPy3 due to different output
+to be skipped appropriately.
+---
+ CHANGELOG.md          | 2 +-
+ tests/test_inspect.py | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 17f3028..1a75bf3 100644
+--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ ### Fixed
+ 
+-- Fixed `test_syntax.py::test_from_path_lexer_override` test failure on PyPy3 https://github.com/Textualize/rich/pull/1904
+- Fixed test failures on PyPy3 https://github.com/Textualize/rich/pull/1904
+ 
+ ## [11.1.0] - 2022-01-28
+ 
+diff --git a/tests/test_inspect.py b/tests/test_inspect.py
+index 63c5f06..b4c1d2a 100644
+--- a/tests/test_inspect.py
+++ b/tests/test_inspect.py
+@@ -32,6 +32,11 @@ skip_py310 = pytest.mark.skipif(
+     reason="rendered differently on py3.10",
+ )
+ 
+skip_pypy3 = pytest.mark.skipif(
+    hasattr(sys, "pypy_version_info"),
+    reason="rendered differently on pypy3",
+)
+
+ 
+ def render(obj, methods=False, value=False, width=50) -> str:
+     console = Console(file=io.StringIO(), width=width, legacy_windows=False)
+@@ -81,6 +86,7 @@ def test_render():
+     assert expected == result
+ 
+ 
+@skip_pypy3
+ def test_inspect_text():
+     expected = (
+         "╭──────────────── <class 'str'> ─────────────────╮\n"
+@@ -98,6 +104,7 @@ def test_inspect_text():
+ 
+ @skip_py36
+ @skip_py37
+@skip_pypy3
+ def test_inspect_empty_dict():
+     expected = (
+         "╭──────────────── <class 'dict'> ────────────────╮\n"
+@@ -119,6 +126,7 @@ def test_inspect_empty_dict():
+     assert render({}).startswith(expected)
+ 
+ 
+@skip_pypy3
+ def test_inspect_builtin_function():
+     expected = (
+         "╭────────── <built-in function print> ───────────╮\n"
+@@ -237,6 +245,7 @@ def test_inspect_integer_with_methods():
+ 
+ @skip_py36
+ @skip_py37
+@skip_pypy3
+ def test_broken_call_attr():
+     class NotCallable:
+         __call__ = 5  # Passes callable() but isn't really callable
+-- 
+2.35.1
+
--- a/dev-python/rich/rich-11.1.0.ebuild
+++ b/dev-python/rich/rich-11.1.0.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1 optfeature

 DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
@ -25,6 +25,10 @@ RDEPEND="

 distutils_enable_tests pytest

+PATCHES=(
+	"${FILESDIR}"/${P}-pypy3.patch
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# check for exact color render string, which changes across pygments bumps
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@ -4,10 +4,11 @@ DIST setuptools-60.2.0.tar.gz 2282807 BLAKE2B 97d54353050d4e8a009e617a112c23d707
 DIST setuptools-60.3.0.tar.gz 2283824 BLAKE2B c0e1ffb6c19fd4c85aed2878a95e23372131e5c069551b39af477c72d591608e73d1bd9710d34a8540c226a0dbb91dd9def170121672daf2928d039f589c238e SHA512 71c19147e8f34a5eb2c830ad0942bcb1a468a3ae07c91035fb19eb50d549dbc3b9e992dd2b654383843ac6ba088a46dedfe928850417da92c24f1c5bf3e8b6c9
 DIST setuptools-60.3.1.tar.gz 2284193 BLAKE2B 0138acaf830d7f29db95c759e60d77986113385b13e96446974b63abf3621db2d2fd033f0f45bf380b6cfb2066ed66ff008446ca595f741c3f5446107f2a554b SHA512 7a2434d857b2914136d5ec0a7b9fbd89352a5dd3452bf2e3f7c0e2ef7317b45a3cfe6d3921b7f61a1f0a99a7c06f73428f9871dac0d7ae481fa1a1a0b97042cb
 DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
+DIST setuptools-60.6.0.tar.gz 2292575 BLAKE2B 410f4eee4e83c14dd1ebc3ab103f9e12bc5092e2e82dece8e71e7be57abc3d41c50763560e94343fe5089c7b903fa223fdab9c9c4648f423fcbd525551c501ef SHA512 9c0bed3d5f3e051fc996c26c2bc8d7ba0193c119a98678c7ef38ee1fdf8b42e569995598e64b527b5c6f1b4c77de655d1d7bdcd526a6d90288fd34efca92ff03
 EBUILD setuptools-59.8.0.ebuild 2933 BLAKE2B d5f4b008152d6a1324ea2a63da229f71fda4f6e20f1d7790f69257e9945ad98c02d765dc5c4e76fe44b476eeb19df6b21f582c684ab13e7b6452e280babfa0fb SHA512 e627a7c69f998d01dcd24c446efddf1af40e97065b13df3398e1c6e8c320f42cf1d5b04d2e84325f32298e0c91c8d789def20d4e947d6aca6e66ddda8058d14e
 EBUILD setuptools-60.2.0.ebuild 2984 BLAKE2B 3cd9bfbbc75d022caf3c2b8e8596d58834a62325ad8089077775eccbf149c65a680a0fd3551e396d9ad9764379ee4d4850ac4a0ad4afeb75f342a0816f77acd6 SHA512 f609442d4acece1735eb444e91db94f2b6a49c48edad30fa58b8fd27bd02cc1583a873b9cbdd3608dc592bed69cc3b1d2a86c80c8589a99218e16b65ae7d589c
 EBUILD setuptools-60.3.0.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
 EBUILD setuptools-60.3.1.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
-EBUILD setuptools-60.5.0-r1.ebuild 3326 BLAKE2B 2f77cb1b0d54a3faa4c4bd2f914fd2968dae89ca59de95bce16595dfd3369a2e239a5f13adbf4b40ea9a23e84b7c02b0c97c46827f4eb392575f308ea3420c55 SHA512 941077a16e57d7757d6fa037ac68544f8c9e9dab1c789f0f7bf6819efffc8ecb77118ce7baf4c6f0ac72685de708a25ca6f6947094ce60de3da593514f595345
 EBUILD setuptools-60.5.0.ebuild 3400 BLAKE2B fc60c2f8fb51f47e40a656f2723640b7962e0c90d8843d80deb25ac2f8984142c29ec0aad437f2feb573e35f88bb33d2b187beb10da4ccbe1276ce88729abb1e SHA512 3750647aff60bf2f1b446a0f2c8e802d438cade32e1843437f693a735ddd44acdbe13a12339e9632ab2df8c024b43c096e70b0733990f4f6d94747037dafc16c
+EBUILD setuptools-60.6.0.ebuild 3567 BLAKE2B 42ddd13c9634b573805de14f30a761b18beb0cff506fe797dc26c8b28446552476ccd9eb070b7269f5ff1542b75ebd71ab5c4e540f1528b32260ba3b17b8b91d SHA512 c05cbc703fb1a7e8bbaafa0eec67ce491b997313dba3222a70ab0a8b889539a901b1b581677e4f9e4901302ce3edcd56bed12143bb8f3c335a294125deca6882
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
--- a/dev-python/setuptools/setuptools-60.5.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-60.5.0-r1.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"

@ -39,6 +39,7 @@ BDEPEND="
 			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
@ -61,6 +62,12 @@ src_prepare() {
 	# automatically
 	rm -r */_vendor || die

+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]extern ::' -e 's:\w*[.]extern[.]::' \
+		-i {} + || die
+
 	# apply distutils patches to the bundled distutils
 	pushd setuptools/_distutils >/dev/null || die
 	# TODO: distutils C++ patch?
@ -84,6 +91,7 @@ python_test() {
 		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
 		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
 		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
 		# unhappy with pytest-xdist?
 		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
 		# TODO
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@ -1,6 +1,8 @@
 AUX xarray-0.19.0-riscv_tests_datetime.patch 1832 BLAKE2B bd38f8d95e67d8c44a17db4283b0e2c8d7b1a87ea2d4c96dd65e186b99d453d4cf3f5b52d70e2077648612c44b9fa26a0f44740f89fa23000bf7f88ac5dec7cf SHA512 40be0dd9969e21dfb6d6183d1aaa18ead960c6aa4888a10b6636bd3ab05d5995fd95c18fd87b95de535b36d0c0bd90302e9e781229407f25c7c68b25042d197c
 DIST xarray-0.20.2.tar.gz 2906021 BLAKE2B 08ed46a27ce66ec1677e63000d74ecc4a01defa81b8ae1ec24595ff330713bf3e5585adce541e5e6769a74d64a4f5eb9d9aad27450e8088973681d0d60d00f83 SHA512 cd292af68ffd8016e01021e30a2ea83dd36e2f79bd9c3d8e7d83adc5a98a95615091d0102a19a0e3337ae334a701f575a142f476d1465804c8d5fe259ca35f1a
 DIST xarray-0.21.0.tar.gz 2937088 BLAKE2B b40d57cbb018e563b92afef1e5208bb597bf8ae892b154f49e90079977c05ab955ba07f136fcf3f456efa8deb70ffd2590dd2d2429b6114a418882b8d96b535f SHA512 85461b86ced78ad5cfd1ace122f1ab89f779a8c0c7e8d0f06233b4654c5f6bcb081eeddc91e5df1c8c40c344d2477f2f18799858e23294c0929e8e59445508b0
+DIST xarray-0.21.1.tar.gz 2936861 BLAKE2B 4d419185a6c49f8054f43748fd7a0ba9694aa9e7377e371705dd6eceea84f5d611d445a7548a79133f8db4c65729c9b5f694ab586d5e2f55640a6369483e3df4 SHA512 be5d925971557f492c8ca7e90eb678a0f98cf0a670eaa8a8564bd160a02fcd8a22362a8691c5447a9baaa67b464257f2ab6954747296839b304f3e25cf13487a
 EBUILD xarray-0.20.2.ebuild 1082 BLAKE2B 9cec6781e283b773d2fc7cfb74a207647f094815101976d84d85d8a20cee06bf8cdb001669e7b33e02cf6108a421a92902a6f471d5f61b7417679188a3fdc618 SHA512 1105213e037c230861494b87a81ee0a9f9f24f88551d114361fe45a360a61ea1f8c106ef7f409c5f49ed614a3f95ddcfb6feacd64741cbdb0db750cc1ac7db93
 EBUILD xarray-0.21.0.ebuild 1199 BLAKE2B 39e238ffc47c27cbcaec5aa30f53c2a406b45c592e533244c05921fd596aa62bc6bb8703416bd9b2487f7e971fdeb6f22cb7213c77f454a1f378531a832b31f3 SHA512 a4f4e26afac89d44a83dd11425392136680a4441276f0ede9d7c95b58c776aff0a02dd00c0df632e50374c065e996787fe6a610a481ca6a7c8da982565fe3eec
+EBUILD xarray-0.21.1.ebuild 1161 BLAKE2B 032c3a27823bfc46b72aaa71835870b1ec1c5a76358bff191bcf41432d46d600a3213ca3ab2221c8ed02a9f070672a06072de2276be9b3c12d10575ef8091146 SHA512 a95aee44d33da4f09f73ab56d55cac002c20a6a331175f604300d45562da9abedd681fa64e9c1315a79dc72b1fde64d0a067d273e9afaae59ee2b229e631575a
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
--- a/dev-python/xarray/xarray-0.21.1.ebuild
+++ b/dev-python/xarray/xarray-0.21.1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]"
+# note: most of test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+)
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@ -1,3 +1,5 @@
 DIST python-zeroconf-0.38.1.gh.tar.gz 133094 BLAKE2B dae802e19b8b9488fc71cf482578be53c99bbb58580de987522e068b8d4042ac093225035bf5f7c2318c9a90bf5404e42f315cae095b0b4455ebd769facdcd81 SHA512 c60f03100c83e9327a910ad84aec768fb890453c21f9baf0fbbec96f0077c602c5e806e8a6047b87108f6d257942305a2ce76c984935ed3c000d83d2c44bb8d6
+DIST python-zeroconf-0.38.3.gh.tar.gz 133187 BLAKE2B 2058a4e8b772b49e1e6c3dd55ca1ef1f73630724d22a253d7f14f63a361e58cff24a700dfdeeaac5ca1bed43490865885dbd8956ee58924b4f9b0c4ae3351131 SHA512 30adeb1d2dfb317224a78a7f23b64da6449b9f2e64bfebf6155711f65fb302327cb78c98afd646ae167f1fbda41b8a6c927f0d36278d266583bc5369af70f8e5
 EBUILD zeroconf-0.38.1.ebuild 1099 BLAKE2B 1b4049225401fd55e519864da1205afe8a2a62f4a250a8ec1efe46c3ac3813bc69c747ab18c4c4c1f9e0908b0639bf8a88e9cb8ff1cf5d5be485704c8b18d8ce SHA512 bf53bab963722c36261a2154626eefe1fcd62abc8a3aa7a6a325b9fd0f4bc84d31b8c8eb128ddc19f95cff28ff7e409ff90b6aca451850a795c2cade60a3aca9
+EBUILD zeroconf-0.38.3.ebuild 1134 BLAKE2B 8ba3fe024b9a0570bef7277bedd95ed8d9cfd676f3086aa0b8a6e77fab730b3976608f1d87edaa9ecbaf972e5f141dced01d48c106244e9b20a3482de2836d57 SHA512 e29bf59dc70c614f5dc0b7b09782a5d07f8f1ef6754334e7124b6c83c1461a3c4ad6083f6ec7374808fe2cdfee9e57d5a3972dd6dcaef686efb9e196fe14d7b4
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
--- a/dev-python/zeroconf/zeroconf-0.38.3.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.38.3.ebuild
@ -0,0 +1,37 @@
+# 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
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/localhost/Manifest
+++ b/dev-ruby/localhost/Manifest
@ -1,3 +1,3 @@
 DIST localhost-1.1.9.tar.gz 2125545 BLAKE2B 5843b3857a11d9f56412f67cb15e424332b07cf81a29ae0a05a3ff20c6f06af56f6a02d8315f97c2d57fe76f7359c737cf19f116868ff532ac083070430fa22e SHA512 d46fd016957fd34309d50488dc61f23e9d47a5a6bfdeda5c049f6ffc112c13cd21394ada3e15c56f14913cba6ab503f60e32237431f7ff824fbbab8cd8a2d746
-EBUILD localhost-1.1.9.ebuild 911 BLAKE2B 610c19bd7fec0ee52a12a0dc61049c053f91e9f89dd53c44113dcd43672b000026e9b42af036045c964981fa216a92d9a6e2b972541dd3aad67d19a67fd6cf12 SHA512 c1919faf24fb65f192aca2b26eb723bf59f729eca88d76241ace02dff574935eb4adf10ce3b4de5043a6c6e1952437388d936cb9a75a75cb9838b5f1b87fa369
+EBUILD localhost-1.1.9.ebuild 909 BLAKE2B cec45b1885571e5067c670ed4a4bf1e5e14a51535257437c4371a3421c47f40db6a8e68e2fff8b8518d2b5719e65fcce0719f8620f878cb0784a7613c5048298 SHA512 3385b937271669d0a00eff1bccfb52102763d927a6ed238cd39be221b10e372936fc3f97f1a908a21897fc31a133a78fb64deb25f5399e0f877a3e3b379cc9cf
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
--- a/dev-ruby/localhost/localhost-1.1.9.ebuild
+++ b/dev-ruby/localhost/localhost-1.1.9.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
@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/socketry/localhost"
 SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"

-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE=""

--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@ -143,6 +143,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.4.0.crate 14035 BLAKE2B 9a2ce4737bbc4f36b007008fb6d66065bb2354c03df4feab127992d360f2e2d9a681c314f61b856b165b6515781917976bee415fba0b9e814695a046de467387 SHA512 d45b090c83bda578d89480f783e7238149203256d61aed46ae1657dc3de62551a618aa5a02e9d9867b39de82a8df527d37432b9b8c41afbbf0188f3644c4ad2d
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD git-delta-0.11.3.ebuild 3638 BLAKE2B b5f9024a73d351cd946907b4932e14c81ff9fe3f22ae6228a72d8e2687ac550d2e480cf7ef42b3d5e7244daa42c8ae5ce44a4933d5852a5f95a522db5c32426a SHA512 d0e8e7883cfcefd7fe7b2c66d83309ad620a5adf3b553846c2d9136652e77f17d947392d20190a49d79b3742cab2f34b297d30101e0226dff0f292022ee97a1c
+EBUILD git-delta-0.11.3.ebuild 3637 BLAKE2B 6b7c2111f9ed1d57c36398679947c7259fff90ac077d2c6a1879ec313742e5726dbf1c508c642aafb5df72c950fd0e04de63a5de66336dbc8196d0fa01bba05c SHA512 57d15f9ee8d1987710ce9e7414dda236ca046c5870c88cc5cedbc56bc845a013a571f6c404959cf5cdc46ac7187be6bd07a04649a1e60bf0ed3b5153df4dda85
 EBUILD git-delta-0.9.2.ebuild 3267 BLAKE2B 4901e4e31893d226fde729f5cdff902695a7b13d58d7c13b31992c18db28e4ae82f8ba97dbb5eb9ef3ac902c6ee09d61a5b141f1ee3c8684d5fd369e70001d3f SHA512 8fb549ec50c1b9f6707f61860602f2f37843d0ac34a85b928894d73b6d025d238b906aa49f5d04967fa212a75923984162626e8e7594e291faca23081deede65
 MISC metadata.xml 331 BLAKE2B 01b09c3e764fe24bd909a1e63b92e84a43a251f2487a0bddbe08f698eed443217a87f346e815e8f50948f3511e8036c8036d3c6e88195b6a6102e69fd169aee7 SHA512 cf4eb826415b89530fca726807669309f34cb2a04adc0b1a9352b10d9cec538beab5ebc79b1bbc5c69d9ae160856a5346cdca7315fd6be70de546e0abb89a020
--- a/dev-util/git-delta/git-delta-0.11.3.ebuild
+++ b/dev-util/git-delta/git-delta-0.11.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -156,7 +156,7 @@ S="${WORKDIR}/${P/git-/}"

 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"

 BDEPEND="virtual/pkgconfig"
 DEPEND="
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@ -1,10 +1,13 @@
 AUX minetest-5.4.1-gcc11.patch 605 BLAKE2B d067b6bf6250fa9928c01220fb0da2c8ffc093c949840767db6cf2b84fbe889fd9ed2546c953048d02116f015a279622c1ada29ce1df6e3b254b0d0e9e56083d SHA512 f42b8c3c38b40a9f22eca7947360ae4d786ff0775f46b4184c3fe014b64958c89828bae314acd8bfe99246a452c818527b5d3c5c1c0b813ed0a82c43b915125b
 AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
+AUX minetest-5.5.0-bundled_luabitop.patch 740 BLAKE2B 91f86c47f17572d1bf27be5012cff147eea6625683d4cb5f285f2da72a541a0f5cf3128f0cf4b9514bf0b4f9a27673f5c989dfb4757d4142b8f24ccb29df6918 SHA512 6bdfdb6a1e022a66c67aa1e2314ed1f4e6791f4901a811e63606116c7e4058e801d1fb772a1f75378c8404e8085cc072b6987b867b45bb0c10b5bed01e6779ff
 AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b
 AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9
 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
 DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
+DIST minetest-5.5.0.tar.gz 9558895 BLAKE2B 13db90556a4faaac31cca7427fb85439cab144d73f25b79ae9f8367883b0fafa39c39fe0e40f3734d7e3f48cef4942a37a302cf58993707a14024905d8ed9b61 SHA512 9c744eac2704457d6896485997666d614dd156214dae26c2cb413771fd3eab54d80731a5220bcc4a18ddc737db64971893a3c89a56a46020adf8d00aad299817
 EBUILD minetest-5.4.1-r1.ebuild 3478 BLAKE2B cb5f11ed5e8b8c0339570af29fd126f75b4f084f0910cd692870c797ecb3ae0349bc26db743cbd911d4d2fd01aedb5ccce4fa6c043ac07d421a7054a20522232 SHA512 3eb3ace3d2f20f457b2460c7a2a28720534a69454337db9ea3089e1b56bee74b267a1745fc1e13ea4e6cba6403de2aebdcccfdb9138443f49462377b76111cc7
+EBUILD minetest-5.5.0.ebuild 3463 BLAKE2B a91b8486891ee45266e45978615d89238aeec189eaac91708acc12b18a5c8a88cb293d26f06409224bbb8dbd4b664f20b582e0b650fad507adc9b9dec9ae2693 SHA512 c24c159b44f82a19a8bedbae2493868d28769aaca8214ef4421f1be6ad89c51e520726fde4d0b6b12065ea447f143b5dd80903da30d44453e05f8844310e5c8c
 MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b
--- a/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
+++ b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
@ -0,0 +1,17 @@
+When built against PUC Lua, minetest binaries get linked against
+a customised version of LuaBitOp which then gets installed
+as /usr/$(get_libdir)/libbitop.so. This violates the policies of both
+Gentoo (unversioned shared library) and Lua itself (compiled extensions
+should be installed into implementation-specific directories rather than
+top-level libdir, and I'm pretty sure linking against such extensions
+is a no-no). Switching to system dev-lua/LuaBitOp will require work
+so just make the customised version static for now.
+
+--- a/lib/bitop/CMakeLists.txt
+++ b/lib/bitop/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(bitop bit.c)
+add_library(bitop STATIC bit.c)
+ target_link_libraries(bitop)
+ 
+ include_directories(${LUA_INCLUDE_DIR})
--- a/games-action/minetest/minetest-5.5.0.ebuild
+++ b/games-action/minetest/minetest-5.5.0.ebuild
@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake flag-o-matic lua-single systemd xdg
+
+DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( client server )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_impl_dep 'deprecated' lua5-1)
+	app-arch/zstd
+	dev-db/sqlite:3
+	>=dev-games/irrlicht-mt-1.9.0.4
+	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
+	sys-libs/zlib
+	client? (
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libvorbis
+			media-libs/openal
+		)
+	)
+	curl? ( net-misc/curl )
+	leveldb? ( dev-libs/leveldb:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	prometheus? ( dev-cpp/prometheus-cpp )
+	redis? ( dev-libs/hiredis:= )
+	server? (
+		acct-group/minetest
+		acct-user/minetest
+	)
+	spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+	"${FILESDIR}"/${PN}-5.5.0-bundled_luabitop.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled libraries other than bitop
+	rm -rf lib/{gmp,jsoncpp,lua} || die
+
+	# To avoid TEXTRELs on riscv
+	append-flags -fPIC
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_MANDIR="${EPREFIX}/usr/share/man"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=no
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_PROMETHEUS=$(usex prometheus)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_GMP=1
+		-DENABLE_SYSTEM_JSONCPP=1
+		-DRUN_IN_PLACE=0
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		keepdir /etc/minetest
+		fowners root:minetest /etc/minetest
+		fperms 2750 /etc/minetest
+
+		keepdir /var/log/minetest
+		fowners minetest:minetest /var/log/minetest
+
+		newconfd "${FILESDIR}"/minetestserver.confd minetest-server
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+		systemd_newunit "${FILESDIR}"/minetestserver_default.service minetest-server.service
+		systemd_newunit "${FILESDIR}"/minetestserver_template.service minetest-server@.service
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
--- a/Show more
+++ b/Show more