Sync with portage [Tue Jun 8 08:31:13 MSK 2021].

3 years ago · 9d0ad1148b
parent 83c15b6f32
commit 9d0ad1148b
412 changed files with 3868 additions and 1076 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -9,3 +9,4 @@ DIST awscli-1.19.85.tar.gz 2014586 BLAKE2B 7d7ec1d8ece349875403258988ac1732e48a7
 DIST awscli-1.19.86.tar.gz 2014916 BLAKE2B acebaf9c5d6b672333162ec578f29781f74e66c4eeda212be8b7722d05b30839ba835f03f4f4e9d780cdb4df3e7e9a5ad4a407a0660ddc4f6a8a60f7073c6440 SHA512 dcf9c23a6b11272a6ffdd04f8ba74bd85624692c5de28b6dc87ae75ac5d8b68a1b73d09cf02d29939f83d7d68860c21b2043d4cdc300b5664e0b221a47344956
 DIST awscli-1.19.87.tar.gz 2015321 BLAKE2B 02cc3f0cc2588c9e0d2c7b8d38248455692f3b30dfeaecc076edfc3ce072128c6e788e8503e110eedf4d45ec71f3309c5db7871fd75018da3aaa424ed9d5fe4c SHA512 5bb6fb4ae62a1c4c5e83f59f32840ceab656d17cdee80dfd5530606f2d24e7b77aa78b8d62a020ca44a74c6f73de2cb4f625da5af68de3a90e704d4020703d7a
 DIST awscli-1.19.88.tar.gz 2016344 BLAKE2B 09d29f2494cb540fcbd128197c0ac181c4106bc8aec651144f641b44d4ad0acb6d3c6381180f301508e8babe66f8cc800ce2932706a4efbf8042a525e433e583 SHA512 a5821af1af468fc1c02a9aaf9691346daffe09bc4b886b3b6ecc0a9e30420deb9e7bd3b3308c5dae2518cf76badb69602948566545473a59efd6eba1a329a728
 DIST awscli-1.19.89.tar.gz 2016580 BLAKE2B d58c490383750df0ec9482dd0adbd119f0db0cd30c4cca944581b81eacb9e7bcc99b9b54816b4a85f50e9d326b930cca62a7999a2218e4057029d02888a3a71e SHA512 7aec8fb6b0c8e44c89d24880483722aef81416918cec1f582c847dc1893458ff6297f39b4591f2502c322a760cc4a5c8621d69fae0937df8e1c2eb2290d66a77
--- a/app-admin/awscli/awscli-1.19.89.ebuild
+++ b/app-admin/awscli/awscli-1.19.89.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1
 DESCRIPTION="Universal Command Line Environment for AWS"
 HOMEPAGE="https://pypi.org/project/awscli/"
 #SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/aws-cli-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_tests --install nose
 PATCHES=(
 	"${FILESDIR}"/awscli-1.19.47-py39.patch
 )
 python_test() {
 	distutils_install_for_testing
 	# integration tests require AWS credentials and Internet access
 	nosetests -v tests/{functional,unit} ||
 		die "Tests failed for ${EPYTHON}"
 }
 python_install_all() {
 	newbashcomp bin/aws_bash_completer aws
 	insinto /usr/share/zsh/site-functions
 	newins bin/aws_zsh_completer.sh _aws
 	distutils-r1_python_install_all
 	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
 }
--- a/app-admin/puppet/puppet-7.7.0.ebuild
+++ b/app-admin/puppet/puppet-7.7.0.ebuild
@ -62,7 +62,7 @@ all_ruby_prepare() {
 	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 	# fix systemd path
-	eapply "${FILESDIR}/puppet-systemd.patch"
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
 	# Avoid specs that can only run in the puppet.git repository. This
 	# should be narrowed down to the specific specs.
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@ -1 +1,2 @@
 DIST rasdaemon-0.6.6.tar.bz2 404681 BLAKE2B 4314cd064b255df1cb1a148914c856d074fda1fc2d63e0554cbf0b78799c4252afdd4e827390729e191ff2ed9f719f6610487e85dd52af2b02694fb17740df05 SHA512 481ecd624ab5521d60ee7c613ee05d1d19b85e914b92eae84d18cb2e6dc788981213d49a6316cf575517b6e180f46c66c65804e4feb518bdd84bc21cd2970e08
 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
--- a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
@ -0,0 +1,64 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit linux-info systemd
 DESCRIPTION="Reliability, Availability and Serviceability logging tool"
 HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
 SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sqlite"
 DEPEND=""
 RDEPEND="
 	${DEPEND}
 	sys-devel/gettext
 	sys-apps/dmidecode
 	sqlite? (
 		dev-db/sqlite
 		dev-perl/DBD-SQLite
 	)
 "
 pkg_setup() {
 	linux-info_pkg_setup
 	local CONFIG_CHECK="~ACPI_EXTLOG"
 	check_extra_config
 }
 src_configure() {
 	local myconf=(
 		$(use_enable sqlite sqlite3)
 		--enable-abrt-report
 		--enable-aer
 		--enable-arm
 		--enable-extlog
 		--enable-hisi-ns-decode
 		--enable-mce
 		--enable-non-standard
 		--enable-devlink
 		--enable-diskerror
 		--enable-memory-ce-pfa
 		--includedir="/usr/include/${PN}"
 		--localstatedir=/var
 	)
 	econf "${myconf[@]}"
 }
 src_install() {
 	default
 	keepdir "/var/lib/${PN}"
 	systemd_dounit misc/*.service
 	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
 	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
 	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
 }
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@ -1 +1,2 @@
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
 DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33
--- a/app-emulation/libguestfs/files/1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch
+++ b/app-emulation/libguestfs/files/1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch
@ -0,0 +1,25 @@
 https://sources.debian.org/data/main/libg/libguestfs/1:1.44.0-2/debian/patches/0016-Check-for-caml_alloc_initialized_string-existence-ev.patch
 From: Hilko Bengen <bengen@debian.org>
 Date: Tue, 10 Mar 2020 17:23:15 +0100
 Subject: Check for caml_alloc_initialized_string existence even if
 --disable-ocaml
 ---
 m4/guestfs-ocaml.m4 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
 index 18f95c2..bf07799 100644
 --- a/m4/guestfs-ocaml.m4
 +++ b/m4/guestfs-ocaml.m4
@@ -214,8 +214,7 @@ AM_CONDITIONAL([HAVE_BYTES_COMPAT_ML],
 	       [test "x$have_Bytes_module" = "xno"])
 dnl Check if OCaml has caml_alloc_initialized_string (added 2017).
 -AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && \
 -       test "x$enable_ocaml" = "xyes"],[
 +AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"],[
     AC_MSG_CHECKING([for caml_alloc_initialized_string])
     cat >conftest.c <<'EOF'
 #include <caml/alloc.h>
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
@ -0,0 +1,202 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils flag-o-matic
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
 [[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
 DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
 HOMEPAGE="https://libguestfs.org/"
 SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
 KEYWORDS="~amd64"
 IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # Failures - doc
 # FIXME: selinux support is automagic
 COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
 	dev-libs/libpcre:3
 	app-arch/cpio
 	dev-lang/perl:=
 	app-cdr/cdrtools
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
 	libvirt? ( app-emulation/libvirt )
 	dev-libs/libxml2:2=
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.8.0
 	sys-fs/squashfs-tools:*
 	dev-libs/libconfig:=
 	sys-libs/readline:0=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
 	app-arch/lzma
 	app-crypt/gnupg
 	app-arch/unzip[natspec]
 	perl? (
 		virtual/perl-ExtUtils-MakeMaker
 		>=dev-perl/Sys-Virt-0.2.4
 		virtual/perl-Getopt-Long
 		virtual/perl-Data-Dumper
 		dev-perl/libintl-perl
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
 	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
 		>=dev-libs/gobject-introspection-1.30.0:=
 	)
 	selinux? (
 		sys-libs/libselinux
 		sys-libs/libsemanage
 	)
 	systemtap? ( dev-util/systemtap )
 	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
 	erlang? ( dev-lang/erlang )
 	inspect-icons? (
 		media-libs/netpbm
 		media-gfx/icoutils
 	)
 	virtual/acl
 	sys-libs/libcap
 	lua? ( ${LUA_DEPS} )
 	>=dev-libs/yajl-2.0.4
 	gtk? (
 		sys-apps/dbus
 		x11-libs/gtk+:3
 	)
 	net-libs/libtirpc:=
 	sys-libs/libxcrypt:=
 "
 # Some OCaml is always required
 # bug #729674
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
 	dev-ml/findlib[ocamlopt]
 	ocaml? (
 		dev-ml/ounit2[ocamlopt]
 		|| (
 			<dev-ml/ocaml-gettext-0.4.2
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 	)
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
 "
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 "
 # Upstream build scripts compile and install Lua bindings for the ABI version
 # obtained by running 'lua' on the build host
 BDEPEND="lua? ( ${LUA_DEPS} )"
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 PATCHES=(
 	"${FILESDIR}"/${MY_PV_1}/
 )
 pkg_setup() {
 	CONFIG_CHECK="~KVM ~VIRTIO"
 	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 src_prepare() {
 	default
 	xdg_environment_reset
 	eautoreconf
 }
 src_configure() {
 	# Disable feature test for kvm for more reason
 	# i.e: not loaded module in __build__ time,
 	# build server not supported kvm, etc. ...
 	#
 	# In fact, this feature is virtio support and requires
 	# configured kernel.
 	export vmchannel_test=no
 	# bug #703118
 	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
 	econf \
 		$(use_with libvirt) \
 		--disable-appliance \
 		--disable-daemon \
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
 		$(use_enable python) \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
 		$(use_enable ocaml) \
 		$(use_enable ruby) \
 		--disable-haskell \
 		--disable-golang \
 		--disable-rust \
 		$(use_enable introspection gobject) \
 		$(use_enable introspection) \
 		$(use_enable erlang) \
 		$(use_enable static-libs static) \
 		$(use_enable systemtap probes) \
 		$(use_enable lua) \
 		$(usex doc '' PO4A=no)
 }
 src_install() {
 	strip-linguas -i po
 	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
 	find "${ED}" -name '*.la' -delete || die
 	if use perl ; then
 		perl_delete_localpod
 		# Workaround Build.PL for now
 		doman "${ED}"/usr/man/man3/Sys::Guestfs.3pm
 		rm -rf "${ED}"/usr/man || die
 	fi
 }
 pkg_postinst() {
 	if ! use gtk ; then
 		einfo "virt-p2v NOT installed"
 	fi
 	if ! use ocaml ; then
 		einfo "OCaml based tools and bindings (sysprep, ...) NOT installed"
 	fi
 	if ! use perl ; then
 		einfo "Perl based tools NOT built"
 	fi
 }
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@ -20,6 +20,7 @@
 		<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
 		<flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag>
 		<flag name="fdt">Enables firmware device tree support</flag>
 		<flag name="fuse">Enables FUSE block device export</flag>
 		<flag name="glusterfs">Enables GlusterFS cluster fileystem via
 			<pkg>sys-cluster/glusterfs</pkg></flag>
 		<flag name="gnutls">Enable TLS support for the VNC console server.
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
+	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
 	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
@ -149,6 +149,7 @@ SOFTMMU_TOOLS_DEPEND="
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
 	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	gnutls? (
 		dev-libs/nettle:=[static-libs(+)]
@ -504,6 +505,7 @@ qemu_src_configure() {
 		$(conf_notuser caps cap-ng)
 		$(conf_notuser curl)
 		$(conf_notuser fdt)
 		$(conf_notuser fuse)
 		$(conf_notuser glusterfs)
 		$(conf_notuser gnutls)
 		$(conf_notuser gnutls nettle)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
+	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
 	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
@ -149,6 +149,7 @@ SOFTMMU_TOOLS_DEPEND="
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
 	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	gnutls? (
 		dev-libs/nettle:=[static-libs(+)]
@ -504,6 +505,7 @@ qemu_src_configure() {
 		$(conf_notuser caps cap-ng)
 		$(conf_notuser curl)
 		$(conf_notuser fdt)
 		$(conf_notuser fuse)
 		$(conf_notuser glusterfs)
 		$(conf_notuser gnutls)
 		$(conf_notuser gnutls nettle)
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/filebus/Manifest
+++ b/app-misc/filebus/Manifest
@ -1,2 +1,2 @@
 DIST filebus-0.2.0.tar.gz 7895 BLAKE2B d113ab7e57ee24371dc9adbeb4767f533007d36cee2a3f55ee7bbcf13c31980355cfee2db748ef6c485bad3cb8c68ba1c31f9829b0c6365fa3b63c4899fb8b02 SHA512 fc7083444a67e36778d15a8af38487024ab661d32b891cfc735fd31cce2ddecfff3ef63c591106d97250373dac9aeef8dd0e8cf0ec260b2d67031018fe66249f
-DIST filebus-0.3.0.tar.gz 16921 BLAKE2B 60ec7eb3fb584c053f00301898b914ba9034e3aaa79a79eecdc31f8e1abd1db5c473486e02761adee537faca6725916cf327e38376bdbbeac2c8548be427089b SHA512 a7dd4cbe96e6e691794ea21b23f79caee518855235c1ee35f857fe2938f437095a9199eb9bf309087cef523b6dfa963f3635d94e9b7ece15bbe1b4284fca793c
+DIST filebus-0.3.1.tar.gz 16926 BLAKE2B 87eea36a58895a89a70e236f505af09efabf37ce04ce58c713dc99222e415f0ecd9a55fc921a9b6336f4dea04c5e3860252425e257706f0e37be3d43d76668c0 SHA512 e0d4e30f478c9ae95b520122b5aa70bc792d7caad9f9dbde6a72dec9eff314ca884b0291ed9ad662998d1e0e91679dc96ec749b33f55188fab61e7b2b5baa792
--- a/app-misc/filebus/filebus-0.3.1.ebuild
+++ b/app-misc/filebus/filebus-0.3.1.ebuild
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@ -1 +1,2 @@
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
 DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a
--- a/app-misc/hivex/hivex-1.3.20.ebuild
+++ b/app-misc/hivex/hivex-1.3.20.ebuild
@ -0,0 +1,119 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_OPTIONAL=yes
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit l10n perl-module ruby-ng python-single-r1
 DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
 HOMEPAGE="https://libguestfs.org"
 SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
 S="${WORKDIR}/${P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ocaml readline +perl python test ruby"
 RDEPEND="
 	dev-libs/libxml2:2
 	virtual/libiconv
 	virtual/libintl
 	ocaml? (
 		dev-lang/ocaml[ocamlopt]
 		dev-ml/findlib[ocamlopt]
 	 )
 	perl? (
 		dev-lang/perl:=
 		dev-perl/IO-stringy
 	)
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0 )
 	ruby? ( $(ruby_implementations_depend) )
 "
 DEPEND="${RDEPEND}
 	perl? (
 		test? (
 			dev-perl/Pod-Coverage
 			dev-perl/Test-Pod-Coverage
 		)
 	)"
 ruby_add_bdepend "ruby? ( dev-ruby/rake
 			virtual/rubygems
 			dev-ruby/rdoc )"
 ruby_add_rdepend "ruby? ( virtual/rubygems )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 			ruby? ( || ( $(ruby_get_use_targets) ) )"
 DOCS=( README )
 pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup
 	fi
 }
 src_unpack() {
 	default
 	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
 }
 src_configure() {
 	use ruby && ruby-ng_src_configure
 	if use perl; then
 		pushd perl || die
 		perl-module_src_configure
 		popd || die
 	fi
 	local myeconfargs=(
 		$(use_with readline)
 		$(use_enable ocaml)
 		$(use_enable perl)
 		--enable-nls
 		--disable-ruby
 		$(use_enable python)
 		--disable-rpath
 		--disable-static
 	)
 	econf "${myeconfargs[@]}"
 }
 src_compile() {
 	default
 	use ruby && ruby-ng_src_compile
 }
 src_install() {
 	strip-linguas -i po
 	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
 	if use python; then
 		python_optimize
 	fi
 	if use ruby; then
 		ruby-ng_src_install
 	fi
 	if use perl; then
 		perl_delete_localpod
 		# Workaround Build.PL for now (see libguestfs too)
 		doman "${ED}"/usr/man/man3/*
 		rm -rf "${ED}"/usr/man || die
 	fi
 	find "${ED}" -name '*.la' -delete || die
 }
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,2 +1,3 @@
 DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
 DIST eix-0.35.0.tar.xz 636432 BLAKE2B 8a880cde56c0010f193445d9813c533effd59b8ee570132a0c40d62de827968839d99ee16981d152e737b881519e9f73d4ddac5375b6339dd480064deefa6149 SHA512 b9a6e59e666ec6015a612e083839a11a77e1d649262a802a9c8684fe25abbeda7a2c51ea629f1bb85ddc77fccce42b577178284763668bb2d1bcc85df5d68f2e
 DIST eix-0.35.1.tar.xz 635996 BLAKE2B e8afb4d33d8e0525471e396e752859ab5fb165df8b1519cfa9ded1a3ff287059d9c647d744ec095eeec92d01f25330cced3ecefdb3d399ecf513d8aa5f14e9d3 SHA512 2812406f28994c133f9fe3dfe53bc0495f5bb446e2f0ac69f070632d0f357044c1c334e5ed2344a81dd8e3ba100fb427c161201e488ef2581717b55a712f3908
--- a/app-portage/eix/eix-0.35.1.ebuild
+++ b/app-portage/eix/eix-0.35.1.ebuild
@ -0,0 +1,103 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools bash-completion-r1 flag-o-matic tmpfiles
 DESCRIPTION="Search and query ebuilds"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 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="debug doc nls sqlite"
 DEPEND="
 	nls? ( virtual/libintl )
 	sqlite? ( >=dev-db/sqlite-3:= )"
 RDEPEND="${DEPEND}
 	>=app-shells/push-2.0-r1
 	>=app-shells/quoter-3.0_p2-r1"
 BDEPEND="
 	app-arch/xz-utils
 	nls? ( sys-devel/gettext )"
 pkg_setup() {
 	# remove stale cache file to prevent collisions
 	local old_cache=${EROOT}/var/cache/${PN}
 	if [[ -f ${old_cache} ]]; then
 		rm "${old_cache}" || die
 	fi
 }
 src_prepare() {
 	default
 	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
 	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
 		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
 		-i src/eix-functions.sh.in || die
 	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
 		-i src/Makefile.am || die
 	eautoreconf
 }
 src_configure() {
 	local myconf=(
 		$(use_enable debug paranoic-asserts)
 		$(use_enable nls)
 		$(use_with doc extra-doc)
 		$(use_with sqlite)
 		--without-protobuf
 		# default configuration
 		$(use_with prefix always-accept-keywords)
 		--with-dep-default
 		--with-required-use-default
 		# paths
 		--with-portage-rootpath="${ROOTPATH}"
 		--with-eprefix-default="${EPREFIX}"
 		# build a single executable with symlinks
 		--disable-separate-binaries
 		--disable-separate-tools
 		# used purely to control/disrespect *FLAGS
 		--disable-debugging
 		--disable-new_dialect
 		--disable-optimization
 		--disable-strong-optimization
 		--disable-security
 		--disable-nopie-security
 		--disable-strong-security
 	)
 	econf "${myconf[@]}"
 }
 src_install() {
 	default
 	dobashcomp bash/eix
 	dotmpfiles tmpfiles.d/eix.conf
 	rm -r "${ED}"/usr/bin/eix-functions.sh || die
 }
 pkg_postinst() {
 	tmpfiles_process eix.conf
 	local obs=${EROOT}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
 		ewarn "Found obsolete ${obs}, please remove it"
 	fi
 }
 pkg_postrm() {
 	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
 		rm -rf "${EROOT}/var/cache/${PN}" || die
 	fi
 }
--- a/app-portage/kuroneko/Manifest
+++ b/app-portage/kuroneko/Manifest
@ -1 +1,2 @@
 DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1
 DIST kuroneko-0.1.1.tar.gz 10223 BLAKE2B aad046291218139662e74c653241bfb36180a0f7fdb4e3571c4d3c8787c41032c48a96d7b02f612e957b2a0eca9fd880daa03c31302d2e92eb6dec5df1b18aab SHA512 c4f29cb5244e659f2615cca706d002c9f20b200b51c964250da8c915d45bcaca03eac2a2dbc19e1d9b6a6374b7458b2c9e0a004e0fa14b1655e8c2c9ce8268a9
--- a/app-portage/kuroneko/kuroneko-0.1.1.ebuild
+++ b/app-portage/kuroneko/kuroneko-0.1.1.ebuild
@ -0,0 +1,33 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
 HOMEPAGE="https://github.com/mgorny/kuroneko/"
 SRC_URI="
 	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="scraper"
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	sys-apps/pkgcore[${PYTHON_USEDEP}]
 	scraper? (
 		dev-python/bracex[${PYTHON_USEDEP}]
 	)"
 BDEPEND="
 	test? (
 		dev-python/bracex[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@ -1,2 +1,3 @@
 DIST libiodbc-3.52.12.tar.gz 760155 BLAKE2B ab1a66b34c55f5ebd72c76c09bf356c9e009666634f7f7516c39653840051bd7ae399b54232284e9cfeae37b752eae761d8f749e48e3184857ba59177016e03a SHA512 992a4d0a36651fe55178a4834160901381ea230a0e1671f61e1c5dd17708d2b649823313b97d5954e1656dc2213382361cb5f1eaf2f28f3b1ac55fd9f7aac535
 DIST libiodbc-3.52.14.tar.gz 800285 BLAKE2B 6d6c52ae6eb133c5d844a9106079878290a317c72e1d1fb31f4a91c703ff26b8b97fbeccfcf0041442dc7775042f64711cf7a47db7a2eba745e6a502b3f2adeb SHA512 76f60b1bf818937f1aa6fa4ac8a98573860e37d437ece94de9500b815be9e931fbd81a5ca700aa645329727773cc1710b4a7de69fbf2ef43cf610b6fbca05bac
 DIST libiodbc-3.52.15.tar.gz 658200 BLAKE2B 856855f424e31629e3c3fb11f31e189d22daee877e989622a4f5c2a9c7145697a639fd79bd7bdc17be03176b0ee34a3bc02afe958c278531de0f9b9685947988 SHA512 843a938c961c77e12b6c5571fa7c5528e547c028e213195e72224166cebb49acb746e2e1e636c37991686d9e476dfd64ee42bb113013f01b4201d6d9cf99c3bd
--- a/dev-db/libiodbc/libiodbc-3.52.15.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.15.ebuild
@ -0,0 +1,66 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools multilib-minimal
 MY_PN="iODBC"
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.iodbc.org/"
 SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="|| ( LGPL-2 BSD )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk"
 RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 DOCS=( AUTHORS NEWS README )
 MULTILIB_CHOST_TOOLS=( /usr/bin/iodbc-config )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.52.12-multilib.patch
 	"${FILESDIR}"/${PN}-3.52.7-debian_bug501100.patch
 	"${FILESDIR}"/${PN}-3.52.7-unicode_includes.patch
 	"${FILESDIR}"/fix-runpaths-r1.patch
 )
 src_prepare() {
 	default
 	sed -i.orig \
 		-e '/^cd "$PREFIX"/,/^esac/d' \
 		iodbc/install_libodbc.sh || die "sed failed"
 	# Without this, automake dies. It's what upstream's autogen.sh does.
 	touch ChangeLog || die "failed to create empty ChangeLog"
 	eautoreconf
 }
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--disable-static \
 		--enable-odbc3 \
 		--enable-pthreads \
 		--with-layout=gentoo \
 		--with-iodbc-inidir=yes \
 		$(use_enable gtk gui)
 }
 multilib_src_install_all() {
 	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
 	# Install lintian overrides
 	insinto /usr/share/lintian/overrides
 	newins debian/iodbc.lintian-overrides iodbc
 	newins debian/libiodbc2.lintian-overrides libiodbc2
 }
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/"
 SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Common dependencies
 # POM: ${PN}/pom.xml
--- a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
+++ b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://creadur.apache.org/rat/apache-rat-tasks/"
 SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Common dependencies
 # POM: ${PN}/pom.xml
--- a/dev-java/rat/rat-0.13.ebuild
+++ b/dev-java/rat/rat-0.13.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://creadur.apache.org/rat/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RDEPEND="
 	~dev-java/apache-rat-core-${PV}:0
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/go/go-1.15.13.ebuild
+++ b/dev-lang/go/go-1.15.13.ebuild
@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
--- a/dev-lang/go/go-1.16.5.ebuild
+++ b/dev-lang/go/go-1.16.5.ebuild
@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@ -2,4 +2,5 @@ DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
 DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
 DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
 DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B 318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208 SHA512 951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
--- a/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
@ -0,0 +1,70 @@
 https://bugs.gentoo.org/755257
 Needed for both fixing the CVE + compatibility with Debian for e.g.
 Unison.
 From c6ca3afc78b75d7748e4e09e56c6b020418be06e Mon Sep 17 00:00:00 2001
 From: Stephane Glondu <steph@glondu.net>
 Date: Fri, 25 Jan 2019 14:34:23 +0100
 Subject: [PATCH] Fix integer overflows when unmarshaling a bigarray
 Malicious or corrupted marshaled data can result in a bigarray
 with impossibly large dimensions that cause overflow when computing
 the in-memory size of the bigarray.  Disaster ensues when the data
 is read in a too small memory area.  This commit checks for overflows
 when computing the in-memory size of the bigarray.
 This patch is based on one by Xavier Leroy and has been modified to
 use caml_ba_multov instead of caml_umul_overflow which is unavailable
 in OCaml 4.05.0.
 The original commit hash is 85162eee9d4072fa9c2f498f03cd94e357033eec.
 Origin: https://github.com/ocaml/ocaml/pull/1718
 Bug: https://github.com/ocaml/ocaml/issues/7765
 Bug-Debian: https://bugs.debian.org/895472
 Bug-CVE: CVE-2018-9838
 --- a/otherlibs/bigarray/bigarray_stubs.c
 +++ b/otherlibs/bigarray/bigarray_stubs.c
@@ -966,22 +966,34 @@ static void caml_ba_deserialize_longarray(void * dest, intnat num_elts)
 uintnat caml_ba_deserialize(void * dst)
 {
   struct caml_ba_array * b = dst;
 -  int i, elt_size;
 -  uintnat num_elts;
 +  int i;
 +  uintnat num_elts, size;
 +  int overflow;
   /* Read back header information */
   b->num_dims = caml_deserialize_uint_4();
 +  if (b->num_dims < 0 || b->num_dims > CAML_BA_MAX_NUM_DIMS)
 +    caml_deserialize_error("input_value: wrong number of bigarray dimensions");
   b->flags = caml_deserialize_uint_4() | CAML_BA_MANAGED;
   b->proxy = NULL;
   for (i = 0; i < b->num_dims; i++) b->dim[i] = caml_deserialize_uint_4();
 -  /* Compute total number of elements */
 -  num_elts = caml_ba_num_elts(b);
 -  /* Determine element size in bytes */
 +  /* Compute total number of elements.  Watch out for overflows (MPR#7765). */
 +  num_elts = 1;
 +  for (i = 0; i < b->num_dims; i++) {
 +    overflow = 0;
 +    num_elts = caml_ba_multov(num_elts, b->dim[i], &overflow);
 +    if (overflow)
 +      caml_deserialize_error("input_value: size overflow for bigarray");
 +  }
 +  /* Determine array size in bytes.  Watch out for overflows (MPR#7765). */
   if ((b->flags & CAML_BA_KIND_MASK) > CAML_BA_CHAR)
     caml_deserialize_error("input_value: bad bigarray kind");
 -  elt_size = caml_ba_element_size[b->flags & CAML_BA_KIND_MASK];
 +  overflow = 0;
 +  size = caml_ba_multov(num_elts, caml_ba_element_size[b->flags & CAML_BA_KIND_MASK], &overflow);
 +  if (overflow)
 +    caml_deserialize_error("input_value: size overflow for bigarray");
   /* Allocate room for data */
 -  b->data = malloc(elt_size * num_elts);
 +  b->data = malloc(size);
   if (b->data == NULL)
     caml_deserialize_error("input_value: out of memory for bigarray");
   /* Read data */
--- a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
@ -0,0 +1,143 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic multilib toolchain-funcs
 PATCHLEVEL="9"
 MY_P="${P/_/-}"
 DESCRIPTION="Type-inferring functional programming language descended from the ML family"
 HOMEPAGE="https://ocaml.org"
 SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
 	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
 RDEPEND="
 	sys-libs/binutils-libs:=
 	ncurses? ( sys-libs/ncurses:0= )
 	spacetime? ( sys-libs/libunwind:= )
 	X? ( x11-libs/libX11 )
 	!dev-ml/num"
 BDEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
 S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.04.2-tinfo.patch #459512
 	"${FILESDIR}"/${P}-gcc10.patch
 	"${FILESDIR}"/${P}-CVE-2018-9838.patch
 )
 pkg_setup() {
 	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
 	# results in relocations if gcc wants to create a PIE executable
 	if gcc-specs-pie ; then
 		append-ldflags -nopie
 		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
 		ewarn "We have appended -nopie to ocaml build options"
 		ewarn "because linking an executable with pie while the objects are not pic will not work"
 	fi
 }
 src_prepare() {
 	EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
 	default
 }
 src_configure() {
 	export LC_ALL=C
 	local myconf=""
 	# Causes build failures because it builds some programs with -pg,
 	# bug #270920
 	filter-flags -fomit-frame-pointer
 	# Bug #285993
 	filter-mfpmath sse
 	# -ggdb3 & co makes it behave weirdly, breaks sexplib
 	replace-flags -ggdb* -ggdb
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
 	# bug #773226
 	if use arm || use ppc || use x86 ; then
 		append-ldflags "-Wl,-z,notext"
 	fi
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 	use ncurses || myconf="${myconf} -no-curses"
 	use X || myconf="${myconf} -no-graph"
 	use flambda && myconf="${myconf} -flambda"
 	use spacetime && myconf="${myconf} -spacetime"
 	# ocaml uses a home-brewn configure script, preventing it to use econf.
 	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
 		--prefix "${EPREFIX}"/usr \
 		--bindir "${EPREFIX}"/usr/bin \
 		--target-bindir "${EPREFIX}"/usr/bin \
 		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
 		--mandir "${EPREFIX}"/usr/share/man \
 		-target "${CHOST}" \
 		-host "${CBUILD}" \
 		-cc "$(tc-getCC)" \
 		-as "$(tc-getAS)" \
 		-aspp "$(tc-getCC) -c" \
 		-partialld "$(tc-getLD) -r" \
 		--with-pthread ${myconf} || die "configure failed!"
 	# http://caml.inria.fr/mantis/view.php?id=4698
 	export CCLINKFLAGS="${LDFLAGS}"
 }
 src_compile() {
 	emake world
 	# Native code generation can be disabled now
 	if use ocamlopt ; then
 		# bug #279968
 		emake opt
 		emake -j1 opt.opt
 	fi
 }
 src_test() {
 	if use ocamlopt ; then
 		emake -j1 tests
 	else
 		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
 	fi
 }
 src_install() {
 	emake BINDIR="${ED}"/usr/bin \
 		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
 		MANDIR="${ED}"/usr/share/man \
 		install
 	# Symlink the headers to the right place
 	dodir /usr/include
 	# Create symlink for header files
 	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
 	dodoc Changes README.adoc
 	# Create envd entry for latex input files
 	if use latex ; then
 		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
 		doenvd "${T}/99ocamldoc"
 	fi
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
 	doins "${FILESDIR}/ocaml.conf"
 }
--- a/dev-lang/ocaml/ocaml-4.12.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.0.ebuild
@ -0,0 +1,93 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic
 HOMEPAGE="https://ocaml.org/"
 SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex +ocamlopt xemacs"
 RDEPEND="sys-libs/binutils-libs:="
 BDEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
 src_prepare() {
 	default
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
 	# bug #773226
 	#if use arm || use ppc || use x86 ; then
 		append-ldflags "-Wl,-z,notext"
 	#fi
 	# Upstream build ignores LDFLAGS in several places.
 	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
 		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
 		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
 		Makefile.config.in || die "LDFLAGS fix failed"
 }
 src_configure() {
 	local opt=(
 		--bindir="${EPREFIX}/usr/bin"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
 		$(use_enable flambda)
 	)
 	econf "${opt[@]}"
 }
 src_compile() {
 	env -u P emake world
 	if use ocamlopt ; then
 		env -u P emake opt
 		env -u P emake opt.opt
 	fi
 }
 src_test() {
 	emake -j
 	# OCaml tests only work when run sequentially
 	if use ocamlopt ; then
 		emake -j1 ocamltest.opt
 	else
 		emake -j1 ocamltest
 		#ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
 	fi
 	emake -j1 tests
 }
 src_install() {
 	default
 	dodir /usr/include
 	# Create symlink for header files
 	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
 	dodoc Changes README.adoc
 	# Create envd entry for latex input files
 	if use latex ; then
 		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" || die
 		doenvd "${T}/99ocamldoc"
 	fi
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
 	doins "${FILESDIR}/ocaml.conf"
 }
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@ -1 +1,2 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
 DIST python-exec-2.4.7.tar.bz2 88204 BLAKE2B c370d5f33063bf0dd02d1b5ddad27b320652664ed3bc89cf2d70b94292f3dcd8c4e3bb6bb43ce8d2514a8e0a5a3e95295ff8d0f95371bda136cd51312da747e8 SHA512 6e061fc1ae84e21effb24d35195a7c61430e0e50dc0b0bfbab65f741dde45a92688fd9ac7a0868f7b08ba603a609fb3f03181238f63fdd383b4d604af8406d14
--- a/dev-lang/python-exec/python-exec-2.4.7.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.7.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit python-utils-r1
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://github.com/mgorny/python-exec/"
 SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="2"
 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"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks"
 RDEPEND="
 	dev-lang/python-exec-conf
 	!<=dev-lang/python-2.7.18-r3:2.7"
 src_configure() {
 	local pyimpls=() i EPYTHON
 	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
 		if use "python_targets_${i}"; then
 			_python_export "${i}" EPYTHON
 			pyimpls+=( "${EPYTHON}" )
 		fi
 	done
 	local myconf=(
 		--with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
 		--with-python-impls="${pyimpls[*]}"
 	)
 	econf "${myconf[@]}"
 }
 src_install() {
 	default
 	if use native-symlinks; then
 		local programs=( python python3 )
 		local scripts=( python-config python3-config 2to3 idle pydoc pyvenv )
 		local f
 		for f in "${programs[@]}"; do
 			# symlink the C wrapper for python to avoid shebang recursion
 			# bug #568974
 			dosym python-exec2c /usr/bin/"${f}"
 		done
 		for f in "${scripts[@]}"; do
 			# those are python scripts (except for new python-configs)
 			# so symlink them via the python wrapper
 			dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
 		done
 	fi
 }
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
+++ b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
@ -0,0 +1,80 @@
 Index: pcre2/ChangeLog
 ===================================================================
 --- pcre2/ChangeLog	(revision 1314)
 +++ pcre2/ChangeLog	(revision 1315)
@@ -1,7 +1,14 @@
 Change Log for PCRE2
 --------------------
 +Version 10.38-RC1 xx-xxx-2021
 +-----------------------------
 +1. Fix invalid single character repetition issues in JIT when the repetition
 +is inside a capturing bracket and the bracket is preceeded by character
 +literals.
 +
 +
 Version 10.37 26-May-2021
 -------------------------
 Index: pcre2/src/pcre2_jit_compile.c
 ===================================================================
 --- pcre2/src/pcre2_jit_compile.c	(revision 1314)
 +++ pcre2/src/pcre2_jit_compile.c	(revision 1315)
@@ -1236,15 +1236,16 @@
 return: current number of iterators enhanced with fast fail
 */
 -static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, sljit_s32 depth, int start)
 +static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start,
 +   sljit_s32 depth, int start, BOOL fast_forward_allowed)
 {
 PCRE2_SPTR begin = cc;
 PCRE2_SPTR next_alt;
 PCRE2_SPTR end;
 PCRE2_SPTR accelerated_start;
 +BOOL prev_fast_forward_allowed;
 int result = 0;
 int count;
 -BOOL fast_forward_allowed = TRUE;
 SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
 SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0);
@@ -1476,6 +1477,7 @@
       case OP_CBRA:
       end = cc + GET(cc, 1);
 +      prev_fast_forward_allowed = fast_forward_allowed;
       fast_forward_allowed = FALSE;
       if (depth >= 4)
         break;
@@ -1484,7 +1486,7 @@
       if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0))
         break;
 -      count = detect_early_fail(common, cc, private_data_start, depth + 1, count);
 +      count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed);
       if (PRIVATE_DATA(cc) != 0)
         common->private_data_ptrs[begin - common->start] = 1;
@@ -13657,7 +13659,7 @@
 private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
 if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
 -  detect_early_fail(common, common->start, &private_data_size, 0, 0);
 +  detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE);
 set_private_data_ptrs(common, &private_data_size, ccend);
 Index: pcre2/src/pcre2_jit_test.c
 ===================================================================
 --- pcre2/src/pcre2_jit_test.c	(revision 1314)
 +++ pcre2/src/pcre2_jit_test.c	(revision 1315)
@@ -351,6 +351,7 @@
 	{ MU, A, 0, 0, ".[ab]*a", "xxa" },
 	{ MU, A, 0, 0, ".[ab]?.", "xx" },
 	{ MU, A, 0, 0, "_[ab]+_*a", "_aa" },
 +	{ MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
 	/* Bracket repeats with limit. */
 	{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
--- a/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
@ -0,0 +1,98 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit libtool multilib-minimal usr-ldscript
 PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="https://www.pcre.org/"
 MY_P="pcre2-${PV/_rc/-RC}"
 if [[ ${PV} != *_rc* ]] ; then
 	# Only the final releases are available here.
 	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
 		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
 else
 	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
 fi
 if [[ -n "${PATCH_SET}" ]] ; then
 	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
 		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
 fi
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 BDEPEND="
 	virtual/pkgconfig
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 "
 RDEPEND="
 	bzip2? ( app-arch/bzip2 )
 	libedit? ( dev-libs/libedit )
 	readline? ( sys-libs/readline:0= )
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${P}-jit_fixes.patch"
 )
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/pcre2-config
 )
 src_prepare() {
 	if [[ -d "${WORKDIR}/patches" ]] ; then
 		rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
 		eapply "${WORKDIR}"/patches
 	fi
 	default
 	elibtoolize
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)
 		$(multilib_native_use_enable readline pcre2test-libreadline)
 		$(multilib_native_use_enable zlib pcre2grep-libz)
 		$(use_enable jit)
 		$(use_enable jit pcre2grep-jit)
 		$(use_enable pcre16 pcre2-16)
 		$(use_enable pcre32 pcre2-32)
 		$(use_enable static-libs static)
 		$(use_enable unicode)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 multilib_src_compile() {
 	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
 }
 multilib_src_install() {
 	emake \
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
 	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
 }
 multilib_src_install_all() {
 	find "${ED}" -type f -name "*.la" -delete || die
 }
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@ -1,2 +1 @@
 DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
 DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65
--- a/dev-libs/libuv/libuv-1.40.0.ebuild
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@ -1,65 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools multilib-minimal
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
 SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="static-libs"
 RESTRICT="test"
 BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
 src_prepare() {
 	default
 	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
 		> m4/libuv-extra-automake-flags.m4 || die
 	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
 		sed -i -e '/!defined(__DragonFly__)/i!defined(__APPLE__) && \\' \
 			src/unix/udp.c || die
 		sed -i -e '/err = pthread_setname_np/cerr = 0;' \
 			src/unix/darwin-proctitle.c || die
 		sed -i -e '/int uv_if_indextoname/i\
 		static size_t strnlen(char *x, size_t len) {\
 			char *r = memchr(x, '"'"'\\n'"'"', len);\
 			if (r == NULL)\
 				return len;\
 			else\
 				return r - x;\
 		}' \
 			src/unix/getaddrinfo.c || die
 	fi
 	# upstream fails to ship a configure script
 	eautoreconf
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		cc_cv_cflags__g=no
 		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 multilib_src_test() {
 	mkdir "${BUILD_DIR}"/test || die
 	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
 	default
 }
 multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die
 }
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@ -1,6 +1,7 @@
 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
 DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
 DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
--- a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
@ -0,0 +1,251 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 # Note: Please bump in sync with dev-libs/libxslt
 PATCHSET_VERSION="2.9.12-r3-patchset"
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
 inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
 XSTS_NAME_2="xmlschema2004-01-14"
 XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
 XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
 XMLCONF_TARBALL="xmlts20130923.tar.gz"
 DESCRIPTION="XML C parser and toolkit"
 HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
 SRC_URI="
 	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
 	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
 	test? (
 		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
 		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
 	)
 	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
 "
 S="${WORKDIR}/${PN}-${PV%_rc*}"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 BDEPEND="
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
 "
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:= )
 "
 DEPEND="${RDEPEND}"
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/xml2-config
 )
 DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
 PATCHES=(
 	## Gentoo
 	# Patches needed for prefix support
 	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
 	# Fix python detection, bug #567066
 	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
 	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
 	# Fix python tests when building out of tree #565576
 	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
 	# bug #745162
 	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
 	# Avoid failure on missing fuzz.h when running tests
 	"${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
 	## Upstream
 	# Fix lxml compatibility (bug #790737)
 	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
 	# Fix serialising empty HTML documents (bug #794733)
 	"${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
 )
 src_unpack() {
 	local tarname=${P/_rc/-rc}.tar.gz
 	if use verify-sig ; then
 		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
 	fi
 	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
 	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
 	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
 	cd "${S}" || die
 	if use test ; then
 		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
 			"${DISTDIR}/${XSTS_TARBALL_2}" \
 			"${S}"/xstc/ \
 			|| die "Failed to install test tarballs"
 		unpack ${XMLCONF_TARBALL}
 	fi
 }
 src_prepare() {
 	default
 	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# Avoid final linking arguments for python modules
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
 		# gcc-apple doesn't grok -Wno-array-bounds
 		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
 	fi
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.
 	#elibtoolize
 	eautoreconf
 }
 multilib_src_configure() {
 	# Filter seemingly problematic CFLAGS (#26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 	# Notes:
 	# 1) USE zlib support breaks gnome2
 	#    (libgnomeprint for instance fails to compile with
 	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
 	#
 	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
 	#    switch (enabling the libxml2 debug module). See bug #100898.
 	#
 	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
 	libxml2_configure() {
 		ECONF_SOURCE="${S}" econf \
 			--with-html-subdir=${PF}/html \
 			$(use_with debug run-debug) \
 			$(use_with icu) \
 			$(use_with lzma) \
 			$(use_enable ipv6) \
 			$(use_enable static-libs static) \
 			$(multilib_native_use_with readline) \
 			$(multilib_native_use_with readline history) \
 			"$@"
 	}
 	libxml2_py_configure() {
 		# Ensure python build dirs exist
 		mkdir -p "${BUILD_DIR}" || die
 		# Odd build system, also see bug #582130
 		run_in_build_dir libxml2_configure \
 			"--with-python=${EPYTHON}" \
 			"--with-python-install-dir=$(python_get_sitedir)"
 	}
 	# Build python bindings separately
 	libxml2_configure --without-python
 	if multilib_is_native_abi && use python ; then
 		python_foreach_impl libxml2_py_configure
 	fi
 }
 libxml2_py_emake() {
 	pushd "${BUILD_DIR}/python" > /dev/null || die
 	emake "$@"
 	popd > /dev/null || die
 }
 multilib_src_compile() {
 	default
 	if multilib_is_native_abi && use python ; then
 		local native_builddir="${BUILD_DIR}"
 		python_foreach_impl libxml2_py_emake \
 				top_builddir="${native_builddir}" \
 				all
 	fi
 }
 multilib_src_test() {
 	ln -s "${S}"/xmlconf || die
 	emake check
 	if multilib_is_native_abi && use python ; then
 		python_foreach_impl libxml2_py_emake test
 	fi
 }
 multilib_src_install() {
 	emake \
 		DESTDIR="${D}" \
 		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		install
 	if multilib_is_native_abi && use python ; then
 		python_foreach_impl libxml2_py_emake \
 			DESTDIR="${D}" \
 			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
 			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
 			install
 		python_foreach_impl python_optimize
 	fi
 }
 multilib_src_install_all() {
 	rm -rf "${ED}"/usr/share/doc/${P}
 	einstalldocs
 	if ! use examples ; then
 		rm -rf "${ED}"/usr/share/doc/${PF}/examples
 		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
 	fi
 	find "${D}" -name '*.la' -delete || die
 }
 pkg_postinst() {
 	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
 	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
 	if [[ -n "${ROOT}" ]]; then
 		elog "Skipping XML catalog creation for stage building (bug #208887)."
 	else
 		# Need an XML catalog, so no-one writes to a non-existent one
 		CATALOG="${EROOT}/etc/xml/catalog"
 		# We don't want to clobber an existing catalog though,
 		# only ensure that one is there
 		# <obz@gentoo.org>
 		if [[ ! -e "${CATALOG}" ]]; then
 			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
 			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
 			einfo "Created XML catalog in ${CATALOG}"
 		fi
 	fi
 }
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@ -248,6 +248,15 @@ multilib_src_install() {
 	fi
 	emake INSTALL_PREFIX="${D}" install
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs.  But this is due to a failing in the openssl
 	# build system: the static archives are built as PIC all the time.
 	# Only way around this would be to manually configure+compile openssl
 	# twice; once with shared lib support enabled and once without.
 	if ! use static-libs; then
 		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
 	fi
 }
 multilib_src_install_all() {
@ -260,13 +269,6 @@ multilib_src_install_all() {
 	use rfc3779 && dodoc engines/ccgost/README.gost
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs.  But this is due to a failing in the openssl
 	# build system: the static archives are built as PIC all the time.
 	# Only way around this would be to manually configure+compile openssl
 	# twice; once with shared lib support enabled and once without.
 	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
 	# create the certs directory
 	dodir ${SSL_CNF_DIR}/certs
 	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild
@ -270,6 +270,15 @@ multilib_src_install() {
 	fi
 	emake DESTDIR="${D}" install
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs.  But this is due to a failing in the openssl
 	# build system: the static archives are built as PIC all the time.
 	# Only way around this would be to manually configure+compile openssl
 	# twice; once with shared lib support enabled and once without.
 	if ! use static-libs; then
 		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
 	fi
 }
 multilib_src_install_all() {
@ -279,13 +288,6 @@ multilib_src_install_all() {
 	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs.  But this is due to a failing in the openssl
 	# build system: the static archives are built as PIC all the time.
 	# Only way around this would be to manually configure+compile openssl
 	# twice; once with shared lib support enabled and once without.
 	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
 	# create the certs directory
 	keepdir ${SSL_CNF_DIR}/certs
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@ -1,2 +1,2 @@
 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
-DIST simdjson-0.9.5.tar.gz 7956300 BLAKE2B bd860e91ff3d14eba49370e7e5f62f3573e3b76e689633f93db7a03030b24bd600d07c7a378a82836e1d234249b10ee3bbb050ba495fd50733f0355fcaac8ff3 SHA512 cdb80fd76a6b67c52f5ad4c0fafe76cdb4c95f35ce6c486fe37c9c61e041c349c1c8ce01fef1dec8024083ae01a0afa780d595bffc833e8a99eb82ab62ab615e
+DIST simdjson-0.9.6.tar.gz 7956235 BLAKE2B 8d1ffb96a937f859598f45232f1c55a767c4dcb401e1b15b8745df0b3b1907a9ecf3319080b5f7dd6deeac7c97b6b7ee608a98173c2c92794ea5f79ea0083b18 SHA512 bfe565dd00e95e1c5c409fce1ec2a8d88c83fc61d9f46265afc0254f8a37f241fcb5b0729bc5ac58695766e2a6cb05abbf93220fa21fd8fe34872ac4a538140c
--- a/dev-libs/simdjson/simdjson-0.9.6.ebuild
+++ b/dev-libs/simdjson/simdjson-0.9.6.ebuild
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@ -1,3 +1,3 @@
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
-DIST tinyxml2-8.1.0.tar.gz 619733 BLAKE2B 7a7e1a250bc8944614ecf578183b41340e7519ad2181e8023244d82e83d9a85fc600e5f00051b7f6f8ebda760a1ac11cb8bfe381fc9f6432f315aa6fdb310a83 SHA512 1ef50ee2648d423f38b6ebb3e45ec3798b87cf73a75aa0e49ae697a2006517d05c8298b325de70ee2aa706546235860f01541ff753c8a1bd97fa862a4ebb5c09
+DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367
--- a/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
@ -3,26 +3,20 @@
 EAPI=7
-inherit meson-multilib
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 DESCRIPTION="A simple, small, efficient, C++ XML parser"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
 SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
-SLOT="0/8"
+SLOT="0/9"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${P}-meson-typo.patch
 )
 multilib_src_configure() {
-	local emesonargs=(
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
-		$(meson_native_use_bool test tests)
+	cmake_src_configure
 	)
 	meson_src_configure
 }
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@ -50,7 +50,7 @@ src_prepare() {
 lua_src_compile() {
 	cd "${S}.${ELUA}/" || die
 	emake CC="$(tc-getCC)" \
-		LUADIR="$(lua_get_include_dir)"
+		LUADIR="${EPREFIX}/$(lua_get_include_dir)"
 }
 src_compile() {
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/dose3/dose3-6.0.1_p2.ebuild
+++ b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt test"
 BDEPEND="
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@ -1 +1,2 @@
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
--- a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
+++ b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
@ -0,0 +1,17 @@
 diff --git a/ConfMakefile.in b/ConfMakefile.in
 index 5a1e9ea..b562698 100644
 --- a/ConfMakefile.in
 +++ b/ConfMakefile.in
@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
 OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
 	ocamlopt=@OCAMLOPT@ \
 	ocamldep=@OCAMLDEP@"
 -OCAMLC       = @OCAMLFIND@ ocamlc 
 -OCAMLOPT     = @OCAMLFIND@ ocamlopt
 -OCAMLDEP     = @OCAMLFIND@ ocamldep
 +OCAMLC       = @OCAMLFIND@ ocamlc -unsafe-string 
 +OCAMLOPT     = @OCAMLFIND@ ocamlopt -unsafe-string
 +OCAMLDEP     = @OCAMLFIND@ ocamldep -unsafe-string
 OCAMLBEST    = @OCAMLBEST@
 OCAMLVERSION = @OCAMLVERSION@
 OCAMLFIND    = @OCAMLFIND@
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
@ -0,0 +1,76 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools findlib
 DESCRIPTION="Provides support for internationalization of OCaml program"
 HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
 SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
 BDEPEND="
 	doc? (
 		app-text/docbook-xsl-stylesheets
 		dev-libs/libxslt
 	)
 "
 # OCaml 4.10 does not support -unsafe-string by default
 # bug #666149
 RDEPEND="
 	>=dev-lang/ocaml-3.12.1:=
 	<dev-lang/ocaml-4.10.0:=
 	>=dev-ml/ocaml-fileutils-0.4.0:=
 	>=dev-ml/camomile-0.8.3:=
 	sys-devel/gettext
 	dev-ml/camlp4:=
 	!dev-ml/ocaml-gettext-stub
 "
 DEPEND="
 	${RDEPEND}
 	test? ( dev-ml/ounit2 )
 "
 src_prepare() {
 	default
 	# Porting to dev-ml/ounit2
 	sed -i \
 		-e 's/OCAMLFIND_CHECK_MODULE(oUnit/OCAMLFIND_CHECK_MODULE(ounit2/' \
 		configure.in || die
 	sed -i \
 		-e 's/oUnit/ounit2/' \
 		test/Makefile || die
 	eautoreconf
 }
 src_configure() {
 	econf \
 		--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
 		$(use_enable doc) \
 		$(use_enable test)
 }
 src_compile() {
 	emake -j1
 }
 src_install() {
 	findlib_src_preinst
 	emake -j1 DESTDIR="${D}" \
 		BINDIR="${ED}/usr/bin" \
 		PODIR="${ED}/usr/share/locale/" \
 		DOCDIR="${ED}/usr/share/doc/${PF}" \
 		MANDIR="${ED}/usr/share/man" \
 		install
 	dodoc CHANGELOG README THANKS TODO
 }
--- a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt"
 RDEPEND="
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt"
 RDEPEND="
--- a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt"
 RESTRICT="test"
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
--- a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt"
 RESTRICT="test"
--- a/dev-ml/opam/opam-2.0.8-r2.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r2.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt"
 RDEPEND="
--- a/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
+++ b/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl wrapper for libmagic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
--- a/dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
+++ b/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read JSON into a Perl Variable"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="test +xs"
 RESTRICT="!test? ( test )"
 # See MoreUtils.pm/LICENSE
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/String-Util/String-Util-1.310.0.ebuild
+++ b/dev-perl/String-Util/String-Util-1.310.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="String processing utility functions"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/Faker/Faker-8.2.0.ebuild
+++ b/dev-python/Faker/Faker-8.2.0.ebuild
@ -1,27 +0,0 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 DESCRIPTION="A Python package that generates fake data for you"
 HOMEPAGE="https://github.com/joke2k/faker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
 	!dev-ruby/faker"
 BDEPEND="
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/random2[${PYTHON_USEDEP}]
 		dev-python/validators[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
--- a/dev-python/Faker/Faker-8.2.1.ebuild
+++ b/dev-python/Faker/Faker-8.2.1.ebuild
@ -1,27 +0,0 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 DESCRIPTION="A Python package that generates fake data for you"
 HOMEPAGE="https://github.com/joke2k/faker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
 	!dev-ruby/faker"
 BDEPEND="
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/random2[${PYTHON_USEDEP}]
 		dev-python/validators[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
--- a/dev-python/Faker/Faker-8.3.0.ebuild
+++ b/dev-python/Faker/Faker-8.3.0.ebuild
@ -1,27 +0,0 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 DESCRIPTION="A Python package that generates fake data for you"
 HOMEPAGE="https://github.com/joke2k/faker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
 	!dev-ruby/faker"
 BDEPEND="
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/random2[${PYTHON_USEDEP}]
 		dev-python/validators[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
--- a/dev-python/Faker/Faker-8.4.0.ebuild
+++ b/dev-python/Faker/Faker-8.4.0.ebuild
@ -1,27 +0,0 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 DESCRIPTION="A Python package that generates fake data for you"
 HOMEPAGE="https://github.com/joke2k/faker"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
 	!dev-ruby/faker"
 BDEPEND="
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/random2[${PYTHON_USEDEP}]
 		dev-python/validators[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
--- a/dev-python/Faker/Faker-8.6.0.ebuild
+++ b/dev-python/Faker/Faker-8.6.0.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="A Python package that generates fake data for you"
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@ -1,6 +1,2 @@
 DIST Faker-8.2.0.tar.gz 1144105 BLAKE2B cac0e083fb91c4eff99b4a1af0c4acf665d2c7dd45acb21926341deb5ac27c6837ed59f9f157f1c4f26810d9844f432dc857887c6d1dcb44b67cc7713fb4ed41 SHA512 4d7d98c2f12f60ea2c690cf4647968181efad4f9940c63ae11dee66e3f4fa45f893711ec6c832b55be9aeac618984206af1ac56daf9af3f2cf5f84ebe4271c2e
 DIST Faker-8.2.1.tar.gz 1144260 BLAKE2B 3c523e394043d2294e9973c0a2764a7c7961ea89b45efecfefa7a094e2b4ffa81513e9ca6ac321e5b2b05bf29c62ae37a4797ad210172d5e988dbd80d8b0858e SHA512 58e6fc188dfb6ef5f5847d2d7966767eb71df66752858fbccbf984afda2d25f6a6b01d2c9446e7b1c9e57bf3744c0e1f89202e0079b01e139789f384e3cdbc17
 DIST Faker-8.3.0.tar.gz 1144870 BLAKE2B fba95fdc3023dc583345d0a7890b4ac6318ca87157270e1d844a2978bd2866c1cd8e8a334e41bc0b8689a1c8814a5353ab4adbb08af49a31779217d82b913ce6 SHA512 7f046e60636dc7c2a584eb75e832a674715424b91de5eac6dba423d40100ce44b5baec178976bcf2b00b5edb81c5796f5eeebed0572984e7740c9e3279afd51a
 DIST Faker-8.4.0.tar.gz 1146293 BLAKE2B 9ec37d76ebfe486a9671f5fc97e321420b9cf83811894db4f7264430f441ab63309e2abed0b5c900467685d7fe979001c216a9e32323c764867f127025706558 SHA512 03abef5c85edccf924191f2bc5be1dd64d56f827bc4307fed16becac7981c0340fa900748e767f2bbbf37721075c03ac068892870f2ac895f8d748403ae8bb08
 DIST Faker-8.5.0.tar.gz 1147011 BLAKE2B 497a3f46a61519707ab3e8d78240ea5dd796b247268930ee4117647b24e4822a023ddda2ffdc1333dde4e35eedc1b7110f2103d0f49d0227ea7991c75c60c7df SHA512 29de2928109281bada27923a76ccb7cfd9e31211d0474cb47473197ea0c89983ac10e3dc990eb987ea3b45b5f5aa324b53004b60b5e20d922969bc552de96f01
 DIST Faker-8.5.1.tar.gz 1147272 BLAKE2B 5842f7ea74cb5eb02bd149e95fbff3d6a75bb007e1e9de98a808854c37b59bd337f17617c4dd8cd899a6740babd4a501bb09bf840cfbbb689c529517ff30271d SHA512 a787bbf4bacd06e7af777e4f10714167d7e9e8ad743cf99d51a3a4c312ded8e5085559f667ab6fca3a6df87650feabf88b0ec647e049c26576e65b3a77191ad4
 DIST Faker-8.6.0.tar.gz 1147647 BLAKE2B 6d3903ec2d75bae963879485572f7781455ff2411f34626ba21627e1b4d59295e983530ef6c8172dd3d6332eed511af3190c4e84dd345a08d5b5746217acb26b SHA512 fa2012d87184d53e91d067f30d107d2731eef72838e74ab82845c61d3074828392e4efd12051b16ae52c251fe9eb58b98df8bd55e81eca0a9e1940b1f74b2e7f
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@ -1,2 +1,3 @@
 DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
 DIST astroid-2.5.7.tar.gz 352082 BLAKE2B ca52339422da3a35cbe34e4b216dbfed3979dce96a8d5fcc508083c0ef9509c491e78dcfea281b79b07fcb7289a9f40aade0da21ca38b6abcf7025b84909a4fd SHA512 17fc185752510396fda9cce842df8ba72473e469b61c037195a9d6ff72af3ec8d3df01bdcf61d6059d4f90c95278928eba3e3380048bf5c6b4fa2a3c9b267176
 DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
--- a/dev-python/astroid/astroid-2.5.8.ebuild
+++ b/dev-python/astroid/astroid-2.5.8.ebuild
@ -0,0 +1,47 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
 HOMEPAGE="
 	https://github.com/PyCQA/astroid/
 	https://pypi.org/project/astroid/"
 SRC_URI="
 	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # Version specified in __pkginfo__.py.
 RDEPEND="
 	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 python_test() {
 	local deselect=(
 		# no clue why it's broken
 		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
 	)
 	# Faker causes sys.path_importer_cache keys to be overwritten
 	# with PosixPaths
 	epytest -p no:faker ${deselect[@]/#/--deselect }
 }
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -10,3 +10,4 @@ DIST boto3-1.17.85.tar.gz 377940 BLAKE2B 7fdfa25b7fd6467f484dc988bac280b0e4e7044
 DIST boto3-1.17.86.tar.gz 378144 BLAKE2B 35d6bfec515c985ead488811e7f2ad021f671e8eee1e63ae1aaade8f4a03dcca228483ec81c4911d12c290b3e4b3363ae92e9153eda83a638258394d0c7b4fcf SHA512 0b267b2333925e830237c830ef5258fa8834fd584f6f4132c012141b4ad5e38b6e6977de019d60f0ba93e3c8b4d9a1036d0c989366145a9d25ac0e5e7e4d39ae
 DIST boto3-1.17.87.tar.gz 378759 BLAKE2B 21ad4c735f34edbd82767043653ed0cee9604f0b36328f40cb22c4f9cd57758e0bc89ae93fd798babc1dded019e2b1531bbffa0574edd7ce3e07515374cd97cf SHA512 da3f2cb772d3f9708f5cbb102907ef58622435d4acdec8fe0abde80511f0734e6cc9739f0652150edc9e4f12039c0c7ee62bcc0059b42d86d5af0e809d779fab
 DIST boto3-1.17.88.tar.gz 379248 BLAKE2B 1aa238efaf5a22594b90903e1090f4f66a04effe93c3506ad36e0a96aa607eef9506f6fc579981a919b0f55ab1ba7a5d7e02a22a3d2692a9442f143a63f1b282 SHA512 989f8f879bdcded758f7b0be93e9355f91be859de7f2eabc7760cb8ad6e3317fa999cc5c092aac53bb2645ea0a86d0a6ceb03237b5164b89850b8c34d3eebdb5
 DIST boto3-1.17.89.tar.gz 379572 BLAKE2B 8a067aa757974cc3399de29173a6fcf99d35196c64978bd0cdb4e85f6e50558c9584722fab3402f3b3a2f951b3cd801aada17ce70bceab4f215f1b91dffd6372 SHA512 6bae209eda16ee07b142fe56740a5e177378b88e66b0e5c6aac99748c59b34f28f0c78d863d5a76b9efeda6413c4e6aab94d3c9ee87fbc5ae7d9c8bf02b5fb3f
--- a/dev-python/boto3/boto3-1.17.89.ebuild
+++ b/dev-python/boto3/boto3-1.17.89.ebuild
@ -0,0 +1,56 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="The AWS SDK for Python"
 HOMEPAGE="https://github.com/boto/boto3"
 LICENSE="Apache-2.0"
 SLOT="0"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/boto3"
 	inherit git-r3
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
 fi
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
 distutils_enable_tests nose
 python_prepare_all() {
 	# don't lock versions to narrow ranges
 	sed -e '/botocore/ d' \
 		-e '/jmespath/ d' \
 		-e '/s3transfer/ d' \
 		-i setup.py || die
 	# prevent an infinite loop
 	rm tests/functional/docs/test_smoke.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
 }
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -10,3 +10,4 @@ DIST botocore-1.20.85.tar.gz 7795550 BLAKE2B 483b6fef456de9a37b00dbaf0f2af766079
 DIST botocore-1.20.86.tar.gz 7798788 BLAKE2B 93450262bf1e34a627a64f8972e4d8b02dc24e1646633e89d4911751b0c919b9dd3515021cfffcd0c79223b237a8bb283220f6793c8e411d399a75321cd7b369 SHA512 fd630d93645861a94173a38b50c7b2ef1c646e33ad30d75eccb4b92bfa0ce08c06ac39ea6bb38f7e5c551f625b919b00170c4a243e67d5d66789a011ee5390a1
 DIST botocore-1.20.87.tar.gz 7800088 BLAKE2B ba98b0f910216a340f48adb5ddf14aa9239ca44202641c97ca91da69f34a67716c50d9bc6a330021fd630f7c309062fc0326543e46ee1207c294870baefd0aeb SHA512 b922e40030a1708ce2e5a2fa60012e21e28b955c6d30fbced5d1a93dafe189e83430b5cee162e2ab73e80c7dfa18657c2ca42057c17e943c0d421c6cd9969b53
 DIST botocore-1.20.88.tar.gz 7806185 BLAKE2B 21c3e3420fc9810712a462cfab4f43509ebd25a4cbaee4a51f2d82cc90a530c4a170b66cb6551121148d284404427eca7d9dd979ead5a9f4132ded47b4adf180 SHA512 aa36c39147d870758b9561e569f6b8a616e69437d775b1f68d522574a24f0e8252e5332d6e20b92448bc3189ec50232d89134bf86d12a3b72d63962de0d9cda6
 DIST botocore-1.20.89.tar.gz 7808318 BLAKE2B cc160b85d7e85267aa4bd7140c8f90b33dc07e5b8c0cf2cd4761ea456dfa955bd95b500e8da89bd9cca70237edcbd7df45c8f1d543e4e67646a8e597a5516fb5 SHA512 41fd7cf61b8eddb3e467d6d6b115c53e75413bdd3bb181723dd48c6efdd7133eee45ac597bf207482b2aa5872bf79d7801176194e474c61614599119df67db5a
--- a/dev-python/botocore/botocore-1.20.89.ebuild
+++ b/dev-python/botocore/botocore-1.20.89.ebuild
@ -0,0 +1,59 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="Low-level, data-driven core of boto 3"
 HOMEPAGE="https://github.com/boto/botocore"
 LICENSE="Apache-2.0"
 SLOT="0"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/botocore"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/jmespath[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=(
 	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
 )
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
 distutils_enable_tests nose
 src_prepare() {
 	# unpin deps
 	sed -i -e "s:>=.*':':" setup.py || die
 	# very unstable
 	sed -i -e 's:test_stress_test_token_bucket:_&:' \
 		tests/functional/retries/test_bucket.py || die
 	distutils-r1_src_prepare
 }
 python_test() {
 	# note: suites need to be run separately as one of the unit tests
 	# seems to be leaking mocks and breaking a few functional tests
 	nosetests -v tests/unit ||
 		die "unit tests failed under ${EPYTHON}"
 	nosetests -v tests/functional ||
 		die "functional tests failed under ${EPYTHON}"
 }
--- a/dev-python/deprecated/deprecated-1.2.12.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.12.ebuild
@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@ -1,2 +1,2 @@
-DIST fasteners-0.16.1.gh.tar.gz 28572 BLAKE2B 8434f2b47eae01bc3eb239df7adf1106299d76e577724291aef82fca2b68c7a7b5b82fa37a80d1d9ca0315615586c61b29bd4f6ac5cfce6fad798b4423eae64d SHA512 e2f94ad4d19fb425f507236ffa4611127d6254485daef4a818e4508ce935aa7a7100c2bb91343697d6005f4c220d8060fbcba19ca1e2dc257be756b0e24454df
+DIST fasteners-0.16.2.gh.tar.gz 29549 BLAKE2B 603cfe3662194f8f493e915aa3689af1c4a5e74c9b96ddb75e44d0fd0df3d17b71c0473c6c5c1deb0c037bc7f5fcbf2cc48d36ceecf9ce0336a926daa352f028 SHA512 f1557f3ab44acb7975dd98c4c5b2b63cffa9e42c82c5b31750dcfbddbd19552ecfe5ada59c2409e5d12da77dc00185619349340f8e4e177139a09c47f0a5ca6f
 DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
--- a/dev-python/fasteners/fasteners-0.16.2.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.2.ebuild
@ -16,6 +16,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/diskcache[${PYTHON_USEDEP}]
@ -24,9 +26,3 @@ BDEPEND="
 	)"
 distutils_enable_tests pytest
 python_install() {
 	# https://github.com/harlowja/fasteners/pull/70
 	rm -r "${BUILD_DIR}"/lib/tests || die
 	distutils-r1_python_install
 }
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@ -1,3 +1,4 @@
 DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.4.tar.gz 100967 BLAKE2B 9473a157ce2aed13ed45d6e8d83b4510c40ae977406b9d7b211caa70c27d1850cf49da8848495841281b1f192b576d269a5372215effd7d89c9211e51d51151d SHA512 25e255fd62d0e75aafa7037085362b7bf2ba8ae142bfb11e0e20452d503d8ec3f90ec84c8ef8966fb021fe1054c226862b3ce99d2288ec9aaa758a8971d1c87a
 DIST identify-2.2.6.tar.gz 101016 BLAKE2B eac32751d54379e3ba5ca5970c3fc02b6ac9f677a26f7a2c91986ba6ce8773a8e51ed98f17b6b12ba920cabd3d66ca23cd765d2cb6c48253ff97c34ddb9cb81e SHA512 09694ea3d92265385a79464ef948effb5b074f5b67a8a25171b4872b2cd70537a17c87c2aa94b66e3079f2047b290300beb7ed74be50ecdf09cb723948bc11d9
 DIST identify-2.2.7.tar.gz 101032 BLAKE2B 988aecb3f32b1d1416984ad7cb5937f85600e222a1053d2800dda1c498fea2660f86ee42208611c71e29b9827e212992fed35697a3d24f02814cc6ea8a560615 SHA512 f3c4073a9018ba595c8535447c7ccb20ca1f8d8bb006b4662db19b3356afc33d810b2073810b86d7dec4572b151c53301feca09bf0662d4d683febbdf7735e06
--- a/dev-python/identify/identify-2.2.10.ebuild
+++ b/dev-python/identify/identify-2.2.10.ebuild
@ -0,0 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="File identification library for Python"
 HOMEPAGE="https://github.com/pre-commit/identify"
 SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@ -1,4 +1,3 @@
 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
 DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
 DIST ipython-7.24.0.tar.gz 5146172 BLAKE2B 9d10eea9c329c78d7698adda999d746cdb305fad71ad521bd2f856590dd1e34010adfef045633bec07f8a6705201325815bbc254c23d74f0a17d73d2c3c060fe SHA512 67f6392b5448f1526da67577e8fa84958c99b3ac71c616c78a034e5c20cd06224134da45a8c3930a3779ce98ebc983bea2f237b5be7e8ba9d6fe97fde91a0608
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
--- a/dev-python/ipython/ipython-7.24.0.ebuild
+++ b/dev-python/ipython/ipython-7.24.0.ebuild
@ -1,139 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 inherit distutils-r1 optfeature virtualx
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/backcall[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	matplotlib? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
 	test? (
 		app-text/dvipng[truetype]
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 		dev-python/nbformat[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	doc? (
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
 RDEPEND+="
 	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
 PDEPEND="
 	notebook? (
 		dev-python/notebook[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
 		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
 	)
 	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
 	smp? (
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
 		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
 	)"
 PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
 DISTUTILS_IN_SOURCE_BUILD=1
 python_prepare_all() {
 	# Remove out of date insource files
 	rm IPython/extensions/cythonmagic.py || die
 	rm IPython/extensions/rmagic.py || die
 	# Prevent un-needed download during build
 	if use doc; then
 		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
 	fi
 	# Rename the test directory to reduce sys.path pollution
 	# https://github.com/ipython/ipython/issues/12892
 	mv IPython/extensions/{,ipython_}tests || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	if use doc; then
 		emake -C docs html_noapi
 		HTML_DOCS=( docs/build/html/. )
 	fi
 }
 src_test() {
 	virtx distutils-r1_src_test
 }
 python_install() {
 	distutils-r1_python_install
 	# Create ipythonX.Y symlinks.
 	# TODO:
 	# 1. do we want them for pypy? No.  pypy has no numpy
 	# 2. handle it in the eclass instead (use _python_ln_rel).
 	# With pypy not an option the dosym becomes unconditional
 	dosym ../lib/python-exec/${EPYTHON}/ipython \
 		/usr/bin/ipython${EPYTHON#python}
 }
 python_install_all() {
 	distutils-r1_python_install_all
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
 pkg_postinst() {
 	optfeature "sympyprinting" dev-python/sympy
 	optfeature "cythonmagic" dev-python/cython
 	optfeature "%lprun magic command" dev-python/line_profiler
 	optfeature "%mprun magic command" dev-python/memory_profiler
 	if use nbconvert; then
 		if ! has_version app-text/pandoc ; then
 			einfo "Node.js will be used to convert notebooks to other formats"
 			einfo "like HTML. Support for that is still experimental. If you"
 			einfo "encounter any problems, please use app-text/pandoc instead."
 		fi
 	fi
 }
--- a/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild
@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@ -2,4 +2,4 @@ DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533e
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
 DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
 DIST guile-2.2.7.tar.gz 18129833 BLAKE2B 03c88d753f83e5a797f12808b7b053c9cf6c51f87fb8f3c3db89e54528aafb0e54de2eb951cc622e98fada82a558932bb074a8e739f4175144d4b06ba42f7d60 SHA512 ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773
-DIST guile-3.0.4.tar.gz 21619204 BLAKE2B c8639019d8d69618726f40ecd44ed5a5790c34872119e806d4851671c61fd592608d066f4584df4a8db5f971b64ba9089bbbe935176923b413621953202bbc2d SHA512 d707d89ef0f94f74eb4678bcc79dfa99ea068d68a789f47039b5f00c0b8b01ace567a567c0f971fdc0dfc620c11d9536fc003d8d8e049e2cc158ce8b171e1134
+DIST guile-3.0.7.tar.gz 21878396 BLAKE2B 4fae35e21e7f7b47ae9b4cdbafd3b2f660ec4844f838c7eef023b307963b8e92bc30698bd85954523f8fb67edee8de44d19004eb288d3d6656c962e5cb57dc8b SHA512 d7b159e109fd4a08231ef9b961376e71c2872f08d47d82896d96ccac250f5677b35be9a8ce3b9a758bd2ed78d6451e4fdd844408a1baf684256d9bfa09999f3f
--- a/dev-scheme/guile/guile-3.0.7.ebuild
+++ b/dev-scheme/guile/guile-3.0.7.ebuild
@ -19,7 +19,6 @@ RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
 	dev-libs/libffi:=
 	dev-libs/libltdl:=
 	dev-libs/libunistring:0=
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="
@ -44,7 +43,6 @@ src_configure() {
 		--without-libgmp-prefix \
 		--without-libiconv-prefix \
 		--without-libintl-prefix \
 		--without-libltdl-prefix \
 		--without-libreadline-prefix \
 		--without-libunistring-prefix \
 		$(use_enable debug guile-debug) \
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/stgit/stgit-1.1.ebuild
+++ b/dev-vcs/stgit/stgit-1.1.ebuild
@ -19,7 +19,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 RDEPEND=">=dev-vcs/git-1.6.3.3"
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST rasdaemon-0.6.6.tar.bz2 404681 BLAKE2B 4314cd064b255df1cb1a148914c856d074fda1fc2d63e0554cbf0b78799c4252afdd4e827390729e191ff2ed9f719f6610487e85dd52af2b02694fb17740df05 SHA512 481ecd624ab5521d60ee7c613ee05d1d19b85e914b92eae84d18cb2e6dc788981213d49a6316cf575517b6e180f46c66c65804e4feb518bdd84bc21cd2970e08`	`DIST rasdaemon-0.6.6.tar.bz2 404681 BLAKE2B 4314cd064b255df1cb1a148914c856d074fda1fc2d63e0554cbf0b78799c4252afdd4e827390729e191ff2ed9f719f6610487e85dd52af2b02694fb17740df05 SHA512 481ecd624ab5521d60ee7c613ee05d1d19b85e914b92eae84d18cb2e6dc788981213d49a6316cf575517b6e180f46c66c65804e4feb518bdd84bc21cd2970e08`
		`DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c`
`@ -1 +1,2 @@`
	`DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1`	`DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1`
		`DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33`
`@ -1,2 +1,2 @@`
	`DIST filebus-0.2.0.tar.gz 7895 BLAKE2B d113ab7e57ee24371dc9adbeb4767f533007d36cee2a3f55ee7bbcf13c31980355cfee2db748ef6c485bad3cb8c68ba1c31f9829b0c6365fa3b63c4899fb8b02 SHA512 fc7083444a67e36778d15a8af38487024ab661d32b891cfc735fd31cce2ddecfff3ef63c591106d97250373dac9aeef8dd0e8cf0ec260b2d67031018fe66249f`	`DIST filebus-0.2.0.tar.gz 7895 BLAKE2B d113ab7e57ee24371dc9adbeb4767f533007d36cee2a3f55ee7bbcf13c31980355cfee2db748ef6c485bad3cb8c68ba1c31f9829b0c6365fa3b63c4899fb8b02 SHA512 fc7083444a67e36778d15a8af38487024ab661d32b891cfc735fd31cce2ddecfff3ef63c591106d97250373dac9aeef8dd0e8cf0ec260b2d67031018fe66249f`
	`DIST filebus-0.3.0.tar.gz 16921 BLAKE2B 60ec7eb3fb584c053f00301898b914ba9034e3aaa79a79eecdc31f8e1abd1db5c473486e02761adee537faca6725916cf327e38376bdbbeac2c8548be427089b SHA512 a7dd4cbe96e6e691794ea21b23f79caee518855235c1ee35f857fe2938f437095a9199eb9bf309087cef523b6dfa963f3635d94e9b7ece15bbe1b4284fca793c`	`DIST filebus-0.3.1.tar.gz 16926 BLAKE2B 87eea36a58895a89a70e236f505af09efabf37ce04ce58c713dc99222e415f0ecd9a55fc921a9b6336f4dea04c5e3860252425e257706f0e37be3d43d76668c0 SHA512 e0d4e30f478c9ae95b520122b5aa70bc792d7caad9f9dbde6a72dec9eff314ca884b0291ed9ad662998d1e0e91679dc96ec749b33f55188fab61e7b2b5baa792`
`@ -1 +1,2 @@`
	`DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a`	`DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a`
		`DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a`
`@ -1 +1,2 @@`
	`DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1`	`DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1`
		`DIST kuroneko-0.1.1.tar.gz 10223 BLAKE2B aad046291218139662e74c653241bfb36180a0f7fdb4e3571c4d3c8787c41032c48a96d7b02f612e957b2a0eca9fd880daa03c31302d2e92eb6dec5df1b18aab SHA512 c4f29cb5244e659f2615cca706d002c9f20b200b51c964250da8c915d45bcaca03eac2a2dbc19e1d9b6a6374b7458b2c9e0a004e0fa14b1655e8c2c9ce8268a9`
`@ -1 +1,2 @@`
	`DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050`	`DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050`
		`DIST python-exec-2.4.7.tar.bz2 88204 BLAKE2B c370d5f33063bf0dd02d1b5ddad27b320652664ed3bc89cf2d70b94292f3dcd8c4e3bb6bb43ce8d2514a8e0a5a3e95295ff8d0f95371bda136cd51312da747e8 SHA512 6e061fc1ae84e21effb24d35195a7c61430e0e50dc0b0bfbab65f741dde45a92688fd9ac7a0868f7b08ba603a609fb3f03181238f63fdd383b4d604af8406d14`
`@ -1,2 +1 @@`
	`DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b`
	`DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65`	`DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65`
`@ -1,2 +1,2 @@`
	`DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6`	`DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6`
	`DIST simdjson-0.9.5.tar.gz 7956300 BLAKE2B bd860e91ff3d14eba49370e7e5f62f3573e3b76e689633f93db7a03030b24bd600d07c7a378a82836e1d234249b10ee3bbb050ba495fd50733f0355fcaac8ff3 SHA512 cdb80fd76a6b67c52f5ad4c0fafe76cdb4c95f35ce6c486fe37c9c61e041c349c1c8ce01fef1dec8024083ae01a0afa780d595bffc833e8a99eb82ab62ab615e`	`DIST simdjson-0.9.6.tar.gz 7956235 BLAKE2B 8d1ffb96a937f859598f45232f1c55a767c4dcb401e1b15b8745df0b3b1907a9ecf3319080b5f7dd6deeac7c97b6b7ee608a98173c2c92794ea5f79ea0083b18 SHA512 bfe565dd00e95e1c5c409fce1ec2a8d88c83fc61d9f46265afc0254f8a37f241fcb5b0729bc5ac58695766e2a6cb05abbf93220fa21fd8fe34872ac4a538140c`
`@ -1 +1,2 @@`
		`DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a`
	`DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec`	`DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec`
`@ -1,2 +1,2 @@`
	`DIST fasteners-0.16.1.gh.tar.gz 28572 BLAKE2B 8434f2b47eae01bc3eb239df7adf1106299d76e577724291aef82fca2b68c7a7b5b82fa37a80d1d9ca0315615586c61b29bd4f6ac5cfce6fad798b4423eae64d SHA512 e2f94ad4d19fb425f507236ffa4611127d6254485daef4a818e4508ce935aa7a7100c2bb91343697d6005f4c220d8060fbcba19ca1e2dc257be756b0e24454df`	`DIST fasteners-0.16.2.gh.tar.gz 29549 BLAKE2B 603cfe3662194f8f493e915aa3689af1c4a5e74c9b96ddb75e44d0fd0df3d17b71c0473c6c5c1deb0c037bc7f5fcbf2cc48d36ceecf9ce0336a926daa352f028 SHA512 f1557f3ab44acb7975dd98c4c5b2b63cffa9e42c82c5b31750dcfbddbd19552ecfe5ada59c2409e5d12da77dc00185619349340f8e4e177139a09c47f0a5ca6f`
	`DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da`	`DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da`