Sync with portage [Wed Feb 10 13:33:38 MSK 2021].

3 years ago · b07ffa749b
parent c8faee3bb9
commit b07ffa749b
1040 changed files with 16748 additions and 3404 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29279 BLAKE2B f9f6688999c0168333af064ce2aa17dac20bd43a3df4ecb5abd162cbb8f31783be32f90183864e22d74c8b3f7d986b8f9d63fa74ec7800b17bcff2f0605dc995 SHA512 c4593964e7e533ceb55b23685af7fa78a0a31d0dc722a326a785b65ce48c7625c7a8f05f3a668a94b84097654b7344489300cd8ac65b475ff04a979c3c179322
-TIMESTAMP 2021-02-08T19:38:35Z
+MANIFEST Manifest.files.gz 29296 BLAKE2B 75a9e5267c89ae1ce37e28ac00aaa3bb2dfa4afc72e5493c075e5a7d596b479b6401805a570a376dbc85062cd1ae3a9900fabd214fc51e7cd579509a892ddc7b SHA512 b7092b600d00f98f2114c1055b65d4fc769599e82dbe12a2381a558c0b3f6526073434ebad37fcd912adad52b449bd4f14b4cf34f2070a26294385bc3370a4ff
+TIMESTAMP 2021-02-10T10:08:36Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhkztfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAjsKRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBtlw/+NE7qKN46d7t3wbNt71DzkhikmuG4DnadaH41cEyLNblA5XHe8JOpzB4d
-AJIsdYsz/8MsBs/xVjJoz52qJHKFZvgVRjplJH/TayC5tudcQRpN78XXVFMQI8Ga
-e1srepJz1JXFXHk1LZO2irHsCuAWIo5crivp0h5UAamHgfLjJxYesKfNQ8Y99i6P
-Us3UjSK5+eWvTydOlRMIfvgsoo3K7Q1gwDMj/QSAWO7dL2g9JYlTFdRrbDjdPgHl
-boJ7YqMo/xCkJmK2oFaC01Spkv1LvKpt/WmGMErHhS8zzk3VyIQXwy5j2ntnq6o3
-WTRnm9SAz8UFUKDUHYCktSKeyfPzwTGdk8AXFifg/jV3exyDWhsSlhC8WwGSZdkw
-FvYUgxRDZbfEoG6Ju69yVySKcKN4QWXugc6h0a52FZfY12mGJf3ZvxrSlmFEDb1R
-UmUWxtB2UJLweiD1dhGBtGwHHpCu+pwnL80PRCWqhz6OyZRfc12RL4qD28vJSXY2
-qOWD6npbT9aIYhabOnqI3Q2jg7jXLkCFC6AkwYXJC6OWfESN+6W7pRCYLdomfUUT
-Rc8ik06o8q4NfHYX5uoAn+rp2viOvFJF9zD726e6fzlluu66SjSsIhdQryN4Ny3a
-RFluGVfClEEN4CdmpUiaMb9w3lQrrtq3ZAgyX/Sf9AfcvX1u66U=
-=2n26
+klDoqQ//bA4fnWv0Y/yix352EUtCqFlSYNs/wmb3ikyhUTH8jLhhfzULOyRaJ3J8
+ZjiJLJKVkAlnO0A17fucFRkZxD0IGI6TzeFbxz6SCbBJJg/mj33hxrQ7qaHYMGKH
+PSIWMTMHAAxjBN6HsPDeXxXZrYUbM5Z6TyKwb9GgMbJ+OdPUNYvf+al8AgUgabhv
+hgBDhtOz+Gu/EJhxeCgIZvy1hkbat8r9O1uE+Dx1SDPX8PdEaQaQOzoJK6DUYmBq
+ERYcB6oV/CXhEIy6NYrwDDKtiTl6FC+WOj86x+dTVyRNgV/Ut++ICvz7bL9BdxF7
+QZmissPoEM38u2EVAIIyYAOVOvIwRZl0X9DVVftOyz+F8buFvWoU53F7I3cLFXCe
+aS7k7zXdukyCeTExlhoO5J21hSQTDARRxoHM5k3EIjhzGq1SRhTUbevJyJn0vMYS
+nQpjK9UXFZyFJJf5Nu9HrSL4QyBEHHx6dK3Pxyi7RRsI89RJIjYbdAkYnFcmZGHD
+cjjnRLnpeBDjoZ4OryZmjBduxyaFGYTLXLXEkFZyQtKjSb6nXl3KLs48WjDaNNGV
+zlhiY8g0fgGPtgSceIxzE31Ua3+Jg93OzMMv/oa7z0I+BMaOuNAD6u/whyI4xQUI
+7s4hIXapBMLPUeIleoqY7Q2Fjj/yTciWbysBt0QTtQ5pvdM0tbU=
+=W9Wj
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/jenkins/Manifest
+++ b/acct-group/jenkins/Manifest
@ -0,0 +1,2 @@
+EBUILD jenkins-0.ebuild 183 BLAKE2B b1c241c9651d8c8e3d3500c8f50ac6ff1d2542fc8ee7019a0b80eafc94a1d8a1aea3ef20cf42c8677ede80d5f8e11fef8617d2702c841c0c546619449a5b73e9 SHA512 02acd3ab5aff31a13c514f5a209f42a1e06d8a18cd1256f604d53ea51a91121bfc786a9763a6a5342197335ae7673a206aabdda2cd932cfb558299b46e2d3642
+MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
--- a/acct-group/jenkins/jenkins-0.ebuild
+++ b/acct-group/jenkins/jenkins-0.ebuild
@ -0,0 +1,10 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Jenkins program group"
+
+ACCT_GROUP_ID=473
--- a/acct-group/jenkins/metadata.xml
+++ b/acct-group/jenkins/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+		<name>Hans de Graaff</name>
+		<description>lts versions</description>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/jenkins/Manifest
+++ b/acct-user/jenkins/Manifest
@ -0,0 +1,2 @@
+EBUILD jenkins-0.ebuild 259 BLAKE2B 5571a53bf546ef42ecfb3e4a70c759d83ec650e334be863bde8e2f6fe15c26a924f8672a89a5257156c1ba9e66ce82b1cb8a97ec59e32c00985a076977a0e1ab SHA512 b0079d52010269d53a2a05ea34f8d4b2c22b65e39477cd2315742d2e4dad0798146d18faf49410eade97197da80c0444d3eaece538587a548197fac4bd4666be
+MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
--- a/acct-user/jenkins/jenkins-0.ebuild
+++ b/acct-user/jenkins/jenkins-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Jenkins program user"
+
+ACCT_USER_ID=473
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
--- a/acct-user/jenkins/metadata.xml
+++ b/acct-user/jenkins/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+		<name>Hans de Graaff</name>
+		<description>lts versions</description>
+	</maintainer>
+</pkgmetadata>
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@ -1,3 +1,3 @@
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
-EBUILD lib_users-0.14.ebuild 1080 BLAKE2B 8484d7563aa0283d4c4dc0630e3d7eb369c417a480c8c0fa1e08578036f930e2ade53076b64eee22b44a598ecccd71171d27aef0920ecb69e3843803b577dd0a SHA512 05ea3006a86ccca2020ffedd4c4bcef4e4d82f0b37c039ee3e811237fe50dc3395b7c2abbda50c2f7a792b9f43e0a4c50890d2762f98b3cfbfb5c19be299d23b
+EBUILD lib_users-0.14.ebuild 1087 BLAKE2B a8ef1300751630c29f683acf122797f3a9d8cd44534272d0663d5fc582a6a664354155f9f5e5bba31ed252d2847b80968393aee946e013c625fce1489ccddc6a SHA512 6287979968dda51be7cd908c75935f0a3fbb93ecffc9e8877efa43aa056c60333ff09907748a1611ae95171740af5356602a3b63a00a2a041bc8fcfa626856a3
 MISC metadata.xml 343 BLAKE2B 546650c71c7021908ec1f5ff61a835329bd7c9c870e9690565f9dd5dcfa2791c78334c3b7186cafb92f0f7b3900c44f37113062918346054bb11c4f54cb109d6 SHA512 890e9d42b29b85f62feae7d61cab7a0468a56df75fc0909bc0d5d0704bfe8052f9e524293011046fc2c8511378d3abb9928afa69ef35c51b79a4effae8ef9ebf
--- a/app-admin/lib_users/lib_users-0.14.ebuild
+++ b/app-admin/lib_users/lib_users-0.14.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@ -6,5 +6,5 @@ DIST mcelog-174.tar.gz 313473 BLAKE2B 6ffbf6f53e4a08d0dbec04f6cfd96e6b564de5e85a
 DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
 EBUILD mcelog-173-r1.ebuild 1353 BLAKE2B 2bd8f0d4bc17feb9fa7435c1056443639777a35803379019cbdf05aaa93d82a152495b7ba3d914665ec57a28441d00a3bf077bf93929916403ad26e3b664caea SHA512 32155344fb55a5a12ff14f56d1c6b392d4cae1bba1fba2e77f219fa35f054f7c60a45917189bb63c37551f4308b90ca4cd17fda0b22f7bb532f9d9cc1c2bca19
 EBUILD mcelog-174.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
-EBUILD mcelog-175.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
+EBUILD mcelog-175.ebuild 1353 BLAKE2B d6b73b5c2cba965f04baa24493349a8a9e20b584f36056d68905bf0072f53dc25dbf53096ff2484b501a2e143b7110718c8a97e983270350e72ac3d81523b36f SHA512 50587acc615805ef2b615ced31b64de5a614cd72afb5aa5953a03652fb98bb6d947deb3c86116ebb6c8db4822bbcb0e8a693c9d17cd1e36a25baab4ba9a6d295
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
--- a/app-admin/mcelog/mcelog-175.ebuild
+++ b/app-admin/mcelog/mcelog-175.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"

 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -5,7 +5,9 @@ AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01b
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.1.0-1focal_amd64.deb 20881084 BLAKE2B 1f16533e9f2da9971bfeaaab696bd0631d058928491c52e7cadba2c710af8373cfb89b4eaa4e293121857dfdad9bc694d562ebd9db8213198191c56fe94dd119 SHA512 3356810dd08baad373fd62669995cea17fed6baad3d3ae54dfd00c88a69602b5d4b8917b5e54aacc41fbd011a4e6877d1fd6c4a62d09648ddfaf26d898c3e7d6
 DIST puppet-agent_7.3.0-1focal_amd64.deb 20876192 BLAKE2B 2d7b9925771c31204f4fe12253ccff0fb68fb1c475856c31b1bf82b4c1ef3f93870660916702e9acfe57235a4293d7807c24f80789310bc4efb9784c86e895c5 SHA512 79c72664795c37fe0bbcc0d96116ff073cc07154b5713a904602308e3fadb37bc1bba04466bd29877340e0d7707475f3cc38348e1811660764d18ed3c1d53250
+DIST puppet-agent_7.4.0-1focal_amd64.deb 20897448 BLAKE2B 1ed2ad91dcba1851b5759591033cfd74ec9dc644b3da416f2c1f5598b89e7cfa1048f09331717fc2b72a479ae8a7137f8f0a074debfbc183aea1197ae31b5df4 SHA512 bd58032f38f349938843550bc1e238f1cadec685ab6f90969e12e47e021fcdf4ffd4aa7be98fd797976d7873045444ba20b4ad3d05f543897a8d3594949c55f4
 EBUILD puppet-agent-6.19.1-r1.ebuild 2063 BLAKE2B 046b9954bf6619f55a664eb77b6552fd23a8d6d8a0da3dc9f9f395d570bd852fc3222bfc92debce028b49919e2fce63115d8c84c4957c75e49ebf5857b33c1d5 SHA512 8d78af238e593ddd88498d4994afa6565c8d5e9dcbc4baf4e05238ed591847ad97b3eb452c1a4d688d8d9d64aad274826349c28797bad960f12ebe39be1c304b
 EBUILD puppet-agent-7.1.0.ebuild 1916 BLAKE2B 7ee5268c276c7166787b64d7b39d5c2066303d552dc3b9880285daa98846d1f92512e353f6ce7a270774cbbcc569781cddd391e3fb2e633188c5535a7e9d0098 SHA512 d1b5ffd018cc68f5e71084b7948fc5aba69cf1b66c50acee9d2ed4927f93f9dc9104c3a691654fc730dd6a0bf891ecaa08b2540201ca2157b0ab81626cff6b99
 EBUILD puppet-agent-7.3.0.ebuild 1917 BLAKE2B e66d42fea919e79bcc08e59ca9b2db83f7fabef3350d7d89bc0534297085e17bb786d638d90d87830317c038c2685278b4d96b63b39578e6512b7aa8b9c36ced SHA512 ed2c789f1ab7d8f35a0e10b2face6ad73ca08bdcd7a01165e7ec9dc38b78fa481c7c7dbe576f7854511f85eb0f318270c2fa991cc2a88a3a5f9b899a4a7951b6
+EBUILD puppet-agent-7.4.0.ebuild 1917 BLAKE2B e66d42fea919e79bcc08e59ca9b2db83f7fabef3350d7d89bc0534297085e17bb786d638d90d87830317c038c2685278b4d96b63b39578e6512b7aa8b9c36ced SHA512 ed2c789f1ab7d8f35a0e10b2face6ad73ca08bdcd7a01165e7ec9dc38b78fa481c7c7dbe576f7854511f85eb0f318270c2fa991cc2a88a3a5f9b899a4a7951b6
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
--- a/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet"
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -9,9 +9,11 @@ DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d5
 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
 DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda
 DIST puppet-7.3.0.tar.gz 2855997 BLAKE2B 38a02a036d82be3ae727f7433b80ee1bdbb66f6fe10dd2ac37d3191fa6bcacac8cff84ae048d449564703448a87860fd9debdc043a47e7dfbcab69f6dedf479f SHA512 811e2a182af7bc8038750d99feb526b261b6c3633d5492fc2e14ab9f8902bb54d3f651730efb6f06001b96f550a9957d8604ffd30d489f038200d1359d91e98d
+DIST puppet-7.4.0.tar.gz 2857763 BLAKE2B 980180d10c3329f8c94f02c6a8b403d88a3836fcc5567fd00eb4e2b4ae63d7a03709f3f14a337cdface62be04f9bb9082436f69b95f8d37996a9a933801a163a SHA512 ffb4ffb5121fcbd4b61ab1ad51fce96c1f2415b85ec785c858721a7f5604a6a8de4d595b6806657b9b1757e70763b2c495ca4d8ee694d668532cd15dd38a9c7f
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
 EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-7.1.0.ebuild 3552 BLAKE2B 14aaaf8c7a30bf347ebd26aa83c000e329a63eec65b00927b8b2e53e5f44d610079fe38d1353e31467302f6c5aad558263ea045faaa564cfef4aa8995a8fea16 SHA512 29bd219cba5000e6a68f8e64bbd1db27e8df220d70288ac76b3258712c2343de636f327aa202e8be8d2dfd1a94aa0ef87cfb72438cbb501bce6162fb7f8a0ec0
 EBUILD puppet-7.3.0.ebuild 3554 BLAKE2B f9eddf609044df429b57035d3f2b19bcb90ce3f3a5c75d6196f96035c2d23b98ffad9fabba74178742bc65b78dfdc84ba7a7f20e9b4549862219183fc525fee1 SHA512 e27b1130decfe5da1b51cbcb9c915403b588e37c2ebd9bef78f2fbeed1595cd02f99d3bd73d3e0c3c24631656b4732b6e5a5a8bb63f2df17689d980c44493160
+EBUILD puppet-7.4.0.ebuild 3554 BLAKE2B f9eddf609044df429b57035d3f2b19bcb90ce3f3a5c75d6196f96035c2d23b98ffad9fabba74178742bc65b78dfdc84ba7a7f20e9b4549862219183fc525fee1 SHA512 e27b1130decfe5da1b51cbcb9c915403b588e37c2ebd9bef78f2fbeed1595cd02f99d3bd73d3e0c3c24631656b4732b6e5a5a8bb63f2df17689d980c44493160
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
--- a/app-admin/puppet/puppet-7.4.0.ebuild
+++ b/app-admin/puppet/puppet-7.4.0.ebuild
@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -2,10 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
 DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
-DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774
-DIST puppetserver-7.0.2.tar.gz 62359801 BLAKE2B dbfc5c2c5ba05666dda2308647d9a164c32e3f2bbf6d290e0137882ee88a1358af6dc73ddde853bc5ef0fe61121ec4eb5993809d7ce5f0e0cf9ab5b50974475a SHA512 5e880d1c267f469d5c7be70b154e7d68fd78b1b3e3f30bc7539dd000f146f70262700e877a16c4699ba0db57f244fc271fd2ff8c8d3971f8272a99eba4ae6a83
+DIST puppetserver-7.0.3.tar.gz 62780509 BLAKE2B ca8762f503e69a8d22881218b1036aeaea19612a96a148999e1c32bb7a1bf53f1940051268896aed1e9c64c3552f4480bd45f2404eb6c4be7ad20b68d02ecff5 SHA512 eb849a4ee95c8f5545e0d92ed9c450ce77ffd327f7d88f320ef99245217ab0f5ecb55bafaef5a97047a5f7559e4f05d06fc4333f76ba0b6418b184e03c705733
 EBUILD puppetserver-6.13.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
 EBUILD puppetserver-6.14.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
-EBUILD puppetserver-7.0.1.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
-EBUILD puppetserver-7.0.2.ebuild 5326 BLAKE2B 1ac5bd0287581c9bdaf1de5cf664224f33041661f1c60f78cb62a16a3dc90861c6618b0b77bab7a8c62a29bd3f70ae8b33cba2a93aad586a24dd4926264aae63 SHA512 ac7582cb40523158a82ed01e696cdb34ffd86b34a846afe6424419541bf87d520d094279300c6ec681f637f7096069a13565aa43d0beb448547343ac7b3984db
+EBUILD puppetserver-7.0.3.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
--- a/app-admin/puppetserver/puppetserver-7.0.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.0.2.ebuild
@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="~amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
--- a/app-admin/puppetserver/puppetserver-7.0.3.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.0.3.ebuild
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@ -1,5 +1,7 @@
 AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf842744949be10355f3f2b6aee0f56bfe9847b7293524151c72a5ed93e1fa1ca1957261c8b7d000668e4d10fed8bd5154b8 SHA512 faba25648305e3c5374f37037cf61f22bc2e6d1a3f40395e988f00f6c2335cd22fe962d0a9a6ae3ccfd879afb05965916f8f333fb677e89e7b7080f5c977a3b0
 AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
 DIST radmind-1.15.1.tar.gz 449653 BLAKE2B 8a516ede28d561a60f7c51424c6e48ea030dd571528fd3422fab3b23b4448ee898d408136c4845ebe9c5f9088fb425ed67b341f4d1721747a415183687e6daa6 SHA512 3dd9477d00083cf9912e2143adff52f9bc127665ff6705bc200b7323e53390fb76ac125733596ba309905fca3db062c7b1bc1d1372b77a3044c3794bacb96e6c
+DIST radmind-1.15.3.tar.gz 843033 BLAKE2B 3d4446e5ce9e668039277f63a16c014dbbecca870886e68603af4100cdbf4a0adf074d26c90985968ec1a680fb483395676b85020134ec56686318b3d0664d99 SHA512 121fa2ea4dc9532bdbb1440c3ee485db1d6a1e770bd01dc0e832d51ee26112441ff47bea8e7f063feffc4d5bf3cfc5ce53d316bb469ff4ff0a65ca5463c99d11
 EBUILD radmind-1.15.1.ebuild 805 BLAKE2B 031c240289284afe3fb43b771e8aaf2c97a6ae4d877744920f7049abb5ffc59cc11eeedc5195b497fcc410e5b46bb860d52c45d4533adfbabc7ef305a252be06 SHA512 07e7321e62b14200c44e4191406de5b8373f9afb8bc0ca4dd2c1974c18b22a64b0a280c6a9b83a2282b20cdf5173ffcc7c407160c7428bae605b22bb74fba8a6
+EBUILD radmind-1.15.3.ebuild 731 BLAKE2B 6c3f8535003661d58a13d6a82e9242260abce5fbdfe734a5ea214cc751a3dcabe50511541461980d3e01d72be7e0c9922b02286aa68497e568d280e80d4edcd3 SHA512 f38ee3e14612df68709d960d6bf48e286d34386e4a5310ff37234dbfc224730ff51789a5bcb16dbb6ad3afca3b6eaadc04c47dc08479874bb5aba17de5c400e5
 MISC metadata.xml 404 BLAKE2B 365cee5ab102123ebee500dc96ba31bc9b47b9e415c1a6b5f682adc011d62f460a09174888f444ecdd6136b86843a55aa64ab15dd9e7af00ffa628099b87b261 SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577
--- a/app-admin/radmind/radmind-1.15.3.ebuild
+++ b/app-admin/radmind/radmind-1.15.3.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tools and server to remotely administer multiple Unix filesystems"
+HOMEPAGE="https://github.com/Radmind https://sourceforge.net/projects/radmind/"
+SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}
+	!dev-util/repo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.14.1-glibc225.patch
+)
+
+src_install() {
+	default
+	keepdir /var/radmind/{cert,client,postapply,preapply}
+}
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@ -5,5 +5,5 @@ DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c004
 EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
 EBUILD restart-services-0.16.0.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
 EBUILD restart-services-0.16.1.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
-EBUILD restart-services-0.17.0.ebuild 1827 BLAKE2B fb2c22d023257c526c671ae954f2a53c606e0d9729a8a52aab4f8695f3ab16fc8d72117a71e8501622eea6bc42d8e780b96d1a67964da76b74321999deae334e SHA512 2e16910ff5344812b00775961609fdeeac7a2c4e6b7ac4cf766104614116ab4c66e85fed0c994b3ec6415ffe17c71063168e46317cd14e24340ff160b933e546
+EBUILD restart-services-0.17.0.ebuild 1846 BLAKE2B c791ad0c9fba7583d226e880cce951c9944b6d29d9b98686bf7a6820d73379ebc0616c1a58c18926dc62c48af39e1490d5a5495c71499bdf5f079810128ceabb SHA512 52f1eb648331e80e0bae5defb6dd565d80c804470ba0bac09263a9e119c85608a7fe03897c884e48d477412f91292a67feb4dc6b35e791d698abc26f1ac3b495
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
--- a/app-admin/restart-services/restart-services-0.17.0.ebuild
+++ b/app-admin/restart-services/restart-services-0.17.0.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -1,9 +1,12 @@
-AUX api-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
+AUX api-confd-1 179 BLAKE2B d014cadfb5dd99c85b1dee0e743f413fc5d6eb05629045bad5df108e6e96104b3b4f5e3736518baff5473c68d94906bb90cb7fe8167e136dd6603eb1087cc01c SHA512 de1d70050c2f911abb306c1b2253f2fdaac505a5ddd34937d7bef9dc9b876e9c6ed06e330a816fcafa38feaf67837235e78f2d97d149fef9fe20a29d945f8f22
 AUX api-initd-4 302 BLAKE2B 385e678ea2fe06f413e68a3812350df823318a2807805373377e747c3a82e524af114aeccab8a6e6e36b1419a3e0a6bf025749db585483906487767e76274376 SHA512 098fb6e1ba83270abd31f9cc3afdc159149276962fcf73ce0ae943df87ec26d0883990652614cdeef48912778780731f91efc972a22a75c4b10f3bd79a251a90
+AUX api-initd-5 483 BLAKE2B 6ebe3d0c7511849c6e0dcea55303eac0684d70d660013d8fdcaa6630b5370faff7d07ec6a302b2dad5c4b0c5ade4752d87dd22da47d196178b414515ef53d6ed SHA512 b0afec231ef08bb55634aa994ea5e8b5024a0991125ec51cfd92b6d64cc5e09a0f881f49571db8a7947d9dfe2c09e4ffb8438f4c9c93d972def1631d83e9bbf1
 AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
 AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc
+AUX master-initd-5 498 BLAKE2B dad96866c1146a2c584e00586b160a54b844922c140166402ce7e2d0605ee17e892a4a676177d2fec912813f68dbd2ff6beb87a5a14298c2d77c18b63b172545 SHA512 73eb1238bc5823640627e1776ea688b95d0afd321deaf95271eea33434bc20054944966b159dc5e1c8ec1e1458c6dd29e769729bad570300d5a6eea1c8d18fab
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
+AUX minion-initd-5 504 BLAKE2B ff49376d596a49aeec649dffee3029be9b6f85663713a7e3bc03b45aee4ab78f31ef5e3b758078a551113ee1a06369c31fb5ef1acdbb30399be748524cd491fd SHA512 3a35e9cdd1fc7e2691f9d451b384982117f03374d40372ff3efca2b3ddba761dc49660004f4859fcc686513994daea538379584faf2a3b020ff8311a1aba9ee8
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
 AUX salt-2019.2.8-ansible-roster-fix.patch 572 BLAKE2B c11106be76626673a0e6365dea7ac8593f420ffa2bc0ca02c24520240d863d69a7f0449f10b5d53f6292c247f434636a0f188338ffa3d81a27abc8db18059c92 SHA512 86a2fc107882855ef60b2722e7282de8e6ad57c5fe6809ff99843f934a193445da599d57d1cbc3d7d3443f93d52a7ba5922c6bd76579f85648f6256ce7a81c66
@ -19,8 +22,9 @@ AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326c
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
-AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
+AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
+AUX syndic-initd-5 498 BLAKE2B f31979e61a2d0f016beefd641cf666cc48d33a14a84f634e6112cdea86db9cb6eac4b312a6f526d38ed0a6e47e09a96a95b03104fac215ce2bac122c06bcbc3b SHA512 11b4332bd1b916b7764ed6b826bdda72192339d90f492e7df5b116e7aa5407129b787bda0a061c48fdb0a53b58558424225e9090b472c5f5cb36189120082459
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
 DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
 DIST salt-3000.6.tar.gz 15236781 BLAKE2B 5a532a6915b331fb532dc6e1651cf8fca3e1a5e9f29f6d75260fdb1162dbfeec755c65f7c6fc28b1cc7dc3ace978547830af31aafc1eee8419bbc7e695725787 SHA512 739e3671766c45a0ef1eb45933c7f00f14586e91f4c4a79cbed913a48961a48baee853206ba569491756e8a872d22f3635eb6bc1a366020e551c567b2334c508
@ -30,4 +34,5 @@ EBUILD salt-3000.5.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152
 EBUILD salt-3000.6.ebuild 6377 BLAKE2B 39cb9ce06b9eed29d75ae8747f780221487565da34475b35659f4f5208910216016a02b1cfd52fe5df7662df20e2741f0028c67f3114b2d8d5833a7bca962b88 SHA512 24ce6c7b9364cb3824c218c8bad4fcc6c103767599e3b0c054391cc908ffc81aacc586039de3855bb5f862fe572971fede0890d79ad755e5bf9c9eaea5edb84d
 EBUILD salt-3001.4-r1.ebuild 6113 BLAKE2B bf84779e65c8f2017fa00c1f0eebd46d6e4030baa8fab11146000ce9ddc7e07a37d3d69f968b8daadce286cdc26cdcec16cf7a8e10240f5ee105ebaa5053074e SHA512 acfba7757f991cc6d4478c5095f53117878cb57d747eed2c4805dccc40aa8d3f5f5cc1c0a98402403ab649ea3cb77a8562456fccea96c7580ca7b34aa625c200
 EBUILD salt-3002.2-r2.ebuild 6149 BLAKE2B 52ba5031eb9949451ab830f29df925cdcd0c140c8c3a68e5f84d9ae66697f8f63306ae3bf61e61ba2510fc305c9e912c258cad030ae49afe01594273153cbb4a SHA512 81cbde2f580d885e2483d31ddfb1336ad58140946057565a5115c718e41c7d66c051af9a02d8931a559f71755e627ce95d226f64c5f8054759304a58f873be68
+EBUILD salt-3002.2-r3.ebuild 6149 BLAKE2B 02eeb59d8a9eb996e653587a44095694afd40a1b19e192e912bb42352f1442aacf1214f4dac2ac22b4d1c998f38df05177c67e1b2b6cc91b70ff351872ffc133 SHA512 07c91e84baa24ccc4c6deed13f3172715ee7fa5e1a1f6b4e5fea2487a20453029f7d63111ca3ae2989f901f541d580e86454cb63352230cb358d5a776e67274d
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
--- a/app-admin/salt/files/api-confd-1
+++ b/app-admin/salt/files/api-confd-1
@ -1,5 +1,5 @@
-# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+# /etc/conf.d/salt-api: config file for /etc/init.d/salt-api

-# see man pages for salt-minion or run `salt-master --help`
+# see man pages for salt-minion or run `salt-api --help`
 # for valid cmdline options
 SALT_OPTS="--log-level=warning"
--- a/app-admin/salt/files/api-initd-5
+++ b/app-admin/salt/files/api-initd-5
@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-api"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-api.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT API daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-api.stdout --"
+error_logger="logger -p daemon.err -t salt-api.error --"
+
+depend() {
+	use net logger
+}
--- a/app-admin/salt/files/master-initd-5
+++ b/app-admin/salt/files/master-initd-5
@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-master"
+command_args="${SALT_OPTS}"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-master.stdout --"
+error_logger="logger -p daemon.err -t salt-master.error --"
+
+depend() {
+	use net logger
+}
--- a/app-admin/salt/files/minion-initd-5
+++ b/app-admin/salt/files/minion-initd-5
@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-minion"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-minion.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT minion daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-minion.stdout --"
+error_logger="logger -p daemon.err -t salt-minion.error --"
+
+depend() {
+	need net
+	use logger
+}
--- a/app-admin/salt/files/syndic-confd-1
+++ b/app-admin/salt/files/syndic-confd-1
@ -1,5 +1,5 @@
-# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+# /etc/conf.d/salt-syndic: config file for /etc/init.d/salt-syndic

-# see man pages for salt-minion or run `salt-minion --help`
+# see man pages for salt-minion or run `salt-syndic --help`
 # for valid cmdline options
 SALT_OPTS="--log-level=warning"
--- a/app-admin/salt/files/syndic-initd-5
+++ b/app-admin/salt/files/syndic-initd-5
@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-syndic"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-syndic.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT syndic daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-syndic.stdout --"
+error_logger="logger -p daemon.err -t salt-syndic.error --"
+
+depend() {
+	use net logger
+}
--- a/app-admin/salt/salt-3002.2-r3.ebuild
+++ b/app-admin/salt/salt-3002.2-r3.ebuild
@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@ -2,9 +2,8 @@ AUX clamav-0.101.2-tinfo.patch 854 BLAKE2B 46479552a2dffcf56c7b142062896e8ae34e3
 AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea
 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19
 AUX clamav-0.102.3-system-tomsfastmath.patch 3769 BLAKE2B 36c6580709a9f3319643e547c37753a65240aaa2ed612465982ea35c392d5031ba105e8ac67a42453fa4960977579a04f61ad9bb30a8e693908c25daa3085154 SHA512 8749a0e0b97570371a4a661b82c210ab1c9e6cba46b7fdf63474daa745bc280ffc84c3e4030a3c659814ba845f38946cbda0f437130057c8a73b3dc762b09ae3
-AUX clamav-0.103.0-freshclam-db-test-fix.patch 869 BLAKE2B b6e9f09217b122a695c929caa89d017a5d4eb72101506db5a8709a62f3a91a651ffe938388e3c3060ace255bdfaab44d053f6bb584b8edf4069dc58b7374808a SHA512 2f7b949a14b4fa95c238f3c261426a911ba469da8faac1cc3717508cf5a7dd71ffd792c08a22c8ed6f6158d2dcb686ca44a15a0833188da5dcc4254117bcec65
 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306
-AUX clamav-0.103.0-upstream-openrc.patch 16572 BLAKE2B 51e6207482cdbe5b82e3cdd73e38a11f5c215edb3905a40a97b2446d582ac59bc7467c43a3c2e2af6ee34fd8402964b6e2017c20960235e47c97810f501f9af6 SHA512 f5a984b71e246713df58b8e83503b2c063d8b44b7e4a5ee6245744aac1284ca2b135d6a9a002c411d06ff43515355283505a76fa45f67e6d236c5870b30f4f8c
+AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672
 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
 AUX clamav-milter.logrotate 1105 BLAKE2B 5bb2b00dbe6e74c51d4ed7233964cfddf0ef7fd8c913caad42a421fc152baa3ffc3e910f38f46ebb72a08a8b53eba880647a6988d38558ec52129afca8dddfad SHA512 cb6cbefc4a093fda5a3cdb52911ff13b04d641896271b844db9ca30a051cb4beb911ee973a5958df8bba59b7b922cfb23bfa69cdd4fe3c0c2b8abe76bf834c2f
 AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee
@ -21,7 +20,7 @@ AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020d
 AUX freshclamd.service-r1 177 BLAKE2B 8c9304e8c43e03288dcb1c6897b53e7c36b6e6116bb5c43db1e9735cc5d7b50094d33679d2b42839a09c572ad631daf572f62c57e4a7b74bfad5ce40a5916364 SHA512 5243465d30de1e64697455b3af50f62e6d7f3d0df7e2ef9b60f89dc974d8118ff67df0b44fbbddd04dd196ca17cf4306ac99f1eec42a5a0ddd42a64c4cb992c8
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
-DIST clamav-0.103.0.tar.gz 13357078 BLAKE2B 6c4b05043f560a56f967642094ba4a9f9bd52268994ac43a99446650a78dafe0ec851b9ebcfe95f3e216fd7942e4756f2e20bda67ca9187e55523fbba9ca56d8 SHA512 e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf
+DIST clamav-0.103.1.tar.gz 13369791 BLAKE2B 974716a17e67240ef606b074584a1ac344f1d5915347aaa02b388570ea543981433c482423b99f5d07054bdf4dce8a0d043afdd52b42d49ace468f3d801c3353 SHA512 f13e9542898ef42c0db6f7826bcb220b9cb57de2a88bfedc6c991b76ff06c59290522d31119132eaa2093da58c5069d63103f6260e271497bda2b472c3cd6ffb
 EBUILD clamav-0.102.4.ebuild 6960 BLAKE2B 292ee4bf55f790a6002f10d4ea040272af557665e5251338d34a43760ffcb667c4fae1f581193425d3555c64b7dc71198621fe09309a9c2831b657162c71a5ed SHA512 8932730bfa50b9b467e3f59256b51054a51a12b52d9c54fb0b4c0b80ce06e8e897d4dd90b2b0044b3b8913a44d5c7aaaee3a177c821e7efe99af1fb4d52e3032
-EBUILD clamav-0.103.0-r2.ebuild 7420 BLAKE2B 75e538c284ba5d5a9eff7c9c967b3f43b73680b0efdb40eaa9eb54bd02d0ba6c016232d48062e082cd0e217bc103d6334250b3c21d391e39676f377534be438e SHA512 b61a1acf5b5e3c8f14b5f02786dfe9fd900451276657c719543a2ec9823d0276b74d1cee71a925b2c6f935b05eea0ac5cf8770eff69e59e730718fa8f786157e
+EBUILD clamav-0.103.1.ebuild 7363 BLAKE2B c23f6231021920fa662b52eac841b61987193ae522647de9f176381d38963232933e21227ba2adebac9a6f0800ce11be6303abf222e11803819175fe11a3202a SHA512 43bde7b4bd5448930d8b439e7b8586908920ceea11b40bb11e686e275eb5bbad25837b490565becb952064e26d9bcebca1f9731c3640d4f2d1eb4e92adb5c4d4
 MISC metadata.xml 933 BLAKE2B 867499e23131bf714cdddd911ef727dc6e487be8c6f0be1985611bc2ce8bfbee639e114f8ade6a6b9418095d03a45095030168912ab21484da81385c53255b05 SHA512 c0a3132dbfafbdb8852d621de187cfbd5daa30ab682593b88c77278e0c8a58fb57ed1427b9f8aa798926ccc94db4a19eeec77915f06de9b0cd182237aa77a892
--- a/app-antivirus/clamav/clamav-0.103.0-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -54,8 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
 	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
 	"${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394
-	"${FILESDIR}/${PN}-0.103.0-upstream-openrc.patch"
-	"${FILESDIR}/${PN}-0.103.0-freshclam-db-test-fix.patch"
+	"${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch"
 )

 src_prepare() {
--- a/app-antivirus/clamav/files/clamav-0.103.0-freshclam-db-test-fix.patch
+++ b/app-antivirus/clamav/files/clamav-0.103.0-freshclam-db-test-fix.patch
@ -1,27 +0,0 @@
-diff --git a/freshclam/freshclam.c b/freshclam/freshclam.c
-index 8db3b8001..8cde8c9a8 100644
--- a/freshclam/freshclam.c
-+++ b/freshclam/freshclam.c
-@@ -280,6 +280,14 @@ fc_error_t download_complete_callback(const char *dbFilename, void *context)
-                 goto done;
-             }
-         } else {
-+            /*
-+             * Attempt to test database in a child process.
-+             */
-+
-+            /* We need to be able to wait for the child process ourselves.
-+             * We'll re-enable wait in the global handler when we're done. */
-+            g_sigchildWait = 0;
-+
-             switch (pid = fork()) {
-                 case -1: {
-                     /*
-@@ -391,6 +399,7 @@ done:
-         logg("!Database test FAILED.\n");
-     }
- 
-+    /* Re-enable the global handler's child process wait */
-     g_sigchildWait = 1;
- 
-     return status;
--- a/app-antivirus/clamav/files/clamav-0.103.1-upstream-openrc.patch
+++ b/app-antivirus/clamav/files/clamav-0.103.1-upstream-openrc.patch
@ -1,5 +1,37 @@
+From 7d7ca4f425909368cd78cd587120703754bcd608 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 9 Feb 2021 14:24:09 -0500
+Subject: [PATCH 1/1] Add OpenRC service scripts integrated with the build
+ system.
+
+---
+ Makefile.am                                   | 11 ++++++
+ clamav-milter/Makefile.am                     | 21 ++++++++++++
+ clamav-milter/openrc/clamav-milter.in.in      | 34 +++++++++++++++++++
+ clamd/Makefile.am                             | 19 +++++++++++
+ clamd/openrc/clamd.in.in                      | 33 ++++++++++++++++++
+ clamonacc/Makefile.am                         | 19 +++++++++++
+ clamonacc/openrc/clamonacc.in.in              | 18 ++++++++++
+ configure.ac                                  | 16 ++++++++-
+ etc/Makefile.am                               | 22 +++++++++++-
+ ...sample => clamav-milter.conf.sample.in.in} |  5 +--
+ ...md.conf.sample => clamd.conf.sample.in.in} |  4 +--
+ ...onf.sample => freshclam.conf.sample.in.in} |  2 +-
+ freshclam/Makefile.am                         | 20 +++++++++++
+ freshclam/openrc/freshclam.in.in              |  8 +++++
+ m4/reorganization/libs/openrc.m4              |  8 +++++
+ 15 files changed, 233 insertions(+), 7 deletions(-)
+ create mode 100644 clamav-milter/openrc/clamav-milter.in.in
+ create mode 100644 clamd/openrc/clamd.in.in
+ create mode 100644 clamonacc/openrc/clamonacc.in.in
+ rename etc/{clamav-milter.conf.sample => clamav-milter.conf.sample.in.in} (98%)
+ rename etc/{clamd.conf.sample => clamd.conf.sample.in.in} (99%)
+ rename etc/{freshclam.conf.sample => freshclam.conf.sample.in.in} (99%)
+ create mode 100644 freshclam/openrc/freshclam.in.in
+ create mode 100644 m4/reorganization/libs/openrc.m4
+
 diff --git a/Makefile.am b/Makefile.am
-index 12e7fcc28..a3c47e23a 100644
+index 42a58e7..c4d82ad 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -52,6 +52,17 @@ nodist_include_HEADERS = clamav-types.h clamav-version.h
@ -21,7 +53,7 @@ index 12e7fcc28..a3c47e23a 100644
 	($(MAKE); cd unit_tests; $(MAKE) lcov)
 quick-check:
 diff --git a/clamav-milter/Makefile.am b/clamav-milter/Makefile.am
-index 1ec4afff6..c75c2b4a3 100644
+index 38d9b94..46885a7 100644
 --- a/clamav-milter/Makefile.am
 +++ b/clamav-milter/Makefile.am
@@ -35,6 +35,27 @@ clamav_milter_SOURCES = \
@ -54,7 +86,7 @@ index 1ec4afff6..c75c2b4a3 100644
 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
 diff --git a/clamav-milter/openrc/clamav-milter.in.in b/clamav-milter/openrc/clamav-milter.in.in
 new file mode 100644
-index 000000000..71053564a
+index 0000000..7105356
 --- /dev/null
 +++ b/clamav-milter/openrc/clamav-milter.in.in
@@ -0,0 +1,34 @@
@ -93,7 +125,7 @@ index 000000000..71053564a
 +           "@RUNSTATEDIR@/clamav"
 +}
 diff --git a/clamd/Makefile.am b/clamd/Makefile.am
-index 12b872b1f..725bc2fc1 100644
+index c161586..b59d94c 100644
 --- a/clamd/Makefile.am
 +++ b/clamd/Makefile.am
@@ -44,6 +44,25 @@ if INSTALL_SYSTEMD_UNITS
@ -124,7 +156,7 @@ index 12b872b1f..725bc2fc1 100644
 
 diff --git a/clamd/openrc/clamd.in.in b/clamd/openrc/clamd.in.in
 new file mode 100644
-index 000000000..5d38f9a84
+index 0000000..5d38f9a
 --- /dev/null
 +++ b/clamd/openrc/clamd.in.in
@@ -0,0 +1,33 @@
@ -162,10 +194,10 @@ index 000000000..5d38f9a84
 +  eend $?
 +}
 diff --git a/clamonacc/Makefile.am b/clamonacc/Makefile.am
-index 181e22056..864a7fc2a 100644
+index 4cb4886..39c2e5d 100644
 --- a/clamonacc/Makefile.am
 +++ b/clamonacc/Makefile.am
-@@ -56,6 +56,25 @@ if INSTALL_SYSTEMD_UNITS
+@@ -58,6 +58,25 @@ if INSTALL_SYSTEMD_UNITS
 systemdsystemunit_DATA = clamav-clamonacc.service
 endif
 
@ -193,7 +225,7 @@ index 181e22056..864a7fc2a 100644
 
 diff --git a/clamonacc/openrc/clamonacc.in.in b/clamonacc/openrc/clamonacc.in.in
 new file mode 100644
-index 000000000..844cd49dd
+index 0000000..844cd49
 --- /dev/null
 +++ b/clamonacc/openrc/clamonacc.in.in
@@ -0,0 +1,18 @@
@ -216,7 +248,7 @@ index 000000000..844cd49dd
 +  need clamd
 +}
 diff --git a/configure.ac b/configure.ac
-index 7b2a777d4..8e0e810f8 100644
+index 33e252e..c8cd60f 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -79,6 +79,12 @@ if test "$enable_experimental" = "yes"; then
@ -232,7 +264,7 @@ index 7b2a777d4..8e0e810f8 100644
 build_configure_args=`echo "$ac_configure_args" | sed -e 's/[\"]//g'`
 AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args])
 
-@@ -104,6 +110,7 @@ m4_include([m4/reorganization/libs/libz.m4])
+@@ -105,6 +111,7 @@ m4_include([m4/reorganization/libs/libz.m4])
 m4_include([m4/reorganization/libs/bzip.m4])
 m4_include([m4/reorganization/libs/unrar.m4])
 m4_include([m4/reorganization/libs/systemd.m4])
@ -240,7 +272,7 @@ index 7b2a777d4..8e0e810f8 100644
 m4_include([m4/reorganization/code_checks/ipv6.m4])
 m4_include([m4/reorganization/code_checks/dns.m4])
 m4_include([m4/reorganization/code_checks/fanotify.m4])
-@@ -192,7 +199,10 @@ AC_CONFIG_FILES([
+@@ -193,7 +200,10 @@ AC_CONFIG_FILES([
                  libclamav.pc
                  platform.h
                  clamav-types.h
@ -250,9 +282,9 @@ index 7b2a777d4..8e0e810f8 100644
 +                 etc/clamav-milter.conf.sample.in
 +                 etc/freshclam.conf.sample.in])
 if test "x$enable_libclamav_only" != "xyes"; then
-     AC_CONFIG_FILES([
-                      clamscan/Makefile
-@@ -202,10 +212,14 @@ if test "x$enable_libclamav_only" != "xyes"; then
+     if test "$have_curl" = "no"; then
+         AC_MSG_ERROR([libcurl not found. libcurl (e.g. libcurl-devel) is required in order to build freshclam and clamsubmit.])
+@@ -207,10 +217,14 @@ if test "x$enable_libclamav_only" != "xyes"; then
                      clamd/Makefile
                      clamd/clamav-daemon.service
                      clamd/clamav-daemon.socket
@ -268,7 +300,7 @@ index 7b2a777d4..8e0e810f8 100644
                      sigtool/Makefile
                      clamconf/Makefile
 diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 487c31429..bee68f1d0 100644
+index c694856..213a978 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
@@ -18,11 +18,31 @@
@ -303,12 +335,12 @@ index 487c31429..bee68f1d0 100644
 +	rm -f $@ $@.tmp
 +	$(editgnudirs) $@.in > $@.tmp
 +	mv $@.tmp $@
-+>>>>>>> ea2f2442b... etc: convert conf files to templates and make @VARIABLE@ substitutions.
+
 diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample.in.in
 similarity index 98%
 rename from etc/clamav-milter.conf.sample
 rename to etc/clamav-milter.conf.sample.in.in
-index bf46b4fc5..c3c5d2000 100644
+index bf46b4f..c3c5d20 100644
 --- a/etc/clamav-milter.conf.sample
 +++ b/etc/clamav-milter.conf.sample.in.in
@@ -17,7 +17,7 @@ Example
@ -341,7 +373,7 @@ diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample.in.in
 similarity index 99%
 rename from etc/clamd.conf.sample
 rename to etc/clamd.conf.sample.in.in
-index 828dd5ad9..0e0ea4b12 100644
+index a1ca9ec..82ef42c 100644
 --- a/etc/clamd.conf.sample
 +++ b/etc/clamd.conf.sample.in.in
@@ -74,7 +74,7 @@ Example
@ -366,7 +398,7 @@ diff --git a/etc/freshclam.conf.sample b/etc/freshclam.conf.sample.in.in
 similarity index 99%
 rename from etc/freshclam.conf.sample
 rename to etc/freshclam.conf.sample.in.in
-index 2f7d14618..3af3a3485 100644
+index 8f4dd49..5a5c42b 100644
 --- a/etc/freshclam.conf.sample
 +++ b/etc/freshclam.conf.sample.in.in
@@ -51,7 +51,7 @@ Example
@ -379,7 +411,7 @@ index 2f7d14618..3af3a3485 100644
 # By default when started freshclam drops privileges and switches to the
 # "clamav" user. This directive allows you to change the database owner.
 diff --git a/freshclam/Makefile.am b/freshclam/Makefile.am
-index ab6ac8f1c..6b16b3d3e 100644
+index 9e48119..46ef224 100644
 --- a/freshclam/Makefile.am
 +++ b/freshclam/Makefile.am
@@ -32,6 +32,26 @@ if INSTALL_SYSTEMD_UNITS
@ -411,7 +443,7 @@ index ab6ac8f1c..6b16b3d3e 100644
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
 diff --git a/freshclam/openrc/freshclam.in.in b/freshclam/openrc/freshclam.in.in
 new file mode 100644
-index 000000000..9feb73747
+index 0000000..9feb737
 --- /dev/null
 +++ b/freshclam/openrc/freshclam.in.in
@@ -0,0 +1,8 @@
@ -425,7 +457,7 @@ index 000000000..9feb73747
 +command_args_background="--daemon"
 diff --git a/m4/reorganization/libs/openrc.m4 b/m4/reorganization/libs/openrc.m4
 new file mode 100644
-index 000000000..1a73d1589
+index 0000000..1a73d15
 --- /dev/null
 +++ b/m4/reorganization/libs/openrc.m4
@@ -0,0 +1,8 @@
@ -437,3 +469,6 @@ index 000000000..1a73d1589
 +              [enable_openrc=no])
 +AM_CONDITIONAL(INSTALL_OPENRC_SERVICES,
 +               [test "x$enable_openrc" = "xyes"])
+-- 
+2.26.2
+
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@ -2,4 +2,4 @@ AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d94409
 AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
 EBUILD makeself-2.2.0-r2.ebuild 706 BLAKE2B 310acea611438b2796a39feb28edf9e51454a33498845220995e9d4d1212e35fb96847949b11758c33624fd4ec6301d080e1cdd383904036b7c3bdf33dd12235 SHA512 aa4211a08ffaad8b4d116d98474efa9dfb6208e8dd9d30a7044ed50c4bb3c150fde5c97c2d383f19f5bc6e98c9d530f7ecd5011b15237b4de9df555ba1c49bd9
-MISC metadata.xml 254 BLAKE2B 3ab17d846132717878fe0587992dc65ac209a16e145e687773a2221f2ea17cb0568d03b4c3b20954ff4ad7deb6e15ead243d5b0410742c2c4c7dd24c56d69081 SHA512 fb782a70e1be3e60d1cc5465b54e05eb5eb3956d281d0951cc53a7b0f320255bc0ec62ffd08b18c765dd6ee0ad3f8c364c93c52ea884375f2782a1bcb90fb9eb
+MISC metadata.xml 279 BLAKE2B 8a6c887387a4bcf867fa969048c281706fc5d65d5e9e9ba0a501148326c3fede4d4ec2770908a771437aaf6a0640efd44f723cc2c3e84bb0ef455be4ca4c4833 SHA512 19449735028e77231307a51d7778a21561adde9feca814292a96b178a5906bd9f109ef18f2167683cac505d99ca90c32522e6b40e9b16d040089b5a790910fcf
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <!-- maintainer-needed -->
+  <stabilize-allarches/>
  <upstream>
    <remote-id type="github">megastep/makeself</remote-id>
  </upstream>
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@ -7,5 +7,7 @@ AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002e
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
 DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d
+DIST open-vm-tools-11.2.5-17337674.tar.gz 4057528 BLAKE2B 2adc5179e09a4bb501fe12c9e6dea7fee106516fd250899170a8fb3bcefb9b576136a82e4c3d3a73217b44aba8880728bb3588cedd715529f9b2991f0156ac84 SHA512 b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab
 EBUILD open-vm-tools-11.2.0_p16938113-r1.ebuild 3138 BLAKE2B 89fd2f0ad743c54e9df564749e4163be037dbed8f159717779419c9c5430528634a36ffb22712be305ad39accadfd12c5cabf99180d782744c028819369c0baf SHA512 0d463a4ac777a0e0afdc6df7035bf5c832b38c60e06c5f96485fec88a7f054d842e487fbe307d41cbf489c44ff83566ef9c94ac3495957120c8074f94d26a628
+EBUILD open-vm-tools-11.2.5_p17337674.ebuild 3112 BLAKE2B 7e9207ec60692927fbfb3e33818f3abc1ee452cfcb835d0804544441076d1c24a7526349dd81b1582136f3fcb120b14028b4282d49b86501e3f11b545b126dd7 SHA512 d99ce3e9505992e3a9a46919932be42a4b2e159a739aed4f2fdd35d9d90e7a26a0b98d9d58a359937f85579da5038b685dc7e8d9e1e2d28b733db21b8a66300d
 MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild
@ -0,0 +1,142 @@
+# Copyright 2007-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info pam systemd
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="https://github.com/vmware/open-vm-tools"
+MY_P="${PN}-${PV/_p/-}"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth"
+REQUIRED_USE="
+	multimon? ( X )
+	vgauth? ( ssl )
+"
+
+RDEPEND="
+	dev-libs/glib
+	net-libs/libtirpc
+	deploypkg? ( dev-libs/libmspack )
+	fuse? ( sys-fs/fuse:0 )
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0 )
+	vgauth? (
+		dev-libs/libxml2
+		dev-libs/xmlsec
+	)
+	X? (
+		x11-libs/libXext
+		multimon? ( x11-libs/libXinerama )
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libSM
+		x11-libs/libXcomposite
+		x11-libs/gdk-pixbuf-xlib
+		x11-libs/gtk+:3
+		gtkmm? (
+			dev-cpp/gtkmm:3.0
+			dev-libs/libsigc++:2
+		)
+	)
+	dnet? ( dev-libs/libdnet )
+	icu? ( dev-libs/icu:= )
+	resolutionkms? (
+		x11-libs/libdrm[video_cards_vmware]
+		virtual/libudev
+	)
+"
+
+DEPEND="${RDEPEND}
+	net-libs/rpcsvc-proto
+"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
+	"${FILESDIR}/10.1.0-Werror.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
+	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
+	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
+	kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-root-privileges
+		$(use_enable multimon)
+		$(use_with X x)
+		$(use_with X gtk3)
+		$(use_with gtkmm gtkmm3)
+		$(use_enable doc docs)
+		--disable-tests
+		$(use_enable resolutionkms)
+		--disable-static
+		$(use_enable deploypkg)
+		$(use_with pam)
+		$(use_enable vgauth)
+		$(use_with dnet)
+		$(use_with icu)
+	)
+	# Avoid a bug in configure.ac
+	use ssl || myeconfargs+=( --without-ssl )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use pam; then
+		rm "${ED}"/etc/pam.d/vmtoolsd || die
+		pamd_mimic_system vmtoolsd auth account
+	fi
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	if use vgauth; then
+		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
+		systemd_dounit "${FILESDIR}"/vgauthd.service
+	else
+		systemd_dounit "${FILESDIR}"/vmtoolsd.service
+	fi
+
+	# Replace mount.vmhgfs with a wrapper
+	mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
+	dosbin "${FILESDIR}/mount.vmhgfs"
+
+	# Make fstype = vmhgfs-fuse work in fstab
+	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+
+	if use X; then
+		fperms 4711 /usr/bin/vmware-user-suid-wrapper
+		dobin scripts/common/vmware-xdg-detect-de
+	fi
+}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@ -1,5 +1,5 @@
 DIST manpages-l10n-v4.0.0.tar.bz2 34796889 BLAKE2B 6413278ab2c9482ffdd2cf6ef1f4c6e05f2f1d7be8c8d556cb137ca4c5c2d6297f9547725f3afcf8023478c05e41d99d595a0b5a44da0d0188ed0287c630e5b6 SHA512 9c83363ffaa9ff9015934869623958594e64f1cbb52367dd8274425a5cb45dac06109d231fd7f165eb35248b4229f3bbf252a6a4630e7d5a47edbf41d4a646a9
 DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652
-EBUILD man-pages-l10n-4.0.0.ebuild 1669 BLAKE2B 4d5e695f32a81d9e158261f15172b97b65f2d317fd49c02aa49978e4ad7dca9337600d46cb5bb682d1140253715d079da4db9198ca9ac0d6054f3a8e0940aed0 SHA512 080798c2c38cd19c383a95f53bfb53dcc2a452757e12771a9df43486526fbf56af8925dc1b42261576ada302934a98b5dff90351b39767d0a246f24268d90b56
-EBUILD man-pages-l10n-4.2.0.ebuild 1766 BLAKE2B b7d8213c0dab7d2808a7e1600f2dd67cd71db3c0b91500192bd29677c51911296bb9d7e2fc930902ac523c13e74c791e1353fe95eec61226bf6fd23dfdb7f449 SHA512 658b0f26f0c165ee7e051dab5764ec11b60bb5379cc29c390bd86b5ad55bae535183936799b05fa8dadc75c8fd33f0d6e01495776776494d5d5ee5a185bc38a3
+EBUILD man-pages-l10n-4.0.0.ebuild 1699 BLAKE2B b1b3d8eb90703a0e00939d7d967590794754a9fdf6fd2cbdc4555ea817f977723eac373aab3071c7360f7a319620b7e8ea1368d3a8a9d95345bbd4d3cf9da7b8 SHA512 8237b93e639111a3dd2767230240bebd3535c8c89cdbf5aab8b49efe2f253dcc4ec952c6aac7cb4f8b038a3da7570146e0d72011e1c7ce7d2cc223cb40c77b79
+EBUILD man-pages-l10n-4.2.0-r1.ebuild 1807 BLAKE2B 17a3ad712a4793a83ea42b33c9c6d5cdee519f4440d222ca9ad389a8ae754321dbaa1130f482b1a79436f0778b5388a663047bd85d69c2f36294ce4ad751207a SHA512 1c3d24bed8169290d533ef3c8e249d3f71fb342fbf24159521668b9ffe2de2c8944b54fe8779fb127042f451655438e21bc5b66cbf8aa1c1ceb45d57fc6d4654
 MISC metadata.xml 235 BLAKE2B a6e10699959bdc64d99b8c0b00f46388bdf0c1e125a9351c63e61aae65c6bd9f70ab55a9497f6a6dcf10b161022abdd23c50443193563ba83744c09d1d4cd9c6 SHA512 fdebae10dcd9eddfe7d9546337826902e38d3d0e7b7e6e140038bcb293c98ca81b096d203b5709f42948bfa8868fe2d68d1385fae6664505e14d9ac1541898f9
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
@ -18,6 +18,7 @@ IUSE="${MY_L10N[@]/#/l10n_}"
 REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"

 RDEPEND="virtual/man
+	!>=sys-process/procps-3.3.17
 	!>=sys-process/psmisc-23.4
 	l10n_de? ( !app-i18n/man-pages-de )
 	l10n_fr? ( !app-i18n/man-pages-fr )
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
@ -46,20 +46,22 @@ src_prepare() {
 		de/su.1
 		# sys-process/procps
 		{de,fr,pl}/free.1
-		{de,nl,pl}/fuser.1
-		{de,pl}/killall.1
 		{de,fr}/pgrep.1
 		{de,fr}/pmap.1
-		de/peekfd.1
-		de/prtstat.1
-		de/pslog.1
-		{de,pl}/pstree.1
+		{de,fr,pl}/ps.1
 		{de,fr}/pwdx.1
 		{de,fr}/tload.1
 		{de,fr,pl}/uptime.1
 		{de,fr}/sysctl.conf.5
 		{de,fr}/sysctl.8
 		{de,fr}/vmstat.8
+		# sys-process/psmisc
+		{de,nl,pl}/fuser.1
+		{de,pl}/killall.1
+		de/peekfd.1
+		de/prtstat.1
+		de/pslog.1
+		{de,pl}/pstree.1
 	)
 	printf '%s\n' "${noinst_manpages[@]}" \
 		| sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/note/Manifest
+++ b/app-misc/note/Manifest
@ -1,5 +1,5 @@
 DIST note-1.3.26.tar.gz 53485 BLAKE2B b88fe67b708d85a60ea705caa99506a5ef59c442ed233b349cb07bf1cbc80514e8324b63f6e7a1ea6727e9742b11ecf4c460ecda818fc03de4532a132e3aa608 SHA512 4de22da10aef93e694cd1facb356666241435d2a468c25d43f42453c708d9a75b451820a01d952e587cca34b310a64c6e0069cdbe264376eb0cf50e3f852a252
 DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
-EBUILD note-1.3.26.ebuild 1345 BLAKE2B 6f1b5a6c8423d634df39e7fdd5454e6e36504c54730fbfe53afd9358a3eb080a0ac3cdc89af557a4e2db903cd1f2f713f7990f3d02bec916db602c0ac5f502f5 SHA512 0384afe90f034f06984548e61a4642647d9918ef978e4b9020a5163df61d3b18b9d29217748981ffaf6ddde0f170169b22704d9a1bf431baba699ce8f89ed3d0
+EBUILD note-1.3.26.ebuild 1344 BLAKE2B 6d6d7464896df47460fb7e2addd3bf665038e1d19dec3f32dfe7fcee162371766681bffc9df2fbcc1236fb2e49ab103c393e2d0820bceeef3ddf1d28f412f840 SHA512 6a8794d8abe60a444caa28a087cafccb6f74c89adb285800beb2715067a044877e21f588e08551046af340ca481827b4513f9430a2b44a7cd1aa13a86aeec988
 EBUILD note-1.3.3-r2.ebuild 1321 BLAKE2B 048c1db99c1562b4e1e2ab89ef50c4bd338a9a87b7eb00a1c1e9e1ff08ccf9a81abf33622dfa2a753841d492fcfa24d4c7fad6c38477e42e2b570fa589f1db38 SHA512 9213fd08ea701cad178fc0a222accc4bfcb9ccb62034fcd58e87d0b90b02a9fa8ae445807d368f9e8c519393bfdd251a032847b69ab7e424b9f8f28b81439c86
 MISC metadata.xml 404 BLAKE2B d3156915a5f7af0c7bb45f39e7083fefe0eccc23fa2e278b236447144dbc132443fee61adda923687bd507892fa1d027e2494ce63f0ea219ba2274b036d2d533 SHA512 e2e8d63b287148f69f14e2fef3ee6c89ada388d69ea7a589a5ca8e75726d93fbcd419bfc26ee09549a429aa0ecb63a6e521ccfe25550f6169df3f6b92a7f078d
--- a/app-misc/note/note-1.3.26.ebuild
+++ b/app-misc/note/note-1.3.26.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="crypt dbm general mysql text"

 DEPEND="
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@ -1,42 +1,23 @@
 DIST aho-corasick-0.7.14.crate 113042 BLAKE2B 6ba517169dd0bfafe7dd7755e2f664d831a17c6a367f29cb54d22b8b61eb04c75b67dead9a7855bdeaa1afd8aa5049b7580617bebf0cdac61c0712eb3525db4e SHA512 0a11e7bd2d3b6868fb6f64b61f3feead4ea57ab3c5d75c6586b68765425219e631bf875e43f73e79888e71079b3d7e10af36af6f96b72515105df79f5922f296
-DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST beef-0.4.4.crate 14801 BLAKE2B 8b6e7cec0503d0fa05becf60a9d9a9073f6eb81f61f36b04f7f7ec4db99029a3e4ef148734be07b25d96ca4061819bd1caa69475080853340e70287a282f2346 SHA512 8c0e04e749860bd42b8fd9a73a981ce948ac2d0000e09710304b4a909b587347c2fa141f53d0c84abd8ff8a62c8d0242baf5f7a57416d3da3f7814f18ed29324
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
-DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
-DIST cc-1.0.31.crate 42956 BLAKE2B 87e79061397a0e12ad4f3a32ab0b4bba764260c7de11eea055163538c749e8da32b95ad5efcb69ab72d210e0e7aed68c79f9ece33352b4cdacc5c1ec6d11f3cb SHA512 d6efba4c53fc8f11fdd685efb2759dbbbe53e65ae7878a61805b110c5a6028debb89a3e6d740bf7fd71055613de4fe92daaa98f34f86473c5a410ce3f17052df
 DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crossbeam-0.7.3.crate 9906 BLAKE2B fcdfb2fc07670cc90e1a60f58b798ecf913cc27153123c430e6920cdbce8459837d8a2ac7436f1fa37389b3912fb3166917af812fee474b73923c8af316a5b84 SHA512 9b06c2379364827df715a1cf6a842d6d793f53082e21eb6daeea0ac03dbc2e6a7902d0cbd39dc8d81d82b02641925f4a70b443d65a413f8e497eb3a9be55a8d0
-DIST crossbeam-channel-0.4.0.crate 86869 BLAKE2B b0f75c33a1527bbcccaa1babffb08582368e33ad66c7838d5500ab9ed6875d603b901fb304920e1f8ea892171259cb762f9db361c84d4bb5d52114c3345686b2 SHA512 169808414541d16a9d2677edd6b4ee339a72e1c72ba43deb85e0c67a6d4980f7d21dac4fa10b612944c56abc0631e490a77dd29051c35a1adb2ed20f5ccb47aa
 DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
-DIST crossbeam-deque-0.2.0.crate 12638 BLAKE2B cbf76e49fee9e1274e295f0958458a6f8f6f0bc449a83011da3dfc64607a649ff6a72102b9ff7784e0ce2b33bb317e4a927eebb749bb9cf31a7ce89e5aca8f7e SHA512 22a1b839ecd4359e3c961e5ff0a044f6f2bc14b5ceec4637c57bb5d26ad04840b0dc0a07f06b494f4b7e224f2a51e3e9a79bf7f895a73179a10705481b33d8a4
-DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
 DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
-DIST crossbeam-epoch-0.3.1.crate 33093 BLAKE2B 915d28d3040232768a60956eaa3d574206ae7664a53af3a993acaa9fac0cca50af321923c3be71d2d1799b7a0d4eb617ddace861644a3c8b067ca360aacab34f SHA512 8fc0641701fdb1d22fa60a5408aff96bbc296b975e6f9644859295abe6ee4729d86ada81969a51a09a7a8518f287ba41fdb258dd0143ce8d7db5abff604b955b
-DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
 DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
-DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
 DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943fe9aea8fc9b10dc1e551a489a178899f1a82c0bc8bebf8511e112711ebb26170d1f76f9caaf06556bbe8b74242e97b6 SHA512 f53385dea0a2b0830372ee11b9d393022f501a79631a15696d641a812939faad62b61112f9da9dda381fe69ecc3c91462fad95f329eddb002aa941110297cd85
-DIST crossbeam-utils-0.2.2.crate 11901 BLAKE2B d089d4d810d3c29163a9c3007c5c3a2479901c111905182df0c24b293853e37107693ee0fb50f0984bb7dae76908a66f1be402222667fe1eec31319e5c6e9979 SHA512 fc49d36efcb3a53125c1173415e27de43970c1d2f32547687e02c99001c98cb200047bd2b0072e47466515df5de9ee2104d1b83e7b4ccf03f0e3580a1d416f32
-DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
@ -45,119 +26,60 @@ DIST defer-drop-1.0.1.crate 9062 BLAKE2B 6b2e1d29d4e7141e70af1c11669e42c7b66dcbc
 DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
-DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
-DIST either-1.5.1.crate 11532 BLAKE2B 3cb46de61309efeedb614c20a83bdcf2c4de024fa1ca4e6e1cec6384445596cfbf2c9d7a9712faf554a373eaa462835b455d7b2a908a99e99ae1c738680778a8 SHA512 268d218b10ed7cabbf1a116afa22ebe47791303aa012a61676d04376961156983374490d3d939e5d68b2ccf3a9c56f41eb9c9651cf81ea1294ef275dc898733e
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST fuzzy-matcher-0.3.1.crate 15837 BLAKE2B 33ce848aa3853df14c695139870046c63dae72479b2279b383bdda79428ccf961943b12ed2c76716f1fe1767b14ac35f9252afd5cfa9a41e977783f752bd1f5c SHA512 f3c29df8f0d70bdcfd8188d190f13aa72ef46ed607bd77abb6a237b40a771c256b35df6d78f1c6942c159132f9849d0fe3b8d106aa097eedab70ec2e7c2cc52e
-DIST fuzzy-matcher-0.3.4.crate 16249 BLAKE2B 2d3b059805d70eeee43d5d00031ac45e712703ee95386fc0ea34498d1d352cd4858985f80c8d6e2886e93659c338e06eacd83b0a219e8fd3d5e29bcd0a063364 SHA512 06e6b5ae153959d3bcbe3fa1211aaa7ee354bd156fa1ff257ec5b0dc6b41c67d682dc063f541655dd1dfd33f2743eedc54cf860628d7be302d1b53c2fd50c3d5
 DIST fuzzy-matcher-0.3.7.crate 18047 BLAKE2B 934b90a74826393ceccc3e433df7cbc056a10744077e7a2178df9d9edc9db5d4cbc86d006c0ef1f7d82f4fb8ea0d52df71be1c7cc9ee39b433207d7f2126404e SHA512 ebcb6de06dd66da952183c75e4a44988bc60df17f035fe541c134f1c4e3c33d18a7385a9867fc23a99c07cef2b2737edd6128dea6546e243985da2f3a55dd8e3
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST getrandom-0.1.6.crate 18529 BLAKE2B 11b9f6475686f59ac710705c2ffb3de3e248cc38c4da8c0d00e7ec938adcc4ffdb120a472d5a9416a9093f62c77a1565ef42a9614d7bfbe5a48aa460a16e4ebd SHA512 e4426a90e1a942344568c087b27a7e7f483e715947ddf25b5a2671b7844b646d09033994a810c9bc96c905d75bf0552e217cf93526a6294a73cb3ddc02540801
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
-DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
-DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a7184aad966f33ea073982045577eebb468bf379a7e342bac722b9df7052d25becd9f25c99923bc309ae75211 SHA512 9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491
 DIST libc-0.2.79.crate 511752 BLAKE2B e5da81cbbf3bd400fc301096750cc94683f13000b3f20461d2bad942c3999122fb944655871039e3bc32b9dc5037de4e82800db16899dce4685d80a569e21512 SHA512 943e097b3a4fd33b547812dadad15da33c98b1d78fd86579f63a78030a5fadd431d5d1fc969e67e1bc301d33dc550c0398ccadae26aa990d05ee474a5f76c634
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
-DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
-DIST nix-0.14.0.crate 184529 BLAKE2B 106c90d03a9359608d99f8356239623a8b983dbabf92d170c19ca05b3eb035bf10749a9bc45e43d014b946c857eff5435aa1a02ae23e3f01a2baf7fab8bc22ba SHA512 34e900f3119d62ac00fd2d8ef001bfd7474bafd8415ba9986562a943eac292f2c9a679dc27e9b09d26d04c1e020bd88ec87689793f78b7b5c45ba21d29510207
 DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
-DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
-DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
-DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
-DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
-DIST rayon-1.0.3.crate 134391 BLAKE2B b0f938ad39bf8772374d312893097bb91ee3886e79f6c3050658b0797fad55f309d03d99c3f300837e86aa28f4b5041d9cf7dc455cb418fb4d38b678e8063a10 SHA512 bd23dbcd8b17061e0623df01af141d0e51532b46ef360ddbd392f4992d6b62fda26255cd9908f853a5a4c3cf111f6c9224a97abb0a3f9754aa0ed79ac58392f7
 DIST rayon-1.4.1.crate 158219 BLAKE2B 67a921c77170092911b5acef76ad550a52906737115b422062bef8f70a8dd3d092ffb0faabbc4247d9d40770bc9a353c9d7f12bc92d1971bab8ba053d9ea5993 SHA512 646727428091def322ef395e032de810d228813f6ea2cfb7ccfc7dcb1a6e09112f469b5fb7cd9a05fba13cecce1ed6a46a53f03b50f691a9b50da2c507fd59de
-DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2e902b5cdf88730dd57e84248c8474c5cfc5dedbc66322b996733bf404226c0d2694fd7139ae9706a822f567d3c SHA512 4d12b8097356d0a9eac8b3ca64085de8d19360dae81b3ccb199275c3487f705e2aded498e819958bb81d4de56c05d4d29c21c07da02236ba6fa0b2888ecfbea8
 DIST rayon-core-1.8.1.crate 63681 BLAKE2B fbb6aa174b141e515a0733cf8c1308ab37ef70f9e0ba5355382e590180ec0151e270a73410802cfafce1d76e60afbfa41406e4231eff517161caf633f5f42489 SHA512 bd5c4a1cf9534229adaf7db52bbe5bc9409758e47cdd783fa0bd50e82beb7ebe1c531bd0a63a92a86afe3c9b14142e94cd7716d7296c9968f245186a228ddd30
-DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-1.4.1.crate 236871 BLAKE2B 1a232e6a83e02b4fd2189142eb2e20d3f06d8d484f9012661aea99c23bfc8d56a04b993cab6a3fe85d29aca38a1b3ad5a8ea6cd5bcf3439d5d173923af9d9d1f SHA512 eb8869031ac156f10e8d031c8f5e5fab66575663b7daf4a0e86523fb3dea43e11c7bffe802d5fb7896e017e61afa856783c0541a1d414d91f322b2fbfaf8e249
 DIST regex-syntax-0.6.20.crate 293727 BLAKE2B ea19fdee49290481d20230e58da22d32e0cb715a93a67f98687b6fa8bfca5fea77d82399485a6be15b2a24d21fa4635c60cfe05b7132128e36a770fe86bf3c8f SHA512 65cfd5c493a066801a290d3663d5ceec738558ac7f3af9f3c3773065d9b6b02df006bedc556ee0dc377c032cf934426dea817d06f9639b837d7864f966ec94d8
-DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
-DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
-DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
-DIST skim-0.7.0.crate 91967 BLAKE2B ea50dda7ba272d5c64a9bd9cf35903df87e25010ea25f1931da0aa0987b5bd1264a49c38078971686c4fbe9b09ef86905540736a6904b620a44ab425d3efddee SHA512 8e43dc786fc301dbec56234c65690461926c899a7b5aad3187f0a588f73b4470bc47fdd12f31e67c59d153cadc7a6b3408a1a23b4ccb220e069dfa6eddf38551
-DIST skim-0.8.1.crate 104044 BLAKE2B 0b375e667aec1998219f4dacbe2599440852e37bf321bdabdf8d6cc82ef81989cb88a9f9b3efc98c14845b945e93d08292d482212b881c181e1a9c25499c4cb0 SHA512 d07acb458b38f62e10a3379da0e79a3ae988700ed34105b3b4194918587514f375adf82b6ce0e86b0fb6dc259b33e63f40821a9dd912eede228f2bfeb0e59083
 DIST skim-0.9.3.tar.gz 120208 BLAKE2B a58d4b5b9f73895504806f3cbc123a4ae4b081b71faa9a3434271c7e7eefdf3345294c6025f4d13a4a5ecc9b5e083804c1c521febce2e550da69a43411875e77 SHA512 00b7ccaf458c0742b8d8fda5bae018ca0de569d36c932fb38d45d4c81d86b476c5f7e6e89c144b050a85932b8d57af5046fbbfa09288a38047b04a3b41ad594e
-DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST syn-1.0.44.crate 225524 BLAKE2B 1e96512143ae8fc2e0c904ec5dd3ef21aeb21a4c16e895c22b46f42a80dc7e56d494b8b225c874b9bdc4895ffbeaf23ee4b7986715c38c987c16a1acac72d90a SHA512 b4215f7fa6373c4c283b872d9464dce40254e7236912d868007e0c9d6c868098dbb50ad218d512d5d1d2f13670dc0562b2f8f1cc758868bbe548bbad888fa774
-DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
 DIST term-0.6.1.crate 37578 BLAKE2B 6ff130b12efadff7ece7858935f3fc9481da87ce0954c49cdcf7f4210a572274048292372aee7ef58efe6c00fa38242c2abd29bbd4563d00a55fb9337e038ed3 SHA512 5e684eedfe522da12914d579fddf1b04720086325ab18498e56b0cc709b0c8a022f887731a2bba9d0ddf200c756d12948835bccdff5bfb2b19af7d071051eacd
-DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST thread_local-1.0.0.crate 12629 BLAKE2B 3ec8ed420965ccd2fe6f8b1322d83f339795bb7121637daf6ee6079dd1bb023d4f723ae53ced5406beffee809752c30dc8be04c09704a6c692a1b3ab4dbc56eb SHA512 70d87a71909c405112257c7e4588d6432844fd9c0ae135149f1378a3b26b6619c0269a059ce02cfabe2e5041770824314ba031a04be1a0cef91b13f9894b6369
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST timer-0.2.0.crate 12190 BLAKE2B 51a84f110fa814a9d844bbc7b81cb68f931e85a1a73f437874b0915458b539b27e90fc6872594f882d2f3d88117f605982c21129dfd2ada105ce207504758b8f SHA512 631997776e6b3d7e7abb4d42b7a4cbb12c3ac4337a11ed2cd83d783ee732b56ef27fc0bdf4156dca331494029b8c207d3c8df6936278b6eacd23348c44a4d757
-DIST tuikit-0.2.9.crate 35141 BLAKE2B 0ade82741a12b9fb094d3c56cd2d5efae093663fb6f52156f18e5777ee556e7521cf98849dc03b88e46d0ceb3cc253afe218708346914960a1a9a371dfe15bec SHA512 33568432d0c38f77b6102c27a5fe2a654c6772afaa442b021e4d29c181573e4d22b323fba642f6e916eba5968733eb422ec1dd24bf3748dbc4158a53a1bc5f86
-DIST tuikit-0.3.2.crate 41529 BLAKE2B 214275063544462a41a9934c7ec8eeb28714b50a42d7ae0c4029fd9215e10b0dc32ce7fad81e2ffd39c02db2d5b7ed60c82d5862d515478369db480721df2dca SHA512 f5cf5918480430e380165fc2e656b98499e237113e65a1e523f4a69721afcfb4d6e64331963d3938e2883588a41459e23a6df4c5048d0c3ad5a5b561b400420e
 DIST tuikit-0.4.2.crate 44394 BLAKE2B ac057f3b5db767be126224385c098f841e829fa6ae956768732465a20eec4df0fae0859648b97d12d8a19112bc33e7ee3d6a3f4bbb54d9b367c96cae9a72d43d SHA512 06a0126d5745fc2653a575d810bf859156f8474dd301263edb680e780c534c12ade029e848efd693c300069ef3918c7b95d1e2761a017ec93d25af6ada42f666
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD skim-0.7.0.ebuild 2107 BLAKE2B c85fef6c012344ee9342a80ad940551dcbbebee2e358866dcc2167c83b674ed9ddcb6abc184f508bf190bab3e4243156add8ea29ecc3fab0f3acb4f1b0753697 SHA512 ce5440a56ae875eeb13b7ae1aa161237f97c59bb6bc88f18068dd8d990561bb2ba162a128de4515692b8385b4bc42e28b1874b106deafcbfa0b3cf611854a995
-EBUILD skim-0.8.1.ebuild 2494 BLAKE2B f7d61ac44cf59b1527dc73ca2ae64ff06a1893f867302ca431e6a725fb204b8d77cb925e0ed281e994c305fa29860ab7372d0e275cd9137baff3b888ca5c3204 SHA512 6a17e7263c3eb1118968ffafe302a561ec96280bdbd3d5d77e52f3a8094829f0b850d8349c63e03ce5485ffaac0f40d565b5dd583d0247203a9704f8bd74dce1
-EBUILD skim-0.9.3.ebuild 2430 BLAKE2B f404554a0c9872d2a29346c00897b0b0a7cb9974fca86bc7e3f9a2366a8594e61fde46a40b21f6626bdc042019f38de12f023209628b32086cb9e435e9f678d9 SHA512 b268308006dd5db58d98551a13ba5e8e9ae6f71390e0fb6bc3b9e2e3872b53917b4ca9a746a959c1518107fe6d1d3d26a1e8a9ce618918638b49fbdc0e4c2fdb
+EBUILD skim-0.9.3.ebuild 2429 BLAKE2B 6e6d000be116093ddfc42ca675fcb6411094d287fb8b131fa404edb8ab3af7dc0f077ed35673744647a72921b9ce0840af80ca2bfd60b199d7c10f496407f38d SHA512 08cccb00a85425dab02cf3b87049c3ecac5cebf1c68de21b0c3e9019e342cb52fe35a8738ba6043d93d05ab97368c01b416d8e657332d2160968df46dedc0827
 MISC metadata.xml 474 BLAKE2B 4934d96b8e2a112cc3b87900b2235f07ad8de1cb4bbc93668503b9723c468bc8a8507368710c4e9e56007712ff2d1e8038258ced062b203cb751118634a5bfcb SHA512 642cc9f11a949fd112fe679d77f42a5334aaaa109126d63997d72e4091c959f9f13f5e597b08c30034a820793280d8775cade0efcd3020713b9d0c0ef4946045
--- a/app-misc/skim/skim-0.7.0.ebuild
+++ b/app-misc/skim/skim-0.7.0.ebuild
@ -1,117 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-ansi_term-0.11.0
-arrayvec-0.4.10
-atty-0.2.11
-bitflags-1.0.4
-byteorder-1.3.1
-cc-1.0.31
-cfg-if-0.1.7
-chrono-0.4.6
-clap-2.32.0
-crossbeam-deque-0.2.0
-crossbeam-epoch-0.3.1
-crossbeam-utils-0.2.2
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
-derive_builder-0.9.0
-derive_builder_core-0.9.0
-either-1.5.1
-env_logger-0.6.1
-fnv-1.0.6
-fuzzy-matcher-0.3.1
-humantime-1.2.0
-ident_case-1.0.1
-lazy_static-1.3.0
-libc-0.2.58
-log-0.4.6
-memchr-2.2.0
-memoffset-0.2.1
-nix-0.14.0
-nodrop-0.1.13
-num-integer-0.1.39
-num-traits-0.2.6
-num_cpus-1.10.0
-proc-macro2-1.0.6
-quick-error-1.2.2
-quote-1.0.2
-rayon-1.0.3
-rayon-core-1.4.1
-redox_syscall-0.1.51
-redox_termios-0.1.1
-regex-1.1.6
-regex-syntax-0.6.6
-scopeguard-0.3.3
-shlex-0.1.1
-skim-0.7.0
-strsim-0.7.0
-strsim-0.9.3
-syn-1.0.11
-term-0.5.1
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-thread_local-1.0.0
-time-0.1.42
-timer-0.2.0
-tuikit-0.2.9
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.2.0
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-vec_map-0.8.1
-void-1.0.2
-vte-0.3.3
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-"
-
-inherit cargo
-
-DESCRIPTION="Command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	# prevent cargo_src_install() blowing up on man installation
-	mv man manpages || die
-
-	cargo_src_install
-	dodoc CHANGELOG.md README.md
-	doman manpages/man1/*
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
--- a/app-misc/skim/skim-0.8.1.ebuild
+++ b/app-misc/skim/skim-0.8.1.ebuild
@ -1,139 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-ansi_term-0.11.0
-arrayref-0.3.6
-arrayvec-0.4.10
-arrayvec-0.5.1
-atty-0.2.11
-autocfg-0.1.7
-base64-0.11.0
-bitflags-1.0.4
-blake2b_simd-0.5.10
-cc-1.0.31
-cfg-if-0.1.7
-chrono-0.4.6
-clap-2.32.0
-constant_time_eq-0.1.5
-crossbeam-0.7.3
-crossbeam-channel-0.4.0
-crossbeam-deque-0.2.0
-crossbeam-deque-0.7.2
-crossbeam-epoch-0.3.1
-crossbeam-epoch-0.8.0
-crossbeam-queue-0.2.1
-crossbeam-utils-0.2.2
-crossbeam-utils-0.7.0
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
-derive_builder-0.9.0
-derive_builder_core-0.9.0
-dirs-2.0.2
-dirs-sys-0.3.4
-either-1.5.1
-env_logger-0.6.1
-fnv-1.0.6
-fuzzy-matcher-0.3.4
-getrandom-0.1.6
-humantime-1.2.0
-ident_case-1.0.1
-lazy_static-1.3.0
-libc-0.2.58
-log-0.4.6
-memchr-2.2.0
-memoffset-0.2.1
-memoffset-0.5.3
-nix-0.14.0
-nodrop-0.1.13
-num-integer-0.1.39
-num-traits-0.2.6
-num_cpus-1.10.0
-proc-macro2-1.0.6
-quick-error-1.2.2
-quote-1.0.2
-rayon-1.0.3
-rayon-core-1.4.1
-redox_syscall-0.1.51
-redox_termios-0.1.1
-redox_users-0.3.4
-regex-1.1.6
-regex-syntax-0.6.6
-rust-argon2-0.7.0
-rustc_version-0.2.3
-scopeguard-0.3.3
-scopeguard-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-shlex-0.1.1
-skim-0.8.1
-spin-0.5.2
-strsim-0.7.0
-strsim-0.9.3
-syn-1.0.11
-term-0.6.1
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-thread_local-1.0.0
-time-0.1.42
-timer-0.2.0
-tuikit-0.3.2
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.2.0
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-vec_map-0.8.1
-void-1.0.2
-vte-0.3.3
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-"
-
-inherit cargo
-
-DESCRIPTION="Command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	# prevent cargo_src_install() blowing up on man installation
-	mv man manpages || die
-
-	cargo_src_install
-	dodoc CHANGELOG.md README.md
-	doman manpages/man1/*
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
--- a/app-misc/skim/skim-0.9.3.ebuild
+++ b/app-misc/skim/skim-0.9.3.ebuild
@ -97,7 +97,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})"

 LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="tmux vim"

 RDEPEND="
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@ -1,5 +1,5 @@
 DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
 DIST worker-4.6.1.tar.bz2 1615384 BLAKE2B a0d665f82d585d4e8a7e515e44b23541da24f6712c86bff422d4612ea67292c31cd204367965f8dd0ed91e69fa11453f7fc5a0228b2508d8397bde39460ff6f1 SHA512 f5977bc2c84c1eebb0058d63c7d10a0b39fa3c3bace09b6adac82f6a17bd9df8b1e2ba8138d764899895b69493493245cb6f7aff15014471a109a023fe203e57
 EBUILD worker-3.8.3-r100.ebuild 1350 BLAKE2B ae916e885f177c37254b0c1fc5239f8f4de0d58c2bdb01cda99fec2ee4ae1e74b51e390bf4faaa0c7361f23853eb3b9f4636f6ae715951e79a98f0c1b8169622 SHA512 9b2d3087f599bb130516cd6b64ee95496eed76c217be928d18d05fb45d9b2ddb373edc2f01477aebc89f4097f4063898ce31ab84150102fc6c237bbb59903a81
-EBUILD worker-4.6.1-r100.ebuild 1464 BLAKE2B 5dbbc41a11ad9d0ddcf4785149b3a0455e8c0be5a9fd626b97b48aa1b6be45793acefe3a02f08d5d8a2a8f4b34956a51740e55d0aeaecb7aa7a9be669e0b8706 SHA512 2bcc4330e62805d2a5863e77f251d5c39839ef9ddb530fbec4573bb6100dc4104086b680ba536484fe60b775426eef341079d31526ca64749640d901a858ce20
+EBUILD worker-4.6.1-r100.ebuild 1463 BLAKE2B 11bd4f1ca104faf75cc7cef5f99db463ade14493725aabaae077d39184090456a3950052aa72bb819bdd357ca461dadd8a504326003380878225b12251e37195 SHA512 479cce695909527b069ed1e3572318a25e6fa37647e596c3da37d8cd8729dfbf1e36282df16815241013506d72715f7069ef72d4c35d307cc04ae153986f122a
 MISC metadata.xml 625 BLAKE2B 663b7236063925cb15a6025b7c48b0cceb01c0af01955215eed227939c1e6f471de78fa16ddaba4eb152b78303d835690a7b18d630f7440bab3934c89b69fc46 SHA512 b8a94fd69a914d144791fca62c5f52085dfc8d9f2d09810860e761683f34bef87623f0e15a33713fac06a1c7529f1967faf155c96b5a8d5bef7a9abb9ff02883
--- a/app-misc/worker/worker-4.6.1-r100.ebuild
+++ b/app-misc/worker/worker-4.6.1-r100.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"

 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@ -4,10 +4,11 @@ AUX magicpoint-1.13a-libpng15.patch 240 BLAKE2B 93ebf799b69a0f0133c9a6cae44d39ba
 AUX magicpoint-1.13a_p20121015-any-giflib.patch 3585 BLAKE2B 5cb2febf20cd1a3270cdc91e2e0bb72157d70be1e47bfeea4fc49594192332b1416d923b00ec3d9f305a3ac728c6efa791d00105032014dd883e44d20328b1bb SHA512 661e86eddc3c929651dd2d06b14638d4c92f03281447ee706203a99940bfca8783373ed8a175ddac73e2a6ccb2d8c25386aca39b977fbc3e631b5a16dcfc3536
 AUX magicpoint-1.13a_p20121015-draw-charset.patch 376 BLAKE2B 2162436ee734410c11461389ca430fcda0410031a649a00f96059e21a2a3575491b91fe35963c64fc692f0f761ea6623d6098ac364d844d094172385ff4fb773 SHA512 3aa3b7e4fa638a86e3a5241ad2768a44b0d3e1925dcbf23e4c5b9cd1fde9d3897b3785336be174d709c6172e47c34a5e1550cef05e868e0706cf2f91b73a160c
 AUX magicpoint-1.13a_p20121015-draw-stringtoolong.patch 310 BLAKE2B 13af238e0ceb7afd3fb6fbe27c9ea50435de74a9be24ed53cb021e8aa708d01abb23127ff54f26d20e59ff214e28ee6e22ac140918b2b7e3de57ad4a830dfb09 SHA512 65f77a096501ba27208bdc7e036ada66946e15c012b22e5dcae579141d399a7149bd647f9a5968f82ff34c344ce9c5ee4841be33a7fb911187b1def131bb7387
+AUX magicpoint-1.13a_p20121015-fno-common.patch 305 BLAKE2B 38096fe5ff8d28ed4def62492e716da01d4fbd2741e68640ab79247599812e7f1c9573ebaff1bb1b74f6f3956eeec435e1ab1592f0a2d4fca5b813508c08f408 SHA512 102ae9f4f00c542cfd0fbf16daec4e0a00a801d9557aea4eaeb792ac958d8d2388f949cf19872387f4ba9429c44bcaeeac09ff34e4c5537230387633739b081d
 AUX magicpoint-1.13a_p20121015-fontconfig.patch 1005 BLAKE2B eaf2ab5655b529fd8511b590cbd73638f6becc047c97ddd92a136ef998f284c96b471bf371085d799f964ea3f3961dfb70a0d51b16cc165fbd20ca15406ca2c0 SHA512 53fc5bbce474e4c60af75ad73f00108c40ab317b9b835f971e475f8f49a893a41614ec76345e220c8e7284032f7df1a7785e2ca91d5a66c4f99470d55b0f9603
 AUX magicpoint-1.13a_p20121015-gif-dimension.patch 493 BLAKE2B ae2e3f94f3b36b319d330504a31331e9c45429d750f2be6f8dffa299ef6541ad777d09520be72bb3ceb7c68b8fa6dc4f78a482dd1b8e0093faa2b2a5e4de0f0b SHA512 d8103374df7696ed6daf36c079c2e1f2efbfc8e774f77e06beec629b2064576325f311603ca7d1dfe3f65ed11dfaff1abd7ae70b4f78a5199e76e1d5030c5aa6
 AUX magicpoint-1.13a_p20121015-implicit-declaration.patch 3673 BLAKE2B 314f8b4022c53022f6e8e2a0612d480509916f3b857a6beaa840bbd08ea6f9e62be33dd295ce516c60162516b585fbd12884866ea184eff1bbbc6c55bec017b6 SHA512 be8da97dd37a59190cddc3f826094a343d2351d832d9bbb42a7a319149884e026fdd97018826162474bb2ffc0f88082cd4075a228487fd3d40e6b76c9ebdc029
 AUX magicpoint-1.13a_p20121015-parse-empty.patch 316 BLAKE2B 4d532b1e56bcc3d21035051b3a1e6421b02d83dd24a2e450b841f8f1c9740e19a266f5ca7619624d6046e6699507ef3a630ba605311977a466efd20b6c57fd19 SHA512 adb7a9e1585c907cd8f8b0f834391620cecf854702301715149ddc80af080115dbdd18c7f8622a5fc403df8f1205133909c98a2153461e4e8f4bf401b647f518
 DIST mgp-snap-20121015.tar.gz 886902 BLAKE2B c4f4730a805aee43f8fff7439cd18ab84f2dc73be6c249c3d8168da63fc0c32b4aff2d800345a35d3c22dd930c78f51e8cc64f4f74f0cf0aeb5f6cc4d145d4f0 SHA512 fa59b1ec04e2e191b74c25fd3ae9b4c855ad96d23e9e5b071c959f56b9d2064d7bdf9217b5c62c5733cc2d9ec17981947febd7afb2552f1145262225909cc711
-EBUILD magicpoint-1.13a_p20121015-r1.ebuild 3871 BLAKE2B 8684a1d2ace2c7d8ae6e6d302c33e9c90367a2aa2618f923300addb3d7a986a80905eee7f1b657d5988da83fdf1a05f3c3b139fb252955e3a46bea67893a9db6 SHA512 3e8ef5fe7ae842b883014bf3be4ce14ad81c4d3ccedf0bc50475470f011ec82cb43dfc7660b90d9d06577d029eba475d853b238eb046a4b98bdbb438e031dbaa
+EBUILD magicpoint-1.13a_p20121015-r1.ebuild 3928 BLAKE2B ac9b56bf426bc4529af7532fc3620c400e1f81e5a31cbb65834156c9878cbe1498b50841e93761166283b66a5455bcf9686e65b75be1db74f50101e075105f70 SHA512 adb2f7a90d01f07bc3c883e584ae03d35d06f4c0b8e7882325760ea59d82a91f51477efe3fa583fe361829372e315ab82effcc238f950b34ccb57838efc1234b
 MISC metadata.xml 619 BLAKE2B cf03f94d998aac24ad462ec4f13de8dfe022ff716c611f12e1a6e5e6964bf4d2ba1038d8d07b61924af5000057445816167c8899a9b784ecdc3ffed00acee8a8 SHA512 252061aa0a52e933b017498596b4b7b5f45fe660616212dd0718b8fe5e46ce90f4b92af96ef5ccd1db8ac05d0190743d6242208d248cc12fc9a523fd06b80c7b
--- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch
@ -0,0 +1,11 @@
+--- a/grammar.y
+++ b/grammar.y
+@@ -73,7 +73,7 @@ static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
+ int n_errors = 0;
+ struct ctrl *root;
+ char *yyfilename;
+-int yylineno;
+extern int yylineno;
+ 
+ #ifdef HAVE_STDARG_H
+ /* GCC complains if we declare this function in traditional style */
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
@ -60,7 +60,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \
 		"${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \
 		"${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \
-		"${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch
+		"${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-fno-common.patch

 	if ! use imlib; then
 		epatch "${FILESDIR}"/${PN}-1.13a-libpng15.patch
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@ -1,5 +1,6 @@
 AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814fb398cc61bc4164e573a7290b6ff0a1d6c710c6932ce0170b8634459beb8f2f53c296b3fcf79ea56d8ca061459babd4 SHA512 25e026aafc04e488183a7537f37566b30c1300f090cc1b4c9eca6531e30654751e10f72c8d45f0ad1bcfa441c659380831de520f41906daec61b4b069fc84f81
+AUX jpilot-1.8.2-fno-common.patch 1094 BLAKE2B 50e039c59bd36af356c9eb53d144be622cc36af5be86464c135ff3184ad5f7bc59bfcb9d19287ba56d59e3eab33274cb8dcc220c8fc1429d4c82df0711d3feb5 SHA512 50d4f6c924fb3c5241d424ec5457f80f93a4fa5dc6dcd9f31e0a2d44bc696ea5ad9f6cd447dfae6f3a6b97a9c951977a0b98379ef3b548eba4b0d1732443bf87
 AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
 DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
-EBUILD jpilot-1.8.2-r1.ebuild 989 BLAKE2B bb2067b305d3e756a0e35168367f5f495b97dfb1945445c77dbe690a128f697c5e1aacc810a79e9415635189791d840cd1afe076ec10a4ce1a1c7cebe27751af SHA512 0b992569f5651b9b9b52ccc333bc3171b94f694b6468a745b0af80be47af8162f46f8967aeae07c2f1ed5d6d7624533203cd3adad3174eb3d3f6adac24e0174b
+EBUILD jpilot-1.8.2-r1.ebuild 1009 BLAKE2B 21d4a9ddb4582f7fa038edf10a6c7393c5d04359a9b679c60591221edad821fe6b4a55e662763b023806e15bd54d71cb0feacbb587962148eb25ca3200c2ee4f SHA512 59de8c25c95eb9dbe825131a1036ca9fb00b0021e62c1d9a82dfb4f06292e25d26502b2ab0770eef91b7c75eb0f9a7cf678f18b086a2de91fe170c830f46223b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
+++ b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
@ -0,0 +1,36 @@
+https://bugs.gentoo.org/709790
+--- a/jpilot-dump.c
+++ b/jpilot-dump.c
+@@ -76,7 +76,7 @@ const char *formatT;
+  * this code but must be instantiated for the code to compile.  
+  * The same is true of the functions which are only used in GUI mode. */
+ pid_t jpilot_master_pid = -1;
+-int pipe_to_parent;
+extern int pipe_to_parent;
+ GtkWidget *glob_dialog;
+ GtkWidget *glob_date_label;
+ gint glob_date_timer_tag;
+--- a/jpilot-sync.c
+++ b/jpilot-sync.c
+@@ -37,7 +37,8 @@
+ #include "otherconv.h"
+ 
+ /******************************* Global vars **********************************/
+-int pipe_to_parent, pipe_from_parent;
+extern int pipe_to_parent;
+int pipe_from_parent;
+ pid_t glob_child_pid;
+ unsigned char skip_plugins;
+ 
+--- a/jpilot.c
+++ b/jpilot.c
+@@ -84,7 +84,8 @@
+ /* #define PIPE_DEBUG */
+ /******************************* Global vars **********************************/
+ /* Application-wide globals */
+-int pipe_from_child, pipe_to_parent;
+extern int pipe_to_parent;
+int pipe_from_child;
+ int pipe_from_parent, pipe_to_child;
+ /* Main GTK window for application */
+ GtkWidget *window;
--- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit autotools

@ -18,7 +18,8 @@ RDEPEND="
 	app-pda/pilot-link
 	dev-libs/libgcrypt:0=
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
@ -26,8 +27,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch
-	"${FILESDIR}"/${PN}-1.8.2-fix-paths.patch
+	"${FILESDIR}"/${P}-qa-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-paths.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )

 src_prepare() {
@ -45,6 +47,6 @@ src_install() {
 	default
 	docompress -x /usr/share/doc/${PF}/icons

-	# .la files for plugins are useless
-	find "${D}" -name '*.la' -delete || die
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@ -1,5 +1,5 @@
-DIST fzf-0.24.4.tar.gz 175421 BLAKE2B 8c06f6abb2e8a8a407f36e613efc084d63cc9797bb8c076c7d9a497b52b86865243b3cf3e80147cd2db0f6a98e850a28dc58dc949109a152ca6adf330dd41ff1 SHA512 348cc000b4e28054bff56a37171ef4dd7ac22c7c292c19c3c0b95f3d30856b443887447604e1e38cfd71b421a22c1135a13cb40c78e5b34d477acaa3dcadb821
 DIST fzf-0.25.0.tar.gz 176905 BLAKE2B fd0fa18643947428d8a7257f9aebf579e3d57fbc0216d4629ed77616d1729d2cc68514125b5de5b2e85b65b26d6c95e69942f076aa99aa27e57d4f9b778f8923 SHA512 73b65374334531ac81a64bb973cb976f4dab7c6458eb2705f323349223880294fa6238b0eeea3412ff121c5c1b70905b261ceb7994c2b00425b02c88286b36e3
+DIST fzf-0.25.1.tar.gz 177955 BLAKE2B e5bb5e40ccdb36ba015196ba6e5abfff6b7c6f4b6ebc4c824d5e2c4e8107a08d49f03210732358bcbb56d1765448f8eecfe4a2e61405ebdd36984c3c54b7d818 SHA512 755046b4a8604fd3d1f2b66b967ad79cf5d4581dba1e40abed338c767d4421620df0f1f6a81a6c22c20da54dfdb1ff6847bad8f58ed83fc5e1928038c9d042f2
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
 DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod 250 BLAKE2B 46093e9211011e814962ba2eafec4392948f185d27a202a8b626e16299e3a3fa4554a604933ceab584b27cca2b7a6b1f51d4e5fe10d673e875e38eca08de64ec SHA512 412dee57c525bd5a3c0ce9c482e7933814758e36ebb226a16392e648f57e280485f86e30f17be2339eed427b52e4b0b601401503d0bd324c7fa874e2fcba2b60
@ -35,6 +35,6 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-EBUILD fzf-0.24.4.ebuild 3402 BLAKE2B d1dd4807695d3b53a8b103f65f736090da52d882a8c3060d0a878033c17d50c50764476c701db57c77b1a7bfe9089fcddc25d79fdf1265ae7bfe29175ec3eb3d SHA512 771227334e51ad4226ed2fa332870f91af52c044de2cd65f3f04c6d15eb10f8814ae97089033dca38f67b0a7d77a9dcd6afb6c573e449cd6a34d5758dc86bf8f
 EBUILD fzf-0.25.0.ebuild 3402 BLAKE2B cf7e0d862812d3d1529b09d39dd3b63672481cb95d7b6c6437ce0a913a5835658a8f1a59f15d557e1930124acaedfc29ce8970f8e492bf24522bfeac4acd895a SHA512 9562bfd4473d057f1100b682206b950d05fd12d005e9f3069eb0d1a98049d234300df88de12d940ccc50240cdbcd62838f60a08f6e468401078fcf02c755f49e
+EBUILD fzf-0.25.1.ebuild 3402 BLAKE2B b4542f11eb53df1956d9d63069e21a20ec2b142e8010bc250ae0191d15d7e2503a231b9611ab6d7c53b83a7ba13134e0742d8fda35dc5b7444eb6a60e4bd78c6 SHA512 1c9cb16972c49ddb6bc741ee723da333c9e094341cb714ba212aa77e0eba4896b7bb18611ad8bd464ade3cefe574ec442b9eb73143757f8f3c210de5f515c4ec
 MISC metadata.xml 575 BLAKE2B d6fa25687111f71da6dbe80c20e8387ef699e5d8022a903b1d8c60a3c0c58692166141fbf4bdc55f305e31a87aaa2a4dcaf0d4429f8b94dc71fdb9305675694c SHA512 14efc2b0b44734d0092306392b5dba2e0745dbdca7801fd6507f1739d5e6431fad622c15cb5b2f7d297abea58b54ebd09391ff9fd9b01c9778b067b9f88ff98b
--- a/app-shells/fzf/fzf-0.25.1.ebuild
+++ b/app-shells/fzf/fzf-0.25.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
 HOMEPAGE="https://github.com/junegunn/fzf"

 # For fancy versioning only. Bump on the next release!
-MY_GIT_REV=00a3610
+MY_GIT_REV=6654239

 EGO_SUM=(
 	"github.com/gdamore/encoding v1.0.0"
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@ -1,6 +1,6 @@
 DIST mksh-R59.tgz 438821 BLAKE2B 4a737b47ab58a99707d93b680ec5474b7b6e190241778010879d0b20028f97bfca9b526c807ed0b37d03b6aef9a2eaf2506d73d1a00ac14b60b21e57791d8d4f SHA512 be5009ce8f02eab1392f95d7f85f5aad57b1445684b4fe8cd0284a7d79386170979303ef19f039fdbb53bd2a791f3e3603d2fe57e015fed4cb4a24ab710bcfbb
 DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
 EBUILD mksh-59.ebuild 1608 BLAKE2B 1eb58f889cae37ed38ca3ad86c0d4b74659c209695a9d72c32931808cc60f2d4bcf59648b6073d7b96c0a12431ce2b989bcecdd36ec73d45150cd460151c312c SHA512 4155e31d97fcf0b3a008e4fb947d7cc85108d2a978280b2232b60e51964a6675d82ee85db80996bc35936085549e828a00781cdceb51e0e78138871cc8e90cb6
-EBUILD mksh-59c.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
+EBUILD mksh-59c.ebuild 1673 BLAKE2B 602760f5991418d1b5df3390500eb15d3e3bbb02c99399656529e96a42fa4373b371ea5ce85db550dd9e292a81868f4030734d85b4878e16361738bf0b649380 SHA512 c37890db5eb26595dff8ed212e4db8700c4dfe700f94b1378eb633972cea95252d1c415c45b9cec64ac5ab8576967f3710869f33eb0ed2542a704e1f32a39f5c
 EBUILD mksh-9999.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
 MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
--- a/app-shells/mksh/mksh-59c.ebuild
+++ b/app-shells/mksh/mksh-59c.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	ECVS_AUTH="ext"
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi

 DESCRIPTION="MirBSD Korn Shell"
--- a/app-shells/pdmenu/Manifest
+++ b/app-shells/pdmenu/Manifest
@ -1,6 +1,4 @@
 AUX pdmenu-impl-dec.patch 400 BLAKE2B b3525ccfd012827225b62ffb1ffd47a5aefc9c2de0ec54e1829e43d067e8e68f46c1527ed6d39cbf9ff0d8ee2d32ea837fe74081f692bbaddc5420473adb6ad1 SHA512 9a676d9384b575466b28ece1ce84d346a6f193288ed686aea94bcebe8f73a0e38723590356cbe822e34644b5b103adab6317b654cfddc961a40b005bc0e0fb0a
 DIST pdmenu-1.3.6.tar.gz 160265 BLAKE2B 7b5a391e4f2ace71bbf7c9a9c184c997a8db91907d61dbcd79cda3112a5e6319942b3dc57bee19701b417a18689f57cb24f03bf38b9fcc064f3412ee175bef95 SHA512 2a930f98f49c3c94687fb403eb186ddc51fec67068c6b4b8dd6694cadb9fefb6802f878efe6e2caed62ddf68aeae36ec80fc9e56ca268021e32dee819f001fb5
-DIST pdmenu_1.3.4.tar.gz 161002 BLAKE2B 51fb2d0384df4b545f908e081e87a1d7414b22a5c1d9e2dffb2ac5f7d4069c7e2e9de8a1bde459a1fed34c8159f37aff8ef20b69e4817e28f9730500b26e654d SHA512 2540b3040a799f4682de1014f8da750501000cef7080ea24b066a7e44971e33452a25e3885849bc47a156727641c4acb8d1268d3c16a2aab2cb37d510f50f3ad
-EBUILD pdmenu-1.3.4-r1.ebuild 1319 BLAKE2B 930a94cf2275468f8ede76876557bcda1de98c20be47fc777b0c022c48176abb19bb029442ce1e65f68a0cafeda94f56bd70c008b17f3806f414993e4522d5eb SHA512 e545a1e6cc7715573d688662ddca2dd52accf003a1bcd74f12f07bab3f3857fac8e88dc61d3078d9e508ab08e584b5a8473e6e57f36c024e2a6af63eabc35daa
 EBUILD pdmenu-1.3.6.ebuild 1256 BLAKE2B 09bf38f56b4fa2da2bbaf321efae6985d60c130189e9b2a39aaa39539cdaa27eed4b7e3f62f0c3c473a342a9318a00f1a1f1d1319a2caa17de0e12cb3d3de405 SHA512 d4efe69f7fd94d7214930295f39f88af289624b31a98ff1db4a14c55e4978f044a15a5f5b05bbe85485c8cb038dc3d70615bdebe8fc1f49ab4587d0c3ac7afb3
 MISC metadata.xml 325 BLAKE2B abee1c792ef8cdafa35208bbf4ed127c4f9a0e1a6920073d445c015d38d00f1fd5fd7c81f10ce35a21892df2db2e06f6d17f5d7a739c0e812ea8110679d79d23 SHA512 6b34b8f7585eb4e22949c55d0204aab8a3843f34b75fe134e202531794b0433b148e128bc447630dad0a6726d037542530b54b4417512525d03c0284435e1e72
--- a/app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild
+++ b/app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A simple console menu program"
-HOMEPAGE="http://joeyh.name/code/pdmenu/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/pdmenu_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="nls gpm examples"
-
-DEPEND="
-	sys-libs/slang
-	gpm? ( sys-libs/gpm )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-impl-dec.patch
-)
-
-DOCS=( doc/ANNOUNCE doc/BUGS doc/TODO )
-
-src_prepare() {
-	default
-	sed \
-		-e 's:\(-o pdmenu\):$(LDFLAGS) \1:g' \
-		-i Makefile || die
-}
-
-src_configure() {
-	append-flags -fcommon
-	CC=$(tc-getCC) econf \
-		$(use_with gpm) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin "${PN}"
-	use examples && dodoc -r examples
-	mv "doc/${PN}.man" "doc/${PN}.1" || die
-	mv "doc/${PN}rc.man" "doc/${PN}rc.5" || die
-	doman "doc/${PN}.1" "doc/${PN}rc.5"
-	einstalldocs
-}
-
-pkg_postinst() {
-	ewarn "Note this part from man page: Security warning! Any exec command"
-	ewarn "that uses the 'edit' flag will be a security hole. The user need"
-	ewarn "only to enter text with a ';' in it, and they can run an"
-	ewarn "arbitrary command after the semicolon!"
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@ -1,5 +1,7 @@
 DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
 DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
+DIST asciidoc-9.0.5.tar.gz 1119318 BLAKE2B 3e5a454f4d47bb3c71e4c180ab05a0d23985473ca83d987435614ddafc9ee0d340a6e6cdafcb7371f719487954233f6d4bae69b4fc7d3818fc1d8e91c94ef36e SHA512 5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3
 EBUILD asciidoc-9.0.2.ebuild 2337 BLAKE2B 19c198213cc90c59641f89cfa9f483b1d5796c2b1e53329ed5a45774607e72cb60dc6a54caab8c32e0061e4d55e9f935dd760cb2106ff7f6cbb063f65aefde73 SHA512 b2491f68d4ebf1fece0af110f465755f8e2bbb97f575923e8f3788f01496a2adb2ec56aa543ef2a2de10bfff3f335fef0b7a2c11b4241cb025b772c31121304a
-EBUILD asciidoc-9.0.4.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
+EBUILD asciidoc-9.0.4.ebuild 2343 BLAKE2B 706bb5b9ff19f325422bcff6a6cea0e0710581332a0209bc781fbf8729e2bec00ccd49f44dd5755de6e3462649f6da69da881234e8ceb31e53b428a52d0c3c77 SHA512 649ca229a78b96d403603fc68e19389717a89e63a05abc3cb407087243d524adc86f26895a59633e0eaa5ae28caacb7cdcaebc9c33453203630e1385013ea298
+EBUILD asciidoc-9.0.5.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
 MISC metadata.xml 435 BLAKE2B c6a62f25ed62fc8bb28f94a51985d44a2b048eed430d1e92670bf257039c15ccf741414f9c64f3a60220217fd8c2e995910c611890664f0118541996d7b9c9d3 SHA512 b18f244fd4bce0103b7a3c6a5d1e063d45fd1f17458d9a8c4cb2b6543bb38d7bb7047105be81b39d309ff0c3d9343e36df44345f31e32c348fc8aff30ef6d837
--- a/app-text/asciidoc/asciidoc-9.0.4.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

--- a/app-text/asciidoc/asciidoc-9.0.5.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.5.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit autotools optfeature python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+	"
+DEPEND="
+	test? (
+		${PYTHON_DEPS}
+		app-text/dvipng
+		app-text/dvisvgm
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
+	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
+	   filters/code/code-filter-readme.txt )
+
+S="${WORKDIR}/${PN}-py3-${PV/_/}"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		asciidoc.py || die
+
+	# enforce usage of the configured version of Python
+	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		emake DESTDIR="${D}" docs
+	fi
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
+	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
+	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "\"graphviz\" filter support" media-gfx/graphviz
+}
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@ -1,3 +1,4 @@
+AUX cmark-0.29.0-python38_tests.patch 1136 BLAKE2B 788a0022fb2d2575ea18133f57863cd8c12958b4fb6f79ea8611c6358ed66531a3b923e9959ff2b29348a2506f5ad7b0fb7a5b4402cb299feb1c6939e1160a62 SHA512 bb07e53f4ead6022863edb738986761a1e7b5184737265166fcee9f9bc00124c71eb49643bcb4ea9d0634c08f1c1ca3916e3a4c76b0f801dd011a184bdc0f39e
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 733 BLAKE2B 368a62d668bad1850d17989fe30d70b9f397d84fb130a9d79a6de63b04f6fbc17eaae99d059ae518e72f96ffb9974b90334dd4c7307dca3e4dde21d89ee1d8de SHA512 3bf8ad975aa548c7fa2fb2e5791af117e8d09d9b5aec53bd698a478520404556f8455b35c613f811ca319bc536aed30a24fc3f9e9671b342196c995f8823f26e
+EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
 MISC metadata.xml 473 BLAKE2B 770f8d92e6aa0ff167733de2877fe1b244cd153875dce9116b361cdb4ee529e54de01f0841af1d1a23b54826786e784097afa993f791515a79c4a1af61b4349a SHA512 a0f0f24ee085d6d49311c08a1cb72f492cb88659a840ffdc2d01576c97b9a56b63beab6fe46a23df5331ce2fc100341283b2cf0bdb18a3861f0953f8c1331c72
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -19,6 +19,10 @@ RESTRICT="!test? ( test )"

 DEPEND="test? ( ${PYTHON_DEPS} )"

+PATCHES=(
+	"${FILESDIR}/${P}-python38_tests.patch"
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
--- a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
+++ b/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
@ -0,0 +1,31 @@
+From 92697d564042d5b914048e087e4274c3c71e0055 Mon Sep 17 00:00:00 2001
+From: Christopher Fujino <christopherfujino@gmail.com>
+Date: Sun, 12 Jul 2020 16:11:42 -0700
+Subject: [PATCH] replace cgi.escape with html.escape (#656)
+
+---
+ test/normalize.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/normalize.py b/test/normalize.py
+index 6073bf01..f8ece18d 100644
+--- a/test/normalize.py
+++ b/test/normalize.py
+@@ -13,7 +13,7 @@ class HTMLParseError(Exception):
+ from html.entities import name2codepoint
+ import sys
+ import re
+-import cgi
+import html
+ 
+ # Normalization code, adapted from
+ # https://github.com/karlcow/markdown-testsuite/
+@@ -66,7 +66,7 @@ def handle_starttag(self, tag, attrs):
+                     self.output += ("=" + '"' +
+                             urllib.quote(urllib.unquote(v), safe='/') + '"')
+                 elif v != None:
+-                    self.output += ("=" + '"' + cgi.escape(v,quote=True) + '"')
+                    self.output += ("=" + '"' + html.escape(v,quote=True) + '"')
+         self.output += ">"
+         self.last_tag = tag
+         self.last = "starttag"
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@ -1,5 +1,6 @@
+AUX diff-pdf-0.4.1-no-poppler-cairo-check.patch 798 BLAKE2B f3932e5e7babd37b0df89f37536b91eee4978b3ac34b8c9e628f0db3f2d0a617f872b137cabc257e6cf470d6b80aade4c835e91310ec84b296d46d24c457f5f3 SHA512 2f4c399e482ace0e00995a732f0489d8b614e31396ed6279b0399e8c009b228386319a611ee52b784ba2313561e7aef27ae5b9090d3fb78fa09660992d483cc8
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
 DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
 EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B 3eef9f78e56f7f0da662a8ad3fb75e8b5683d58c3dcdc6d4df426d78814b834afec798b0189bf22c65da304d5ccfea1afd324d7f066536f0b162f89715af6596 SHA512 5f667ed5f3391c1fd6bbf426d7947b50e5c75ae0aab61dbe20c1c6efd3710b18d9d2a8c1407e657219db6a58b9450542eacd52bbd382361ba7341d99b00ada23
-EBUILD diff-pdf-0.4.1.ebuild 1290 BLAKE2B 6f960173b5b8fc9a853a47fcc356008f2e98e8a3112a4dae7cb71c381fbb2bc2040212e821c668ea31633b14d83d0e93b54ff80c49c4616aed4416e7fdfd9c24 SHA512 85a2da6028e118be3eabc04f7580bf94a6a164d534fc409262f451fff80fe6ecd7a54b1ae7a15eb7bd60c49873014d9a85cf8cd1a5550a01ec559f0f6f9b7bf6
+EBUILD diff-pdf-0.4.1-r2.ebuild 1412 BLAKE2B c8b69c608f797be990cd7ff2bba3d8394efe6a9fcf0824e386d78a65194f37db2002a33f85316dea65263083d6990201a94b32717b0678b98a64c4657d332546 SHA512 bbbf7c920ce7663f518c8f0517c022a58e1d7d2632312d89c9356fb8dc855a4fbc77c98fb766fc2ac2775fddeedee3a1e34e413ee97b34338f52a2d86150b361
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # No EAPI=7 support in wxwidgets.eclass.
-EAPI=6
+EAPI=7

-inherit wxwidgets
+inherit autotools wxwidgets

 DESCRIPTION="A simple tool for visually comparing two PDF files"
 HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
@ -29,11 +29,18 @@ IUSE=""
 DEPEND="app-text/poppler[cairo]
 	dev-libs/glib
 	x11-libs/cairo
-	x11-libs/wxGTK:3.0[X]"
+	x11-libs/wxGTK:3.0-gtk3[X]"
 RDEPEND="${DEPEND}"

+PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	WX_GTK_VER="3.0"
+	WX_GTK_VER="3.0-gtk3"
 	setup-wxwidgets
 	default
 }
--- a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
+++ b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
@ -0,0 +1,24 @@
+From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001
+From: FX Coudert <fxcoudert@gmail.com>
+Date: Sat, 12 Dec 2020 16:18:59 +0100
+Subject: [PATCH] Remove legacy poppler-cairo dependency (#69)
+
+poppler-glib already depended on it, so this is non-breaking,
+and it is removed in poppler 0.18.1.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 382e220..2e9b6e5 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -41,7 +41,7 @@ AC_LANG(C++)
+ dnl === Library checks ===
+ 
+ PKG_CHECK_MODULES(POPPLER,
+-                  [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf])
+                  [poppler-glib >= 0.10 cairo-pdf])
+ 
+ AM_OPTIONS_WXCONFIG
+ AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@ -1,5 +1,5 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee
+EBUILD highlight-3.57-r1.ebuild 2797 BLAKE2B 58e774538015b0a194f6ecc7704b65f33ece3163f3e27d63aa32bdcfd12c3d4a2cce678f723f97e6d77ee73f6465f1e1bf1aff3e1f0ea77bf5e43cac5e03389b SHA512 4799a93b1588e7392f2953579f71ffdadb37e3d5caa8fee686dc2f204d1bdc1cda9c17219eff8c81482925ee2b2a3b0445f45c30cb951323af2b55cbbecb91fc
 EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"

 RDEPEND="
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@ -1,5 +1,5 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
-EBUILD qpdf-10.1.0.ebuild 1312 BLAKE2B 96398fccd57ec2db02a17272edb0b2ae0918ec1dee1f47dd644749c483867ddc32c045144febe40ece9607c2d176f259954f0af2f6d1b022522832aa113bf651 SHA512 dd1b76121976f376b5643ecbede88e977ce03441c5c8cd10a5026ba393a45e51ab1f23c4574a8e1607155c48eb5ebd51194008d87383064ce4ec8b7765f3bf8a
+EBUILD qpdf-10.1.0.ebuild 1311 BLAKE2B ac435cf51da6b724772275ebbe5a3e0421db00b51c9a59741cecdfe40fee0417f10c3b97b55f4fc69a014a68456c5e37cf2eba7e7bfb83ada8b2643f176ca13d SHA512 a3468bda0dac4a01c1c5cef2efad79c4101fc4160022c8cc1a5c14dd5af6c144719369251ef2b38ddb9d9535989996c435ebaebfba1b204b92522f529b67186f
 MISC metadata.xml 394 BLAKE2B 9f082b9d232876cce300488a5e4edd5ac46390af0a5cd21639093571b95ffde9771d74eb1ae664522796f6250c6e9c49e23f5e37e9819454dcd5b99ec97ba798 SHA512 b194bf416b11f76e04f300e0d3b6748302c9cfbda1f949f6caf9da07f297c26edbb65ada5edad820fa16c9fd971ebdc8202ad4f273ae5de3d01136f2cd95f6af
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"

--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@ -17,5 +17,5 @@ DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
 EBUILD xpdf-4.02-r4.ebuild 3649 BLAKE2B 575cdd3db727f7efbe4f6146c5edafcbe763616e480cf28a7a078347e74d6570f817d5fe9db31a770b3dd014c370fa362521d0608e26a94d11b0bd49be8ea02c SHA512 c8b8a71667e9e42c401f74e9b609f867eff1eb0adc629b8ebc9726de389f17873ebdd321a1c0f694b366476deb41e4c907e383668655c490591892ada33ca428
-EBUILD xpdf-4.03.ebuild 3638 BLAKE2B 25f40d78c916934b2870298aa088426db71263f275e78ede3857a00a4f00416776edac90cfc0c097f12dad73a51e9c99f858c5aeebe304df8bf11f91a996baf5 SHA512 189c7435b14e78cb69694069f4a5a347c56260c500620a5b289373ffe7288155575cd812630a604c2a788f2312291bb2d340f5528de5fbfc0bea7f7108e2b56b
+EBUILD xpdf-4.03.ebuild 3637 BLAKE2B c2ff73425db4cd26b2b8b4cc655a074341384e11ff2784a390ef6a4e7e4b38c09f8c5db72c84f60978edca8cf7ea3196230ff77d4a9747ac5db71ae9ff2c738a SHA512 36c8c9ddadca31aa673135c9cf361d9889a2e81a00b3377c5150982919b05dac439cca40d23a9f898bb0317dc5ecb69153abf7330dead28f3cd867734a8f204f
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@ -24,7 +24,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz

 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"

 BDEPEND="
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@ -1,3 +1,5 @@
 DIST barman-2.10.tar.gz 1247335 BLAKE2B 79bfa4ff6ee587464a18c48b9db110fe100b9f5b1439c21b522e7f5a14a520d247023ca893e2920278cb2170e9daa165f4447b4adff3e09d83cf53c2a9d32bc6 SHA512 64e9386603158bfe19723ec273f8fb3e6856d76315a3e3c31ef489fcb8caaa44a019fff6087dd3d8810661ca8c613552680e5a10e9d673ef96962340dd12dd6a
+DIST barman-2.12.tar.gz 1370978 BLAKE2B 2b44e153addab3fca7dbf572b03b2e22fe18f0960d98048aa145c64552a0de4cea977c423c268bfb9b822e44aaead3572ee350053049ab5459cc022d976eb4d0 SHA512 b4b479a03e5b770ba783af1d5645f6be2a19e2427cb58c6d9dfc6389240d4eeeec85401caa59c0d837a70f1cf67c0edbdb1539ecbd2f3de86285a122fc184320
 EBUILD barman-2.10.ebuild 678 BLAKE2B d69e49b5eb7cf4f2d07b628c44616c53cdf0bc28d7698c405421bb1d217bfbcad4cc21c9988032b9d80ca0f77f84689f14ade79c3453d31f0471ff851cb21727 SHA512 aeabd828660aec0563af89aa44d1739eed1c70860833a2284dd324fd64e1ef9330f330bc03dfd0b7d7200f800718342823a57376c482a198bee89696eaf6ce73
-MISC metadata.xml 326 BLAKE2B e34e2bc75606ca796fde6cb82ddcc8993aa093c76a95cd36d1b5ecea0109f301636f5ff5217da2216f029e4891d95a23225f8a5d7ac3fd63c36a3876c70ebd89 SHA512 c0fd87ba5960595461b98161bc9debc37bd5f9665461486845900929854a9b27954020d234688abd9c4589a4066d0185bd11ad53a96551b5399f0025acde4ed1
+EBUILD barman-2.12.ebuild 1073 BLAKE2B 7e9e6d6e804bd7238941caf8edfcb45b18ca8b9d6e4624ca2b0b0e60648f07cd58a7f23a788d517b07afeb1d5460e37106f02ea56b77259dafb92e611edd39ae SHA512 fa1b68478b5942a6172b7c526d3f9bf971ced5d53a96703c945350731e16dd9910d774f514f9dcd933d603068ea3ab2ecdd4f4cdffc0e3b5ee77935c3df23ad9
+MISC metadata.xml 451 BLAKE2B f3a0a41709a89527881547557ae78094174f23499291f5a0509c5b055036847e9299cdb357eba6a5a2ae4c1049d5fb2cdcf1478939213118012c1478d09a90c6 SHA512 62d28dd86e17b41598a8d0c08ca404067ebad8430325e68a993878acc081dd1b5d0b3af04f43eee0de1a4df237a327ece4c18a358e4ae7104a2a0e6d14dbf6c8
--- a/dev-db/barman/barman-2.12.ebuild
+++ b/dev-db/barman/barman-2.12.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+HOMEPAGE="https://www.pgbarman.org https://sourceforge.net/projects/pgbarman/"
+SRC_URI="https://github.com/2ndquadrant-it/barman/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/argh[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	net-misc/rsync
+	dev-db/postgresql[server]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i -e \
+		"s/^    def test_xlog_segment_mask(.*:/    @pytest.mark.xfail(reason='Test fails on Gentoo')\n\0/" \
+		tests/test_xlog.py || die
+}
--- a/dev-db/barman/metadata.xml
+++ b/dev-db/barman/metadata.xml
@ -6,6 +6,8 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">downloads</remote-id>
+		<remote-id type="github">2ndquadrant-it/barman</remote-id>
+		<remote-id type="sourceforge">pgbarman</remote-id>
+		<bugs-to>https://sourceforge.net/p/pgbarman/tickets/</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@ -0,0 +1,3 @@
+DIST citus-9.5.2.tar.gz 4714211 BLAKE2B b8e9d862b5ea8cb77202632ddac1b20d521b82d512c424f093e41bca146630197fd57c6986660a7d3fd98b67fefac0255184bc83ac1c6ef4242b67bda28cbe69 SHA512 db114053419f9b268ad45a3bbebc58ba5aec0925737840c4389c5ebf23bef9a26ce8c132a4a88cf06fa54cab926172cc283a12acc2c09bd888b55a9a4c0472a3
+EBUILD citus-9.5.2.ebuild 545 BLAKE2B a55e994a95d3dc45985461843c8b69372835fa47cd1721cd580c9bcfda147ff5a5d69336b2e34cb487d92bebca583fe007255e0895cb6a253b0ab0c0c53d1df3 SHA512 4d38ab59fda3a078faabd49e22f36d1f9d449e730f82fd71e63ddce161c7af402edf7dc5a67d3aa08eebf0076d7f829ede2f2959a8b82bbbd1c0a91d7b1cc893
+MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
--- a/dev-db/citus/citus-9.5.2.ebuild
+++ b/dev-db/citus/citus-9.5.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
--- a/dev-db/citus/metadata.xml
+++ b/dev-db/citus/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="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@ -0,0 +1,3 @@
+DIST timescaledb-2.0.1.tar.gz 2226320 BLAKE2B 0bd5011e30d6c0d5ac11b78ddf6650044f35d720317213bd0437a43e0421953708d3d69b6933a821d255b183bb72b1c5e34ff88223790266daf7af3cf21f2de2 SHA512 84e9c7da3f0fc6740eb0555bbd92f5511ceef4868fb1952650f9499f3054a4d2be59b3a042b17bf655155c9f9c1de82b6b4fb302bdad7ffbe893ed901adcefc0
+EBUILD timescaledb-2.0.1-r1.ebuild 1393 BLAKE2B d23f9c7b23f30ea412537613ebc3d22222ed9d729330edf7c236217f7f8f5063fcadf0ffdcee33af357fe4b77e5bc7fa5012ca4d209480292dd32430ecadbbe6 SHA512 786ad20862721c71d7a90a1fcb5ac3e46fd0d6238e03544f53cbbd6db04c84f84b90c5306552ff55ddf848e4e955836b0120ba189c32dd33ed3393c4dc896c4a
+MISC metadata.xml 423 BLAKE2B a3a3492702b7cb6926726e2bc423baa3f9cedd29dd4c22d40d3e3b04e2513bd0a98cd003fcec34f6df4e0e01e653ecc550f38c8869f170bd8fbc08897ccd025c SHA512 cf01e5ba26d38251ef1fabdbf01f3190a077ba000b36682cc49c93b1f5149d1812e3e3a1dc659fa6e9acc39bcfc0dba2effd6588ef50e8d7834b4c68d7016801
--- a/dev-db/timescaledb/metadata.xml
+++ b/dev-db/timescaledb/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<use>
+		<flag name="proprietary-extensions">
+			Enable proprietary features/extensions licensed under the TimeScale License
+		</flag>
+	</use>
+</pkgmetadata>
--- a/dev-db/timescaledb/timescaledb-2.0.1-r1.ebuild
+++ b/dev-db/timescaledb/timescaledb-2.0.1-r1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 )
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="proprietary-extensions"
+LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD=yes
+BUILD_DIR=${WORKDIR}/${P}
+
+src_prepare() {
+	postgres-multi_src_prepare
+	postgres-multi_foreach cmake_src_prepare
+}
+
+timescale_configure() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
+
+	# licensing is tied to features, this useflag disables the non-apache2 licensed bits
+	if ! use proprietary-extensions ; then
+		mycmakeargs+=("-DAPACHE_ONLY=ON")
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_compile
+}
+
+src_compile() {
+	postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_install
+}
+
+src_install() {
+	postgres-multi_foreach timescale_src_install
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/Show More
+++ b/Show More