gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /sys-apps
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
120 files changed, 778 insertions, 1199 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0b931f0728d7..e36eaff012c2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 011df9073d0f..51d0503e75aa 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,7 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
 DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
+DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
 EBUILD acl-2.2.53-r1.ebuild 1388 BLAKE2B bb54a8d13adcdbc8c349501a314f08dcbbcc88ba35c511ed9d000f34495652474fa021e4eecbae1dd77a5b7ac6a04fbdc008aa07207dc79a216ab1518fb240e5 SHA512 ef48ffdf0891f550ae6b86d5b81cc00436ca791fb5583d976e6bad502e6a410498f468526fddf69ff1ec58db3c8c32e1803fe9d2ab2333dc983e6eec70cc0e53
 EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
+EBUILD acl-2.3.1.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild
new file mode 100644
index 000000000000..b802802db8a9
--- /dev/null
+++ b/sys-apps/acl/acl-2.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="access control list utilities, libraries and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# filter out -flto flags as they break getfacl/setfacl binaries
+	# (bug #667372)
+	filter-flags -flto*
+}
+
+src_prepare() {
+	default
+	elibtoolize #580792
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable static-libs static)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# Tests call native binaries with an LD_PRELOAD wrapper
+	# https://bugs.gentoo.org/772356
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	default
+
+	# move shared libs to /
+	gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index d7b03d001324..6c58b0840e1e 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -3,8 +3,10 @@ AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45b
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
 DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
+DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b
 EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa
 EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
 EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
+EBUILD attr-2.5.1.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
 EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
new file mode 100644
index 000000000000..7465baca96b8
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize #580792
+	fi
+}
+
+src_configure() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+	append-ldflags "-Wl,--no-gc-sections" #700116
+	tc-ld-disable-gold #644048
+	append-lfs-flags #760857
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Sanity check until we track down why this is happening. #644048
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$($(tc-getREADELF) -V "${lib}")
+		local symbols=$($(tc-getREADELF) -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
+	if multilib_is_native_abi; then
+		# we install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 4f9d3822fd81..99a501e9fa9c 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -1,45 +1,30 @@
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
-DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
-DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 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.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
-DIST bat-0.15.4.tar.gz 1021888 BLAKE2B 88ebac97807a81a2734325c4d1d86bd3d340572850ba9ff61fb23c8c6a1f902f95be04388e38c862b48b792df71fce2f97e97ca1041c3664868cd147b3b60a0e SHA512 f4338799047c1169c759a0ddf61481972d53103c5e29374ec2fb7bf814458ff6b724aacd551264ad7fc5e135c1e4484a38e391e046e76e113d404a92442db538
 DIST bat-0.17.1.tar.gz 1302347 BLAKE2B b46fdbf088d9033ae3e34155a774d3436ab0753ccfb5a8128aee2e6d5859a38cca27f5a01fa4146a0e8a17ecd66274a352ccdfb9111b4d169cb48edf5e62f732 SHA512 22222bb19cfa0804165d599e491fe2b1ad9220c5ea79c0cccd3292edca024963d6dc435c576bac19214849a1ffcc2b826488c6995758c4773af64ef945c2e460
-DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
 DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
-DIST bit-set-0.5.1.crate 14125 BLAKE2B 570b78834400bd6d69b2ad4a3a77766941503fceee069f9b616eab00fe7aff40fb25fc44b1f6506997bd655511c3e941afb0f9bf220b414e4e8cb8a6de4e93da SHA512 1b58b9a1e6dc33483f302415e0a77544dab288c819ed5d899f6ef3969750a17227c5aeb1b563aef41e77e06e665cfa995e358a566f5783a2d3af0087d5fc65c1
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
-DIST bit-vec-0.5.1.crate 18765 BLAKE2B 17d08d7813893a02a588197f84d9c5bbce574f77150d018889f690902691d83bd42eed4ca9b968789915d09c84e32147b1631ca6323a9fbfd328f6734196c5dc SHA512 c0d57ec2c07ea660919ab7e17881b544496de0d6ee51cc8008b7da0bb39a2dd1ca680cc07051e007d6efaa91b25335e13a799e11a7a9d9a8084cc47525742cc7
 DIST bit-vec-0.6.2.crate 19630 BLAKE2B 84580a6f99393e507f3fd76b543fd357fc018745e029ebb6b3e71ac3b91b6f760a0474b4d90506e36581ec432ad336be6dc67c07be206917ba2af2322e15b867 SHA512 27cafa198a55853585d76c89490878c43bccdb0fe7dd68b0b4809497be2d497056e7ca6fbef321d71dfbe18272a2571b33d79e2a1458891a420eb7a1910ff383
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
-DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90
 DIST cc-1.0.60.crate 53351 BLAKE2B 95fec29226818496e56c132d45eaf728df17f3ab1b939842dc228febe7bdfabc9b0b407fab65a6a7d308a1e57a40702a2810516882f712319de119ca7cad4b52 SHA512 3aaeb5f6b0fed31dd65f8c884252d8a6f8f79cd801edf7626aebf4f2843a414cf45ec72b4d6f88f9e9fdd959e0547b9ee5da817b7c34235196113cdbe915b888
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clircle-0.1.3.crate 8026 BLAKE2B 33c18a0f9ed204597fad1720b8e361ca4d1beb2dc2db82eb0fe6632ea7fd1213ca55d5fb88f84c099aacb8c14dd2468f07d9563512b8ef4e1c2fe38b6590bc86 SHA512 1a51fd8a35b4179748d654916e0713c31dde2a96627c08a82cadcc05dcf816f8266ccd4fe75af2532dcb92dcd0043942c2150c76264a39760cc2d4e8e5455836
-DIST console-0.11.2.crate 20816 BLAKE2B 4e2c92739fee932e31b28948fa982c1d5feb2c0f590495fcb22ea07d2f88422f475f54b47273bb33556b595e12410ec9592e861e86df9e27466518b15cd4ba26 SHA512 d3f51204654289c59f310730cd1968f6f628cfc7c557f1d645940e78f3831b24b1cc142ac904b5f98ee5dbbbdf51bc91e4914cb203054128e9aeacfb16a1d6e5
 DIST console-0.13.0.crate 22451 BLAKE2B a02b87a53b5f6e3adc88b0369e9e5b786fb60741263d5441752c51164562704d93c8954ecabc2ddf7a999139aa236cfbb0e9b8baa27901837f731591636044a8 SHA512 b687031ebfec1ee705c47e147239b602ffc147eec021ce7c9a4f400db7e3e0b1cf124b4c1664f9ffd1f3719f13a5d65c67bb15146bf42dccc5733373bd10b20c
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
@@ -47,14 +32,10 @@ DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fc
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
-DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
-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 doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST dtoa-0.4.5.crate 14840 BLAKE2B d6e46d8d53baf565931d0796cdebd030a0f6fae8c6b88f738b7dd00db35bdb130a2b3778192e90fcf06183e706db7c30cc3e2b05909dabc04472e3f6ca9fca7a SHA512 7f9cd7d2e8f143c81896f8a242b09de3384d9dd6c375659a48b4e4f0506b2eb642c8aba6d500a989668760458861f2249bd82f5f3d6fa22d0ffb68e508d059c0
 DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
-DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
 DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2
@@ -63,181 +44,107 @@ DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170eda
 DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a
 DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d
 DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
-DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
-DIST fancy-regex-0.3.3.crate 63336 BLAKE2B 365bcc78e68aa5e5c61f76695c93178892137ebcea24e63c74baad2ed2b9bcf928ec82a1a058aba1eb837cb69805dcb44652ba62e4b0cfcad40bb5eac85e92da SHA512 6451ee6a994f29c1e10341de80e17b9c208b62bf1ebbe3cb90fd850cf03e4b43f3cbf9635357448d5eb29b98291b3aa6c564dedf28299e985a120f1ee7424d5c
 DIST fancy-regex-0.3.5.crate 64304 BLAKE2B b0da0024bd7dba0a574109859984919102d02044ed7c389a3ba1f10aceaf5fc908094e865eee829a1ad65de6f0d9a6d8c1bf59091d35bf8637ef7c55f21bb593 SHA512 0edf91221f7088719607492accb71158d7ff445a2893eec90fef402df30ded30fdf388fe05f0d334577b642d5c5b724bc4a1724359dc4738c9bc34823dbe33f2
-DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST flate2-1.0.18.crate 74164 BLAKE2B 7defdf3f084f18c9e7776edda9bb3cea5692de0d9d2d006bcba0895ae3555f4ca006c76733175e4982932c67e6c65fd59b21275f19572e23dc2eed8f331eafbd SHA512 3695e7de578da3bc935988fdc67b22ded26f00bcae6818eaa6313c47628a19b66ad589b06e164ddc4c30c49eeec2011e41031287071a43460a8c5bf8e7cb5cef
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
-DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST git2-0.13.12.crate 175580 BLAKE2B 18321da8e89b18dbec31bbee75cd779994363ff6e9f2dd15e6d85b301e495d769fd66ba4dc4ee5edd9c806d8acad94336e403899f2da147430c89cc984ab03c1 SHA512 aab4564c385e378d5df34b8b8aab12107bc9e4b3b1cec1b5206e32fe72fbd0a7a2fd4c40d0ce75deed6ee9a51edb0383f26af2a53e59a5384c74dac4162f312b
-DIST git2-0.13.5.crate 166321 BLAKE2B da23d425d90e117c226509ca3d5247db0ec395808e741cdca24506ea2daff95916ba28581055a1b628c12cb92bb72e1baf45f777e2e5c5f191309f90aa8e838a SHA512 a1833899e8391ae81a91786e7e57382efe86c77929ed334c51071c3710c3572912e62b14dd0c64c688b74f0366d074aee705702fac8437019312d663ea238c86
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST hermit-abi-0.1.11.crate 9203 BLAKE2B ff6f5325f9439979db9b592a4465f343399991e7ec6f0f38a5ab8e1621d83b1b8e9f46b3ac4b6a76f22364367546dd6fd8edb87556eca4c690f93ea9d09126e4 SHA512 b44fbe8d7674dc5a610da9d2c58baede69f7b942e08c214131a449483bd41afd0d221be2eed8ce8d71581be066b1717ee6d80876c7621a10391199fbb79ef1fd
 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
-DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
-DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
 DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
-DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
-DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST kstring-0.1.0.crate 12465 BLAKE2B 8c004826a246e982e5e62ac300a056897d07f543d6db710e276cc0a41e62ea3ea64cd6d02cb08693a7c649be8f9eee7bd0f0b7402b8a2cce6f039d7959f06fe8 SHA512 65529fe62435a77504d38e1bbb5be911ff350c445cc568947aa9e1da254655eb0e3b5d38ef351d4b331bb9c97917a6b4b2bdeed153a9cbbd1760c47fd7bd0206
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
 DIST libc-0.2.78.crate 508428 BLAKE2B 0bb5545c24cc14f8831edd69785e43f169afdbe0343d480a76d4784b1784a68ab26e7d049418cb09643af61cac47a6d19f7658227e5e23c195389bb915e3651e SHA512 91cb2cd8541082822480e248c373f3320bca99483174aef295b373e6d051190bc5b100350cf680e1d48bda442b3e450741314dd9cf4f8536adbd2c6d7e869cd4
 DIST libgit2-sys-0.12.14+1.1.0.crate 1603930 BLAKE2B 8fd9366e09a8d6ab9f3df865aea3d9ecd43e4c2a339597c939a09cc36c28146e6ca6cd94656a9d17519b008fe65bbf6901ed639308b857a68977de4695f477e5 SHA512 d0fe6243b07c0d0711e832f4efdd69701c27fafb7df82d6010f24f79393c80bff3fc5639707863f2a8073c57bbc9fdfa0eab32c64eb053799c1c1e08de5c9854
-DIST libgit2-sys-0.12.5+1.0.0.crate 1549598 BLAKE2B 62c018ebe05a525cf138f7c412f34d38d273b6a9d38dc18af836fe8ec013a7dfcaa3b11c5b619df33028b784ec393ecd5f1867b585c8acd063771915de77fd64 SHA512 7c6b9aa2294bd9ab752ed44d4735af7741b9d16a2e84736c21543b842b25278909dbb434fe59c83d4e8b705f7d4e21c172fa5359805522a0950d95f5249bdf6e
-DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
-DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
-DIST liquid-0.20.0.crate 53764 BLAKE2B be3f7e48985cfce462cb809a31e24e92e4f7ce69aa1f023debfcf4eef276907a07a6b2d56ff8e95ace041efdd161cf1214d6ada495047bbc45dd517ba6d3d605 SHA512 38c51b04d5d5c25753bb26ada44dd667d3d9fc62bf8100e2ffb88370cbe3863fad8cf9d2543fd7e5fab079afb798bf32ed784e21dafa1c4c7faa5ef8b5b10136
-DIST liquid-core-0.20.0.crate 52462 BLAKE2B f2033aa5e573b764ecf3af3d74348723e4a017a6a3b1fea4261d2d51352f515cf2558db1e62493f7cef8fbb53e6a9ee2c5177b66a079da5d5c026d78295a8d83 SHA512 46bcc6742c871ed69337b6e4c38872ac745ea243195f9bfa9ca412974e03e704dd367bf89f935817d90b0bb2e945f88b4678d5ee6546aae39c56e94d7966c745
-DIST liquid-derive-0.20.0.crate 19587 BLAKE2B 12de1c4c3c599926d7972e60dc40dbb2c1f3dd233413198ab2281f07a9b0337d3ddf3c527aa90162eb33fc07a54ac22f6c25c903cc43764d0e2e457f2ae7f4b2 SHA512 7b9546251eb539aa47e29fdc206c3517c7e989190fe9e45f1b1b216b3a273476034712400cb836a77b355ebaec742184cf8fd425b96636aa3c97193dbed25234
-DIST liquid-lib-0.20.0.crate 37174 BLAKE2B 977faa3272a14260cd9a2f9503c4f0c08a929c2f0f030844927c75cbb9289948d0197459adb5bd73b1196c9ff604c08078b9d5e0a1d2f041304926e75cbf123b SHA512 ca99b787ca70f665d2982dae3425483235aab43c345300d25a3664bf130fd59b364d522488e6460d6e21b97d49a00c64e6ccb551ffcaf58d0aba295c992695e1
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
 DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c
 DIST nix-0.19.0.crate 212652 BLAKE2B a9d3f87fac9591111e1977b9d8cc38d57b560ddd3cf27ce06342c97e10113c8a8e548096d537577267152467883e9ae82618b24b02b2ee355a8689f7147335aa SHA512 db31253c4520448156be3b3e8eb234236a33012b2933710d772f19a14ee83c856f5426057e2f8b87e19fb52d18302d1f8345036ed5dcb7f10e6e961d8e6cf238
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
-DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
-DIST once_cell-1.3.1.crate 23800 BLAKE2B 0dbb0d62ef11454bf8e6e56ab213d3abbe112e1a00d3b82af77e381f01818e7ca293fd2bd95dc12f887d3e5a4425546c40f4c062a349ef99ac3b7c0dc94254c0 SHA512 2e326096216f2b02a922cd2b16e6cd444b9b34ce46d8f77197bcc5e0988f7d4db8f2bf56bdef8daf0a8c9af7e93100f9a46bb434975ea7d4732e3ef5ff561a92
-DIST onig-6.0.0.crate 30200 BLAKE2B 9e9ea6ff6345db408a09ee78e57acf12ba698bdd90c8a41c7c9a9e17df048570f6241de2ec3be8fcea661be66665a3ad70526e24113b09ee97d87700b1eed782 SHA512 f5ab1586c23a96b813300d0478c6f4d401f3a6e44c562f72cc251225374811d3d89ec77b2660a10b5b52d71e4c1656f1f9fb9ab640d227af308401162663be69
 DIST onig-6.1.0.crate 30287 BLAKE2B 1b8b4539432ddf128381212fe9fb705fc2e9ca366b09bc7e2d109486a95e3f51e29c81c879fd45f3986b05a73dee42d8e9cc86f732de0ce73371f123722b8f65 SHA512 8f08ddbb48ea0e75a8dd8d788dfcc6f88773c5cb44a93f42df8b32bcef8279e6d8280314a096950aa5cfeef17c881b509d5136de69fd805604a0ebce69921475
-DIST onig_sys-69.5.0.crate 614674 BLAKE2B 3f98097a709b1e95e84404b81ea104a4800e0b9f0713e988c6417c36e578b8148a8b5bb8c6dacd2d59d760ed79d8cf1f93f2ae2cec7ee8abfcb607e5dbb92538 SHA512 644019ca67a89790bab5cb173f5499bf3b0af5a4c39e027e79a63e5752f471c6bff86f679e1c86502b6c3cf795c23cd461a87c36b2eb687dfe21e9d232bcb7ac
 DIST onig_sys-69.5.1.crate 615126 BLAKE2B 964ddfffb677a8dd384a0ba5cf2096fb931eb73f48fd1f1ed6767402dd186343a83d68c06f834bd279e929121ead39a8860644dcffda08c52cf627e84c2682b6 SHA512 d85005612206a383af1a00ea508d076d27e31109659a9741e55deaa8423aa649a90af6cdaead67143943f3f9e1db212d5a88597b600a116067f7a5d855a9a379
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST path_abs-0.5.0.crate 31108 BLAKE2B 5c6d52f445ffa2f1e87e5ee078b79bcc9dc709fa97a4246759ae1ca476842d87943610ea441b504212bbd9d5f23dcf9482d747294722df7dbdcd93ee187fba75 SHA512 978a3a4d769ebf870ac619f10615cc2375f740b6d329f89bf9af26dcf3e361b4779e95483b4ae11d3ab4440dd6392f7cf9fd5a94dcfd434f9a77a8cb880bf2e1
-DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
-DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.18.crate 14674 BLAKE2B a03292e97a195f8eef0cb74f2f640193b2045846b7d79a898927d6b6849b65a7e6bbd45fcd4103d3152e64c6f9c0316f2abf1c86a8a24c0467564894e1d45b54 SHA512 b4cae39a11bb80f6df96262ed77844270c0a02793ace5dd255820e9ce52a5f3a43b36bd6296ab9428253e96f9b991bb6a7090d7b749db1ecb0b03aa721813d8a
 DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
-DIST predicates-1.0.4.crate 26239 BLAKE2B 12ca05a2d98f9a4b6ad5442cdd8c5f5bd90a691d5f9c61389d710a7dcc88998b251252b9dcee4f4d8f742e1e4c00b25ceda57e39fc23b431fa7f04b2d7e64bfb SHA512 20f2ae6853e665b262651d4a2bf1fb70f4ee8e536f4fef2de79225fae44a4f32b4680f06f06523675e5af23e301ff58b0cde3e61c0e58c27e412d2eeec96fc35
 DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
-DIST proc-macro-hack-0.5.15.crate 12806 BLAKE2B 7c6beaad31a2da23028e0a5517737fd9d8f8c81894c4aa09f15e7d323cfc6ee27ad69c5797843d05b360466e46d2e339b4c0b2a03f6a0d3e3bb2114db8c192b1 SHA512 a49115f1271c6a9df57fbfa647b725f84dcf87c6c3894c35d878a13fa5981c790de16f02823c2ea1b07da5fcde85e9b13398e7317aecb4119b80a4ced5dcf59b
-DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST proc-quote-0.3.2.crate 17160 BLAKE2B 30034393cff6aced46d11b6b651b3fe02e73262c8c52760513a344b5f928e9e5869865681232d87d7fbd37c65359fe4a52b602ae309c75a893f7e586a88bbd12 SHA512 96946b74e3a0ec0572ca178a5651ca7eacc9df55abbf0d7688af6e7d0be2b6738a19d53a2b9368d5d7e50522f5e9551728b82661815c872823b53a9868da70d8
-DIST proc-quote-impl-0.3.2.crate 8920 BLAKE2B 5a7932f3070f07514172c2ad9d5780c3c74d551cff7a8bbe5bba9557d1ee0a2d6d8d392ffdf3240248f3ed911fafcdea8dd2565d0f5f321f2c1b56f0154b458a SHA512 59c5205ee9bda70a5a449fb2deebae27805ccfa3300ad59053acd26f8f39a5615bebe3140aaeb625c1c84747e8cdca67178b8bbc9152a3347240e0b335779feb
-DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-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.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
-DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-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 ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
 DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
-DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
 DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
-DIST serde_json-1.0.51.crate 72691 BLAKE2B 7f17bd47618009a3e6f7fcabe623c476bd40a0fc92be0c736f5b367914f14a923a5ff8cc6183081e6b0957ef3c61451fbc22c15bc6b6f9de63454c2f4aecfb45 SHA512 0e9e1be1e1c7ef6af2b2b374df6680ccdce149ee7c0641cb518c678b06d72a335321dd857bb1dc64561c3cb090cc1388c7a016fe4cda66da1f1a19e338c1a470
 DIST serde_json-1.0.58.crate 114933 BLAKE2B eda53fe830e539b760ad968191077aab05512f33d613796856cd3df7cd7ce21e9b704f30a6748e9622bd47e9c0c69310edc12bbb1dbe90547eb3b7b97b93a475 SHA512 377a067b1aad851fe7056c080b7a3d07cf6d2c75122766f25b2bf30d6023e70a6f7b5211200019983bfb1f0ac9cf09da4a8c74aef45c819a785818a6ce33ca0a
-DIST serde_yaml-0.8.12.crate 35916 BLAKE2B 6a2cee8a83219dd804d1b8bdeeb8c7b14b6989a849c6707a56fd14c65099a4f67b0a9c0e5f85a6cc97d90abada3d736a18a022a8522aab6c7e6987f5accb43ec SHA512 53cc9327e2baed3583497922dd20870c570de2be20074a537d703d17d7038e2826bf4b5ebf6daa8f451204d07453dff05e931a66670b19910b2d04385229fb1f
 DIST serde_yaml-0.8.14.crate 37928 BLAKE2B 58b5fe3678e022667696811fb0979081e50727f6efb288f97510eecacf86ad0ad1c6ae98a3916df574cfa73c9825414623f0a75e623e149048adf94369560c08 SHA512 de4b18f1e9bda434b93b32c8b3c8135ec3163ebf6f734920dc88c8736e40c05dd75f314d730c5c0c92eb259b85c5fa9263f5d0f3e78a7e214a9258e28c5ec06a
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
-DIST smallvec-1.3.0.crate 23930 BLAKE2B 3eac4d03ad4a6e111587bce612bcc540a619fc2f68a384a2e0aa0b52e8034a8738f6b56607c3457cb34593a701da2f3b3ff8afb523af050c38b732299fbea224 SHA512 3cb400f5f2e2a8619d6adb6b65e5b8515acddfb686c2545f66432ef279bca147cf4c55b09893a82bcb7f9f91c7c2b7099fa707da8939b1ac4a6b92326e7bb806
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
 DIST syn-1.0.42.crate 225244 BLAKE2B 814e7f8fcef54ffb87710fb271bf711b7d463d75e10cd0a686097d73d49767fbfdf3d84a09bc64b520d243db1b0be367ceb5900812a987fba48abec597ac629d SHA512 c758c4175fc9e48418224a02142f045eb0fcbb9ca6732a9ac36c55f075ec70268cc729f6b8002238d6c79a8ac4c3a9ef8c3ff69f78db9434fc9866152a2932eb
-DIST syntect-4.2.0.crate 750573 BLAKE2B a526ab895803a9779c08021cef315cf457aea88193cdfb5f5cf8eef45a02651e3847467e7e51d0b50d098098d8ee59e82079b8488589ef80a7f999b9d28498d7 SHA512 d2dcf5444b739b6f4466aa40c0f061573d89d639ab1c759a4bd0e1d5eaab706794e8f510e70dd146e4212617fa16c0cc1745e98323e65baa699b79ef37040df6
 DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
-DIST terminal_size-0.1.12.crate 8111 BLAKE2B a5b43c7fe8a3e13e49d7c9e787fc712f51313ea09648e474ac6eee4c0eceda346f5bd85ad69bac1eda67d6713d6d34230398a7b6b008cc3b58ee6d4d6b096bcd SHA512 6f0060529cda5a891a861566d22b0c3a17a702fccd8191387ec7e463bcd05cc88a80d889eb146ef704b6bc50c7b136d340b44897a300d6ef6269dd4b83837b5d
 DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
-DIST termios-0.3.2.crate 16545 BLAKE2B a42ef0fdfe6d55784f628d6f39813a5fa02578c09c699cbad104d34e494e8b58d10ef411ac53cd1cd00203437063a0e1871dfa4dbed1e02c8b07379affa8258d SHA512 d672f0bf950da913ac94f94b01d1dc15f29064fc9ae8a0ccf09d399bfabc61c6906f255f60dfbd6b83a8493ac23f9f7c82a5852f854c498eddab1a04a48a4907
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 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 url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
 DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
-DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
-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 version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wild-2.0.3.crate 7059 BLAKE2B b4dfafc1a83bb6ae06f6f76a24cb7f2fd8b583ff6225b3ee05b6011ceb407bef48e62ec3b8562936cac884a1d7363751e75a5b754d6d7da1441877ce755f59d4 SHA512 e477b3701027ef6099c08f1b085b3e012debbf6688b249511108246792ba76b5462f581fdf2a6298a6fbcf4d34beccd14619031983ee0a83871d150ea434cd5c
 DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 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 xml-rs-0.8.2.crate 52353 BLAKE2B e5f041831d7e15459704e031b22b018c82aa214c0d3041639aceca53661536d71f33f2ae254a6376f683fafea351e34e274190a8abfa57cde778acd35ca305b9 SHA512 b98dcb7e9293b372ab61739ea5c82782f4b8dab87c9f3de24fb2c98b87399c6990d77cff87921c4c5b3e072b79a3c5ebd9088d0476d19956b4771e879f575dd3
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
-DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
-EBUILD bat-0.15.4.ebuild 3975 BLAKE2B 1f53e7236725360091e06e9568a0b00f4e5193c7842ad4fe1929feb0021cd1c3f24dada83504b97d149517687802b33feb8760159a8f9f7f93127ffed69452e7 SHA512 301acd3940aad422b93aaae0cc7f6695cc7e6fcf3d93b70a40141c7e4e4000ca0dc40ff8e23dde4424b2f08b79e841e66e728677bf62fadbd5962685b38b30a7
 EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
-EBUILD bat-0.17.1.ebuild 3817 BLAKE2B 2b07c6231ec1cf4380875f5b8384fc357fc24be96d3f2545d60f5ba189b2414e35a666d70173f10fb8e88b760b8482a0f9e5134a806a853dd2571fa571c2612f SHA512 444fe3586c0f429fb26c87cb495c1dcde535f52257363fcfc0081277d06fecbe3fb7ce998b20eca164758aa73f30f29f9081f34e621e5049c50d80ff23677477
-MISC metadata.xml 818 BLAKE2B a006c6a94fd0c73b87ec6395c42e29e0b6986224606ee98d1eb058b22bb7530048035fbad80f58696d651e4192bcd0c841610011390a7e043a425520b92a9df8 SHA512 0f74f00f4e135e8daaa1744b3d3c7b05d1d5b8c1bc1a6bdeb72d9a7375c5ec2a15be332489ba8d9f7bb24d3d2c695ed592407b672990e58a762bf754780a100e
+MISC metadata.xml 848 BLAKE2B 35d6b7cb58f7d60d0eabad8a89903ede1284020715b5cd4afe741ca1e1c380c66e206cfb585a83ece10cf50d654098808bcb192d8a83fac142c90ed24e91d8b7 SHA512 181456aed79f1ecaa7d68cebf7763509ab1aee0decd73d976316720dd75b8a416ffbd42375f7c63309bb84a21aac8fa1c4ea4d0d2257b3edac847e681df7afeb
diff --git a/sys-apps/bat/bat-0.15.4.ebuild b/sys-apps/bat/bat-0.15.4.ebuild
deleted file mode 100644
index 864ac40b0ab1..000000000000
--- a/sys-apps/bat/bat-0.15.4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler32-1.0.4
-aho-corasick-0.7.10
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-anymap-0.12.1
-arrayref-0.3.6
-arrayvec-0.5.1
-assert_cmd-1.0.1
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-base64-0.12.1
-bincode-1.2.1
-bit-set-0.5.1
-bit-vec-0.5.1
-bitflags-1.2.1
-blake2b_simd-0.5.10
-block-buffer-0.7.3
-block-padding-0.1.5
-bstr-0.2.12
-byte-tools-0.3.1
-byteorder-1.3.4
-cc-1.0.52
-cfg-if-0.1.10
-chrono-0.4.11
-clap-2.33.0
-console-0.11.2
-constant_time_eq-0.1.5
-content_inspector-0.2.4
-crc32fast-1.2.0
-crossbeam-utils-0.7.2
-difference-2.0.0
-digest-0.8.1
-dirs-2.0.2
-dirs-sys-0.3.4
-doc-comment-0.3.3
-dtoa-0.4.5
-either-1.5.3
-encode_unicode-0.3.6
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding-index-tradchinese-1.20141219.5
-encoding_index_tests-0.1.4
-error-chain-0.12.2
-fake-simd-0.1.2
-fancy-regex-0.3.3
-flate2-1.0.14
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-generic-array-0.12.3
-getrandom-0.1.14
-git2-0.13.5
-glob-0.3.0
-globset-0.4.5
-hermit-abi-0.1.11
-idna-0.1.5
-idna-0.2.0
-indexmap-1.3.2
-itertools-0.8.2
-itoa-0.4.5
-jobserver-0.1.21
-kernel32-sys-0.2.2
-kstring-0.1.0
-lazy_static-1.4.0
-lazycell-1.2.1
-libc-0.2.69
-libgit2-sys-0.12.5+1.0.0
-libz-sys-1.0.25
-line-wrap-0.1.1
-linked-hash-map-0.5.2
-liquid-0.20.0
-liquid-core-0.20.0
-liquid-derive-0.20.0
-liquid-lib-0.20.0
-log-0.4.8
-maplit-1.0.2
-matches-0.1.8
-memchr-2.3.3
-miniz_oxide-0.3.6
-num-integer-0.1.42
-num-traits-0.2.11
-once_cell-1.3.1
-onig-6.0.0
-onig_sys-69.5.0
-opaque-debug-0.2.3
-path_abs-0.5.0
-percent-encoding-1.0.1
-percent-encoding-2.1.0
-pest-2.1.3
-pest_derive-2.1.0
-pest_generator-2.1.3
-pest_meta-2.1.3
-pkg-config-0.3.17
-plist-1.0.0
-predicates-1.0.4
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro-hack-0.5.15
-proc-macro2-1.0.10
-proc-quote-0.3.2
-proc-quote-impl-0.3.2
-quote-1.0.3
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.2
-rdrand-0.4.0
-redox_syscall-0.1.56
-redox_users-0.3.4
-regex-1.3.7
-regex-syntax-0.6.17
-remove_dir_all-0.5.2
-rust-argon2-0.7.0
-ryu-1.0.3
-safemem-0.3.3
-same-file-1.0.6
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.110
-serde_derive-1.0.110
-serde_json-1.0.51
-serde_yaml-0.8.12
-sha-1-0.8.2
-shell-words-1.0.0
-smallvec-1.3.0
-std_prelude-0.2.12
-strsim-0.8.0
-syn-1.0.17
-syntect-4.2.0
-tempdir-0.3.7
-term_size-0.3.1
-terminal_size-0.1.12
-termios-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-time-0.1.43
-treeline-0.1.0
-typenum-1.12.0
-ucd-trie-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.12
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-url-1.7.2
-url-2.1.1
-vcpkg-0.2.8
-vec_map-0.8.1
-version_check-0.9.1
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-wild-2.0.3
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.8.2
-yaml-rust-0.4.3
-"
-
-inherit cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	>=dev-libs/libgit2-0.99:=
-	dev-libs/oniguruma:=
-	sys-libs/zlib:=
-"
-
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doman target/release/build/bat-*/out/assets/manual/bat.1
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins target/release/build/bat-*/out/assets/completions/bat.fish
-}
diff --git a/sys-apps/bat/bat-0.17.1.ebuild b/sys-apps/bat/bat-0.17.1.ebuild
deleted file mode 100644
index 0b9d7841bdae..000000000000
--- a/sys-apps/bat/bat-0.17.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler-0.2.3
-aho-corasick-0.7.13
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-arrayref-0.3.6
-arrayvec-0.5.1
-assert_cmd-1.0.1
-atty-0.2.14
-autocfg-1.0.1
-base64-0.12.3
-bincode-1.3.1
-bitflags-1.2.1
-bit-set-0.5.2
-bit-vec-0.6.2
-blake2b_simd-0.5.10
-block-buffer-0.7.3
-block-padding-0.1.5
-bstr-0.2.13
-byteorder-1.3.4
-byte-tools-0.3.1
-cc-1.0.60
-cfg-if-0.1.10
-chrono-0.4.19
-clap-2.33.3
-clircle-0.1.3
-console-0.13.0
-constant_time_eq-0.1.5
-content_inspector-0.2.4
-crc32fast-1.2.0
-crossbeam-utils-0.7.2
-difference-2.0.0
-digest-0.8.1
-dirs-3.0.1
-dirs-sys-0.3.5
-doc-comment-0.3.3
-dtoa-0.4.6
-encode_unicode-0.3.6
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding_index_tests-0.1.4
-encoding-index-tradchinese-1.20141219.5
-error-chain-0.12.4
-fake-simd-0.1.2
-fancy-regex-0.3.5
-flate2-1.0.18
-float-cmp-0.8.0
-fnv-1.0.7
-fuchsia-cprng-0.1.1
-generic-array-0.12.3
-getrandom-0.1.15
-git2-0.13.12
-glob-0.3.0
-globset-0.4.6
-hashbrown-0.9.1
-hermit-abi-0.1.16
-idna-0.2.0
-indexmap-1.6.0
-itoa-0.4.6
-jobserver-0.1.21
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.78
-libgit2-sys-0.12.14+1.1.0
-libz-sys-1.1.2
-line-wrap-0.1.1
-linked-hash-map-0.5.3
-log-0.4.11
-maplit-1.0.2
-matches-0.1.8
-memchr-2.3.3
-miniz_oxide-0.4.2
-nix-0.19.0
-normalize-line-endings-0.3.0
-num-integer-0.1.43
-num-traits-0.2.12
-onig-6.1.0
-onig_sys-69.5.1
-opaque-debug-0.2.3
-path_abs-0.5.0
-percent-encoding-2.1.0
-pest-2.1.3
-pest_derive-2.1.0
-pest_generator-2.1.3
-pest_meta-2.1.3
-pkg-config-0.3.18
-plist-1.0.0
-predicates-1.0.5
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro2-1.0.24
-quote-1.0.7
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.2
-rdrand-0.4.0
-redox_syscall-0.1.57
-redox_users-0.3.5
-regex-1.3.9
-regex-syntax-0.6.18
-remove_dir_all-0.5.3
-rust-argon2-0.8.2
-ryu-1.0.5
-safemem-0.3.3
-same-file-1.0.6
-semver-0.11.0
-semver-parser-0.10.0
-serde-1.0.117
-serde_derive-1.0.117
-serde_json-1.0.58
-serde_yaml-0.8.14
-sha-1-0.8.2
-shell-words-1.0.0
-std_prelude-0.2.12
-strsim-0.8.0
-syn-1.0.42
-syntect-4.4.0
-tempdir-0.3.7
-terminal_size-0.1.13
-term_size-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-tinyvec-0.3.4
-treeline-0.1.0
-typenum-1.12.0
-ucd-trie-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.13
-unicode-width-0.1.8
-unicode-xid-0.2.1
-url-2.1.1
-vcpkg-0.2.10
-vec_map-0.8.2
-version_check-0.9.2
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-wild-2.0.4
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.8.3
-yaml-rust-0.4.4
-"
-
-inherit cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libgit2-0.99:=
-	dev-libs/oniguruma:=
-	sys-libs/zlib:=
-"
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doman target/release/build/bat-*/out/assets/manual/bat.1
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins target/release/build/bat-*/out/assets/completions/bat.fish
-
-	insinto /usr/share/zsh/site-functions/
-	newins target/release/build/bat-*/out/assets/completions/bat.zsh _${PN}
-}
diff --git a/sys-apps/bat/metadata.xml b/sys-apps/bat/metadata.xml
index 9bbc255a76f4..a14943551b91 100644
--- a/sys-apps/bat/metadata.xml
+++ b/sys-apps/bat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>toshokan@shojigate.net</email>
 		<name>J. Pz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index bace85276cba..37da7d898d79 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,3 +1,3 @@
 DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
 EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c
-MISC metadata.xml 245 BLAKE2B 9d48c927e5844df237d0d7c23fe22d6b1896b0369c41a9c7d62c6ff09ccd0937de415f743270a074b9d389a6ea0c10933b9701a264a2ce155899ec2535f6bf0c SHA512 77077cbe810752d5fb24ae88ff5d9a00a175d7d043e95268d69b1f461546d9bf9053273e5d5bc3ba9dc80641b0ef908f8d189d7f51602f0c6786d04c8c991bfa
+MISC metadata.xml 245 BLAKE2B cfb1c75ae97a85e469dede0ae542d146c40033c7220b383abaf7ffbb38325cb5132c98f4d920f7f33833b98ec5a1b51ca1b7574df675830a9e65468f01063e08 SHA512 d4a6599b57a5234bf178a387868bc06977b83bd56117edb8ff6dc4f0e3c8739cbb9acd9aa6ab7c053e6d84a2e14de474b0e9e76cf75938d492ccd7b87c314d9f
diff --git a/sys-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index b9de019cb593..94d309808674 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 09b1f48230b8..f4a7ccb17927 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -2,4 +2,4 @@ DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91a
 DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
 EBUILD bleachbit-4.0.0.ebuild 1480 BLAKE2B ef7caa1f0f56776df47511c805009d53d8078c6567ea2aa2aa21fae2ead5766ba93208e0eda3cc4a5e4a868e1f1d0d76109d8a440df1a952fdca45e149bad795 SHA512 da9661c2ed01f32902cc2524959540d3abfdda8c82240f7436681c288992deabbc85cf5fb2e67a3c1568567accbd489a466b8e27adb35ff39f22790ff174e175
 EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055
-MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
+MISC metadata.xml 556 BLAKE2B 3d2e34427ddd2e3ba55b12f247feac62e522fea8f952e69af43eeeed04a246d851b04fdfa16e169f5804eff20938bc545f0040b9133a1622cb4fe5b764b549f1 SHA512 1e58cf757be397a69a57e4ede9feaed4ba495a9c094fbe690062ea5623cb955434e9926d12ddf5f0f651a40a0a2775d168e3f8343b64bac4efb514e403a3fe77
diff --git a/sys-apps/bleachbit/metadata.xml b/sys-apps/bleachbit/metadata.xml
index b025f5f8290e..12a50970946c 100644
--- a/sys-apps/bleachbit/metadata.xml
+++ b/sys-apps/bleachbit/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>christian.tietz@mailbox.org</email>
 		<name>Christian Tietz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/crazydiskinfo/Manifest b/sys-apps/crazydiskinfo/Manifest
index a3c7ca0e0526..30f40516c2c8 100644
--- a/sys-apps/crazydiskinfo/Manifest
+++ b/sys-apps/crazydiskinfo/Manifest
@@ -1,3 +1,3 @@
 DIST crazydiskinfo-1.1.0.tar.gz 5372 BLAKE2B f00c989b33cff303066b76d8da0bdb8ca12d94598a26f6990706637c0f430d18c3ae9344fcd7ad3e5ff301dac9651c29002548190d06dd16ea99132dbd94c50c SHA512 57e9ea4f8abec18355806da35225132f06a5562b1717e6dca1515043b2a0f2a51b47a2bcda31f1e64d6b2e9c8c6de5445d835f59eed79fd0911e06fd32296803
 EBUILD crazydiskinfo-1.1.0.ebuild 686 BLAKE2B 421eb26810c0e9baa2d8cf0c0e94bafe39b96ff8cbb0b7cc103a527ccb118be9a8d92b9e9f66087b8b7cbac7bcf93acdc310a66ccd82e423ea3b1174ea561948 SHA512 e9dfe1ff7a0d69acf6c600eaa46a28950959954ce51983ffd7893a30cc22554899216ed6be06d42239921f45a6eb85109e2af617a498fcc6cea7afb2d54962ff
-MISC metadata.xml 337 BLAKE2B f419cc18fce7059f2d34451cda69ba7679511de53c756544a4180a66882503f7b2b7686e4ef14c533fcb5481bb774e0b7f4ac50849b11bf8bd5bfaa121caa3fd SHA512 ab01ee7de306762e116bc7ca43f4b229b0b1ab28e608a4cb7a1b866f167025aebb9455e90ebce01120bbd6254eb372d3e0df2a783c4378da488a769ed1a64650
+MISC metadata.xml 337 BLAKE2B 5fe18f1ee9170a67a9a9ca06bfe616e201cc206df3ff4db58427188ad6316364fa62552ff84a5002624847f674eb8ad171be0d4b0512593350425737af6774b8 SHA512 d2db95f5443566d3c216dced563587dddaa72d23befc9cc982539b9872c89d0e57a2a633b7a69e7ea0817941736c3c99b0ee61f9b69144043681dbe7a190d9cb
diff --git a/sys-apps/crazydiskinfo/metadata.xml b/sys-apps/crazydiskinfo/metadata.xml
index cb75991bdac4..7a56ad9d9b41 100644
--- a/sys-apps/crazydiskinfo/metadata.xml
+++ b/sys-apps/crazydiskinfo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 492e270805fe..76db4278e6d3 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,9 +1,3 @@
-DIST dcfldd-1.3.4-1.tar.gz 163141 BLAKE2B 99954c674907196020dc1eff86103122897accdf0ff20ea0e6d5582d7fb87e4bcebfd12bf774f47e402853240896bbd536500c79ae6e7b478a3611171745dcc3 SHA512 04b53adf62c6b468ff816e2cd94cf360eb5315eb980e2aa7d71afae706ec9c4683430269e82d712608be265710907fdaaa1316e4f734b7481ee9395a37926c7a
-DIST dcfldd-1.5.tar.gz 81661 BLAKE2B c1037c8948bfa78704279b438f4604c8b6383d3840947c0e8e0a3ea52ba2b96fe0958b38e700675be97ec2bcee4fb6290f94a847476e3536fdd2790891d02cc9 SHA512 4c91211bf10fec409abe930fe67ae73ebfa67b5a29263cc2b5de7bc42df51f4c7d0647261e31bdad96b591f947c2f0e951004befe296fc37957ce5b56756debd
-DIST dcfldd-1.6.tar.gz 81795 BLAKE2B e4e09fd2f3720bb4a1ecff3427bbdda832d2c82cbc1dd95ef884fa3b10a02707d6eaa6302c86518d124eaff5669ecd4d5bbe8b207bb1bb70f7fdb1c88ee8ecae SHA512 893bb4920d86749fd01e877239ddbb3e85e73f6b305c8cd6e9a38135fec1f8c14dc748f5761a3630e83299769284c55a80afc93f3c9981cd8b4e19d4506a8c08
 DIST dcfldd-1.7.tar.gz 81892 BLAKE2B bf34dcd3e0430421c36dbd9d6b3f5ea2d4a4cb41151db8f14deb48d4169d1008fee2776f2ae821ea40ca7743f2354db62520bc919206e02a6e525ed6a38a0fec SHA512 e1dc4773438914a8102a692c7b7cbf486a9b03111820facb0134b4b9d058751695d1a7c64481852026412aacbb0fa04a18f833ff77ca30f154d5067a07057f31
-EBUILD dcfldd-1.3.4.1-r1.ebuild 388 BLAKE2B 25a759b95addbfee2fa6417aac011fa5359a04b9ffb1b6ff71722f1aa9019d823d9b0a8036d3f7ea3e45863c9e4f43b0acec4ad6e9eef894be434104c5138cab SHA512 28a07c933cce37cdedabefcfc14acac0d07518de54821959b065d007a1b591f69cd58484eeabc9d760812b9a8592061945b50943f0602671551a8bc5a89e36d9
-EBUILD dcfldd-1.5.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
-EBUILD dcfldd-1.6.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
-EBUILD dcfldd-1.7.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
+EBUILD dcfldd-1.7.ebuild 502 BLAKE2B 3e16b7123b2fd9c9d7b5e9fb187aef04226cf8f13521864b38615b5a8ab0f4f2dc6098b21b669cfe93d9288ff8efa5442cd9dad7910d83e11e28e54ef86deb2e SHA512 65a14bc441a7c9b0841ab895ebad8773bda6ad67a11966b9031c173e664f0ff45fbb4e59e73b9f2e96df822afba40a34acbe5cdf3b30ea639c1c3a1111c9dc8f
 MISC metadata.xml 325 BLAKE2B eb9d69a33645c35442d8ffebb66aca8daf8615766a63b3cd9130dd4c9eac6442aa56a0ea8e6eb92962b1a28d852acf1b9c987bb048f1c2531b59071b79b4c45a SHA512 a79a7a8ba4a77b73460156c8a241535d95eff0865d6f1288af6ac85be23574cc8e9339e7b28b6c48eee8c323eae6d16a18a9e683a08afb41692f97fcf099fccb
diff --git a/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
deleted file mode 100644
index 22ae54876b88..000000000000
--- a/sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-My_PV=$(ver_rs 3 '-')
-
-DESCRIPTION="enhanced dd with features for forensics and security"
-HOMEPAGE="http://dcfldd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dcfldd/${PN}-${My_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-S="${WORKDIR}/${PN}-${My_PV}"
diff --git a/sys-apps/dcfldd/dcfldd-1.5.ebuild b/sys-apps/dcfldd/dcfldd-1.5.ebuild
deleted file mode 100644
index 83b8567efac5..000000000000
--- a/sys-apps/dcfldd/dcfldd-1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="enhanced dd with features for forensics and security"
-HOMEPAGE="http://dcfldd.sourceforge.net/"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	ChangeLog
-	NEWS
-	README.md
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/dcfldd/dcfldd-1.6.ebuild b/sys-apps/dcfldd/dcfldd-1.6.ebuild
deleted file mode 100644
index 83b8567efac5..000000000000
--- a/sys-apps/dcfldd/dcfldd-1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="enhanced dd with features for forensics and security"
-HOMEPAGE="http://dcfldd.sourceforge.net/"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	ChangeLog
-	NEWS
-	README.md
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/dcfldd/dcfldd-1.7.ebuild b/sys-apps/dcfldd/dcfldd-1.7.ebuild
index 83b8567efac5..cec2cbeafba6 100644
--- a/sys-apps/dcfldd/dcfldd-1.7.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.7.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 DOCS=(
 	AUTHORS
 	CONTRIBUTING.md
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 959cabcc3cef..62622bb95b9d 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,4 +3,4 @@ DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
 EBUILD debianutils-4.11.2.ebuild 934 BLAKE2B 48f99a9d5c1ad125ef6cb120f39f2a3ea97f0a4238b4e153ba906436786280cb6c9a3e0bc28d9a1ecbb5594b741897d4e49097ac84ab011f0c209a1450875eae SHA512 6c286ff2e91e212e2aae39a389608f27c18074f4a8edde2127e7aca181aeed85e858fa65501b362c6a7702804abe672fb0e0736b3f0c3d3358896286069a5b82
-MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
+MISC metadata.xml 445 BLAKE2B 82971a9985ae487b4333505a1279ed6a642f7eb18880a693c6b0470a270c90b0508d7fcab5039a219a11bcb8a2d05ee3855c7f5bd93ac1172ebe7ed8d7542973 SHA512 1382c27ab6b70c086132eee442ac149ab41fa73bc33958fc93bcf1598c34c43658138c5f476c1291428c71983dee148abdcd630aad128d9b7ccc7c2309870db6
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 1c1ee347ef1a..34dccd26a929 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-		<flag name='installkernel'>
+		<flag name="installkernel">
 			Install /sbin/installkernel script (for Linux).
 			installkernel is required whenever a kernel will be installed via make install
 		</flag>
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 74521306c071..c938cdbcea2a 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,3 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.7-r1.ebuild 1171 BLAKE2B c42cca73af228b8d347c5ac5d0eec096624fd1a9b137faf87b3a28dfa3cb8b79b71f368441a2d7892c1f12bbec010bb2c068accfbe046e74eeacdcf00bf16471 SHA512 89e2bb0af464bf31d0f2288e86deaa6d68a359e78d381486873e81ce15bdbbb6e9b87c7406fce6e94ee9ffbcd82b34ebc2bec9e54c6e40cf60c6f366abc2472a
+EBUILD diffutils-3.7-r1.ebuild 1178 BLAKE2B 6c06908ec0f5b348ec7efe85cd83dfe5a009f75ed77828b51b7d14a78d43b3e0f78a1765cb8621e8fa6b2c310a89be5990cb0166ee28a781802b0effe6accfbe SHA512 f08a62f5df058a94f53380d99d81f71f3c4f9970ec656cd0c8cb729c3032c145eb63ffc6784ba792902bb83537cb598d11c8b5248f77355c80fc2f36f4a2ea7e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 79eb1d1d0f51..7a31a9305625 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="https://www.gnu.org/software/diffutils/"
 SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
+	https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index d0fd1d969a3c..bee2bf154f03 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -3,4 +3,4 @@ AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de8
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.4-r2.ebuild 1302 BLAKE2B 780501a45604b7a4201662fa4e4ba0474ac9c4677c86ccca0bcc064e3c39697214d59f743c4aa01d145319e2149f852ef8ab69b26263f53f6f9d56ed060c7a43 SHA512 4ff2b59b7ac8d6d5f55ad0740ef964cfc8fba7b8ce13a044aabd8efd0cbd4ba41077f8ead34a2e2ea11b2e45957d461980509ea281cad66c6882e16a4a78b433
-MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
+MISC metadata.xml 896 BLAKE2B ab386faa21da0035defd393633c51a45b41b99fdabf5c948dd5a203152debda9f88665cec10585e8eed46d6d4815e8468816b3b63604806780790b5f022c6a48 SHA512 e6cdbf551d972f77475b8a1a6623891c5c85aff7f8a599cc51719a51fbe0944e17fbe56d5a12c3fe37df1c3f29ea26867e22f122b6692c8f95d768ec99bba7c7
diff --git a/sys-apps/dstat/metadata.xml b/sys-apps/dstat/metadata.xml
index 4ae294d3be22..e6abab92628d 100644
--- a/sys-apps/dstat/metadata.xml
+++ b/sys-apps/dstat/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -22,4 +22,3 @@ same interval).
 		<remote-id type="github">dagwieers/dstat</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index b17677b3448d..ed97ca7fa64d 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -3,4 +3,4 @@ DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66
 EBUILD ethq-0.5.0.ebuild 1134 BLAKE2B 28624d6aa8f9a8d19fbbbb08bdbea6436846f078ed761226b5a6b2bb8da977f524454c2128f7bc43619c52edbe26b787eea0b9ff5e2ca6bd98bc4bdde8d2963f SHA512 680a0d4041432264376a487034a5623713c24fd16c173b0dd58c91d22faf9c9c2f2f4cd7d1bbebf6fac389e5b9c17980d8339e9196954894ecd0a3825d1b3bd2
 EBUILD ethq-0.6.1.ebuild 1108 BLAKE2B b5a7190f422bc8550c3f28ea2cd0670500d0cae8825bb87b6f605b6684cd6c569156f93339972b430dc709a98792dae1ffa9e4ab16a646553f3b701b815f60c9 SHA512 f994c61f5ca592f26f5fa68c3fbe117429b55e470109cc5807ed656f256c69b4561decd5bd1b10b68c3bf645fee1c954d35f4a2e913cf4c97b89f165940ce304
 EBUILD ethq-9999.ebuild 1048 BLAKE2B a3128ed96ad614d415fd69d8b24a56991571d1f4c814e4e05eed7f7e7af69b71777ec8a56e5bf66cd4e507d96bbfd7caece1c1a8cdb88b56b225da0c57bb4d42 SHA512 04f9165e4af08224f2b6d9c3e04b68cf41b474e3bd74556ebf84c22e8928d5c53f882c589d0750d0567539177665543501974d8d6c1425a8a9de3c835e5ee34c
-MISC metadata.xml 627 BLAKE2B b215c0a1e6902bcab4f169740279965bb2b3b26e3bbd79e73aca34449942c6f49a5142758e1b726415f5094f737b86bc4f3625c94a2c575e14f00fbb140e7958 SHA512 c7d1186a0f354e9fa9d44569f7ab22e596d3b5dd996677d080da838f0f0274396fecf208751d7ff3e03123202391a4f1deed6c893310a64575d3a570094bc655
+MISC metadata.xml 657 BLAKE2B 42d6c240e11da7194084ce27240208ed46bd4b2352dc63851a2c2e2c51c2bc90f596766e985bcc395a10477c19b641c9a298417cbf36511efa14a31342792e01 SHA512 be3db53a8ff0ac2bc3c54febec669d34b949363c1e5087cd414c521395629123df47ba832c397c5d7f79586f5f75a79b26b03917445d4ee82f72cb47bd07cc7b
diff --git a/sys-apps/ethq/metadata.xml b/sys-apps/ethq/metadata.xml
index 61adaf0931ba..74a04a1fad38 100644
--- a/sys-apps/ethq/metadata.xml
+++ b/sys-apps/ethq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index f8aecfabd020..bdb3d51ee924 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,3 @@
-DIST fakechroot-2.19.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
 DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
-EBUILD fakechroot-2.19.ebuild 560 BLAKE2B b7ca8b03cf134d813ccf36ab31e8b183a8f02c2393abdd66081a82ebbefa2f2f3abd48c2d16a56a0f76b311226790cc9b494b535d64c390bb3a41a3f66078493 SHA512 c6159d2ebd987f2b58b392786d8cf438689d1170160ec3062baae1b4adb5228c3b0426cfbdce938846c5b0025eb61130b21d91577208b5dc22bde31b1583396c
 EBUILD fakechroot-2.20.1.ebuild 566 BLAKE2B ca5f78363d136c7ba8b369d28e9b27a2a9c3736b6da6aabf902622873a065845c254fb9a31eeb4604a855386fc5b55f7e131d6b0ccf22b7123fc2bd58e8ff757 SHA512 ce35cd103fdc77360c694ec0ff710a0cc7f03dabf10ad7e0a947f35c2a5c45ec56fe705459147778e4dd7bae0d515d497e9752384ec03a955b51899ad65b4d90
 MISC metadata.xml 249 BLAKE2B c28e86a35ce07ccc4abb7f53597931333d12ba3676c698252179744b361ff822b6346565d8eaa3d1ccd699569240dfd11387f8a80c456bdcec42707863e9377f SHA512 3a7a3d57ead4b33905b475bd13d7a4e6db1c9badcc8d5954d2a9fc4232146e8ace0fecff65c66070fa47ed989b5ee68b87ec5351daacc88d7c9c06f02c8d2b64
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
deleted file mode 100644
index 93702f3f87d1..000000000000
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
-HOMEPAGE="https://github.com/dex4er/fakechroot"
-SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-
-RESTRICT="test"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 1a14d81a25e8..fbef851dae0d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -12,6 +12,6 @@ DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3
 EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76
 EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff
 EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088
-EBUILD file-5.39-r4.ebuild 3458 BLAKE2B 42284b9cca829b4602bc383761feffe15f2eb1e6c3d6732edf6e71937702b9de0546baefe47e318a29b0c3e1535a3c8fc1b325ca73e9a2c80ef0d4f4bca1268d SHA512 cd689bf33cdcaef5f23b239103c6ba5ba46a0194007ef8f81c616fcd185c2c0d79ba70dfa250df6aba39373cc346e5fb77c8c6e17e264df4f2b379b311b9164d
+EBUILD file-5.39-r4.ebuild 3451 BLAKE2B 5671ec10d0d409f2843f39c7113c2f5c4022e55ea1bebd49f61084e0a8ffbd99bca9a8fdc6f37b34f3d6544ab724f9c94fdd992e0ca7d0fdf41dd92fb48c856b SHA512 56f4099f550aa4bacca098b29bc9adf8961ea771822446dbf63eaaf915e8be01aca662d00f09c44a36d8fe9882da661fc49c3267167e4771689efb4e323f0962
 EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
index 70dea08b9d9f..331509b85e3a 100644
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index 7b7fa9af63bd..423216fb56d2 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -2,4 +2,4 @@ AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
 EBUILD firejail-lts-0.9.56.2-r1.ebuild 1217 BLAKE2B 1d7dcd7ebfee4c51d441a80dd59c1043b4accd6acdc95c7aaab747f79f4ded5ccd6bd7dbd7a687e09d8920b80f0cb179d56a6e9701d6839425051e3bd2080251 SHA512 d71262d24137f1f7f9f31e5f9a163c95a94b8680958d74e1729a7171197d6459e9e359994591201a469b110dd1da7ad51f9453296cb461534cdb5138bebe491a
 EBUILD firejail-lts-0.9.56.2-r2.ebuild 1417 BLAKE2B 9d14448692c72fa0482c8adc6edb428d2460b535117873940c323ba52b6b0eecf7942a2a98ea9a965a80491944cc0c7e82bfcf7226d3ac5e21b5f94b4cc46f9f SHA512 09efd926c9ee37d54a04f9c5d122e6d87ff7a3af0cae390ad5dd01e4c40b22dbe61f9741437f6f3ff610465215646ef58d361fc42efc528404b44fa9173e3dd9
-MISC metadata.xml 1515 BLAKE2B 39fc57111fed8406749144c4404040e22dae6fa9b0fdfb1f74840a38f7abd39d7a222cab48d9d2658361195b378290f917f9f500704520a304d6d44810e0ce61 SHA512 d3af3ada41c5a1ebeee7cd48e876c1c06b8bd4ba114cef0f681d8d3a91a280a38cb9edb4a88129df58fad69fb6c3f1de97f94fe9ab24efabcc18c78f41c89599
+MISC metadata.xml 1545 BLAKE2B 3cb87f899738e96a6cd8257eba2c477f67b6f24d9b2188777fb1ec3263a47740188e07875c5285a320bce9a8bc5f30e6d13ab3d575daa5f90918b2583fa88d87 SHA512 a3b184163d6c0b787f301bc0280b10ff755a701882b9fdf4a219816a384e1f87179ecf59fd79280f577bb15226d044648bea35db358af60435f02b9bf72a41c3
diff --git a/sys-apps/firejail-lts/metadata.xml b/sys-apps/firejail-lts/metadata.xml
index d0dfd5bb16ba..f0ba9df866cb 100644
--- a/sys-apps/firejail-lts/metadata.xml
+++ b/sys-apps/firejail-lts/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5d4012139f70..8ad17fba60b3 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,4 @@
 DIST firejail-0.9.64.4.tar.xz 431116 BLAKE2B 1e64af1459cdbd6e753299796b2521efdc1fe364a66b8f0f40df1adabec32d0673cb9805a2ab385b96b64aca16e038e615ab1e4dc4df1dbcaa0b5b24f54c89d0 SHA512 580a074cb40e7559f6d532418b5e05e042c30306e8507d32ac3c71a51dec6648035ad810d253da02caaa4adc41f773dfdab55528618f5ca30ff30d4e7bbd12c9
 EBUILD firejail-0.9.64.4.ebuild 2514 BLAKE2B 5169243203fa8e77926aaccce08a9ad82277f8e9d272c99a87e885ab4a6bc251ec30b2c2e9f754ba35744f2933d0845a636ca15132c529a97f304a1be1828963 SHA512 da06a3199f3714b07bb99831d59e796b940d600334b9d8df8d4f2c887cdbd9205a9933e028353b41ae58afa3ecedd3f39c65c11ed01d2b344b4adb9cbc321082
 EBUILD firejail-9999.ebuild 2304 BLAKE2B 88ce4ea8d871af749c4f19ede13aa7d35b9037451b3e782b1a9558bf2a00274470b99d8e3d315f4a91af7084aabd5133562827e347852364ef0e0bbf07932f9e SHA512 c3c3c7d8e953630bb9f0765506780512e324ca8cf467a7a23568e2de3544c223bbe5e027b6fac32bb3be2716e64beb5084ca8959bd235b7638114e9e15be8814
-MISC metadata.xml 1783 BLAKE2B 747901d18b87b2ad96fed6307a7eb63594b817378e25b84eb178055c1eae50e8c5213091d42d5a8917136276d43e4020c39ee7c892e8a00dff7e75e6b6b79928 SHA512 be513de56d8eaa38373c66eecf4d5bbf53bc7b0ab04c2a2fad73c58c271db6fb4a53c79568e82a39c99697d5f9c58b63222e7f3f0986ab74b43e66a9734d6e90
+MISC metadata.xml 1813 BLAKE2B 464550e81aed6c70688f7f146e0200fd351ae2a6163a41df836ece5e0dd54e0710ff3baefed509ac73ac81f37783acfe9baf3026f31ec4f668b2fb0f87e326d3 SHA512 23eee71dbf308db9f76cb42622442f9749b353577fb624bceb12c9e377fdcc0c45efe52c1c028d439835185502acf9822ffb53ee514ce5113710d036994ff6da
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index b007062e7a91..8a213d3a83ed 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/frandom/Manifest b/sys-apps/frandom/Manifest
index 6700bc20e8f8..7c33e2cdb86e 100644
--- a/sys-apps/frandom/Manifest
+++ b/sys-apps/frandom/Manifest
@@ -1,3 +1,3 @@
 DIST frandom-1.1.tar.gz 8146 BLAKE2B a18a97c4650376cb2e3c6abfa8b6043c69426f83c9607c36614007426b7734f89a537206e7656b3fd901d69111683592e4511d0c94c7b111c8e77e6fbe660323 SHA512 f64bd1bc1482d223f84f344554b04a4a413be32cf6c348e006b831e68eea0165f1231e194536bb6867450dfc901e80e765e71ba6369209ce579597ad1cdfdeaf
 EBUILD frandom-1.1-r1.ebuild 666 BLAKE2B a8cca754a2eb1443b5bbe1126543a15db028ddc7b83ecb1aeeaa8b948d2007c83ff56b4b119a87d26ab7a2666add988cd2184afce79706d5fc3693a2b4b328f2 SHA512 ce20ec724ccc68f9967abc0dd5072d743e8d8c355138a8333e4f23bdf975f0980bdd5ff234b441c2c953001d1f0e0c3c960eb11a72169e831006153ef9d2a51a
-MISC metadata.xml 334 BLAKE2B b93b75e593a2b4c531b5c9210b752fdb20cc7e0394d4a683d267937a96ad92c9fe07a11143cadb37613d5aacc1240d40761acdb849bb9163bf618b8b48435b4d SHA512 94b5fa15925b1a85b0fe1d52f35323acd3a900666283a346283a7745f88b35380e3424668f7651f78e4039de2f00a4affcb461b3a9a72ba671bff8b1634bd4f3
+MISC metadata.xml 334 BLAKE2B 4234148b21ab18cf7577cfde5d92691d0f6dc6e0257aaf8145e9c2b048decf7afadee4154bddc61fbfb081141a91aac830f213ae3075d6c2424bb742f6f9c85e SHA512 1c879766e65b498a70e9f71e11d52250a3c6fc2d008310764555f274f764cd1a43910f5678801941a5bf397d79167ef4d05bd71d20ae9043a0595605333b17ba
diff --git a/sys-apps/frandom/metadata.xml b/sys-apps/frandom/metadata.xml
index 423ed6917d9c..d1e0554a5471 100644
--- a/sys-apps/frandom/metadata.xml
+++ b/sys-apps/frandom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index 53c1621087a4..5cbae73fae2e 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,5 +1,3 @@
-DIST fwts_20.05.00.orig.tar.gz 3817917 BLAKE2B 10365979a1b6bf2768930e144baa3982d462f05b77b1ca81116f7b44b80487924f37e097e46602c49696e987d9061a1917e3613e016bdb126146d880699c38f8 SHA512 4f68f6fc8351024e877e6fa6c9b856c7c3720348c1936f33fc8b455f5e85df83c9dc39a5c2dc16e106c851d4ac622f0a1d23b70f2b7726689f92077dbca5d82f
 DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
-EBUILD fwts-20.05.00.ebuild 1127 BLAKE2B c966a749987a9f5a23d7bb2ae3b7f506a5ace2bdab79851615d601cafd0aae20d2a845d89b064944a0c12076d6cce058604195ad266918dde1e8295eed241ede SHA512 4ce7fd15f1bd44644998be1b7d0913a6a8176bf3d76738077e1d793294b8d865aea579e386deba766b3d8080d5f2b08bf58722c6b0e950e8b990c62abf7951fb
 EBUILD fwts-20.11.00.ebuild 1160 BLAKE2B 3babb19a62e51f008dffbeec21350e6549a3857bc370e26252dcf6b9fe835723f17fd0e8cddd46b33c5ac37cfce584cc03aef2d7ab32615496a861e1d8f9152c SHA512 fb2e7c94ca9b19f36e329b7ffb9b6a4955b7eb8581cffec849e10797851e598ababfaf4dc05b3adb8ae01413cc97b66cdcc42b175a960c7595e5c4c1ad5851ba
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-20.05.00.ebuild b/sys-apps/fwts/fwts-20.05.00.ebuild
deleted file mode 100644
index 55aaf54db461..000000000000
--- a/sys-apps/fwts/fwts-20.05.00.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/json-c-0.10-r1
-	dev-libs/libpcre
-	sys-apps/dmidecode
-	sys-apps/pciutils
-	sys-power/iasl
-	sys-power/pmtools"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
-	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
-	# Fix json-c includes
-	sed -e 's/^#include <json\//#include <json-c\//g' -i \
-		configure.ac || die
-	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
-		-i src/lib/include/fwts_json.h \
-		src/utilities/kernelscan.c || die
-	sed -e 's/-ljson/-ljson-c/'\
-		-i src/Makefile.am\
-		src/lib/src/Makefile.am\
-		src/utilities/Makefile.am || die
-
-	eautoreconf
-}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4cd23be54944..4af3b35c9b39 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-disk-utility-3.36.3.tar.xz 1373276 BLAKE2B 445aeaf68aa6b56dd6731e69e8fecdd1ca0385ba481bd0c8cd2ed411f7b117261f7acf47651f5354d0832141c479a6cd1b0727257d6f533159dd2d437edc59db SHA512 160283e1b0864e08ba6feb9368791e4cd3b287dc628553a69a1c276fa66252b37b1d906451b4342d953504a4669056aed0ebb3233ff61cbb761e612258ca078f
+DIST gnome-disk-utility-3.38.2.tar.xz 1375128 BLAKE2B e437eead1273bb2931462ac6c7a7dfea75c603c5325af003d403f4b5130b28e95496724c1939e5dd2e3c8b517eb0d3cdf51952299451546b41f9f5eaddcf9e63 SHA512 3afc0a40e82f0ab3608302af3d83acb15a758581122188125f9572e95a802359d1af0a1e99fb0cd8fb612413aac09e3d33404d08a2d5e189b79d4f284c92cb82
 EBUILD gnome-disk-utility-3.36.3.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e
+EBUILD gnome-disk-utility-3.38.2.ebuild 1386 BLAKE2B def2335d9c7ff5ed1b174e4322a6ec81873e207c72f675e90599c50fd586d23c13f8f4385b21c3cc7e421446667c6c1c6af035d136806b17ac57b346452ee639 SHA512 f003a4b2a35324a78046b3eb3ef83e032434c775a258d8f17c8bd99446c6742ad86d5e7e95c3501db27b4f3fad8c109bfc70d6268a3832d6477009d64e65918a
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
new file mode 100644
index 000000000000..fd8e8d3461c8
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7:=
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index dc7abe67c0e7..90565c371b40 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,9 +1,6 @@
 AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682
-DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
-DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
-EBUILD gptfdisk-1.0.4.ebuild 1244 BLAKE2B 5e1ed279d0996ac37fb669a8025334a7d2168cb2956604eed0212fa6031ff97654b402d4c88434b90b9718b8993ac289c4889216a8b2dddf8097a372f6684b9d SHA512 74bbf5c72a625e7b8bc2cb6c219712bbde4e58679d3c1c0e56c2dde58a556ec25e7fe9c59c87042f419094db81b33fa85647a75246fcd398a91d3ae758ff2cba
-EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
+DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 EBUILD gptfdisk-1.0.6-r1.ebuild 1308 BLAKE2B 494064be22ec49402cd5a884ea03a4d130fa6a66d565efa4187dde06e5cbf511961dea8f3abbad31b741e94453956c3d5b2531a404ec0cefa51e8b30cc35d1d2 SHA512 ddfb19466f938f5f6a58f19dccfd80de3dbdbe2e488e63e6338df4272f585be567a7a74c9d8a32dd83ba34822ac558166ece8b8ff029a8bfa3d74a673e773581
-EBUILD gptfdisk-1.0.6.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
+EBUILD gptfdisk-1.0.7.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
deleted file mode 100644
index f8935b6212f9..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_linux ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s:cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild
deleted file mode 100644
index 253b6a84a848..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_linux ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s:cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
index 253377c376a9..253377c376a9 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.6.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 6cc8dda53963..916213ecbeca 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
-EBUILD grep-3.4.ebuild 1483 BLAKE2B 10a274f820dc338f8058adf3c9ad76fa23faca41b695ce6749b16e0460e3bb97c071075662f5e4335030755c150f1420f96fb44383d475ac6ace57e5681ea75c SHA512 9c090efff4b3e1c81ab5867f04c20f66bf3b4d6a0bb1a7e2fc6be9623ba6fb5728e955218144ea18b06cd7ac3315bd3bd89b8a99b32b17fcd1eba0a59ba37b28
-EBUILD grep-3.5.ebuild 1485 BLAKE2B 00235fd67f3f37ad0def3d57378e2ef802c9eafa45ae442b088b7447f010f6832b7c0c4a433d88ea69d4bb04972bacce7cc116cdfef31c8c603be90d1b4a1b0d SHA512 93d066fd92d75de0829ac686424914a662e902b4ddd5a9c17b30be5209ff357edce19976df95086f571ab8f5e2eddccb235bda2588df24983005f3bcfe96b855
-EBUILD grep-3.6.ebuild 1463 BLAKE2B a6076ab22306df9fe8dbc3fe7410c6ebe4b058de8b2385c6dac4a80975c9dce16894f899bcf71d299188b083056a822660aa37a38c53dde80b5ec3e2fe876df8 SHA512 43c891dd21e1a1cd4f5e3786c0aace2591c84f2e34a86091034bc4ba4940bdc07ff0fdaef9ce310bf8e29897ad2208c38e3012c640e3f2470963645092ea92b9
+EBUILD grep-3.4.ebuild 1496 BLAKE2B 7abaf611e588c187df417df78d2b3e91d38455ee29ded09af8d7f7b5855748d9acf2b97a74a0c870e7716ed2d6ff7dc1745ea4f893cff21c75e646071e3cec73 SHA512 5dcf6ce5e50442ec490cab1f5e8ac5f68541e3b1609468c48680cffd8ba51f4bb245944763d40424e7e416b8e06f0ee0514c1c2d4510b79a2904023e464746c1
+EBUILD grep-3.5.ebuild 1498 BLAKE2B 7f7c000f1dea830b2fa231561af26bdd5e9d7f0e4ae76733620c1640f89ab72d91f47c7651350f4a78a85f7082ac0a3b19aaeb5b8255fc7652202f77587bb02c SHA512 717583a2987ee45708fe302502e1cee271ac17ad1e337c5b8928304af4392d4f673ed950aaccef19588088e85f45e2ed28922608f1c956d77a048bd0d2691dfd
+EBUILD grep-3.6.ebuild 1476 BLAKE2B f44b88f10ebb7ab4e5722fbf8e1b35d3951c450076d635cbfe9c6f028673a3553fbe0537208f79a69f152dc4cef2db7f5a1af75898b85df7786baea9c20a14a6 SHA512 841b71ddf3c9b8bffd504047082b10086b9dd6a2fff80983f2034daf36f7cabd80234106aa96cfff6fb03eb54a622fc6fa960fdb06e9e550d11f6bb025721c43
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 89e057e1a1c1..a33a051b2f6b 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index 1ddad9147b1f..c66425de5967 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild
index 549cc796ef0d..576125c1c746 100644
--- a/sys-apps/grep/grep-3.6.ebuild
+++ b/sys-apps/grep/grep-3.6.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 85b7bc9fc672..c19ee177d995 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.4.ebuild 2576 BLAKE2B 3016dae2d330453774d6c9ffa56b8824d5bd11b0f9766c85679d394f2a44d6278d9a565e9cfdeee5f2ea6626ae41be11fc6f07c545ee802fae9298b113da495b SHA512 e1d78778c61e1510335564ea673c455520679b6d1a1ebff21d1e1444d0631c14daaf20893d1efd269ce6ebc76829226ebba1275bfd6f72d1d44e6b05730f7b03
+EBUILD groff-1.22.4.ebuild 2561 BLAKE2B 6a525c7d600dcffa276b15a6755ad0072c68434ddb5cff628ab7f7f6c97469fa500792915f959cb96ae53ec87b90b4f3b235b4d7e7c036cdbb8ebe08a5f2c2cb SHA512 192fe962721594878bd767eb97edaf6ba05748ec0bba7bcfaedd9249ec76612a48ac217e12d609be60b5a2c3936546d86f295c281c281da8ec721006278832d0
 MISC metadata.xml 365 BLAKE2B 0cf4dd1abdfcb39494154dc55c2e86b43d23638caa9644b6002e2e7919b05503feda2e7ab85c0a620a8a29b7c2fef7d699795c7d3185fe24afb6c863af80336b SHA512 4fcb10e056f0c0933c7877635fe42b565f330e0b99946855f223fb6624bc3a756a94d9170bfef89ae6eddee4f751a6c0234f3a126f0a11e456c70fd931927544
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 375b70f0e78c..9b743edaf3b4 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ MY_P="${P/_/.}"
 DESCRIPTION="Text formatter used for man pages"
 HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
 SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
-	mirror://gnu-alpha/groff/${MY_P}.tar.gz"
+	https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,14 +21,15 @@ IUSE="examples uchardet X"
 RDEPEND="
 	uchardet? ( app-i18n/uchardet )
 	X? (
+		x11-libs/libICE
+		x11-libs/libSM
 		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXmu
 		x11-libs/libXaw
-		x11-libs/libSM
-		x11-libs/libICE
+		x11-libs/libXmu
+		x11-libs/libXt
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
 	sys-apps/texinfo"
 
@@ -70,16 +71,13 @@ src_configure() {
 }
 
 src_compile() {
-	if tc-is-cross-compiler ; then
-		local CROSS_ARGS=(
-			GROFFBIN="$(type -P groff)"
-			TROFFBIN="$(type -P troff)"
-			GROFF_BIN_DIR=
-			GROFF_BIN_PATH=
-		)
-	else
-		unset CROSS_ARGS
-	fi
+	local -a CROSS_ARGS
+	tc-is-cross-compiler && CROSS_ARGS+=(
+		GROFFBIN="$(type -P groff)"
+		TROFFBIN="$(type -P troff)"
+		GROFF_BIN_DIR=
+		GROFF_BIN_PATH=
+	)
 
 	emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
 }
@@ -93,11 +91,11 @@ src_install() {
 
 	if ! use examples ; then
 		# The pdf files might not be generated if ghostscript is unavailable. #602020
-		local pdf="${ED%/}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
 		if [[ -e ${pdf} ]] ; then
 			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
-			mv "${pdf}" "${ED%/}"/usr/share/doc/${PF}/pdf/ || die
+			mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die
 		fi
-		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}/usr/share/doc/${PF}/examples"
 	fi
 }
diff --git a/sys-apps/hd-idle/Manifest b/sys-apps/hd-idle/Manifest
index 46f89cd74544..a8b760d20a48 100644
--- a/sys-apps/hd-idle/Manifest
+++ b/sys-apps/hd-idle/Manifest
@@ -3,4 +3,4 @@ AUX hd-idle-init 296 BLAKE2B e4d2b4a7f7ff816198c7e9b1b5289ec3abb1a928d4bfe50175a
 AUX hd-idle-service 349 BLAKE2B 1bf8fe9941f3ab861263047742f9275c7481a4198f9b20261b98b0e343ee95d725affb61b931e5a54a74e5494e5b47d0c7ac4221e1ebbc599b19f05fa0d4dfa3 SHA512 a819a6150b7a83928112f9088effc99c2ed1c91fd792ed5d79f4da3c85a2660a4a756f247ab286cb2fa30b34d4901ef395c73c73ea933cc24765050f9f26602c
 DIST hd-idle-1.05.tgz 17951 BLAKE2B f99dd25d41f2ac4391025ff652827a8687db19df2dafe0f07eeeea700eaf0d67a255ee67017123510a3b89f3aba2f50de7204923d9ab85e80138f657f5e120d3 SHA512 8636d8bf2bce40f380afdea859aef7d142258071c62f87884a9af55c7c84310d89de712f56dff2bd825f0c7d79b04356df92e3012d8f683d8c41ebb23cd3920b
 EBUILD hd-idle-1.05-r1.ebuild 616 BLAKE2B 4d613a67dd4a3addd5bda95bd914bff5b206c6faf0c2d94da67405fe1c8aea477ab09435a89c8ed14597fe703933ff2d0a49fdd3ddd294e1ef7e0aaa7883e0f7 SHA512 08a4da1b4409dd71707366db50d9e1daf84c5c58bc60472c596c9842197145b5d1ba27150b5287db0c73cc2771ab601949932d8211c803e4ec9707d70d606f56
-MISC metadata.xml 470 BLAKE2B 4f25dbde41f691405a8290671c9c39baf0cf2fb08cbc5b1fb35307fb37f8dbfeb80a8cdffb8ab3fd58857eae738ba8af3465f1db2789d9f7899fd13a6d467303 SHA512 0f6483a0a6f8a89d8de21ae2506854221b7e5077a69ec70238451efbb2c15690c46296d493f0da5e348b1f7eaa75711bbef669d6d913b7f15e231d159d081945
+MISC metadata.xml 500 BLAKE2B 104263d2511c92dc5ddc157c4fb564a1acceaed8130144282812b70c71b54e49e2e5616ca47cd1b5013e3cf4af8d28c6ca370271da4e1197573ba78c9772517a SHA512 827fa6e525b29f6466fd2dba2af16cf682fdd8dfed407d4fd540331b689a39ad95e5f97218c91b501060cac93f80a28d844138f314b9bf8f19ba8bfc7de7076a
diff --git a/sys-apps/hd-idle/metadata.xml b/sys-apps/hd-idle/metadata.xml
index 4687c9a5147b..8e980e4351e3 100644
--- a/sys-apps/hd-idle/metadata.xml
+++ b/sys-apps/hd-idle/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-apps/highway/Manifest b/sys-apps/highway/Manifest
index f9d5b1aa7de0..ef4d2002edef 100644
--- a/sys-apps/highway/Manifest
+++ b/sys-apps/highway/Manifest
@@ -1,3 +1,3 @@
 DIST highway-1.1.0.tar.gz 319516 BLAKE2B 40df25eb139433f759ca98724d18bea8c324138fd26c24dce6899c899bd86d5cd86d1a16cd5631c0986d76f324d53e9b4e96ebf3582557f1e6699a9faa448a3a SHA512 c30c90f5b601a775e64a684037d668acc6c1a8b6e64f7aa1204c184978c49079a3cd07683ebeeab674a9b64932223da0c067fdb184b5918bf88eca7e113c05fd
 EBUILD highway-1.1.0.ebuild 412 BLAKE2B 00a9b6bf64c6ca449923234feb9d32d947f8a0066b27597dd40f182f068aa5f9f36007e189c9246135a80755c5a51b4f223bbdd9d4c0e94b5c9bbf5d4c3d47e1 SHA512 fc3e4372483dc908b77d8d11b61a3afdcb6cc93e75f3f4ffbc832ff734422bfa6a806a3b114ef8d41dbfacb5dedce8c973fd2fb6438f7bb6c016058bc2dd275b
-MISC metadata.xml 556 BLAKE2B c8fc33fabb8391adc3670b91150c1890a528f632ae90d9022098cae518c77321a0418059c21acd21f9616cc8c8ef2df7398aa404f3144e08aab64513363e26ed SHA512 5f2801d3119a4be7e8723f2e2fd2779a74980aceb716a26cf2e026fe82920353b985c2ace87696d931be244456789a19b4cd216cd583afcf3d6cbc3c3ba91080
+MISC metadata.xml 586 BLAKE2B e5c3da8b3d48193b7518945c95afe62b446f5aca864a2ad793231708726506b7a3122ab186480658f18c522fb5b276754c045eafea8fea9e734f06f971f234da SHA512 b303ef0f903a9aac18779d4dd87ad16362c168e37c725d36921b32a436465dfcc3f836528eca0dfed89ff5566ae27818c83447ed55cc850700d10e598bc0cb3f
diff --git a/sys-apps/highway/metadata.xml b/sys-apps/highway/metadata.xml
index fe4d17c2ec3b..d29708820b97 100644
--- a/sys-apps/highway/metadata.xml
+++ b/sys-apps/highway/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>otakuto.gentoo@gmail.com</email>
 		<name>Tact Yoshida</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>alicef@gentoo.org</email>
 		<name>Ferrazzi Alice</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index 249232a2a200..b720b3a1f917 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -5,4 +5,4 @@ DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf
 EBUILD kmscon-8-r1.ebuild 2978 BLAKE2B 778c7acd8c5d2fec8d9f3adea8e47f9f1d8b27688f18dcfcf92fca9e0bba15ab32aedff2000907ed88e12f9412ea54fa6d813c29e92fc181ff5222ec8c588fe8 SHA512 e762b0372dd21c6afd8b7a46572d5f005eeb8f18ccaa50f5dd05f9f0fd63bb12d448b12fa44c398ccd50f6a7e2ea4430cfc92322aaaf816643f5058e449fb173
 EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a
 EBUILD kmscon-8_p20180906.ebuild 2856 BLAKE2B a794c5360d3214ec1b6928525b5333e721c313d73bcb5df7be4bbc2c48624a2dc52971bb5af43db18ccd50b38cbbc070340491681108d1f9fd63311874ad1fe5 SHA512 a07cce39e1db29f5efe8291a53141b7a3fc0e5d267d45e62bfc5f101966fb4fb6ec60c68e8b2727897d5b3b37093e6915ad3c6d2728ab406da5f93ad83c8ee6b
-MISC metadata.xml 664 BLAKE2B 7c1efe65339f48a43b2fe2134fbd23c3145a73671bcec300af6f6700454b9c1a852f5ff9a5e17a94c263186f31e7703853973da5b5489ede6e59c5648f890f8d SHA512 95cfea7cb2c3c2e07a234af335dc708be83f3e6239231faf28c4e9544a37cb6ae8f619000b15382357c26fd01e2656666f8b13f0717e8b529999ca347d8b8230
+MISC metadata.xml 664 BLAKE2B 3e24275e972d23c41dbab76a90f4a47b589f652f580f5e019b44d5e926556ac2e5138a23f36beee31c53f3f5c344908832ca0d008826a720256d756425048063 SHA512 96f2c383dda46a41505e4aaf01376ed51cb2856516b800652d9ddb43c4794c1f57840368d31b822230ed3f16b6009699ee0ccec62f4967cbdaa8781a845d96b3
diff --git a/sys-apps/kmscon/metadata.xml b/sys-apps/kmscon/metadata.xml
index 796abf1fb7d2..ccf91db44504 100644
--- a/sys-apps/kmscon/metadata.xml
+++ b/sys-apps/kmscon/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 	<use>
-		<flag name='drm'>Enable Linux DRM for backend</flag>
-		<flag name='fbdev'>Enable Linux FBDev for backend</flag>
-		<flag name='gles2'>Enable GLES2 for backend</flag>
-		<flag name='pango'>Enable pango font rendering</flag>
-		<flag name='pixman'>Enable pixman font rendering</flag>
-		<flag name='systemd'>Enable multiseat support via systemd</flag>
-		<flag name='optimizations'>Enable optimizations</flag>
+		<flag name="drm">Enable Linux DRM for backend</flag>
+		<flag name="fbdev">Enable Linux FBDev for backend</flag>
+		<flag name="gles2">Enable GLES2 for backend</flag>
+		<flag name="pango">Enable pango font rendering</flag>
+		<flag name="pixman">Enable pixman font rendering</flag>
+		<flag name="systemd">Enable multiseat support via systemd</flag>
+		<flag name="optimizations">Enable optimizations</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index b48e4bd6f7aa..a52f0dd57a89 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -14,4 +14,4 @@ DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e0
 EBUILD lm-sensors-3.5.0.ebuild 6481 BLAKE2B a28ee881c1e8fe7de8b68e68023e580b2958cd155b36221cfc6095e7229bda353fa0bed2d42b65fe1b609abd492bac0b06d08569b7f9b9839e2851f0fcc8e806 SHA512 a462ecf888eaaafbedbd1c79b35a5c0b9c2c1038a22abf980e2998f813853ad76545ea5d3351daec64366eae801f619435b197fcd59ede44f44ec369f8c66ffb
 EBUILD lm-sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B eb3ab6b35813340445e4331395e385dd2fe0c69b42de7b43eea71d6df90ad38042a0b9256c352c11f25ed0d0c174291e6e5ab149164f55bef27855c60e761137 SHA512 fdc1508af3da4697989db7c00ea9abe21cc91e7ca79d8a3fa761c4602c026359d72e1f342a34332bb951b0ab8e331f555fc7bc05fb637a3df54de510b5367fdc
 EBUILD lm-sensors-3.6.0.ebuild 6437 BLAKE2B 881c07726a43b51e3d252b7d04fd8ad36ee649d351b9b174fe6a466ee990f1b44ff0840db4085b6d2768116299fe1313cad48611af32593afcd6e4973ee46481 SHA512 d605df45e8d36ea70e99fb84b67cb0b967c025b3e2cdf890f5563915090f534362d236f62c7d79b41fc6763b355fb5f647f3f790e8531c1b03b151da695a3930
-MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
+MISC metadata.xml 943 BLAKE2B e88d21fd3475dcd3de6168ae87904460826b379d41e803b29afae94a5376e230b4dc2376bfff5d60d5deec13a1671eb1371fff7666c02745c77bb5fae8778a10 SHA512 a27ac8c06494d6ab7c4c69fbee2e4de07dd1bdbc68be4625f1331aaae4d11902d41eee3b66c94cbc46ee6fab9ec8f6a021f4d6c2f52fcba789c56e9679dec35f
diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 897d37da3562..e1066143b49d 100644
--- a/sys-apps/lm-sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-apps/metadata.xml b/sys-apps/metadata.xml
index e780a8953053..61564a07385a 100644
--- a/sys-apps/metadata.xml
+++ b/sys-apps/metadata.xml
@@ -42,4 +42,3 @@
 		programy, których jeszcze nie przeniesiono do kategorii sys-.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 6bbdc69b4167..db36ec51cc2f 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,5 +1,3 @@
 DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
-DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
 EBUILD miller-5.10.0.ebuild 1044 BLAKE2B 74501a4d7622e89ae1bf1653466b7ad41950e3e15b5e25b0d344a28378edd4b9e2ee3950c48669bf8258bc794e9ddee6a2949bad5518b7ca695da0bfff6a714d SHA512 ce2b40ca3f6a0e360bb5a13e87c4e51a4b629458501f6dc9c07d5aa6e06c3077864316caab187e5cbee1dbe8914cdd16d8d7857a1c61a8aaccd83fc2bdbd14b1
-EBUILD miller-5.3.0.ebuild 1043 BLAKE2B bd9aba828d1e446d70ef561f9930eecf7ffb02030c03d03c779122d7e0d6362f8ddb7bde63a609b253aa5be45fd384c81ad272279e5835cb2ed573422b83faba SHA512 28594f3915eaa1e7bf01405db64a14551d476eae0ece718bf5c7c1ec36a78cddc037c04ceb500a599ab69a6bb4b2ab109e9720e6a1e31a7a216637a823764be2
-MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
+MISC metadata.xml 245 BLAKE2B 99e9ca57f1b154300ca2be7ca1206ed452a161018fbb46c1c8a46b3387e6267f3cb2832ba0d3dac88ef6b71ca3e931fe20f998ad6839d1fbe724bb42baabcb58 SHA512 2997363b86d62fd687ba842015c5fcfe4b3a0055f226291bd2a797d7dab1df44e4dbab56152e4adf288f27ebebf5978d3b5761452840da554fd025cc493d8210
diff --git a/sys-apps/miller/metadata.xml b/sys-apps/miller/metadata.xml
index 8181d42fee83..3e847b948a42 100644
--- a/sys-apps/miller/metadata.xml
+++ b/sys-apps/miller/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
diff --git a/sys-apps/miller/miller-5.3.0.ebuild b/sys-apps/miller/miller-5.3.0.ebuild
deleted file mode 100644
index 1412928d0805..000000000000
--- a/sys-apps/miller/miller-5.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-
-	# respect flags
-	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	if ! use test; then
-		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_test() {
-	emake -C c/reg_test
-	emake -C c/unit_test
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'doc/mlr.1'
-}
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index e48d218cd49d..2fe584c3b903 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -4,4 +4,4 @@ DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a272
 DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717
 EBUILD minijail-12.ebuild 1797 BLAKE2B d28cef527341f960f5d58ea0578ac7a10fe000413bf5e12739ddb6c0b107c8dabb287c282e20798352471ca0e121d0cb7c42918ca70201e474997a229ce7980d SHA512 eb3f04b4b5a586306e6364887e4d728a1dc661db11b639d1c9134a0286f42322d2769c921bdaa04a3fbf11bb0d1ede780cce73ac6e48af571331bd01c31ae11a
 EBUILD minijail-9.ebuild 1691 BLAKE2B 09b11a3b5c8a898c8d4b76daaa79a70cd83fc64860349df50e03f4460170b772d94ac8c7f0e4cc5f9a4fbe1f4bb9f9be9e21e83a61e7ce94ca1a2626e87dc16d SHA512 c6a0292b154fe643628b82858ccd5e6e3ebb1d82fa3744d2463286d78b15fd249e678d941031c404d7158286dab3c141d6775c4018fb87835358e0c612a7eddb
-MISC metadata.xml 301 BLAKE2B d5f9282d8aabde609103f044f2d3716395795229a7651e0c0f34df9c3995593633cf13d515fddda390096403bd1f52ca286a9c6f8fe287fb5af575b333b2146d SHA512 e88cdf0fc48e93ef15d4048015fde4939955cc48a437c9cc4f8f5053e3af4524206ee4ee3b11067fce6f0defc511484b1ba2b4afde82c9684d9df4e4750b9599
+MISC metadata.xml 315 BLAKE2B c2a00fa1d9a8400721a08edfc86a0c416522345a305e810c5781d3edb1415840141ba46dffcc8056be65ddc0902d8afc5a7039c241ed3e8e0141d82b2bfb9f9a SHA512 fe148de8a20f5fd0cf076e83d5a870063ffa0e23ee94c05f27681a8915c9e4f444af1fb0f4d9753e5e68a003991335fb1cf10c538ed69ba8b08ea1c0b64155a0
diff --git a/sys-apps/minijail/metadata.xml b/sys-apps/minijail/metadata.xml
index aa105de6900b..0ff376aa210b 100644
--- a/sys-apps/minijail/metadata.xml
+++ b/sys-apps/minijail/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>coles.david@gmail.com</email>
 	</maintainer>
 	<maintainer type="person">
diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest
index 37c046aed063..836d2b545eb0 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -1,8 +1,4 @@
 AUX mount-gtk-1.4.2-c++11.patch 1125 BLAKE2B 25871ab418def7d5723455afbf481be81f022978e563e904595de506f897349659b72a4ce5614e8ecccc5edfa9a71c988da71b5b2bc8650493fcb53795c9faeb SHA512 8ecbbec87ab65d1b69b3a64301c10168589a30a0b1487f841388c269ea705b3b04662b35d196daa8f17e9c708670597a2fe6c10f6dceab3d3cce62fa24318501
-DIST mount-gtk-1.4.2.tar.gz 232132 BLAKE2B 7c6be675db2fd11ce36501e8b247ddbb5a786b28698c4195c329b310cabc710f6df65f7869ec2bbece2edfd54820b8de88a0a7b20d442fe3d6e27ab5e93689fc SHA512 90fa174238d19bf009f5863e5571030091681038ddbfdc06c7a39f8859b78d9864b398899d66463d0f8a189e484201c7a32753b38898e0f5d55970feb85420ba
-DIST mount-gtk-1.4.4.tar.gz 240716 BLAKE2B 25244bfea0db577c3bfb61abb9acea4cdab41e9cad3173dc472c57ca39b7739e3cfef0501ecb874faf1bd8cd92e0cfd8b48ecc5aadcbe4294309aa692593c376 SHA512 85ed7e5bd92d6ea15a8fd907a0bca4bc7e64861b03e922bc28827108820f1fb4daa87b94a16f468c87d741a8d456f27f755e06b2049f2a95ce4ab00d395763d2
 DIST mount-gtk-1.4.5.1.tar.gz 239116 BLAKE2B 94ca6b0b4b9aec8989169c7a52e3e38f65c490e88e07531eb398c06be8c61b4d5ecbcaddabb2286ce7353294991a35e0f3b2d94a7b255817651e6570a6c7be1b SHA512 3cd69b872c278db80b6f91a8f66054c56be964d23f1a4e5a435343de5178c5a64440ba871e6e4b6b76b55bb01e156e8cacc8e4e3c7cfdb4bc55f95680d6dc511
-EBUILD mount-gtk-1.4.2.ebuild 858 BLAKE2B 80c7eea632ae9694cbe22fa1b01cf36f47f456fd6058010d557834e5738f67e5210af91a8cf3bf48014567eefd9c6e2aed5b54416cd054121868f97c9adc4904 SHA512 ccf32adf1b708c6330b706a9485a560e3ec5016f784e059ace30324b7c567a346fb8581d0efd9c79d707bef88475b8eadad1565ec42f23f2fabcedd22d4d574e
-EBUILD mount-gtk-1.4.4.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
-EBUILD mount-gtk-1.4.5.1.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
+EBUILD mount-gtk-1.4.5.1.ebuild 789 BLAKE2B ef94101f5aab2dacb2faf251fb0c2aecc77e796256caa22ada2cd86562da19c07e83eae0d451522dec931feca862fcde965445e069f0f873fd5d9423908a564e SHA512 0db26cd5bc2fea834ba6909105830d354d072d4fd322cc4f1fff1d6c2ac3979ac40326ca22d444025d7e4710ad78aa2389296b982546b49bf6cfb851afeb02ac
 MISC metadata.xml 355 BLAKE2B 2057650f632b2f484a75473cf9bb2054392e41704767bd7d33c3182230e4e386b4d99cc1b654b2e3b5b5c0d06cc574cf9f097ae78bd981334abbbcd4eece2d82 SHA512 a2160b97106975c45262beb68b1c6e1412edf2df400868ece4a93c1318a2e24b0a178cca0b0a4ac7c766e0a3c1e98b1a812d0fe079ec1412a05aaa1eb5f8d8e3
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
deleted file mode 100644
index 1746bf782587..000000000000
--- a/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="GTK+ based UDisks2 frontend"
-HOMEPAGE="http://mount-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.28
-	sys-fs/udisks:2
-	x11-libs/c++-gtk-utils:0
-	x11-libs/libX11
-	x11-libs/libnotify:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS BUGS ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-c++11.patch
-	sed -i -e 's:AC_CONFIG_HEADER:&S:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# acinclude.m4 is broken and environment flags override these:
-	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
-	econf --docdir=/usr/share/doc/${PF}
-}
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
deleted file mode 100644
index c8cf9d128bbf..000000000000
--- a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="GTK+ based UDisks2 frontend"
-HOMEPAGE="http://mount-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.28
-	sys-fs/udisks:2
-	x11-libs/c++-gtk-utils:0
-	x11-libs/libX11
-	x11-libs/libnotify:=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUGS ChangeLog )
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-c++11.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# acinclude.m4 is broken and environment flags override these:
-	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
-	econf
-}
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
index c8cf9d128bbf..de3f8eebfec8 100644
--- a/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
+++ b/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="GTK+ based UDisks2 frontend"
 HOMEPAGE="http://mount-gtk.sourceforge.net/"
@@ -12,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-libs/glib-2.28
 	sys-fs/udisks:2
@@ -19,12 +21,10 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libnotify:=
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS BUGS ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-c++11.patch
 )
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index 52a8a014a837..a0e1703effa7 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -10,4 +10,4 @@ EBUILD opentmpfiles-0.1.3.ebuild 1114 BLAKE2B 50b2351d9239ae96ce9c9f563d95c48abe
 EBUILD opentmpfiles-0.2.ebuild 1382 BLAKE2B 8b5fdb30d45b4c1fc3fa10938ca3d2b1b9d2dbe007c7a3c95188dc71af7484b7ac7d2794517affc75e697b7bc6485890e58d8369cc88284e58636f9dbb61717b SHA512 98e815ecf98e4533afc258a0a4837bdad429d78759fd3f8d3884967ab6d443f9f22fca8a96929a2ddd1937963b88f6d6ef1ea398d055bf99d8e625f0471459ef
 EBUILD opentmpfiles-0.3.1.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c
 EBUILD opentmpfiles-9999.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c
-MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
+MISC metadata.xml 445 BLAKE2B 4aad5dcfe48ca38a0de24e7c5a1fa53ec639827f9caa2f03c71fb2c054d74de487cda2eb7c8efccd20d5012955163bd9cef7f73f892a14e8ffd63bb73878dd90 SHA512 9dd3d1e30ceff27dbe6b5250ca0915d31957f94f830236b385d2cfcf2e28806d8fac23220148d7a7cfd09f73136e0bc728e1c289da77f939faff2c2d5c55dd6b
diff --git a/sys-apps/opentmpfiles/metadata.xml b/sys-apps/opentmpfiles/metadata.xml
index 26fecb1eb64b..e38bd1fa78a5 100644
--- a/sys-apps/opentmpfiles/metadata.xml
+++ b/sys-apps/opentmpfiles/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 8189cefd5477..92063f6810c2 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-tools-1.8.0.tar.xz 57428 BLAKE2B daaacd6c2facb7cd8e090ff8aa028b4651d1036399810342f01369ad308fa240b76ca209dc6f8fd30527f27178a1d29d0b5fd44c0efc050a0dc20397afc33e11 SHA512 181531bcc8b644718411b09cd3f0971520a2df8f86c87deb34a8664e03c9b10ec73a0904cde004f045641ce8d087bbe7337c6a124e422c94b93de21088767a7f
+DIST osinfo-db-tools-1.9.0.tar.xz 57704 BLAKE2B 43b25f9d3a32a4d22fb50874b8da5ffa2611b439213c4d41292f954b23515756558e4d6a5a56b53dc0f15a9abebc4f4b5dc08bf8fe9f77fc8c66d8c56ae96acd SHA512 516c57d47649d9425a54863e0050cccd9757caa710b7ef81b339bc75454c7b55bafe6623a69305f0fc3e47e5bcccfd05222475f8487e4a1b0c1588764c87a4e6
 EBUILD osinfo-db-tools-1.8.0.ebuild 1146 BLAKE2B 687a03d25e942634299ad4c403236770171594a93e76563b43703cdd5685617c284b0c731ef7d6b6f8a8f2811f46fdca6401374a5975e922ccdcfecd87caf55f SHA512 21cba760e281abd7b8dc306d463d5d56deff0751814836a00443e9c8d7fc553e98c4dc4b82a2099f470b7e8d8cac1563a481b802ad56ce70823f827570bc43b2
+EBUILD osinfo-db-tools-1.9.0.ebuild 1051 BLAKE2B b7d055619c45dbacb8d15505ba899ef3f2d6a9a536d214b420cc8692b8ba3e8fc8846248960c6480855ba1c7ed5820d8dcef102112f3092a043bf2baf888d8ed SHA512 2062b4a008c30b181f74cb661692c0aa4756e1097084932def5cfc51c6062d10ea84bbac85890b36463b6f19701b925cea5d745ec4d370246577ee7465ad0684
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
new file mode 100644
index 000000000000..e3903da5e692
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=app-arch/libarchive-3.0.0:=
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+"
+# perl dep is for pod2man (manpages)
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test && \
+		has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index d0d8e89c9193..48e76999e960 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20200529.tar.xz 104668 BLAKE2B cb5b980cfc7753ad76aeb80d79108b125c3f1d3bec8a8878d2e562ce6b11b4369b8f9b0a03f5720ad58aa09abe8e140633652f19a4dc6f40e941e626d918e4aa SHA512 27efed4680d80432541c9e3dc692a381b479811ebce39e9b42382bd8b499d2782b59323a6c29517f38fa63061720d26c87e3c7ca806414adddfb9e4294ee106b
 DIST osinfo-db-20201015.tar.xz 108840 BLAKE2B cbda3fc868e2bd0f240d86dde70b04aa85ab869d6d8275426b60ca6ec63da3738da48b78540d5b4426e4aaea600d7ceb29d698618500fa1f45d6b2a1c3ddf5a4 SHA512 0c75ba6a3410af7e59e5696fff2883dd2285d9beb1eaaed90f12e78f05ad0e3f54352eb30ebfab2a4c4fa19c5c86c83b55931acdf04b25eeb015b19d64f824e6
+DIST osinfo-db-20210312.tar.xz 113832 BLAKE2B 41deacfc739b00d76a50fef95476eb5ef134b30b3fd9c7d0847daf3e49163087c014db49de2bd50e079baa8e2ad1d5727010c97f53220a87579e220b7f7fb3b6 SHA512 f5644e37c9e1aebea2dcf5a63adec1fd7c0f98b7455c4dea8d8b51cba396a388f9d847d5dd5e0ef8426df8da228a9766a297852ff27cb72dacecd01fd9fbf19b
 EBUILD osinfo-db-20200529.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
 EBUILD osinfo-db-20201015.ebuild 648 BLAKE2B 4cf67103c1a97853fd2eeb9e58f49b718abec82fb7f5aece511568412ebd97efa8b733f7f51dbebde7ea511e668919cf557f30caaf4da27434031eafcb60ce53 SHA512 f9d2541ab25a1a1ae08fdc7c4e74244cc6c1af22c5c17b15159e68542988f6595bcd6e81c00c7414fb96c598257258d6c969c63a69452bafa1ec3b6f16b0dd25
+EBUILD osinfo-db-20210312.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
new file mode 100644
index 000000000000..b76468286d57
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index c50a256b6857..463daece410d 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,6 +1,4 @@
 AUX pick-4.0.0-tinfo.patch 805 BLAKE2B ab40112024bec12d18f25a84f39cf09850c11f2878acbcdb91bf33fa74c1a35525da04917381c548437017714c70def44aa8ed4697f13639669c64b148c4a0f0 SHA512 d974ded22d5527522178eac47845c85de1fb0c50df626fdc9792798de3439bf6e6ced12f2434d89086a8fe7c5f11a775745d880cd0f58066108e48cae2912042
-DIST pick-3.0.1.tar.gz 29878 BLAKE2B 8910bf726102802a76717ecc20360882c1c25bc346324c33173eb64872066ff284636557bf10a98a6cfbecc50dd4c8cd87b68aa924b976b072e5fead8989e316 SHA512 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
 DIST pick-4.0.0.tar.gz 29786 BLAKE2B c1d119cfb5dd91bd3c71171d32a6ce92d06ab8ea1cfa5a40c042448b7b90ef5d24c02dc04962b24ef91fd3ea5cb56858b231901c7035f47e2c04682f99e5c61e SHA512 690f8ee174f69ec5897831b71f22bc82dbdaf71329e2b540cfb06e49963231196efe6192d1f564c1c7029c7335736d42f02483850ccbb2bd5bcd1dc52b034f56
-EBUILD pick-3.0.1.ebuild 654 BLAKE2B daa505885757851edf558654770b275661a8a94771e5fcf019fa0146d0bffa7dbfb5c625b0abb36146d5fbebc477f714e93e4fbc77ac30a49cbd767acc6802e8 SHA512 d194db2a604de6eb826220d619c72d77372f5fa86d679b9bea4488bb65026a5006c470b27f37db2005cc6289eb0e8cefe291bb8313d7f11fd3f379db6c2a0630
 EBUILD pick-4.0.0.ebuild 706 BLAKE2B 4bd61519fda8c56a801352c14bf96618841cbbd5e150ea80d238f9ea007f872cd78edff76fb48026785d969af9704e7c6f375e2b0f5b1c2da55e090b9bbf2b98 SHA512 f3159eab84352e1fa3e131f178313da4ddf706d10ec717d5c70f32703e5ffc253abada95d43e22b4e049e47e6de9ed0e431dd47a7b20f6e8bdbcc17546a2d08d
 MISC metadata.xml 242 BLAKE2B 3917c4e887e59cb27fa14a1ea92192b5a924ce39a4dd39a2cd75d04d7a861f57f7c9e969581a243339ea432f132f6e0963efe9940ad1678b506588317da0ace0 SHA512 03639d79f8e79b78d86d64d217268bfbb6255cfb2d37188a764465686dcae9ffe5e41b01cc746f465a6ba92a3bc2c9d87d56889e00317c96fd759d37b840fae0
diff --git a/sys-apps/pick/pick-3.0.1.ebuild b/sys-apps/pick/pick-3.0.1.ebuild
deleted file mode 100644
index 7bdaff986327..000000000000
--- a/sys-apps/pick/pick-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/mptre/pick"
-SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	# not autoconf
-	./configure || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man install
-	dodoc CHANGELOG.md
-}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f805a70c377a..fce1ec264757 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,18 +1,18 @@
+AUX pkgcore-0.10.13-metadata-xsd-2.patch 1202 BLAKE2B 8844f6819579ab54c8ea88f551de2d2671324e494b7321f5d69f7207415f481075742416add7055618b6baaea91588bb82796b764000216f6b051c988837a3bd SHA512 48adb353f4522d682f99c2cafcdd98b51c450579a313a93d3dcb00bcd4e9fc59f7cf6f0ce54377c912c3a4b6af10340a1b6690d845c489e6b77af52b295ac1ae
 AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
 DIST pkgcore-0.10.14.tar.gz 627149 BLAKE2B 05012f21998ae97212364f63ca6d423806e20d0f2fd5785b9a52ec3c535c12675cd2a8f300ed1b3fbfe627d33ab9b138bf28a3a2792c405dbe068045d73243af SHA512 f4e4959d55d412b81306a4e7205163814b95b2f454dd7bb233c9a16d5a5975c0d2e20882e73859266ebf1bd6233e4d88e97291632b2f6cf2c2ae58cb5a680a3b
-DIST pkgcore-0.11.0.tar.gz 641831 BLAKE2B 93b2d680b0daa6611ee4fe3782e90736950859135b1e22d05068abdcb64d3a94bcbd564af4940d8944cf8d49f867404f61697ba7b1d1b45d0ba31c93232bdd44 SHA512 d9a1f3cecd0a84b353a2515e6053d300aba0257b7034d852e469177f04e05f79c95cd9bd1278afcedd321b825f5f46241d2098317e1bc29bb77efef9f641ccef
-DIST pkgcore-0.11.1.tar.gz 642312 BLAKE2B 70aac2357af1d84f3d7372f09483b9b1ba46dec9cb20044c540e482a1161c1419d8dfd5383aa12731679f05c5fe2f98981317eecd32059301ca757982f8b1ea2 SHA512 572137175f9af3cc451f412ead5d67d5fe79826d56f773dc5b6cc791cdfe575d6cab82c2943afe705c759edd89cba1282092d772f46343c8452b52d344bd2ff0
 DIST pkgcore-0.11.2.tar.gz 641792 BLAKE2B 295cc8302badcae333939d69329331be5f76d965549c75140ce809d693cf688fe3d3152c44a9d738aa2d90ed1c9f4aad2cf3c9a9a3a52a067e69cf7dd6c87b96 SHA512 602e7ad03699b3b3f302d6d414a9587f1c7829be83898e055e8e1a46e2a805b535cb715bbbb4d43100f77b8b119e13e8b1e374f45be879b4c9dfe02340f225d6
 DIST pkgcore-0.11.3.tar.gz 641848 BLAKE2B 7a1ff52e9f41b15ec3c211b99ac8666ac16ca1ca40168cce15aba42f3dea6c030623ef4e4ad837297dca860a70396743842467b0ff7305bbc5d3d640d1f2918b SHA512 2d7e4d3228c6ec3bf5aa5cbf8d4235d1b1c0b10c2f4f50c48c84948c68fe1f277eca8effc2bc1310cef2e5227143acb96775c4a0288ab94757de23437f57a084
 DIST pkgcore-0.11.4.tar.gz 643951 BLAKE2B 79567cdf5719b090ec358b51a7482f01a77658728efe267ca5bb217512004f920864f101cc59bdc2ce6f7260a3abc896b2cf4ef168f77500d541c92bfa848f4e SHA512 f290efacc13b72f6bf2319e240b2fba30a1307e6673db2f653dcc6a21420e94928deb63aa0483d9ac632791e60246758fe1de0481316b222c0b60197047dfb10
-EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 023679ec203e7e1454e6bb6d91c3408b8e819e002ceb42efa71832a77ab306c11b5efb54a0f76cd90b14873c55a55d9451e064d6ec1bcd124aaab351d63133c8 SHA512 66c437ae8d726cae98c63daf13e8ac92e9bd8add181ca1a737643e688c33bbe02fc3bfc0008eab1d6b2988eebc61dae98aaebf026dded376713257801b7dd5a2
-EBUILD pkgcore-0.10.14-r1.ebuild 1094 BLAKE2B 4f34fa4e80c1bb45f6a65e4cc49710ee286d5689df1dd1620d5db6ec70cde9afee34624d92ced2c1c1f1ea141fa86f4f138f43bc713ba8a4e00a1d87dcc7ee0e SHA512 028b1458b694f4808cbcac91db41a29613c7bbfea235f67e388b9a4e4c86f982e9c65d2d09107e99e9e2c2ada4b1c120dc5aeacb6032e8898ab69e0cfc4f0838
-EBUILD pkgcore-0.10.14.ebuild 1091 BLAKE2B 557b9c192ec28b39a0eb043fa653763900b9de64ca1bcdbb13772d39dbf14177640225c14c97041b7349bd8a39f5b5af9c52f2900d78ade100e6b3f6b3854c02 SHA512 fe7158312fbc934482838af4af6149d66a4d43d806e4504a203b0d1dcf59e3dbf5c86ac3ede2698a2e51d73873e8d7c75114bdf07962a365aa57db910b1e762f
-EBUILD pkgcore-0.11.0.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
-EBUILD pkgcore-0.11.1.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
-EBUILD pkgcore-0.11.2.ebuild 997 BLAKE2B 3a339f210ac956f187fa330e33b704846acea863a77d74a0276cff62d35aca232454d255c0a383e3abb7071b1d88cba7793d05fca45197648a6fae938394d61e SHA512 7250338d678ab5b23bd5da15a63fbbbaa0fdc5d1735dd3c44c3180a6f8ff1f8a554ebeb22d1e8f17f15d80ad7d345c52cf5c2b89ae259612fa368abf006abb7f
-EBUILD pkgcore-0.11.3.ebuild 1003 BLAKE2B 440fcc183d493bd314c048a1e926cde74cd772ed254646daf33a57a474544afda4eb4c38c74eaa94762364353b40c2b87ed677f0ba9c55bfb50b40d42f7c5dd3 SHA512 ae46dba3188594c895433b9e4547a2964841aca78498e7e916d75f86c81dfab1fb5e9055e7c567c72df6b07ce51122a3ab79d478e177ad3fd2bf080a004997ab
-EBUILD pkgcore-0.11.4.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
+DIST pkgcore-0.11.5.tar.gz 637303 BLAKE2B bd7e609039253864bf02c9a6cb084b54971a37b7d18d8c8234dcea3a7f25f25ec6652f51fc451bd991727f147d1341ee8ab7ecbcb37b727966708c1248fef428 SHA512 59a31cc9166ae2b12ec2cb349a5e29ce06999c532f7007af2392773a1e6f91ae7d6fa91c123991368dfe5ebdd7edc4ccc2a23fbf008c22b7e251562c8deb8bf8
+DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a SHA512 e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800
+EBUILD pkgcore-0.10.13-r3.ebuild 1247 BLAKE2B d0a3f38b90222ecbff5e8df115e686c3c77ed3f472c08c03b89cc3742093a69677617b1f25cff58ba4bd07727c6668f4a2d0cccefbddaf7fe3ce97fabe3e4a91 SHA512 35476b502934a9f8aa8dc44f1339782db18505e00622631dcbdfb4dc74cef9b3920f12d79135d8672546662939fb901dc21763e5b0262705f88700508dab7f27
+EBUILD pkgcore-0.10.14-r3.ebuild 1205 BLAKE2B 8310cceda556f51b36c89a60e28e0c884b92fede00d27672ecc31e14d2fd348aa2813ec6f5caa5efb5591dbee85f8ab2513a3dedbf93c24aba2e7ddebb8938db SHA512 3d38afe69a523e11e2d930c31ca7cdfab38ca890c2ebe57284a9ce838312acfac9dfa48580057a478b7f43f391ecee4561d74e2878d8189d0e920bbb023e94ed
+EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60734dcb86eba10b726b1c2fb43629f7f2e86948a6f2a9770d5a4737413a6d6396212aafdc9e902bda064f8c64b046d SHA512 38fca7cc42e4e87a164d3f6912786fa0feb5bea777ac9028848b6bbf264de3af5f4a43cf1ae6d6c4eb77c66b8fd66336d8ac7ad27e61a1ee505469b817f54fc4
+EBUILD pkgcore-0.11.3-r2.ebuild 1117 BLAKE2B fe299e2de72b1dd790325b75bd7d9f2c02dfeb6e87b4c63a22a46777db3b4ea9053318969f32a259b3514476d0a3c588e8310c84e2a80736036381e27a09ff4e SHA512 7209df6b7170cd2435e124c4c9ab4b3ef377d91fb11fbc3aff0f73bcd29f943fbf8019dff7b742f185e9c7888d2b5cb89c85b68a6cb532c1baec63700a08f508
+EBUILD pkgcore-0.11.4-r2.ebuild 1190 BLAKE2B 6da813bd67c9d823429a3f9bf22006ab2e701a65b1b65ac42122421dedf27932a37a3a44d55718191adcff850cfd6a1d74205d21cf0a3b3c67b4fd442348ab1a SHA512 866a579309511c7b9f299b51ec74652f8831af9b3810bce991bcfe976978b7a00c913697456e60e499590ccbd7c3bf2e9cde045d9de8916613e5cd782aebc043
+EBUILD pkgcore-0.11.5-r2.ebuild 1191 BLAKE2B f2230f3a09376a3429ec63ada66384ef67fb9479d0207258abb527b178a82c24876a732f58ff6853edf02796ba532682fc7b26231549d0cdc3259976388d5fcb SHA512 778ad43775ab53863850d42b8d868d55a0ad4403cd9007c5cc02645c856e32a7815fb400c942e1c03f2f13d6534e540a96b9fe28e896ef2ab8122a4efe0ef47b
+EBUILD pkgcore-0.11.6.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
 EBUILD pkgcore-9999.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch
new file mode 100644
index 000000000000..84aaf93f73db
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd-2.patch
@@ -0,0 +1,40 @@
+From cc7be6516d25cfa27b25b5c0ced6b8a8514d46e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Mar 2021 21:19:46 +0100
+Subject: [PATCH] data: Sync metadata.xsd for proxied="" attr
+
+---
+ data/xml-schema/metadata.xsd | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
+index db243abb..d2e3d4ff 100644
+--- a/data/xml-schema/metadata.xsd
++++ b/data/xml-schema/metadata.xsd
+@@ -127,6 +127,8 @@
+ 		</xs:choice>
+ 		<xs:attribute name='type' type='maintainerTypeAttrType'
+ 			use='required'/>
++		<xs:attribute name='proxied' type='maintainerProxiedAttrType'
++			default='no'/>
+ 		<xs:attribute name='restrict' type='restrictAttrType'
+ 			default=''/>
+ 	</xs:complexType>
+@@ -138,6 +140,14 @@
+ 		</xs:restriction>
+ 	</xs:simpleType>
+ 
++	<xs:simpleType name='maintainerProxiedAttrType'>
++		<xs:restriction base='xs:token'>
++			<xs:enumeration value='yes'/>
++			<xs:enumeration value='no'/>
++			<xs:enumeration value='proxy'/>
++		</xs:restriction>
++	</xs:simpleType>
++
+ 	<xs:complexType name='upstreamMaintainerType'>
+ 		<xs:all>
+ 			<xs:element name='email' type='emailType'
+-- 
+2.30.2
+
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild
index 794dab08f1bf..231497d64904 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r3.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
@@ -26,7 +26,9 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -38,6 +40,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-metadata-xsd.patch"
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
 )
 
 python_test() {
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
deleted file mode 100644
index 259e6675cd17..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild
index da21d28449c6..59c8183d8a79 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild
@@ -26,7 +26,9 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -36,6 +38,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 python_test() {
 	esetup.py test
 }
diff --git a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild
index 42c6a3cacd81..0de5a597644f 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.2-r2.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
@@ -33,6 +35,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/sys-apps/pkgcore/pkgcore-0.11.1.ebuild b/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild
index 2998f6377a3f..5094000142d6 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
@@ -33,6 +35,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
index 2998f6377a3f..ad98dca71057 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -24,7 +24,9 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
@@ -33,8 +35,17 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
 python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
diff --git a/sys-apps/pkgcore/pkgcore-0.11.3.ebuild b/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
index 0bed083a982f..596e3598f7ed 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.3.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
+	RDEPEND+="
+		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
@@ -33,8 +35,17 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+)
+
 distutils_enable_tests setup.py
 
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
 python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild b/sys-apps/pkgcore/pkgcore-0.11.6.ebuild
index d98868c1bf84..d98868c1bf84 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.4.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.6.ebuild
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
new file mode 100644
index 000000000000..820b84039893
--- /dev/null
+++ b/sys-apps/plocate/Manifest
@@ -0,0 +1,7 @@
+AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097e98178913766f88fdcea68b25f3285b14ff8791d668ca2a608ed6bcdf5f9b5b3c2cfedb2e76ad5c674bba03664ee19232e5bb SHA512 440b96a621c9f39f3b9a846342d5dc1d95ef7a8b5253e1c569582bddd6e1a544767996885c5f19a5bcc78cfc48f522f93631c382d2cd360a528141bc8a029aa2
+AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
+AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
+AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
+DIST plocate-1.1.5.tar.gz 69090 BLAKE2B 70b398eb1a5d7b36294188966ef5f46843d9db9f41021a294d88795944412b4ef3819771082955a74a9945296fa14c59461a4ab4af197691f7085a40eeb7f0ef SHA512 6169ea7b3587e12e555a42e0c70e149626810f5e6f9f1f03ca1b069d7892d45bc52cabf072324eaa6f14055943dd680a71642914c0218a770e2b00a22c75efbc
+EBUILD plocate-1.1.5.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
+MISC metadata.xml 1285 BLAKE2B 778c722e0b5e673f97f22f3c60fb2ed5cd1ce18ceb6aec3426049010eaa930a51bb68c2bda2b9a3f471a9737dec406c52fc849cb674df913410868d3c9dd5479 SHA512 f558b515d2dabb31d11ace480ad94c8c2a925c5ffab618930bb3fecc29fb710f7ad3ff253955272930004ca96344950ce5aa743bece0862a3a6c1c1675be22ff
diff --git a/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch b/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch
new file mode 100644
index 000000000000..2635a8007882
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch
@@ -0,0 +1,21 @@
+Unconditionally install systemd unit
+--- a/meson.build
++++ b/meson.build
+@@ -76,17 +76,9 @@
+                configuration: conf_data)
+ install_man(updatedb_conf_man)
+
+-if get_option('install_systemd')
+-	systemd = dependency('systemd', required: false)
+-	if systemd.found()
+-		unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+		updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
+		       output: 'plocate-updatedb.service',
+		       configuration: conf_data)
+-		install_data(updatedb_service, install_dir: unitdir)
+-		install_data('plocate-updatedb.timer', install_dir: unitdir)
+-	endif
+-endif
+
+ # Requires having TurboPFor checked out, so not built by default.
+ # Unless you have a recent Meson, there's no apparently good way
diff --git a/sys-apps/plocate/files/plocate-cron.conf b/sys-apps/plocate/files/plocate-cron.conf
new file mode 100644
index 000000000000..f207344a9e6c
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-cron.conf
@@ -0,0 +1,9 @@
+# nice value to run at: see -n in nice(1)
+NICE="19"
+
+# ionice class to run at: see -c in ionice(1)
+# you have to install sys-apps/util-linux manually
+IONICE_CLASS="2"
+
+# ionice priority to run at: see -n in ionice(1)
+IONICE_PRIORITY="7"
diff --git a/sys-apps/plocate/files/plocate.cron b/sys-apps/plocate/files/plocate.cron
new file mode 100644
index 000000000000..ebcfcbffe7b0
--- /dev/null
+++ b/sys-apps/plocate/files/plocate.cron
@@ -0,0 +1,51 @@
+#! /bin/sh
+set -e
+
+# check if we run on battery and if so then don't run
+if which on_ac_power >/dev/null 2>&1; then
+	ON_BATTERY=0
+	on_ac_power >/dev/null 2>&1 || ON_BATTERY=$?
+	if [ "${ON_BATTERY}" -eq 1 ]; then
+			exit 0
+	fi
+fi
+
+# check if we are already running (lockfile)
+LOCKFILE="/var/lock/plocate.daily.lock"
+if [ -e "${LOCKFILE}" ]; then
+	echo >&2 "Warning: \"${LOCKFILE}\" already present, not running updatedb."
+	exit 1
+fi
+touch "${LOCKFILE}"
+# trap the lockfile only if we really run the updatedb
+trap "rm -f ${LOCKFILE}" EXIT
+
+# source the user specified variables
+if [ -f /etc/plocate-cron.conf ]; then
+	. /etc/plocate-cron.conf
+fi
+
+# check the config file
+NODEVS=""
+if [ ! -f /etc/updatedb.conf ]; then
+	NODEVS=$(awk '$1 == "nodev" && $2 != "rootfs" { print $2 }' /proc/filesystems)
+fi
+
+# alter the priority of the updatedb process
+if [ -x /usr/bin/renice ]; then
+	/usr/bin/renice +${NICE:-19} -p $$ > /dev/null 2>&1
+fi
+if [ -x /usr/bin/ionice ] && /usr/bin/ionice -c3 true 2>/dev/null; then
+	/usr/bin/ionice -c${IONICE_CLASS:-2} -n${IONICE_PRIORITY:-7} -p $$ > /dev/null 2>&1
+fi
+
+# Cleanup old temp files from previous unsuccessful runs
+rm -f /var/lib/plocate/plocate.db.*
+
+# run the updatedb if possible
+if [ -x /usr/sbin/updatedb ]; then
+	/usr/sbin/updatedb -f "${NODEVS}"
+else
+	echo >&2 "Warning: \"/usr/sbin/updatedb\" is not executable, unable to run updatedb."
+	exit 0
+fi
diff --git a/sys-apps/plocate/files/updatedb.conf b/sys-apps/plocate/files/updatedb.conf
new file mode 100644
index 000000000000..6a00d3aa2b94
--- /dev/null
+++ b/sys-apps/plocate/files/updatedb.conf
@@ -0,0 +1,16 @@
+# /etc/updatedb.conf: config file for slocate
+
+# This file sets variables that are used by updatedb.
+# For more info, see the updatedb.conf(5) manpage.
+
+# Filesystems that are pruned from updatedb database
+PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devfs devpts devtmpfs ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs"
+
+# Paths which are pruned from updatedb database
+PRUNEPATHS="/tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
+
+# Folder names that are pruned from updatedb database
+PRUNENAMES=".git .hg .svn CVS"
+
+# Skip bind mounts.
+PRUNE_BIND_MOUNTS="yes"
diff --git a/sys-apps/plocate/metadata.xml b/sys-apps/plocate/metadata.xml
new file mode 100644
index 000000000000..ffe1b7daa0ad
--- /dev/null
+++ b/sys-apps/plocate/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag>
+	</use>
+	<longdescription>
+	plocate works by creating an inverted index over trigrams (combinations of
+	three bytes) in the search strings, which allows it to rapidly narrow down the
+	set of candidates to a very small list, instead of linearly scanning through
+	every entry. It does nearly all I/O asynchronously using io_uring if available
+	(Linux 5.1+), which reduces the impact of seek latency on systems without SSDs.
+	Like mlocate and slocate, the returned file set is user-dependent, ie. a user
+	will only see a file if find(1) would list it (all directories from the root
+	have +rx permissions).
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/plocate/plocate-1.1.5.ebuild b/sys-apps/plocate/plocate-1.1.5.ebuild
new file mode 100644
index 000000000000..4aaa46baf9c4
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+io-uring"
+
+RDEPEND="
+	acct-group/locate
+	app-arch/zstd:=
+	io-uring? ( sys-libs/liburing:= )
+	!sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~IO_URING"
+ERROR_IO_URING="required for USE=io-uring"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.5-no-systemd-check.patch
+)
+
+src_prepare() {
+	# Pretend liburing dep doesn't exist when USE flag off
+	if ! use io-uring; then
+		sed -i "s/dependency('liburing/dependency('/" meson.build || die
+	fi
+
+	# We'll install the manpage ourself to locate.1
+	sed -i "/install_man('plocate.1')/d" meson.build || die
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlocategroup=locate
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc README NEWS
+	newman "${S}"/${PN}.1 locate.1
+	dosym plocate /usr/bin/locate
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/plocate-cron.conf
+	fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}"/plocate.cron plocate
+	fperms 0755 /etc/cron.daily/plocate
+
+	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 21a0908e5122..4cd0e8ab98a7 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -2,4 +2,4 @@ AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d112802
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197
 EBUILD razercfg-0.42.ebuild 2102 BLAKE2B be673b8f875378ff984e54500378d7d279779779f773f32883fcb584830dce3b92907e6dbc171604618c8b7a52f1b0bb26babc34c28ba3236a9a16811492a2f7 SHA512 5f605666f375fd55732c2c9be3df825d3e0cd1fb0a5420b751484c88b432c0d8d54eefcfb72840ea7f2210be4eb5efb17f09e653bd2aa73fc666c57e5998d8f2
-MISC metadata.xml 963 BLAKE2B 4de293a678fe24f692ce51f935bd9c112247d7a896725f35ed52a19560448ee085bfed868110b7a687e9fe7f85e1f41858fa368413c35dba05a0639ae5e8c431 SHA512 b94a639add6cb35bb62fa7a061e1b7acf18f26aa15088f519f1f076ba50b20c839afd38a70b0fbfa968b9167eb48d9c70985d18b38496a0da8a593ca734ebdc5
+MISC metadata.xml 993 BLAKE2B 31175b645ebae1a40a17a18be2ec443c612cafdc568ae8be03dd8101789987f3fc3157c53f8e0c117930bdddb7508e663690aa0b2ce31dae76ee2675a678b66d SHA512 3a4d211df0bff7e749003f6357edd902a2f434784381bdd923fa54055321fa257c9b4fb29cda2be94bd5bffed1b5ecad1d4a87e3b26a056ea7757c0acb25f9d7
diff --git a/sys-apps/razercfg/metadata.xml b/sys-apps/razercfg/metadata.xml
index c8db6971140a..c4a6d9a3aac1 100644
--- a/sys-apps/razercfg/metadata.xml
+++ b/sys-apps/razercfg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>kaikaikai@yandex.ru</email>
     <name>Alexey Korepanov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 024cebf694ec..816d158d2ac3 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
 EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b
 EBUILD s6-linux-init-1.0.4.2.ebuild 1684 BLAKE2B 87a4f9184c55aff9b1390c22bc72abbcf71b38451fda08c503c479800d89eabb8c5afc9663bf931800f1c92cdd3cc0e61ae0f0f9abce6114b2723a5c8cda79f1 SHA512 ab6701ff5a1f1f53d48f93c300aaf7f449149e53a0966afd77921ead2f58a3d2b3359f25ccb3b4d86d504afff518e60b5f069fd2f0a70045a6e421401914c465
-MISC metadata.xml 496 BLAKE2B e80d42ffadfc225ac5c6e6bc7470e136057a25c73effd1e0510740631bebec02a5df7b405977aa6be9a9a23cf2af7d5c03c74ca2882164e2394585f01dd6498f SHA512 98e0969469c67f17e91add2fdc82ecc31316e93a597e748119ce44340b81efca9548f3845f8abe9888855d711e2e573e5c8f97ee566ec0ded81a033e410a1d83
+MISC metadata.xml 510 BLAKE2B 17c9ce817246dc8c4b2fe743f59db38b33c28249e911a2b918bfed6c318d823a16766bd490573db42c847d600afa9a813ea362a7a681d24174e711ea1a9a7bc0 SHA512 73d805f67c26de05f906807879da5a1c22781dae1f3b07aaec2c0d3b9c8d32daabd977b4218d119ed399dc04cd17fee76dfc787b2a70fbf2cbcee0dd10797843
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 4f506a138719..929e2f352a4e 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 2c5ec77b61d4..54694150ac33 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8e
 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
 EBUILD s6-linux-utils-2.5.1.1.ebuild 1006 BLAKE2B 9cf302ee56e750aecc9c11b1b5bc0a8c47ea3f1fa5b97c7c2ded615f5eea59bd2793aebca3f58cee10a5cf16fbc5d8a507cce344c9cc32e71980d2d38d0cd020 SHA512 11ce68e1a66e0b13d47c0403c428c0885813ed2004ec3bd7d0520069caed21888106f8b52a826daf2e3253775b67e359320f31fb284b90db4b26a0f93ec07363
 EBUILD s6-linux-utils-2.5.1.3.ebuild 1006 BLAKE2B 775838d0b17dacddba4a208cd0d1c1d37e5f47f822fadd4fbca5ee3b83e1d040900782367969020593d32d1ac96cadb3dbcda84733273ec56d8d9eb5bec0b374 SHA512 919375509aaf59f8050622b6a90245fd319fca97b58045dfb1b7bcb689d49c707596b9253852f1d2424040d9e98b4d3c177529938e7b247391d3447240987ec9
-MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
+MISC metadata.xml 372 BLAKE2B d2ffe4d3f79a5f0e1e0b0ce6f1e3929fb2e986ab391251969aa5bba7f85c84b18e0f8066d19f283977b8d26062f48b1bb57f3a796e9dd8dc5ec5322493aa48b2 SHA512 c80bcb46a785bb91c503c2281f0e5b627c6c36296a2c37dc2df9586de6eac80416ea43aa7d02cb678af21accf111361514c95e8c35525544428f4b7fc516248c
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index 2e37454094e4..3b78456dd8e6 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index e0f2a6d34855..db4df9c968cd 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5
 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
 EBUILD s6-portable-utils-2.2.2.1.ebuild 1017 BLAKE2B c8bf282a83274cd985fbcd41b530fa42d619a4021602a438d4b08daa23bc840cd8054b720a66cca29254e65cadd768925a2e187ddd14e5ac16a83403ff411d2b SHA512 3708099d6318515bc2746b738ed3dbbc8314ba58a7f81e5548f3bffc8cce18c16b6933199a6b64cc6c8fdf0de740a5aeefa924a864e4b8018d93d7ed4fdf38d9
 EBUILD s6-portable-utils-2.2.3.0.ebuild 1017 BLAKE2B 284b5576cf3ac0dff133e3fc70d6c8ec27aad7a820252564f7e8e0a903609e579ade7aa46d794b9710cc11273cbbbe021d9c8d72d453a53de5d17792eb26d7a3 SHA512 9a0a24a5a57eec4271a59bcccdb917ac30175e5191ee5fc2106d161f0446ba4c1dff553e516d3cd0a942658106f52b7bac329d1e9ec7ceb460b49441b009808d
-MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
+MISC metadata.xml 372 BLAKE2B d2ffe4d3f79a5f0e1e0b0ce6f1e3929fb2e986ab391251969aa5bba7f85c84b18e0f8066d19f283977b8d26062f48b1bb57f3a796e9dd8dc5ec5322493aa48b2 SHA512 c80bcb46a785bb91c503c2281f0e5b627c6c36296a2c37dc2df9586de6eac80416ea43aa7d02cb678af21accf111361514c95e8c35525544428f4b7fc516248c
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index 2e37454094e4..3b78456dd8e6 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 476048deccc4..15856afe6159 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -12,4 +12,4 @@ EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c8
 EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
 EBUILD s6-rc-0.5.1.1.ebuild 1496 BLAKE2B 55776ae5839593d33b77504e5f78bceac60c007647dee1124532360173cbaf23220c8071012b5da755bca90752226f6ae2c32449104cf7c9c45ebfd8eafbcf41 SHA512 d1fcc1adcfb715d48cbb79db91d6b76114d7e150a4fc5e5e1d80ae64ef4c329f5b25da60590925daaf730393b791fc7081ae8e8037c525d71fae55ac7193caa8
 EBUILD s6-rc-0.5.2.0.ebuild 1505 BLAKE2B c58ece484908002d3d05fb1d7a6cbe28a4afb4dfc64be42978fc9c9fcd79b77c4c40a0ad1d4f0dafb75b446cc48cd53f38b31df39a84d0a5af6cde7434a3867c SHA512 c737b7a4dcb1cf5889143034d405a50d9e8718d6c0f4f687c50bf81ddb8d6464828868e193149501c9cee7d026352332809c5ca93635111ac6b53cfd0510a927
-MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
+MISC metadata.xml 372 BLAKE2B d2ffe4d3f79a5f0e1e0b0ce6f1e3929fb2e986ab391251969aa5bba7f85c84b18e0f8066d19f283977b8d26062f48b1bb57f3a796e9dd8dc5ec5322493aa48b2 SHA512 c80bcb46a785bb91c503c2281f0e5b627c6c36296a2c37dc2df9586de6eac80416ea43aa7d02cb678af21accf111361514c95e8c35525544428f4b7fc516248c
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 2e37454094e4..3b78456dd8e6 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 9970b910bc53..ed92ba81fb62 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -14,4 +14,4 @@ EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066
 EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912
 EBUILD s6-2.9.0.1.ebuild 1184 BLAKE2B 2efc249add48ac861e56017ce27eba5cfe5d3bb11a5b345c677269ae73e8a1f0d6090ec1bc39e2a0eafe2518bd838c66a95e6b595439a3929badbc19aa51977b SHA512 299f09ccc8be432fe0c71ff3ca900f0ff05345911bed83040fb8c03a1c0a2596274eb5b2fa45947a40181b567a8e92f3045b1f7b2d9bb065119262d1683e769c
 EBUILD s6-2.9.2.0.ebuild 1254 BLAKE2B 4f83b4f35ccb8b9f469a987f3966af0599b9dec91d268f342588a3aa070e62b4c505bb72ad8fe9d6422f2d1308c8bdd88c88b8796cb2e2656925f5228a549712 SHA512 9637e4a55844f31e270b66860cbe3138904e8c6ea35a9997241dff026eb57075b66ea59a31ca8245bbc3b93288d061ac6f38f8a5ac1d768d8bc20b0cea488806
-MISC metadata.xml 617 BLAKE2B 54bf4abe6178471732a42ac78f017567932bcfa1579d0815f4b2a365486cbe9ff3a0bee00bd6aa5b1b4a6b27182885790f5d80c099c7f404a28c4fb604a2091e SHA512 644271e7fc3b6bdaf85470bbb908df5a82f3988378a7a001db46d957974e3518664580ba55844917a70fa3f2d1b0480a90e8b7b56e0769209b70240093a84e91
+MISC metadata.xml 631 BLAKE2B 9f6052892e8ca9905487393bb8a0cb24e172ce432afbb1881ddbaf4706f9e64125d1386d35e5565409f006379368bced8f60ff85520168ac3b4b61b8ccebf0a8 SHA512 1dfd042e66b518ce9a0ac0de2af077e1f29b578be548f9b67bd434732d8bf170b29c6fbb46d38a13bd898671018fb492654195c31328ca365dc6572f0b5265db
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 1718e243ff88..38e06983f1b3 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -5,7 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b118910936c0..3171caee9ef1 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,4 @@
+AUX 247-cgroup-test.patch 1859 BLAKE2B e97d638c96e0f9c783736227031ac8774dfa5c2040bfb828abbbc14faa1edde312187ff2314d9f762081bc93dd5ecec077229e30aeb46ade43410c961feed965 SHA512 1c08ce1e7a8e56b68966666d8af5764f903e2d851a288e3e1bc78ad58f7223d7a52486ed4b1c1a4afef0ba24e4b90eecea56df9f2139c771a935e050bf436aff
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0
@@ -9,6 +10,6 @@ DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20
 EBUILD systemd-246.6.ebuild 15393 BLAKE2B 9e107dc2e511b55e338faa6706e1e5959a598afd44886a51ed9ee0be001944a5541fafe02dd818fbce0b679ffa47af58d0d2444c9757eb9aa4ce835a3a649ebe SHA512 17d667ce4ea662d94206c3b04d206f0b0f14d94ae9c19d969c9b235f3f32dc63b10ba5116c3e96dc59b873c495c3a2c4039e0de3a2bc64c7375c088979e1c592
-EBUILD systemd-247.2-r4.ebuild 15729 BLAKE2B f69ffe1d93cc5d2ee2e065aed95eead585ff385504b8eea8b124086b642c1f9a97e1526f90fa3b2e48736683906b3df477a3aafdf1cc008c6475d7591fab8684 SHA512 89eaa2a59907c996903ea1809a6688dd9160138eed7b29386f8884646b302f5ed1e33b20ecb88ef4bb3ef01e2accfb23d5096b92cc2a28b66daace5e544e6be1
+EBUILD systemd-247.2-r4.ebuild 15766 BLAKE2B 51833eca4fe5b60b72fd8b7a4f23726da3dc88946737426a6bb513ae18cb96c81fd373b0c21fd844a6a12184b800b5363acb2b2f8f6c35e77d0dfceac3724d7c SHA512 20064f79166a8faa1b6da1a4ec0849d1bfb7416b8a958e129df72aa76dfbbc63b1fce9ead8b67300377f98083a5be4ceef4d4d4afc149299194aeb0a0d6ec1ab
 EBUILD systemd-9999.ebuild 15731 BLAKE2B e1021ad90a8f0b60829f2da18947c0c21d9fe590bd4e0e591030964c57ef6774d7b1c39189d0e7291c3e590b68a32a932edba10dfe16810fd9154306e721bcaa SHA512 2d7f30712144e5071a6463c0117b8d476b5e771d6fa0213d89b8b5e3aaadd8ee09defef207cb0d7149c76a644c3d5ff60f95c7cf9529f9f4ac84d00a94ba26ee
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/files/247-cgroup-test.patch b/sys-apps/systemd/files/247-cgroup-test.patch
new file mode 100644
index 000000000000..bfa4422a6211
--- /dev/null
+++ b/sys-apps/systemd/files/247-cgroup-test.patch
@@ -0,0 +1,35 @@
+From ddfc6ad061ad47caeeff901d27cbc59af85e0db3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 9 Mar 2021 17:57:37 -0500
+Subject: [PATCH] cg_unified_cached: return ENOMEDIUM if we cannot find a known
+ hierarchy
+
+When the test suite is being run in a foreign environment,
+/sys/fs/cgroup might not be set up in a way that we recognize.
+Returning ENOMEDIUM causes the tests to be skipped in this case.
+
+Bug: https://bugs.gentoo.org/771819
+---
+ src/basic/cgroup-util.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
+index 527043a2b39..0b252eb28fb 100644
+--- a/src/basic/cgroup-util.c
++++ b/src/basic/cgroup-util.c
+@@ -2052,8 +2052,14 @@ int cg_unified_cached(bool flush) {
+                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
+                         unified_systemd_v232 = false;
+                 } else {
+-                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
++                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) {
++                                if (errno == ENOENT) {
++                                        /* Some other software may have set up /sys/fs/cgroup in a configuration we do not recognize. */
++                                        log_debug_errno(errno, "Unsupported cgroupsv1 setup detected: name=systemd hierarchy not found.");
++                                        return -ENOMEDIUM;
++                                }
+                                 return log_debug_errno(errno, "statfs(\"/sys/fs/cgroup/systemd\" failed: %m");
++                        }
+ 
+                         if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
+                                 log_debug("Found cgroup2 on /sys/fs/cgroup/systemd, unified hierarchy for systemd controller (v232 variant)");
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 2239dc02efc4..4853d82c9c9c 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{7..9} )
@@ -212,6 +212,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}"/247-cgroup-test.patch
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
index d2404f45f1c3..da084b8c7b89 100644
--- a/sys-apps/thunderbolt-software-user-space/Manifest
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -2,4 +2,4 @@ AUX thunderbolt-software-user-space-0.9.3-cmake.patch 521 BLAKE2B ca7756afc0504e
 DIST thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz 1160 BLAKE2B 2710f2acea71a7301a121a564bc7625c73b7c983622f9d50f544836facbda7c8cbc29055c81706ec0d8fe5aaa8d254872f9c9740b2b9235642b1264380ad17c1 SHA512 3a5b5e5bfc6b7e2a0f2cd09428e315d6895a217bfda7faacd3817e85b3201192f6dd6b26d10071721164bb9c49731aead1d8249ad6652fdba9d38074fcb74907
 DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
 EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 1031 BLAKE2B 6ae85474d7ca2eff7c2b522b40b57af6279ed10988199cbe35f50c26d276c21b422ee8f750d6d492aa66376fdb35f2c541fecc66cdc6665211d712d248f28f10 SHA512 3a92e3138aeb8ac1262af5324201bae6b48e820c8fb1109e66c26553a2534bd90a42f67155bf89abb29a182db679aee156ea2e8f262da02737531d13c98f4c9b
-MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
+MISC metadata.xml 584 BLAKE2B 47a098906ea69b9cb3625f0f5a77508e70ba8450f12b4b5cda93201c2ccf91f39d9927a2b552f56f80d56ffd38d3aa174f8ab6e7ec007267f967ac8ed0a24d8f SHA512 a6fc4258f7a0b98630779e170cd3bd8a44d369ac2972916e0ecc762847c61a4e58dee577a812eabe45d07081ace127f08f4815d8b094bc3e80b97ab910f6e4df
diff --git a/sys-apps/thunderbolt-software-user-space/metadata.xml b/sys-apps/thunderbolt-software-user-space/metadata.xml
index 8fb8d2b55b7d..953ef4b670cd 100644
--- a/sys-apps/thunderbolt-software-user-space/metadata.xml
+++ b/sys-apps/thunderbolt-software-user-space/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<name>Jonas Licht</name>
 		<email>jonas.licht@gmail.com</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 47850b8967f1..951d85427f0d 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -3,6 +3,5 @@ AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc48
 AUX udevil-0.4.4-no-libtool.patch 223 BLAKE2B d31cc00b2aeb4143a2ce58f36dd13f3701ed8f8e30604e73757c3c04e21fd80fb69f50d80bfa30360b83c3a8a882e72009c99767cbb7a0c90c3403b00477c92d SHA512 bc77d93ac17f8345b973df6dd81890dc3e437e7926d53db5cbbbb17a5c3f2067ad0ff027b0d870c15276a5528bbc869bed6d7ec5b090927e671865783ffc37a2
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r3.ebuild 1960 BLAKE2B a1aec5c2fd909c3b0361651bb39771bb88dcb939654af6a6e149b2407453e15693d19a15293a63400e9e7279c8dc056edf62f87c7494a8cd2554896de904c2ff SHA512 e1a6f76c8e7e1423288fb3c486bffbaf37b28ec3975e30c8d857f8f369cea6060c9f373358b9f4cf0b2c731efaf3a2254b8d71978715c3652d07c3cdbaa48489
 EBUILD udevil-0.4.4-r4.ebuild 2004 BLAKE2B 1e18b59577fdcac142dbdd87471e71d53ed271af55a359eaddb0db1d6716844230237daf2f46a685bb136e0dbf9a9353925cb4f5565389dc49010066c825770a SHA512 ba747431b7ff309b36c72a26e341df81b7973749b7c720d8357fe5e3819b4b1733d207959ea1101916f3525699ee87b6c08737f36fbca5759e3f997f509bb543
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
deleted file mode 100644
index fdae0cfa0d3d..000000000000
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-group/plugdev
-	>=app-shells/bash-4.0:*
-	dev-libs/glib:2
-	sys-apps/util-linux
-	virtual/acl
-	>=virtual/udev-143"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	# This works for 0.4.4 too, no sense copying the patch
-	"${FILESDIR}"/${PN}-0.4.3-flags.patch
-	"${FILESDIR}"/${PN}-0.4.4-stat.patch
-	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-setfacl-prog="$(type -P setfacl)" \
-		--enable-systemd
-}
-
-src_install() {
-	default
-	fowners root:plugdev /usr/bin/udevil
-	fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
-	einfo
-	elog "Please add your user to the plugdev group"
-	elog "to be able to use ${PN} as a user"
-	elog
-	elog "Optional dependencies:"
-	elog "  gnome-extra/zenity (devmon popups)"
-	elog "  net-fs/davfs2      (mount WebDAV resources)"
-	elog "  net-fs/cifs-utils  (mounting samba shares)"
-	elog "  net-fs/curlftpfs   (mounting ftp shares)"
-	elog "  net-fs/nfs-utils   (mounting nfs shares)"
-	elog "  net-fs/sshfs       (mounting sftp shares)"
-	elog "  virtual/eject      (eject via devmon)"
-	if ! has_version 'sys-fs/udisks' ; then
-		elog
-		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See https://ignorantguru.github.com/${PN}/#polling"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index e00872b9b907..152527b1069e 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,3 +1,3 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
-EBUILD which-2.21.ebuild 635 BLAKE2B a313a8e20d0face63b3be433134f4118f97b2abc24a43e6b8dfa6c0f2d9a7d83a2ede0d4998d4b2363e37226e5f122b84369f4d9a4584979cd72244cc00641b3 SHA512 3cd0b4cfbf3ee71908137d5c8d7c68d212badb3269cee04c2fcc9652f8810aaca2bb89527661fdc561888cbdd356db6afddde9216ffab43dd49084bd31427403
+EBUILD which-2.21.ebuild 627 BLAKE2B c066b5e0a67d0a5d77fd68fd94152db51ce0715c79d6462482712d508b5fbf385f5b7ccf052ed9cca79a4d0161955ae37bb09d93e80f0e1bb933eb3948c125c5 SHA512 9b6a061004068cafb0e8d753e734b8838d22fd0a336b30259cc745765c2a20bf62e1708ed723ca0651d926b2ef85604b452d41f0ff17cc7681f848bb3164fad4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index a292cba08689..831688cf7c05 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 src_configure() {
 	append-lfs-flags
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index b581857af729..a79c2496f9d8 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -4,4 +4,4 @@ DIST yarn-v1.22.5.tar.gz 1244837 BLAKE2B cf5054893c8937ceb6788c27f23005386449664
 EBUILD yarn-1.22.10.ebuild 1070 BLAKE2B 049c5a5cdbb20425ba71385b41725ae5bbb7965eec3db80394ffbfb57ec506be22cf712324ba638d486297fce65d004c0b51ea0fad387f012884d1da04ec82e8 SHA512 b092d1a53a5b6c6f1586a75bca7581a13c8c2a420bd84e33b46b82f8a7b9c6f65429401c2a6b093d4e44bdb59573752227c478d5a4dda7a707e226f061b9b4c1
 EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
 EBUILD yarn-1.22.5.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
-MISC metadata.xml 654 BLAKE2B 4554ddbe2ccaaf07ae2324740b9776f7473ee6a10638b8b91dd75a4451c4030a0bc0cc41dc3fe91e392cdfe07ce6bbd55e9b04f2cd31b9c4021456c70e219237 SHA512 42ea44ef45e4c756ec6b04a657ae184380fe34829b3d770e125762bfa22e4d950a537d82e90e08ff6786dc46927212d0b5ab44e788070d0d7e05072c28440a5b
+MISC metadata.xml 684 BLAKE2B 34b72baadc1750b01ce8d205c272950cab3e883fb646cef6bfd5cc3b62b5da2963f220ecbd3ca6b82f1560406c69606719434fd3c387e4aaedf80653d2f1c4ce SHA512 f72bcf2a5fbe055652c29df20a3f0796394bed5fd6ed9e5f0e49582b8d68263f2905daed2fa90cda6b71f5b4c648d7363f8d3fc641fa4e26dc2265c9b84821da
diff --git a/sys-apps/yarn/metadata.xml b/sys-apps/yarn/metadata.xml
index 52bf09ed0f47..3f3135f6050a 100644
--- a/sys-apps/yarn/metadata.xml
+++ b/sys-apps/yarn/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>saboya@gmail.com</email>
 		<name>Rodrigo Saboya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index 7855ae986c3b..7911b6ac55c2 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -6,4 +6,4 @@ DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f
 DIST zorroutils-0.05.tar.gz 15428 BLAKE2B e9baa6de4da3cbc6754c52d9e0c1fe34ce735b4d5377772c1765bdd30ae988f92125a5f254fcaab797eed33d65dad59e2a385fba3fc4610a9cfb6c34c6b45e7e SHA512 5260cfc7ccf77d0a0fe012c32ab492824903cb0f1397a82cf4c52aa12df5845b9e3d53aa1f619cc3a0637dfb42e9b75f80d715e4e912c5b8f42e0588f9053421
 EBUILD zorroutils-0.04.ebuild 689 BLAKE2B 8a7bd4d720e3ed693777d8fe6cf929d1cd9ce207dfd79f396bf552bc8070ddb50585e4766c59809310d9ed0abeca0459b16678b75e0956aa951c95303a0ab313 SHA512 118207c7b40c0014c555b8c7d9e2327040b28370424cc9c1cefde33216fd4f27b7ed6f17317b3d80062a7ffe2d5f1cce9823021826390ebe542530d5ca35382c
 EBUILD zorroutils-0.05.ebuild 690 BLAKE2B f93d54e87e5311751b73865df6475a70797074f66bdee36cb6124cc8ea288ef9ac687ec4013cf8cb38d6ba04de813df03b9fdab30aa82e97442e5fb0f45624c0 SHA512 271b061ba8b2015a7fc97dba703e8d2baa510d27d0da48ac8d5aa4ae0d9e537c95b077dd0295f72fe72a7be97047f4ffa2a20b9bd1100c593c1af2e99f047927
-MISC metadata.xml 430 BLAKE2B 6394dd99f4248b05a48e72b7f5b499f6e403f38ff6f43236bccaea69ccbfd352f094b9a5e9a09db8f5741d46104ba44243784570bd4fc654a77a4e96ca8d6bb6 SHA512 8e8419f4e429758c2d1d42405505da55f47fc3ea7e30c69c994d825aeb6e45d8639533f8cf276d44e1d272062d6d8058f27651c8b38eae7f7ac8c5844523318b
+MISC metadata.xml 460 BLAKE2B a96bd20cc3d8c469b21e4eb2ff121416e65c54d3bfcf596437bb4f0874f1d9ca50a388a1d24cf63770fe4667f584c75e73a669229b65ebcc5e5a088e3ff74b23 SHA512 91c6187ff9ff3202b1a63e60e0a62722a00b2c3899602998cb1d26b72baa5dcc6412f8b95b1a9f70b5e4c7532726be27f13a7d19664795026b144e2a842c73e4
diff --git a/sys-apps/zorroutils/metadata.xml b/sys-apps/zorroutils/metadata.xml
index 0a210accc7d8..dc215fe993d9 100644
--- a/sys-apps/zorroutils/metadata.xml
+++ b/sys-apps/zorroutils/metadata.xml
@@ -4,11 +4,11 @@
 <maintainer type="project">
 	<email>m68k@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>gentoo@kolla.no</email>
 	<name>Kolbjørn Barmen</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /sys-apps
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)